diff --git a/.github/guides/AUTODOC.md b/.github/guides/AUTODOC.md index dd2f30627b7d..90e5b2d1ac66 100644 --- a/.github/guides/AUTODOC.md +++ b/.github/guides/AUTODOC.md @@ -1,9 +1,9 @@ # dmdoc -[DOCUMENTATION]: **PUT DOCUMENTATION LINK HERE** +[DOCUMENTATION]: https://docs.cm-ss13.com/ [BYOND]: https://secure.byond.com/ -[DMDOC]: https://github.com/SpaceManiac/SpacemanDMM/tree/master/src/dmdoc +[DMDOC]: https://github.com/SpaceManiac/SpacemanDMM/tree/master/crates/dmdoc [DMDOC] is a documentation generator for DreamMaker, the scripting language of the [BYOND] game engine. It produces simple static HTML files based on @@ -13,9 +13,9 @@ We use **dmdoc** to generate [DOCUMENTATION] for our code, and that documentatio is automatically generated and built on every new commit to the master branch This gives new developers a clickable reference [DOCUMENTATION] they can browse to better help -gain understanding of the /tg/station codebase structure and api reference. +gain understanding of the CM-SS13 codebase structure and api reference. -## Documenting code on /tg/station +## Documenting code on CM-SS13 We use block comments to document procs and classes, and we use `///` line comments when documenting individual variables. diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm index dfa335375b67..87c5e2255b52 100644 --- a/code/__DEFINES/__game.dm +++ b/code/__DEFINES/__game.dm @@ -1,9 +1,3 @@ -#define RANGE_TURFS(RADIUS, CENTER) \ -block( \ - locate(max(CENTER.x-(RADIUS),1), max(CENTER.y-(RADIUS),1), CENTER.z), \ - locate(min(CENTER.x+(RADIUS),world.maxx), min(CENTER.y+(RADIUS),world.maxy), CENTER.z) \ -) - //Admin perms are in global.dm. /// To make it even more clear that something is a bitfield. diff --git a/code/__DEFINES/_math.dm b/code/__DEFINES/_math.dm index f0281f51cedb..d7c068237987 100644 --- a/code/__DEFINES/_math.dm +++ b/code/__DEFINES/_math.dm @@ -14,6 +14,8 @@ #define CEILING(x, y) ( -round(-(x) / (y)) * (y) ) +#define ROUND_UP(x) ( -round(-(x))) + // round() acts like floor(x, 1) by default but can't handle other values #define FLOOR(x, y) ( round((x) / (y)) * (y) ) diff --git a/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm b/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm index 61eb757e9c4d..f4df347c62db 100644 --- a/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm +++ b/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm @@ -75,9 +75,13 @@ #define COMSIG_MOB_PRE_CLICK "mob_pre_click" #define COMPONENT_INTERRUPT_CLICK (1<<0) -///from base of /mob/Login(): () +/// From base of /mob/Login(), called when a client logs into this mob: () +/// Not to be confused with [COMSIG_MOB_LOGGED_IN] #define COMSIG_MOB_LOGIN "mob_login" -///from base of /mob/Logout(): () +/// From base of /mob/Login(), called after a client logs into this mob: () +/// Not to be confused with [COMSIG_MOB_LOGIN] +#define COMSIG_MOB_LOGGED_IN "mob_logged_in" +/// From base of /mob/Logout(): () #define COMSIG_MOB_LOGOUT "mob_logout" /// From /mob/proc/change_real_name(): (old_name, new_name) diff --git a/code/__DEFINES/dcs/signals/atom/signals_atom.dm b/code/__DEFINES/dcs/signals/atom/signals_atom.dm index d9bd1202c159..4e4458232669 100644 --- a/code/__DEFINES/dcs/signals/atom/signals_atom.dm +++ b/code/__DEFINES/dcs/signals/atom/signals_atom.dm @@ -1,6 +1,7 @@ /// From /atom/proc/Decorate #define COMSIG_ATOM_DECORATED "atom_decorated" - +//from SSatoms InitAtom - Only if the atom was not deleted or failed initialization and has a loc +#define COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON "atom_init_success_on" ///from base of atom/setDir(): (old_dir, new_dir). Called before the direction changes. #define COMSIG_ATOM_DIR_CHANGE "atom_dir_change" diff --git a/code/__DEFINES/dcs/signals/atom/signals_turf.dm b/code/__DEFINES/dcs/signals/atom/signals_turf.dm index 6a0788bcf871..881ffc3ee139 100644 --- a/code/__DEFINES/dcs/signals/atom/signals_turf.dm +++ b/code/__DEFINES/dcs/signals/atom/signals_turf.dm @@ -19,3 +19,6 @@ ///from /turf/closed/wall/proc/place_poster #define COMSIG_POSTER_PLACED "poster_placed" + +///from base of /datum/turf_reservation/proc/Release: (datum/turf_reservation/reservation) +#define COMSIG_TURF_RESERVATION_RELEASED "turf_reservation_released" diff --git a/code/__DEFINES/dcs/signals/signals_client.dm b/code/__DEFINES/dcs/signals/signals_client.dm index 3968f654c486..36a60c153d0f 100644 --- a/code/__DEFINES/dcs/signals/signals_client.dm +++ b/code/__DEFINES/dcs/signals/signals_client.dm @@ -19,8 +19,8 @@ /// Called after one or more verbs are added: (list of verbs added) #define COMSIG_CLIENT_VERB_REMOVED "client_verb_removed" -/// Called after a client logs into a mob: (mob) -#define COMSIG_CLIENT_MOB_LOGIN "client_mob_changed" +/// Called from /mob/Login() after a client logs into a mob: (mob) +#define COMSIG_CLIENT_MOB_LOGGED_IN "client_mob_logged_in" /// Called when something is added to a client's screen : /client/proc/add_to_screen(screen_add) #define COMSIG_CLIENT_SCREEN_ADD "client_screen_add" diff --git a/code/__DEFINES/dcs/signals/signals_global.dm b/code/__DEFINES/dcs/signals/signals_global.dm index 905ff1246182..378948347a81 100644 --- a/code/__DEFINES/dcs/signals/signals_global.dm +++ b/code/__DEFINES/dcs/signals/signals_global.dm @@ -8,6 +8,8 @@ ///from base of datum/controller/subsystem/mapping/proc/add_new_zlevel(): (list/args) #define COMSIG_GLOB_NEW_Z "!new_z" +/// sent after world.maxx and/or world.maxy are expanded: (has_exapnded_world_maxx, has_expanded_world_maxy) +#define COMSIG_GLOB_EXPANDED_WORLD_BOUNDS "!expanded_world_bounds" ///from base of datum/controller/subsystem/mapping/proc/add_new_zlevel(): (list/args) #define COMSIG_GLOB_VEHICLE_ORDERED "!vehicle_ordered" /// from /datum/controller/subsystem/ticker/fire @@ -32,9 +34,11 @@ #define COMSIG_GLOB_REMOVE_VOTE_BUTTON "!remove_vote_button" -#define COMSIG_GLOB_CLIENT_LOGIN "!client_login" +/// Called from /client/New() when a client logs in to the game: (client) +#define COMSIG_GLOB_CLIENT_LOGGED_IN "!client_logged_in" -#define COMSIG_GLOB_MOB_LOGIN "!mob_login" +/// Called from /mob/Login() when a client logs into a mob: (mob) +#define COMSIG_GLOB_MOB_LOGGED_IN "!mob_logged_in" ///from /datum/controller/subsystem/ticker/PostSetup #define COMSIG_GLOB_POST_SETUP "!post_setup" diff --git a/code/__DEFINES/dropships.dm b/code/__DEFINES/dropships.dm index f7df570a2864..d53e7c68d8db 100644 --- a/code/__DEFINES/dropships.dm +++ b/code/__DEFINES/dropships.dm @@ -10,3 +10,8 @@ #define DROPSHIP_MIN_AUTO_DELAY 10 SECONDS #define DROPSHIP_AUTO_RETRY_COOLDOWN 20 SECONDS #define DROPSHIP_MEDEVAC_COOLDOWN 20 SECONDS + +//Hatches states +#define SHUTTLE_DOOR_BROKEN -1 +#define SHUTTLE_DOOR_UNLOCKED 0 +#define SHUTTLE_DOOR_LOCKED 1 diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index 155a91fa62ed..ef3d17572f0d 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -118,8 +118,5 @@ require only minor tweaks. #define MAP_ARMOR_STYLE_JUNGLE "jungle" #define MAP_ARMOR_STYLE_PRISON "prison" -//turf-only flags -#define NOJAUNT_1 (1<<0) -#define UNUSED_RESERVATION_TURF (1<<1) -/// If a turf can be made dirty at roundstart. This is also used in areas. -#define CAN_BE_DIRTY_1 (1<<2) +/// A map key that corresponds to being one exclusively for Space. +#define SPACE_KEY "space" diff --git a/code/__DEFINES/mob_hud.dm b/code/__DEFINES/mob_hud.dm index 02f992694832..c451d01d3c90 100644 --- a/code/__DEFINES/mob_hud.dm +++ b/code/__DEFINES/mob_hud.dm @@ -35,7 +35,7 @@ #define MOB_HUD_XENO_INFECTION 6 #define MOB_HUD_XENO_STATUS 7 #define MOB_HUD_XENO_HOSTILE 8 -#define MOB_HUD_FACTION_USCM 9 +#define MOB_HUD_FACTION_MARINE 9 #define MOB_HUD_FACTION_OBSERVER 10 #define MOB_HUD_FACTION_UPP 11 #define MOB_HUD_FACTION_WY 12 diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 2b018c0a2810..ef3dfb03b337 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -279,6 +279,7 @@ DEFINE_BITFIELD(whitelist_status, list( #define FACTION_LIST_MERCENARY list(FACTION_MERCENARY) #define FACTION_LIST_MARSHAL list(FACTION_MARSHAL) #define FACTION_LIST_DUTCH list(FACTION_DUTCH) +#define FACTION_LIST_SURVIVOR_WY list(FACTION_SURVIVOR, FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY) #define FACTION_LIST_MARINE_WY list(FACTION_MARINE, FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY) #define FACTION_LIST_MARINE_UPP list(FACTION_MARINE, FACTION_UPP) #define FACTION_LIST_MARINE_TWE list(FACTION_MARINE, FACTION_TWE) diff --git a/code/__DEFINES/objects.dm b/code/__DEFINES/objects.dm index 292b315360c5..d495c8e8c012 100644 --- a/code/__DEFINES/objects.dm +++ b/code/__DEFINES/objects.dm @@ -175,3 +175,8 @@ GLOBAL_LIST_INIT(RESTRICTED_CAMERA_NETWORKS, list( //Those networks can only be #define CHECKS_PASSED 1 #define STILL_ON_COOLDOWN 2 #define NO_LIGHT_STATE_CHANGE 3 + +//tool capabilities or something i don't know +#define REMOVE_CROWBAR (1<<0) +#define BREAK_CROWBAR (1<<1) +#define REMOVE_SCREWDRIVER (1<<2) diff --git a/code/__DEFINES/sentry_laptop_configurations.dm b/code/__DEFINES/sentry_laptop_configurations.dm index 8626ba2cfaee..6f4e2bec14ca 100644 --- a/code/__DEFINES/sentry_laptop_configurations.dm +++ b/code/__DEFINES/sentry_laptop_configurations.dm @@ -1,4 +1,3 @@ -#define FACTION_USCM "USCM" #define FACTION_WEYLAND "WY" #define FACTION_HUMAN "HUMAN" #define FACTION_COLONY "COLONY" diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm index a3299184e4ef..dfd470a5dba3 100644 --- a/code/__DEFINES/shuttles.dm +++ b/code/__DEFINES/shuttles.dm @@ -41,7 +41,7 @@ #define TRANSIT_REQUEST 1 #define TRANSIT_READY 2 -#define SHUTTLE_TRANSIT_BORDER 8 +#define SHUTTLE_TRANSIT_BORDER 16 #define PARALLAX_LOOP_TIME 25 #define HYPERSPACE_END_TIME 5 diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index fdfec5e8ca08..a4fb6d40be73 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,6 +1,6 @@ // tgstation-server DMAPI -#define TGS_DMAPI_VERSION "7.0.2" +#define TGS_DMAPI_VERSION "7.1.1" // All functions and datums outside this document are subject to change with any version and should not be relied on. @@ -50,6 +50,13 @@ #endif +#ifndef TGS_FILE2TEXT_NATIVE +#ifdef file2text +#error Your codebase is re-defining the BYOND proc file2text. The DMAPI requires the native version to read the result of world.Export(). You can fix this by adding "#define TGS_FILE2TEXT_NATIVE file2text" before your override of file2text to allow the DMAPI to use the native version. This will only be used for world.Export(), not regular file accesses +#endif +#define TGS_FILE2TEXT_NATIVE file2text +#endif + // EVENT CODES /// Before a reboot mode change, extras parameters are the current and new reboot mode enums. @@ -490,6 +497,16 @@ /world/proc/TgsChatChannelInfo() return +/** + * Trigger an event in TGS. Requires TGS version >= 6.3.0. Returns [TRUE] if the event was triggered successfully, [FALSE] otherwise. This function may sleep! + * + * event_name - The name of the event to trigger + * parameters - Optional list of string parameters to pass as arguments to the event script. The first parameter passed to a script will always be the running game's directory followed by these parameters. + * wait_for_completion - If set, this function will not return until the event has run to completion. + */ +/world/proc/TgsTriggerEvent(event_name, list/parameters, wait_for_completion = FALSE) + return + /* The MIT License diff --git a/code/__DEFINES/turf_flags.dm b/code/__DEFINES/turf_flags.dm index d7b3e90811d8..19dc17191d7c 100644 --- a/code/__DEFINES/turf_flags.dm +++ b/code/__DEFINES/turf_flags.dm @@ -1,3 +1,12 @@ +//turf_flags values +/// Marks a turf as organic. Used for alien wall and membranes. +#define TURF_ORGANIC (1<<0) +/// If a turf is an usused reservation turf awaiting assignment +#define UNUSED_RESERVATION_TURF (1<<1) +/// If a turf is a reserved turf +#define RESERVATION_TURF (1<<2) + +//ChangeTurf options to change its behavior #define CHANGETURF_DEFER_CHANGE (1<<0) /// This flag prevents changeturf from gathering air from nearby turfs to fill the new turf with an approximation of local air #define CHANGETURF_IGNORE_AIR (1<<1) @@ -5,12 +14,3 @@ /// A flag for PlaceOnTop to just instance the new turf instead of calling ChangeTurf. Used for uninitialized turfs NOTHING ELSE #define CHANGETURF_SKIP (1<<3) -#define IS_OPAQUE_TURF(turf) (turf.directional_opacity == ALL_CARDINALS) - -/// Marks a turf as organic. Used for alien wall and membranes. -#define TURF_ORGANIC (1<<0) - - -#define REMOVE_CROWBAR (1<<0) -#define BREAK_CROWBAR (1<<1) -#define REMOVE_SCREWDRIVER (1<<2) diff --git a/code/__DEFINES/turfs.dm b/code/__DEFINES/turfs.dm new file mode 100644 index 000000000000..b9a80d4ab257 --- /dev/null +++ b/code/__DEFINES/turfs.dm @@ -0,0 +1,29 @@ +#define RANGE_TURFS(RADIUS, CENTER) \ +block( \ + locate(max(CENTER.x-(RADIUS),1), max(CENTER.y-(RADIUS),1), CENTER.z), \ + locate(min(CENTER.x+(RADIUS),world.maxx), min(CENTER.y+(RADIUS),world.maxy), CENTER.z) \ +) + +#define RECT_TURFS(H_RADIUS, V_RADIUS, CENTER) \ + block( \ + locate(max((CENTER).x-(H_RADIUS),1), max((CENTER).y-(V_RADIUS),1), (CENTER).z), \ + locate(min((CENTER).x+(H_RADIUS),world.maxx), min((CENTER).y+(V_RADIUS),world.maxy), (CENTER).z) \ + ) + +///Returns all turfs in a zlevel +#define Z_TURFS(ZLEVEL) block(locate(1,1,ZLEVEL), locate(world.maxx, world.maxy, ZLEVEL)) + +/// Returns a list of turfs in the rectangle specified by BOTTOM LEFT corner and height/width, checks for being outside the world border for you +#define CORNER_BLOCK(corner, width, height) CORNER_BLOCK_OFFSET(corner, width, height, 0, 0) + +/// Returns a list of turfs similar to CORNER_BLOCK but with offsets +#define CORNER_BLOCK_OFFSET(corner, width, height, offset_x, offset_y) ((block(locate(corner.x + offset_x, corner.y + offset_y, corner.z), locate(min(corner.x + (width - 1) + offset_x, world.maxx), min(corner.y + (height - 1) + offset_y, world.maxy), corner.z)))) + +/// Returns an outline (neighboring turfs) of the given block +#define CORNER_OUTLINE(corner, width, height) ( \ + CORNER_BLOCK_OFFSET(corner, width + 2, 1, -1, -1) + \ + CORNER_BLOCK_OFFSET(corner, width + 2, 1, -1, height) + \ + CORNER_BLOCK_OFFSET(corner, 1, height, -1, 0) + \ + CORNER_BLOCK_OFFSET(corner, 1, height, width, 0)) + +#define TURF_FROM_COORDS_LIST(List) (locate(List[1], List[2], List[3])) diff --git a/code/__DEFINES/typecheck/generic_types.dm b/code/__DEFINES/typecheck/generic_types.dm index d9fa3df55430..587108d5b5e6 100644 --- a/code/__DEFINES/typecheck/generic_types.dm +++ b/code/__DEFINES/typecheck/generic_types.dm @@ -11,6 +11,7 @@ #define ismovableatom(A) (ismovable(A)) #define isatom(A) (isloc(A)) #define isfloorturf(A) (istype(A, /turf/open/floor)) +#define isclosedturf(A) (istype(A, /turf/closed)) #define isweakref(D) (istype(D, /datum/weakref)) #define isgenerator(A) (istype(A, /generator)) diff --git a/code/__DEFINES/vendors.dm b/code/__DEFINES/vendors.dm index 086b70a92428..dc78f7caa4d3 100644 --- a/code/__DEFINES/vendors.dm +++ b/code/__DEFINES/vendors.dm @@ -19,6 +19,8 @@ #define MARINE_CAN_BUY_COMBAT_ARMOR "combat_armor" #define MARINE_CAN_BUY_KIT "kit" #define MARINE_CAN_BUY_DRESS "dress" +#define CIVILIAN_CAN_BUY_BACKPACK "civilian_backpack" +#define CIVILIAN_CAN_BUY_UTILITY "civilian_utility" #define MARINE_CAN_BUY_ALL list(MARINE_CAN_BUY_UNIFORM = 1, MARINE_CAN_BUY_SHOES = 1, MARINE_CAN_BUY_HELMET = 1, MARINE_CAN_BUY_ARMOR = 1, MARINE_CAN_BUY_GLOVES = 1, MARINE_CAN_BUY_EAR = 1, MARINE_CAN_BUY_BACKPACK = 1, MARINE_CAN_BUY_POUCH = 2, MARINE_CAN_BUY_BELT = 1, MARINE_CAN_BUY_GLASSES = 1, MARINE_CAN_BUY_MASK = 1, MARINE_CAN_BUY_ESSENTIALS = 1, MARINE_CAN_BUY_SECONDARY = 1, MARINE_CAN_BUY_ATTACHMENT = 1, MARINE_CAN_BUY_MRE = 1, MARINE_CAN_BUY_ACCESSORY = 1, MARINE_CAN_BUY_COMBAT_SHOES = 1, MARINE_CAN_BUY_COMBAT_HELMET = 1, MARINE_CAN_BUY_COMBAT_ARMOR = 1, MARINE_CAN_BUY_KIT = 1, MARINE_CAN_BUY_DRESS = 99) diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm index 6f6e4eef7c20..fb9d6bfb4faf 100644 --- a/code/__DEFINES/xeno.dm +++ b/code/__DEFINES/xeno.dm @@ -62,6 +62,9 @@ #define ACID_SPRAY_LINE 0 #define ACID_SPRAY_CONE 1 +/// Defines for Abomination ability /datum/action/xeno_action/activable/feralfrenzy +#define SINGLETARGETGUT 0 +#define AOETARGETGUT 1 #define WARDEN_HEAL_SHIELD 0 #define WARDEN_HEAL_HP 1 diff --git a/code/__HELPERS/lighting.dm b/code/__HELPERS/lighting.dm index 08c360849b58..e768d9d1255c 100644 --- a/code/__HELPERS/lighting.dm +++ b/code/__HELPERS/lighting.dm @@ -1,3 +1,5 @@ +#define IS_OPAQUE_TURF(turf) (turf.directional_opacity == ALL_CARDINALS) + /// Produces a mutable appearance glued to the [EMISSIVE_PLANE] dyed to be the [EMISSIVE_COLOR]. /proc/emissive_appearance(icon, icon_state = "", layer = FLOAT_LAYER, alpha = 255, appearance_flags = NONE) var/mutable_appearance/appearance = mutable_appearance(icon, icon_state, layer, EMISSIVE_PLANE, alpha, appearance_flags | EMISSIVE_APPEARANCE_FLAGS) diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm index 30ef9428586d..9a8528aabcc3 100644 --- a/code/__HELPERS/lists.dm +++ b/code/__HELPERS/lists.dm @@ -534,7 +534,7 @@ //Copies a list, and all lists inside it recusively //Does not copy any other reference type -/proc/deepCopyList(list/L) +/proc/deep_copy_list(list/L) if(!islist(L)) return L . = L.Copy() @@ -545,10 +545,10 @@ continue var/value = .[key] if(islist(value)) - value = deepCopyList(value) + value = deep_copy_list(value) .[key] = value if(islist(key)) - key = deepCopyList(key) + key = deep_copy_list(key) .[i] = key .[key] = value diff --git a/code/__HELPERS/logging.dm b/code/__HELPERS/logging.dm index d6c18c8a93be..59e4c7710992 100644 --- a/code/__HELPERS/logging.dm +++ b/code/__HELPERS/logging.dm @@ -286,6 +286,16 @@ GLOBAL_PROTECT(config_error_log) WRITE_LOG(GLOB.config_error_log, text) SEND_TEXT(world.log, text) +/// Logging for mapping errors +/proc/log_mapping(text, skip_world_log) +#ifdef UNIT_TESTS + GLOB.unit_test_mapping_logs += text +#endif + if(skip_world_log) + return + WRITE_LOG(GLOB.mapping_log, text) + SEND_TEXT(world.log, text) + /proc/log_admin_private(text) log_admin(text) diff --git a/code/__HELPERS/string_lists.dm b/code/__HELPERS/string_lists.dm new file mode 100644 index 000000000000..076bbf642756 --- /dev/null +++ b/code/__HELPERS/string_lists.dm @@ -0,0 +1,23 @@ +GLOBAL_LIST_EMPTY(string_lists) + +/** + * Caches lists with non-numeric stringify-able values (text or typepath). + */ +/proc/string_list(list/values) + var/string_id = values.Join("-") + + . = GLOB.string_lists[string_id] + + if(.) + return . + + return GLOB.string_lists[string_id] = values + +///A wrapper for baseturf string lists, to offer support of non list values, and a stack_trace if we have major issues +/proc/baseturfs_string_list(list/values, turf/baseturf_holder) + if(!islist(values)) + return values //baseturf things + // return values + if(length(values) > 10) + return string_list(list(/turf/closed/cordon/debug)) + return string_list(values) diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 9287197bbcc2..7396e8624ba9 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -201,6 +201,24 @@ return "" +//Returns a string with reserved characters and spaces after the first and last letters removed +//Like trim(), but very slightly faster. worth it for niche usecases +/proc/trim_reduced(text) + var/starting_coord = 1 + var/text_len = length(text) + for (var/i in 1 to text_len) + if (text2ascii(text, i) > 32) + starting_coord = i + break + + for (var/i = text_len, i >= starting_coord, i--) + if (text2ascii(text, i) > 32) + return copytext(text, starting_coord, i + 1) + + if(starting_coord > 1) + return copytext(text, starting_coord) + return "" + //Returns a string with reserved characters and spaces before the first word and after the last word removed. /proc/trim(text) return trim_left(trim_right(text)) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 2fd7ea8919df..aa23131847d7 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -820,7 +820,7 @@ animation.master = target flick(flick_anim, animation) -//Will return the contents of an atom recursivly to a depth of 'searchDepth' +///Will return the contents of an atom recursivly to a depth of 'searchDepth', not including starting atom /atom/proc/GetAllContents(searchDepth = 5, list/toReturn = list()) for(var/atom/part as anything in contents) toReturn += part @@ -828,6 +828,16 @@ part.GetAllContents(searchDepth - 1, toReturn) return toReturn +///Returns the src and all recursive contents as a list. Includes the starting atom. +/atom/proc/get_all_contents(ignore_flag_1) + . = list(src) + var/i = 0 + while(i < length(.)) + var/atom/checked_atom = .[++i] + if(checked_atom.flags_atom & ignore_flag_1) + continue + . += checked_atom.contents + /// Returns list of contents of a turf recursively, much like GetAllContents /// We only get containing atoms in the turf, excluding multitiles bordering on it /turf/proc/GetAllTurfStrictContents(searchDepth = 5, list/toReturn = list()) @@ -1905,8 +1915,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) return list(region_x1 & region_x2, region_y1 & region_y2) -#define TURF_FROM_COORDS_LIST(List) (locate(List[1], List[2], List[3])) - //Vars that will not be copied when using /DuplicateObject GLOBAL_LIST_INIT(duplicate_forbidden_vars,list( "tag", "datum_components", "area", "type", "loc", "locs", "vars", "parent", "parent_type", "verbs", "ckey", "key", diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 59d14f2e0fed..bf9330c567cc 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -154,6 +154,12 @@ DEFINE_BITFIELD(flags_atom, list( "HTML_USE_INITAL_ICON" = HTML_USE_INITAL_ICON, )) +DEFINE_BITFIELD(turf_flags, list( + "TURF_ORGANIC" = TURF_ORGANIC, + "UNUSED_RESERVATION_TURF" = UNUSED_RESERVATION_TURF, + "RESERVATION_TURF" = RESERVATION_TURF, +)) + DEFINE_BITFIELD(flags_item, list( "NODROP" = NODROP, "NOBLUDGEON" = NOBLUDGEON, diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm index 7d9cd3324067..4dbf46086f02 100644 --- a/code/_globalvars/global_lists.dm +++ b/code/_globalvars/global_lists.dm @@ -37,6 +37,9 @@ GLOBAL_LIST_EMPTY(minimap_icons) GLOBAL_LIST_EMPTY(mainship_pipes) +/// List of all the maps that have been cached for /proc/load_map +GLOBAL_LIST_EMPTY(cached_maps) + /proc/initiate_minimap_icons() var/list/icons = list() for(var/iconstate in icon_states('icons/UI_icons/map_blips.dmi')) diff --git a/code/_globalvars/lists/mapping_globals.dm b/code/_globalvars/lists/mapping_globals.dm index 47cc22dae5e1..772561dbf4a6 100644 --- a/code/_globalvars/lists/mapping_globals.dm +++ b/code/_globalvars/lists/mapping_globals.dm @@ -53,6 +53,7 @@ GLOBAL_LIST_EMPTY(teleporter_landmarks) GLOBAL_LIST_INIT(cardinals, list(NORTH, SOUTH, EAST, WEST)) GLOBAL_LIST_EMPTY(nightmare_landmarks) +GLOBAL_LIST_EMPTY(nightmare_landmark_tags_removed) GLOBAL_LIST_EMPTY(ship_areas) diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 37a858d76699..b8b55b42c028 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -272,18 +272,14 @@ static_inventory += using /datum/hud/human/proc/draw_hand_equip(datum/custom_hud/ui_datum, ui_alpha, ui_color) - var/atom/movable/screen/using = new /atom/movable/screen() - using.name = "equip" - using.icon = ui_datum.ui_style_icon - using.icon_state = "act_equip" - using.screen_loc = ui_datum.ui_equip - using.layer = ABOVE_HUD_LAYER - using.plane = ABOVE_HUD_PLANE + var/atom/movable/screen/equip/equip_button = new() + equip_button.icon = ui_datum.ui_style_icon + equip_button.screen_loc = ui_datum.ui_equip if(ui_color) - using.color = ui_color + equip_button.color = ui_color if(ui_alpha) - using.alpha = ui_alpha - static_inventory += using + equip_button.alpha = ui_alpha + static_inventory += equip_button /datum/hud/human/proc/draw_oxygen(datum/custom_hud/ui_datum) oxygen_icon = new /atom/movable/screen/oxygen() @@ -312,38 +308,28 @@ infodisplay += locate_leader /datum/hud/human/proc/draw_gun_related(datum/custom_hud/ui_datum, ui_alpha) - use_attachment = new /atom/movable/screen() + use_attachment = new /atom/movable/screen/gun/attachment() use_attachment.icon = ui_datum.ui_style_icon - use_attachment.icon_state = "gun_attach" - use_attachment.name = "Activate weapon attachment" use_attachment.screen_loc = ui_datum.ui_gun_attachment static_inventory += use_attachment - toggle_raillight = new /atom/movable/screen() + toggle_raillight = new /atom/movable/screen/gun/rail_light() toggle_raillight.icon = ui_datum.ui_style_icon - toggle_raillight.icon_state = "gun_raillight" - toggle_raillight.name = "Toggle Rail Flashlight" toggle_raillight.screen_loc = ui_datum.ui_gun_railtoggle static_inventory += toggle_raillight - eject_mag = new /atom/movable/screen() + eject_mag = new /atom/movable/screen/gun/eject_magazine() eject_mag.icon = ui_datum.ui_style_icon - eject_mag.icon_state = "gun_loaded" - eject_mag.name = "Eject magazine" eject_mag.screen_loc = ui_datum.ui_gun_eject static_inventory += eject_mag - toggle_burst = new /atom/movable/screen() + toggle_burst = new /atom/movable/screen/gun/toggle_firemode() toggle_burst.icon = ui_datum.ui_style_icon - toggle_burst.icon_state = "gun_burst" - toggle_burst.name = "Toggle burst fire" toggle_burst.screen_loc = ui_datum.ui_gun_burst static_inventory += toggle_burst - unique_action = new /atom/movable/screen() + unique_action = new /atom/movable/screen/gun/unique_action() unique_action.icon = ui_datum.ui_style_icon - unique_action.icon_state = "gun_unique" - unique_action.name = "Use unique action" unique_action.screen_loc = ui_datum.ui_gun_unique static_inventory += unique_action diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 1eb555fceaf7..edf2d44a0714 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -59,9 +59,11 @@ /atom/movable/screen/action_button/attack_ghost(mob/dead/observer/user) return -/atom/movable/screen/action_button/clicked(mob/user) +/atom/movable/screen/action_button/clicked(mob/user, list/mods) if(!user || !source_action) return TRUE + if(source_action.owner != user) + return TRUE if(source_action.can_use_action()) source_action.action_activate() @@ -97,7 +99,7 @@ icon_state = "hide" var/hidden = 0 -/atom/movable/screen/action_button/hide_toggle/clicked(mob/user, mods) +/atom/movable/screen/action_button/hide_toggle/clicked(mob/user, list/mods) user.hud_used.action_buttons_hidden = !user.hud_used.action_buttons_hidden hidden = user.hud_used.action_buttons_hidden if(hidden) @@ -107,7 +109,7 @@ name = "Hide Buttons" icon_state = "hide" user.update_action_buttons() - return 1 + return TRUE /atom/movable/screen/action_button/ghost/minimap/get_button_screen_loc(button_number) return "SOUTH:6,CENTER+1:24" @@ -211,54 +213,53 @@ update_icon(user) return 1 -/atom/movable/screen/clicked(mob/user) +/atom/movable/screen/gun + /// The proc/verb which should be called on the gun. + var/gun_proc_ref + +/atom/movable/screen/gun/clicked(mob/user, list/mods) + . = ..() + if(.) + return + // If the user has a gun in their active hand, call `gun_proc_ref` on it. + var/obj/item/weapon/gun/held_item = user.get_held_item() + if(istype(held_item)) + INVOKE_ASYNC(held_item, gun_proc_ref) + +/atom/movable/screen/gun/attachment + name = "Activate weapon attachment" + icon_state = "gun_attach" + gun_proc_ref = TYPE_VERB_REF(/obj/item/weapon/gun, activate_attachment_verb) + +/atom/movable/screen/gun/rail_light + name = "Toggle rail flashlight" + icon_state = "gun_raillight" + gun_proc_ref = TYPE_VERB_REF(/obj/item/weapon/gun, activate_rail_attachment_verb) + +/atom/movable/screen/gun/eject_magazine + name = "Eject magazine" + icon_state = "gun_loaded" + gun_proc_ref = TYPE_VERB_REF(/obj/item/weapon/gun, empty_mag) + +/atom/movable/screen/gun/toggle_firemode + name = "Toggle firemode" + icon_state = "gun_burst" + gun_proc_ref = TYPE_VERB_REF(/obj/item/weapon/gun, use_toggle_burst) + +/atom/movable/screen/gun/unique_action + name = "Use unique action" + icon_state = "gun_unique" + gun_proc_ref = TYPE_VERB_REF(/obj/item/weapon/gun, use_unique_action) + + +/atom/movable/screen/clicked(mob/user, list/mods) if(!user) return TRUE if(isobserver(user)) return TRUE - switch(name) - if("equip") - if(ishuman(user)) - var/mob/living/carbon/human/human = user - human.quick_equip() - return 1 - - if("Reset Machine") - user.unset_interaction() - return 1 - - if("Activate weapon attachment") - var/obj/item/weapon/gun/held_item = user.get_held_item() - if(istype(held_item)) - held_item.activate_attachment_verb() - return 1 - - if("Toggle Rail Flashlight") - var/obj/item/weapon/gun/held_item = user.get_held_item() - if(istype(held_item)) - held_item.activate_rail_attachment_verb() - return 1 - - if("Eject magazine") - var/obj/item/weapon/gun/held_item = user.get_held_item() - if(istype(held_item)) - held_item.empty_mag() - return 1 - - if("Toggle burst fire") - var/obj/item/weapon/gun/held_item = user.get_held_item() - if(istype(held_item)) - held_item.use_toggle_burst() - return 1 - - if("Use unique action") - var/obj/item/weapon/gun/held_item = user.get_held_item() - if(istype(held_item)) - held_item.use_unique_action() - return 1 - return 0 + return FALSE /atom/movable/screen/inventory/clicked(mob/user) @@ -585,6 +586,19 @@ vision_define = XENO_VISION_LEVEL_NO_NVG to_chat(owner, SPAN_NOTICE("Night vision mode switched to [vision_define].")) +/atom/movable/screen/equip + name = "equip" + icon_state = "act_equip" + layer = ABOVE_HUD_LAYER + plane = ABOVE_HUD_PLANE + +/atom/movable/screen/equip/clicked(mob/user) + . = ..() + if(. || !ishuman(user)) + return TRUE + var/mob/living/carbon/human/human_user = user + human_user.quick_equip() + /atom/movable/screen/bodytemp name = "body temperature" icon_state = "temp0" diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm index c47531f5fc45..d71bf1d747c9 100644 --- a/code/controllers/configuration/config_entry.dm +++ b/code/controllers/configuration/config_entry.dm @@ -4,6 +4,7 @@ #define KEY_MODE_TEXT 0 #define KEY_MODE_TYPE 1 +#define KEY_MODE_TEXT_UNALTERED 2 /datum/config_entry var/name //read-only, this is determined by the last portion of the derived entry type @@ -153,7 +154,9 @@ var/key_value = null if(key_pos || value_mode == VALUE_MODE_FLAG) - key_name = lowertext(copytext(str_val, 1, key_pos)) + key_name = copytext(str_val, 1, key_pos) + if(key_mode != KEY_MODE_TEXT_UNALTERED) + key_name = lowertext(key_name) if(key_pos) key_value = copytext(str_val, key_pos + length(str_val[key_pos])) var/new_key @@ -161,7 +164,7 @@ var/continue_check_value var/continue_check_key switch(key_mode) - if(KEY_MODE_TEXT) + if(KEY_MODE_TEXT, KEY_MODE_TEXT_UNALTERED) new_key = key_name continue_check_key = new_key if(KEY_MODE_TYPE) diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index 83929ecf8803..e2572e5e2d61 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -629,3 +629,14 @@ This maintains a list of ip addresses that are able to bypass topic filtering. /datum/config_entry/flag/guest_ban /datum/config_entry/flag/auto_profile + +/// Relay Ping Browser configuration +/datum/config_entry/keyed_list/connection_relay_ping + splitter = "|" + key_mode = KEY_MODE_TEXT_UNALTERED + value_mode = VALUE_MODE_TEXT + +/datum/config_entry/keyed_list/connection_relay_con + splitter = "|" + key_mode = KEY_MODE_TEXT_UNALTERED + value_mode = VALUE_MODE_TEXT diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index ae4783e4837a..f0d5ee14363e 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -19,6 +19,9 @@ SUBSYSTEM_DEF(atoms) var/list/BadInitializeCalls = list() + ///initAtom() adds the atom its creating to this list iff InitializeAtoms() has been given a list to populate as an argument + var/list/created_atoms + initialized = INITIALIZATION_INSSATOMS /datum/controller/subsystem/atoms/Initialize(timeofday) @@ -34,7 +37,7 @@ SUBSYSTEM_DEF(atoms) populate_seed_list() return SS_INIT_SUCCESS -/datum/controller/subsystem/atoms/proc/InitializeAtoms(list/atoms) +/datum/controller/subsystem/atoms/proc/InitializeAtoms(list/atoms, list/atoms_to_return) if(initialized == INITIALIZATION_INSSATOMS) return @@ -73,7 +76,10 @@ SUBSYSTEM_DEF(atoms) processing_late_loaders = FALSE /// Actually creates the list of atoms. Exists soley so a runtime in the creation logic doesn't cause initalized to totally break -/datum/controller/subsystem/atoms/proc/CreateAtoms(list/atoms) +/datum/controller/subsystem/atoms/proc/CreateAtoms(list/atoms, list/atoms_to_return = null) + if (atoms_to_return) + LAZYINITLIST(created_atoms) + #ifdef TESTING var/count #endif @@ -152,12 +158,10 @@ SUBSYSTEM_DEF(atoms) qdeleted = TRUE else if(!(A.flags_atom & INITIALIZED)) BadInitializeCalls[the_type] |= BAD_INIT_DIDNT_INIT - /* else - SEND_SIGNAL(A,COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE) + SEND_SIGNAL(A, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON) if(created_atoms && from_template && ispath(the_type, /atom/movable))//we only want to populate the list with movables created_atoms += A.get_all_contents() - */ return qdeleted || QDELING(A) diff --git a/code/controllers/subsystem/interior.dm b/code/controllers/subsystem/interior.dm index 8abc3179f191..e2b845f833d7 100644 --- a/code/controllers/subsystem/interior.dm +++ b/code/controllers/subsystem/interior.dm @@ -15,11 +15,11 @@ SUBSYSTEM_DEF(interior) var/height_to_request = template.height + INTERIOR_BORDER_SIZE var/width_to_request = template.width + INTERIOR_BORDER_SIZE - var/datum/turf_reservation/reserved_area = SSmapping.RequestBlockReservation(width_to_request, height_to_request, type = /datum/turf_reservation/interior) + var/datum/turf_reservation/reserved_area = SSmapping.request_turf_block_reservation(width_to_request, height_to_request, reservation_type = /datum/turf_reservation/interior) - var/list/bottom_left = reserved_area.bottom_left_coords + var/turf/bottom_left = reserved_area.bottom_left_turfs[1] - var/list/bounds = template.load(locate(bottom_left[1] + (INTERIOR_BORDER_SIZE / 2), bottom_left[2] + (INTERIOR_BORDER_SIZE / 2), bottom_left[3]), centered = FALSE) + var/list/bounds = template.load(locate(bottom_left.x + (INTERIOR_BORDER_SIZE / 2), bottom_left.y + (INTERIOR_BORDER_SIZE / 2), bottom_left.z), centered = FALSE) var/list/turfs = block( locate(bounds[MAP_MINX], bounds[MAP_MINY], bounds[MAP_MINZ]), locate(bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ])) @@ -51,12 +51,7 @@ SUBSYSTEM_DEF(interior) if(!isturf(loc)) loc = get_turf(loc) - var/datum/weakref/reservation_weakref = SSmapping.used_turfs[loc] - - if(!reservation_weakref) - return - - var/datum/turf_reservation/interior/reservation = reservation_weakref.resolve() + var/datum/turf_reservation/interior/reservation = SSmapping.used_turfs[loc] if(!istype(reservation)) return FALSE diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 0f4a63ff65e8..f4e4b5979618 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(mapping) name = "Mapping" init_order = SS_INIT_MAPPING - flags = SS_NO_FIRE + runlevels = ALL var/list/datum/map_config/configs var/list/datum/map_config/next_map_configs @@ -19,16 +19,24 @@ SUBSYSTEM_DEF(mapping) var/list/turf/unused_turfs = list() //Not actually unused turfs they're unused but reserved for use for whatever requests them. "[zlevel_of_turf]" = list(turfs) var/list/datum/turf_reservations //list of turf reservations var/list/used_turfs = list() //list of turf = datum/turf_reservation + /// List of lists of turfs to reserve + var/list/lists_to_reserve = list() var/list/reservation_ready = list() var/clearing_reserved_turfs = FALSE // Z-manager stuff var/ground_start // should only be used for maploading-related tasks - var/list/z_list + ///list of all z level datums in the order of their z (z level 1 is at index 1, etc.) + var/list/datum/space_level/z_list var/datum/space_level/transit var/num_of_res_levels = 1 + /// True when in the process of adding a new Z-level, global locking + var/adding_new_zlevel = FALSE + /// list of traits and their associated z leves + var/list/z_trait_levels = list() + //dlete dis once #39770 is resolved /datum/controller/subsystem/mapping/proc/HACK_LoadMapConfig() if(!configs) @@ -52,14 +60,10 @@ SUBSYSTEM_DEF(mapping) loadWorld() repopulate_sorted_areas() preloadTemplates() - // Add the transit level - transit = add_new_zlevel("Transit/Reserved", list(ZTRAIT_RESERVED = TRUE)) - initialize_reserved_level(transit.z_value) + // Add the first transit level + var/datum/space_level/base_transit = add_reservation_zlevel() + initialize_reserved_level(base_transit.z_value) repopulate_sorted_areas() - for(var/maptype as anything in configs) - var/datum/map_config/MC = configs[maptype] - if(MC.perf_mode) - GLOB.perf_flags |= MC.perf_mode if(configs[GROUND_MAP]) send2chat(new /datum/tgs_message_content("<@&[CONFIG_GET(string/new_round_alert_role_id)]> Round restarted! Map is [configs[GROUND_MAP].map_name]"), CONFIG_GET(string/new_round_alert_channel)) @@ -68,21 +72,60 @@ SUBSYSTEM_DEF(mapping) return SS_INIT_SUCCESS +/datum/controller/subsystem/mapping/fire(resumed) + // Cache for sonic speed + var/list/unused_turfs = src.unused_turfs + // CM TODO: figure out if these 2 are needed. Might be required by updated versions of map reader + //var/list/world_contents = GLOB.areas_by_type[world.area].contents + //var/list/world_turf_contents = GLOB.areas_by_type[world.area].contained_turfs + var/list/lists_to_reserve = src.lists_to_reserve + var/index = 0 + while(index < length(lists_to_reserve)) + var/list/packet = lists_to_reserve[index + 1] + var/packetlen = length(packet) + while(packetlen) + if(MC_TICK_CHECK) + if(index) + lists_to_reserve.Cut(1, index) + return + var/turf/T = packet[packetlen] + T.empty(RESERVED_TURF_TYPE, RESERVED_TURF_TYPE, null, TRUE) + LAZYINITLIST(unused_turfs["[T.z]"]) + unused_turfs["[T.z]"] |= T + //var/area/old_area = T.loc + //old_area.turfs_to_uncontain += T + T.turf_flags = UNUSED_RESERVATION_TURF + //world_contents += T + //world_turf_contents += T + packet.len-- + packetlen = length(packet) + + index++ + lists_to_reserve.Cut(1, index) + /datum/controller/subsystem/mapping/proc/wipe_reservations(wipe_safety_delay = 100) if(clearing_reserved_turfs || !initialized) //in either case this is just not needed. return clearing_reserved_turfs = TRUE message_admins("Clearing dynamic reservation space.") + // /tg/ Shuttles have extra handling here to avoid them being desallocated do_wipe_turf_reservations() clearing_reserved_turfs = FALSE +/datum/controller/subsystem/mapping/proc/get_reservation_from_turf(turf/T) + RETURN_TYPE(/datum/turf_reservation) + return used_turfs[T] + /datum/controller/subsystem/mapping/Recover() flags |= SS_NO_INIT initialized = SSmapping.initialized map_templates = SSmapping.map_templates + + shuttle_templates = SSmapping.shuttle_templates unused_turfs = SSmapping.unused_turfs turf_reservations = SSmapping.turf_reservations used_turfs = SSmapping.used_turfs + areas_in_z = SSmapping.areas_in_z configs = SSmapping.configs next_map_configs = SSmapping.next_map_configs @@ -126,18 +169,33 @@ SUBSYSTEM_DEF(mapping) var/start_z = world.maxz + 1 var/i = 0 for (var/level in traits) - add_new_zlevel("[name][i ? " [i + 1]" : ""]", level) + add_new_zlevel("[name][i ? " [i + 1]" : ""]", level, contain_turfs = FALSE) ++i + // ================== CM Change ================== + // For some reason /tg/ SSmapping attempts to center the map in new Z-Level + // but because it's done before loading, it's calculated before performing + // X/Y world expansion. When loading a map bigger than world, this results + // in a negative offset and the start of the map to not be loaded. + // load the maps for (var/datum/parsed_map/pm as anything in parsed_maps) - var/cur_z = start_z + parsed_maps[pm] - if (!pm.load(1, 1, cur_z, no_changeturf = TRUE)) + var/bounds = pm.bounds + var/x_offset = 1 + var/y_offset = 1 + if(bounds && world.maxx > bounds[MAP_MAXX]) + x_offset = round(world.maxx / 2 - bounds[MAP_MAXX] / 2) + 1 + if(bounds && world.maxy > bounds[MAP_MAXY]) + y_offset = round(world.maxy / 2 - bounds[MAP_MAXY] / 2) + 1 + if (!pm.load(x_offset, y_offset, start_z + parsed_maps[pm], no_changeturf = TRUE, new_z = TRUE)) errorList |= pm.original_path - if(istype(z_list[cur_z], /datum/space_level)) - var/datum/space_level/cur_level = z_list[cur_z] - cur_level.x_bounds = pm.bounds[MAP_MAXX] - cur_level.y_bounds = pm.bounds[MAP_MAXY] + // CM Snowflake for Mass Screenshot dimensions auto detection + for(var/z in bounds[MAP_MINZ] to bounds[MAP_MAXZ]) + var/datum/space_level/zlevel = z_list[start_z + z - 1] + zlevel.bounds = list(bounds[MAP_MINX], bounds[MAP_MINY], z, bounds[MAP_MAXX], bounds[MAP_MAXY], z) + + // =============== END CM Change ================= + if(!silent) INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!") return parsed_maps @@ -256,66 +314,78 @@ SUBSYSTEM_DEF(mapping) var/datum/map_template/tent/new_tent = new template() tent_type_templates[new_tent.map_id] = new_tent -/datum/controller/subsystem/mapping/proc/RequestBlockReservation(width, height, z, type = /datum/turf_reservation, turf_type_override) - UNTIL(initialized && !clearing_reserved_turfs) - var/datum/turf_reservation/reserve = new type - if(turf_type_override) +/// Adds a new reservation z level. A bit of space that can be handed out on request +/// Of note, reservations default to transit turfs, to make their most common use, shuttles, faster +/datum/controller/subsystem/mapping/proc/add_reservation_zlevel(for_shuttles) + num_of_res_levels++ + return add_new_zlevel("Transit/Reserved #[num_of_res_levels]", list(ZTRAIT_RESERVED = TRUE)) + +/// Requests a /datum/turf_reservation based on the given width, height, and z_size. You can specify a z_reservation to use a specific z level, or leave it null to use any z level. +/datum/controller/subsystem/mapping/proc/request_turf_block_reservation( + width, + height, + z_size = 1, + z_reservation = null, + reservation_type = /datum/turf_reservation, + turf_type_override = null, +) + UNTIL((!z_reservation || reservation_ready["[z_reservation]"]) && !clearing_reserved_turfs) + var/datum/turf_reservation/reserve = new reservation_type + if(!isnull(turf_type_override)) reserve.turf_type = turf_type_override - if(!z) + if(!z_reservation) for(var/i in levels_by_trait(ZTRAIT_RESERVED)) - if(reserve.Reserve(width, height, i)) + if(reserve.reserve(width, height, z_size, i)) return reserve //If we didn't return at this point, theres a good chance we ran out of room on the exisiting reserved z levels, so lets try a new one - log_debug("Ran out of space in existing transit levels, adding a new one") - num_of_res_levels++ - var/datum/space_level/newReserved = add_new_zlevel("Transit/Reserved [num_of_res_levels]", list(ZTRAIT_RESERVED = TRUE)) + var/datum/space_level/newReserved = add_reservation_zlevel() initialize_reserved_level(newReserved.z_value) - for(var/i in levels_by_trait(ZTRAIT_RESERVED)) - if(reserve.Reserve(width, height, i)) - return reserve - CRASH("Despite adding a fresh reserved zlevel still failed to get a reservation") + if(reserve.reserve(width, height, z_size, newReserved.z_value)) + return reserve else - if(!level_trait(z, ZTRAIT_RESERVED)) - log_debug("Cannot block reserve on a non-ZTRAIT_RESERVED level") + if(!level_trait(z_reservation, ZTRAIT_RESERVED)) qdel(reserve) return else - if(reserve.Reserve(width, height, z)) + if(reserve.reserve(width, height, z_size, z_reservation)) return reserve - log_debug("unknown reservation failure") QDEL_NULL(reserve) -//This is not for wiping reserved levels, use wipe_reservations() for that. +///Sets up a z level as reserved +///This is not for wiping reserved levels, use wipe_reservations() for that. +///If this is called after SSatom init, it will call Initialize on all turfs on the passed z, as its name promises /datum/controller/subsystem/mapping/proc/initialize_reserved_level(z) UNTIL(!clearing_reserved_turfs) //regardless, lets add a check just in case. clearing_reserved_turfs = TRUE //This operation will likely clear any existing reservations, so lets make sure nothing tries to make one while we're doing it. if(!level_trait(z,ZTRAIT_RESERVED)) clearing_reserved_turfs = FALSE CRASH("Invalid z level prepared for reservations.") - var/turf/A = get_turf(locate(8,8,z)) - var/turf/B = get_turf(locate(world.maxx - 8,world.maxy - 8,z)) + var/turf/A = get_turf(locate(SHUTTLE_TRANSIT_BORDER,SHUTTLE_TRANSIT_BORDER,z)) + var/turf/B = get_turf(locate(world.maxx - SHUTTLE_TRANSIT_BORDER,world.maxy - SHUTTLE_TRANSIT_BORDER,z)) var/block = block(A, B) - for(var/t in block) - // No need to empty() these, because it's world init and they're - // already /turf/open/space/basic. - var/turf/T = t - T.flags_atom |= UNUSED_RESERVATION_TURF + for(var/turf/T as anything in block) + // No need to empty() these, because they just got created and are already /turf/open/space/basic. + T.turf_flags = UNUSED_RESERVATION_TURF + CHECK_TICK + + // Gotta create these suckers if we've not done so already + if(SSatoms.initialized) + SSatoms.InitializeAtoms(Z_TURFS(z)) + unused_turfs["[z]"] = block reservation_ready["[z]"] = TRUE clearing_reserved_turfs = FALSE -/datum/controller/subsystem/mapping/proc/reserve_turfs(list/turfs) - for(var/i in turfs) - var/turf/T = i - T.empty(RESERVED_TURF_TYPE, RESERVED_TURF_TYPE, null, TRUE) - LAZYINITLIST(unused_turfs["[T.z]"]) - unused_turfs["[T.z]"] |= T - T.flags_atom |= UNUSED_RESERVATION_TURF - GLOB.areas_by_type[world.area].contents += T - CHECK_TICK +/// Schedules a group of turfs to be handed back to the reservation system's control +/// If await is true, will sleep until the turfs are finished work +/datum/controller/subsystem/mapping/proc/reserve_turfs(list/turfs, await = FALSE) + lists_to_reserve += list(turfs) + if(await) + UNTIL(!length(turfs)) //DO NOT CALL THIS PROC DIRECTLY, CALL wipe_reservations(). /datum/controller/subsystem/mapping/proc/do_wipe_turf_reservations() + PRIVATE_PROC(TRUE) UNTIL(initialized) //This proc is for AFTER init, before init turf reservations won't even exist and using this will likely break things. for(var/i in turf_reservations) var/datum/turf_reservation/TR = i @@ -323,19 +393,28 @@ SUBSYSTEM_DEF(mapping) qdel(TR, TRUE) UNSETEMPTY(turf_reservations) var/list/clearing = list() - for(var/l in unused_turfs) //unused_turfs is a assoc list by z = list(turfs) + for(var/l in unused_turfs) //unused_turfs is an assoc list by z = list(turfs) if(islist(unused_turfs[l])) clearing |= unused_turfs[l] clearing |= used_turfs //used turfs is an associative list, BUT, reserve_turfs() can still handle it. If the code above works properly, this won't even be needed as the turfs would be freed already. unused_turfs.Cut() used_turfs.Cut() - reserve_turfs(clearing) + reserve_turfs(clearing, await = TRUE) /datum/controller/subsystem/mapping/proc/reg_in_areas_in_z(list/areas) for(var/B in areas) var/area/A = B A.reg_in_areas_in_z() +/// Takes a z level datum, and tells the mapping subsystem to manage it +/// Also handles things like plane offset generation, and other things that happen on a z level to z level basis +/datum/controller/subsystem/mapping/proc/manage_z_level(datum/space_level/new_z, filled_with_space, contain_turfs = TRUE) + // First, add the z + z_list += new_z + // Then we build our lookup lists + //var/z_value = new_z.z_value + //TODO: All the Z-plane init stuff goes below here normally, we don't have that yet + /// Gets a name for the marine ship as per the enabled ship map configuration /datum/controller/subsystem/mapping/proc/get_main_ship_name() if(!configs) diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm index db0d449b4dd7..439f83ceb8c0 100644 --- a/code/controllers/subsystem/shuttles.dm +++ b/code/controllers/subsystem/shuttles.dm @@ -39,9 +39,6 @@ SUBSYSTEM_DEF(shuttle) var/loading_shuttle = FALSE /datum/controller/subsystem/shuttle/Initialize(timeofday) - if(GLOB.perf_flags & PERF_TOGGLE_SHUTTLES) - can_fire = FALSE - return initial_load() return SS_INIT_SUCCESS @@ -52,8 +49,6 @@ SUBSYSTEM_DEF(shuttle) CHECK_TICK /datum/controller/subsystem/shuttle/fire(resumed = FALSE) - if(!resumed && (GLOB.perf_flags & PERF_TOGGLE_SHUTTLES)) - return for(var/thing in mobile) if(!thing) mobile.Remove(thing) @@ -187,13 +182,19 @@ SUBSYSTEM_DEF(shuttle) var/transit_path = M.get_transit_path_type() - var/datum/turf_reservation/proposal = SSmapping.RequestBlockReservation(transit_width, transit_height, null, /datum/turf_reservation/transit, transit_path) + var/datum/turf_reservation/proposal = SSmapping.request_turf_block_reservation( + transit_width, + transit_height, + 1, + reservation_type = /datum/turf_reservation/transit, + turf_type_override = transit_path, + ) if(!istype(proposal)) log_debug("generate_transit_dock() failed to get a block reservation from mapping system") return FALSE - var/turf/bottomleft = locate(proposal.bottom_left_coords[1], proposal.bottom_left_coords[2], proposal.bottom_left_coords[3]) + var/turf/bottomleft = proposal.bottom_left_turfs[1] // Then create a transit docking port in the middle var/coords = M.return_coords(0, 0, dock_dir) /* 0------2 @@ -362,7 +363,7 @@ SUBSYSTEM_DEF(shuttle) return shuttle -/datum/controller/subsystem/shuttle/proc/action_load(datum/map_template/shuttle/loading_template, obj/docking_port/stationary/destination_port) +/datum/controller/subsystem/shuttle/proc/action_load(datum/map_template/shuttle/loading_template, obj/docking_port/stationary/destination_port, replace = FALSE) // Check for an existing preview if(preview_shuttle && (loading_template != preview_template)) preview_shuttle.jumpToNullSpace() @@ -371,8 +372,7 @@ SUBSYSTEM_DEF(shuttle) QDEL_NULL(preview_reservation) if(!preview_shuttle) - if(load_template(loading_template)) - preview_shuttle.linkup(loading_template, destination_port) + load_template(loading_template) preview_template = loading_template // get the existing shuttle information, if any @@ -407,9 +407,6 @@ SUBSYSTEM_DEF(shuttle) for(var/area/A as anything in preview_shuttle.shuttle_areas) for(var/turf/T as anything in A) - // turfs inside the shuttle are not available for shuttles - T.flags_atom &= ~UNUSED_RESERVATION_TURF - // update underlays if(istype(T, /turf/closed/shuttle)) var/dx = T.x - preview_shuttle.x @@ -418,8 +415,10 @@ SUBSYSTEM_DEF(shuttle) T.underlays.Cut() T.underlays += mutable_appearance(target_lz.icon, target_lz.icon_state, TURF_LAYER, FLOOR_PLANE) + preview_shuttle.register(replace) var/list/force_memory = preview_shuttle.movement_force preview_shuttle.movement_force = list("KNOCKDOWN" = 0, "THROW" = 0) + preview_shuttle.initiate_docking(D) preview_shuttle.movement_force = force_memory @@ -430,7 +429,7 @@ SUBSYSTEM_DEF(shuttle) preview_shuttle.timer = timer preview_shuttle.mode = mode - preview_shuttle.register() + preview_shuttle.postregister(replace) // TODO indicate to the user that success happened, rather than just // blanking the modification tab @@ -440,16 +439,21 @@ SUBSYSTEM_DEF(shuttle) selected = null QDEL_NULL(preview_reservation) -/datum/controller/subsystem/shuttle/proc/load_template(datum/map_template/shuttle/S) +/datum/controller/subsystem/shuttle/proc/load_template(datum/map_template/shuttle/loading_template) . = FALSE - // load shuttle template, centred at shuttle import landmark, - preview_reservation = SSmapping.RequestBlockReservation(S.width, S.height, SSmapping.transit.z_value, /datum/turf_reservation/transit) + // Load shuttle template to a fresh block reservation. + preview_reservation = SSmapping.request_turf_block_reservation( + loading_template.width, + loading_template.height, + 1, + reservation_type = /datum/turf_reservation/transit, + ) if(!preview_reservation) CRASH("failed to reserve an area for shuttle template loading") - var/turf/BL = TURF_FROM_COORDS_LIST(preview_reservation.bottom_left_coords) - S.load(BL, centered = FALSE, register = FALSE) + var/turf/bottom_left = preview_reservation.bottom_left_turfs[1] + loading_template.load(bottom_left, centered = FALSE, register = FALSE) - var/affected = S.get_affected_turfs(BL, centered=FALSE) + var/affected = loading_template.get_affected_turfs(bottom_left, centered=FALSE) var/found = 0 // Search the turfs for docking ports @@ -463,13 +467,13 @@ SUBSYSTEM_DEF(shuttle) found++ if(found > 1) qdel(P, force=TRUE) - log_world("Map warning: Shuttle Template [S.mappath] has multiple mobile docking ports.") + log_world("Map warning: Shuttle Template [loading_template.mappath] has multiple mobile docking ports.") else preview_shuttle = P if(istype(P, /obj/docking_port/stationary)) - log_world("Map warning: Shuttle Template [S.mappath] has a stationary docking port.") + log_world("Map warning: Shuttle Template [loading_template.mappath] has a stationary docking port.") if(!found) - var/msg = "load_template(): Shuttle Template [S.mappath] has no mobile docking port. Aborting import." + var/msg = "load_template(): Shuttle Template [loading_template.mappath] has no mobile docking port. Aborting import." for(var/T in affected) var/turf/T0 = T T0.empty() @@ -478,7 +482,7 @@ SUBSYSTEM_DEF(shuttle) WARNING(msg) return //Everything fine - S.post_load(preview_shuttle) + loading_template.post_load(preview_shuttle) return TRUE /datum/controller/subsystem/shuttle/proc/unload_preview() diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 2b9812abade4..f265315460e3 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -8,6 +8,10 @@ SUBSYSTEM_DEF(ticker) var/current_state = GAME_STATE_STARTUP //State of current round used by process() var/force_ending = FALSE //Round was ended by admin intervention + + /// If TRUE, there is no lobby phase, the game starts immediately. + var/start_immediately = FALSE + var/bypass_checks = FALSE //Bypass mode init checks var/setup_failed = FALSE //If the setup has failed at any point var/setup_started = FALSE @@ -80,6 +84,10 @@ SUBSYSTEM_DEF(ticker) var/mob/new_player/player = i if(player.ready) // TODO: port this == PLAYER_READY_TO_PLAY) ++totalPlayersReady + + if(start_immediately) + time_left = 0 + if(time_left < 0 || delay_start) return @@ -207,7 +215,7 @@ SUBSYSTEM_DEF(ticker) CHECK_TICK mode.announce() if(mode.taskbar_icon) - RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_LOGIN, PROC_REF(handle_mode_icon)) + RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_LOGGED_IN, PROC_REF(handle_mode_icon)) set_clients_taskbar_icon(mode.taskbar_icon) if(GLOB.perf_flags & PERF_TOGGLE_LAZYSS) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 6188e38e8d60..2438577a1771 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -59,7 +59,7 @@ SUBSYSTEM_DEF(vote) voting.Cut() remove_action_buttons() - UnregisterSignal(SSdcs, COMSIG_GLOB_CLIENT_LOGIN) + UnregisterSignal(SSdcs, COMSIG_GLOB_CLIENT_LOGGED_IN) for(var/c in GLOB.player_list) update_static_data(c) @@ -373,7 +373,7 @@ SUBSYSTEM_DEF(vote) if(send_clients_vote) C.mob.vote() - RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_LOGIN, PROC_REF(handle_client_joining)) + RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_LOGGED_IN, PROC_REF(handle_client_joining)) SStgui.update_uis(src) return TRUE return FALSE @@ -525,7 +525,7 @@ GLOBAL_LIST_INIT(possible_vote_types, list( if(!(params["vote_type"] in GLOB.possible_vote_types)) return - if(!check_rights(R_ADMIN)) + if(!check_rights(R_MOD)) var/list/vote_type = GLOB.possible_vote_types[params["vote_type"]] if(vote_type["admin_only"]) return diff --git a/code/datums/ammo/ammo.dm b/code/datums/ammo/ammo.dm index 7a4006deee73..229c10b31e3a 100644 --- a/code/datums/ammo/ammo.dm +++ b/code/datums/ammo/ammo.dm @@ -84,7 +84,7 @@ /// that will be given to a projectile with the current ammo datum var/list/list/traits_to_give - var/flamer_reagent_type = /datum/reagent/napalm/ut + var/flamer_reagent_id = "utnapthal" /// 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" @@ -237,11 +237,12 @@ P.fire_at(new_target, original_P.firer, original_P.shot_from, P.ammo.max_range, P.ammo.shell_speed, original_P.original) //Fire! -/datum/ammo/proc/drop_flame(turf/T, datum/cause_data/cause_data) // ~Art updated fire 20JAN17 - if(!istype(T)) +/datum/ammo/proc/drop_flame(turf/turf, datum/cause_data/cause_data) // ~Art updated fire 20JAN17 + if(!istype(turf)) return - if(locate(/obj/flamer_fire) in T) + if(locate(/obj/flamer_fire) in turf) return - var/datum/reagent/R = new flamer_reagent_type() - new /obj/flamer_fire(T, cause_data, R) + var/datum/reagent/chemical = GLOB.chemical_reagents_list[flamer_reagent_id] + + new /obj/flamer_fire(turf, cause_data, chemical) diff --git a/code/datums/ammo/bullet/pistol.dm b/code/datums/ammo/bullet/pistol.dm index 8be63b0a15af..937c40d16cff 100644 --- a/code/datums/ammo/bullet/pistol.dm +++ b/code/datums/ammo/bullet/pistol.dm @@ -66,7 +66,7 @@ /datum/ammo/bullet/pistol/ap/toxin/on_hit_turf(turf/T, obj/projectile/P) . = ..() - if(T.flags_turf & TURF_ORGANIC) + if(T.turf_flags & TURF_ORGANIC) P.damage *= organic_damage_mult /datum/ammo/bullet/pistol/ap/toxin/on_hit_obj(obj/O, obj/projectile/P) @@ -197,7 +197,7 @@ /datum/ammo/bullet/pistol/squash/toxin/on_hit_turf(turf/T, obj/projectile/P) . = ..() - if(T.flags_turf & TURF_ORGANIC) + if(T.turf_flags & TURF_ORGANIC) P.damage *= organic_damage_mult /datum/ammo/bullet/pistol/squash/toxin/on_hit_obj(obj/O, obj/projectile/P) diff --git a/code/datums/ammo/bullet/revolver.dm b/code/datums/ammo/bullet/revolver.dm index 633bf3e2f7ff..0688e615378e 100644 --- a/code/datums/ammo/bullet/revolver.dm +++ b/code/datums/ammo/bullet/revolver.dm @@ -52,7 +52,7 @@ /datum/ammo/bullet/revolver/marksman/toxin/on_hit_turf(turf/T, obj/projectile/P) . = ..() - if(T.flags_turf & TURF_ORGANIC) + if(T.turf_flags & TURF_ORGANIC) P.damage *= organic_damage_mult /datum/ammo/bullet/revolver/marksman/toxin/on_hit_obj(obj/O, obj/projectile/P) diff --git a/code/datums/ammo/bullet/rifle.dm b/code/datums/ammo/bullet/rifle.dm index ab30599eeb12..7711e082a596 100644 --- a/code/datums/ammo/bullet/rifle.dm +++ b/code/datums/ammo/bullet/rifle.dm @@ -21,11 +21,16 @@ /datum/ammo/bullet/rifle/holo_target name = "holo-targeting rifle bullet" damage = 30 + /// inflicts this many holo stacks per bullet hit var/holo_stacks = 10 + /// modifies the default cap limit of 100 by this amount + var/bonus_damage_cap_increase = 0 + /// multiplies the default drain of 5 holo stacks per second by this amount + var/stack_loss_multiplier = 1 -/datum/ammo/bullet/rifle/holo_target/on_hit_mob(mob/M, obj/projectile/P) +/datum/ammo/bullet/rifle/holo_target/on_hit_mob(mob/hit_mob, obj/projectile/bullet) . = ..() - M.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time) + hit_mob.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time, bonus_damage_cap_increase, stack_loss_multiplier) /datum/ammo/bullet/rifle/holo_target/hunting name = "holo-targeting hunting bullet" @@ -69,7 +74,7 @@ /datum/ammo/bullet/rifle/ap/toxin/on_hit_turf(turf/T, obj/projectile/P) . = ..() - if(T.flags_turf & TURF_ORGANIC) + if(T.turf_flags & TURF_ORGANIC) P.damage *= organic_damage_mult /datum/ammo/bullet/rifle/ap/toxin/on_hit_obj(obj/O, obj/projectile/P) diff --git a/code/datums/ammo/bullet/smg.dm b/code/datums/ammo/bullet/smg.dm index e24b3021da97..3fa087972fbe 100644 --- a/code/datums/ammo/bullet/smg.dm +++ b/code/datums/ammo/bullet/smg.dm @@ -51,7 +51,7 @@ /datum/ammo/bullet/smg/ap/toxin/on_hit_turf(turf/T, obj/projectile/P) . = ..() - if(T.flags_turf & TURF_ORGANIC) + if(T.turf_flags & TURF_ORGANIC) P.damage *= organic_damage_mult /datum/ammo/bullet/smg/ap/toxin/on_hit_obj(obj/O, obj/projectile/P) diff --git a/code/datums/ammo/bullet/sniper.dm b/code/datums/ammo/bullet/sniper.dm index a82f00631608..22371972e623 100644 --- a/code/datums/ammo/bullet/sniper.dm +++ b/code/datums/ammo/bullet/sniper.dm @@ -139,6 +139,28 @@ BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating/heavy) )) +/datum/ammo/bullet/sniper/anti_materiel/vulture/holo_target + name = "holo-targeting anti-materiel sniper bullet" + damage = 60 // it's a big bullet but its purpose is to support marines, not to kill enemies by itself + /// inflicts this many holo stacks per bullet hit + var/holo_stacks = 333 + /// modifies the default cap limit of 100 by this amount + var/bonus_damage_cap_increase = 233 + /// multiplies the default drain of 5 holo stacks per second by this amount + var/stack_loss_multiplier = 2 + +/datum/ammo/bullet/sniper/anti_materiel/vulture/holo_target/on_hit_mob(mob/hit_mob, obj/projectile/bullet) + hit_mob.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time, bonus_damage_cap_increase, stack_loss_multiplier) + playsound(hit_mob, 'sound/weapons/gun_vulture_mark.ogg', 40) + to_chat(hit_mob, isxeno(hit_mob) ? SPAN_XENOHIGHDANGER("It feels as if we were MARKED FOR DEATH!") : SPAN_HIGHDANGER("It feels as if you were MARKED FOR DEATH!")) + hit_mob.balloon_alert_to_viewers("marked for death!") + +// the effect should be limited to one target, with IFF to compensate how hard it will be to hit these shots +/datum/ammo/bullet/sniper/anti_materiel/vulture/holo_target/set_bullet_traits() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff) + )) + /datum/ammo/bullet/sniper/elite name = "supersonic sniper bullet" diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm index 3d53c6b0c0d0..97c1bf5735f9 100644 --- a/code/datums/ammo/bullet/special_ammo.dm +++ b/code/datums/ammo/bullet/special_ammo.dm @@ -46,12 +46,16 @@ /datum/ammo/bullet/smartgun/holo_target //Royal marines smartgun bullet has only diff between regular ammo is this one does holostacks name = "holo-targeting smartgun bullet" damage = 30 - ///Stuff for the HRP holotargetting stacks + /// inflicts this many holo stacks per bullet hit var/holo_stacks = 15 + /// modifies the default cap limit of 100 by this amount + var/bonus_damage_cap_increase = 0 + /// multiplies the default drain of 5 holo stacks per second by this amount + var/stack_loss_multiplier = 1 -/datum/ammo/bullet/smartgun/holo_target/on_hit_mob(mob/M, obj/projectile/P) +/datum/ammo/bullet/smartgun/holo_target/on_hit_mob(mob/hit_mob, obj/projectile/bullet) . = ..() - M.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time) + hit_mob.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time, bonus_damage_cap_increase, stack_loss_multiplier) /datum/ammo/bullet/smartgun/holo_target/ap name = "armor-piercing smartgun bullet" diff --git a/code/datums/ammo/energy.dm b/code/datums/ammo/energy.dm index 16cbab378438..1f48806d2d52 100644 --- a/code/datums/ammo/energy.dm +++ b/code/datums/ammo/energy.dm @@ -230,3 +230,10 @@ var/mob/living/carbon/xenomorph/xeno = hit_mob xeno.apply_damage(damage * 0.75, BURN) xeno.interference = 30 + +/datum/ammo/energy/yautja/rifle/bolt/set_bullet_traits() + . = ..() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary) + )) + diff --git a/code/datums/ammo/misc.dm b/code/datums/ammo/misc.dm index 62a78539b6a2..bcb9673548db 100644 --- a/code/datums/ammo/misc.dm +++ b/code/datums/ammo/misc.dm @@ -49,11 +49,11 @@ drop_flame(get_turf(P), P.weapon_cause_data) /datum/ammo/flamethrower/tank_flamer - flamer_reagent_type = /datum/reagent/napalm/blue + flamer_reagent_id = "napalmx" /datum/ammo/flamethrower/sentry_flamer flags_ammo_behavior = AMMO_IGNORE_ARMOR|AMMO_IGNORE_COVER|AMMO_FLAME - flamer_reagent_type = /datum/reagent/napalm/blue + flamer_reagent_id = "napalmx" accuracy = HIT_ACCURACY_TIER_8 accurate_range = 6 diff --git a/code/datums/ammo/shrapnel.dm b/code/datums/ammo/shrapnel.dm index e27caa4b277d..39b0813fad25 100644 --- a/code/datums/ammo/shrapnel.dm +++ b/code/datums/ammo/shrapnel.dm @@ -43,10 +43,17 @@ shrapnel_chance = 0 shell_speed = AMMO_SPEED_TIER_3//she fast af boi penetration = ARMOR_PENETRATION_TIER_5 - -/datum/ammo/bullet/shrapnel/hornet_rounds/on_hit_mob(mob/M, obj/projectile/P) + /// inflicts this many holo stacks per bullet hit + var/holo_stacks = 10 + /// modifies the default cap limit of 100 by this amount + var/bonus_damage_cap_increase = 0 + /// multiplies the default drain of 5 holo stacks per second by this amount + var/stack_loss_multiplier = 1 + +/datum/ammo/bullet/shrapnel/hornet_rounds/on_hit_mob(mob/hit_mob, obj/projectile/bullet) . = ..() - M.AddComponent(/datum/component/bonus_damage_stack, 10, world.time) + hit_mob.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time, bonus_damage_cap_increase, stack_loss_multiplier) + /datum/ammo/bullet/shrapnel/incendiary name = "flaming shrapnel" diff --git a/code/datums/components/bonus_damage_stack.dm b/code/datums/components/bonus_damage_stack.dm index faf4813541b8..78da5e036ce4 100644 --- a/code/datums/components/bonus_damage_stack.dm +++ b/code/datums/components/bonus_damage_stack.dm @@ -15,15 +15,21 @@ var/bonus_damage_cap = 100 /// Last world.time that the afflicted was hit by a holo-targeting round. var/last_stack + /// extra cap limit added by more powerful bullets + var/bonus_damage_cap_increase = 0 + /// multiplies the BONUS_DAMAGE_STACK_LOSS_PER_SECOND calculation, modifying how fast we lose holo stacks + var/stack_loss_multiplier = 1 -/datum/component/bonus_damage_stack/Initialize(bonus_damage_stacks, time) +/datum/component/bonus_damage_stack/Initialize(bonus_damage_stacks, time, bonus_damage_cap_increase, stack_loss_multiplier) . = ..() src.bonus_damage_stacks = bonus_damage_stacks + src.stack_loss_multiplier = stack_loss_multiplier + src.bonus_damage_cap = initial(bonus_damage_cap) + bonus_damage_cap_increase // this way it will never increase over the intended limit if(!time) time = world.time src.last_stack = time -/datum/component/bonus_damage_stack/InheritComponent(datum/component/bonus_damage_stack/BDS, i_am_original, bonus_damage_stacks, time) +/datum/component/bonus_damage_stack/InheritComponent(datum/component/bonus_damage_stack/BDS, i_am_original, bonus_damage_stacks, time, bonus_damage_cap_increase, stack_loss_multiplier) . = ..() if(!BDS) src.bonus_damage_stacks += bonus_damage_stacks @@ -32,22 +38,32 @@ src.bonus_damage_stacks += BDS.bonus_damage_stacks src.last_stack = BDS.last_stack - src.bonus_damage_stacks = min(src.bonus_damage_stacks, bonus_damage_cap) + // if a different type of holo targetting bullet hits a mob and has a bigger bonus cap, it will get applied. + if(src.bonus_damage_cap_increase < bonus_damage_cap_increase) + src.bonus_damage_cap_increase = bonus_damage_cap_increase + src.bonus_damage_cap = initial(bonus_damage_cap) + src.bonus_damage_cap_increase + + // however, if it has a worse stack_loss_multiplier, it will get applied instead. + // this way, if a weapon is meant to have a big bonus cap but holo stacks that rapidly deplete, it will not be messed up by a weapon that a low stack_loss_multiplier. + if(src.stack_loss_multiplier < stack_loss_multiplier) + src.stack_loss_multiplier = stack_loss_multiplier + + src.bonus_damage_stacks = min(src.bonus_damage_stacks, src.bonus_damage_cap) /datum/component/bonus_damage_stack/process(delta_time) if(last_stack + 5 SECONDS < world.time) - bonus_damage_stacks = bonus_damage_stacks - BONUS_DAMAGE_STACK_LOSS_PER_SECOND * delta_time + bonus_damage_stacks = bonus_damage_stacks - BONUS_DAMAGE_STACK_LOSS_PER_SECOND * stack_loss_multiplier * delta_time if(bonus_damage_stacks <= 0) qdel(src) var/color = COLOR_BONUS_DAMAGE - var/intensity = bonus_damage_stacks / (bonus_damage_cap * 2) - color += num2text(BONUS_DAMAGE_MAX_ALPHA * intensity, 2, 16) - + var/intensity = bonus_damage_stacks / (initial(bonus_damage_cap) * 2) + // if intensity is too high of a value, the hex code will become invalid + color += num2text(BONUS_DAMAGE_MAX_ALPHA * clamp(intensity, 0, 0.5), 1, 16) if(parent) var/atom/A = parent - A.add_filter("bonus_damage_stacks", 2, list("type" = "outline", "color" = color, "size" = 1)) + A.add_filter("bonus_damage_stacks", 2, list("type" = "outline", "color" = color, "size" = 1 + clamp(intensity, 0, 1))) /datum/component/bonus_damage_stack/RegisterWithParent() START_PROCESSING(SSdcs, src) @@ -67,7 +83,7 @@ SIGNAL_HANDLER L += "Bonus Damage Taken: [bonus_damage_stacks * 0.1]%" -/datum/component/bonus_damage_stack/proc/get_bonus_damage(mob/M, list/damage_data) // 10% damage bonus at most +/datum/component/bonus_damage_stack/proc/get_bonus_damage(mob/M, list/damage_data) // 10% damage bonus in most instances SIGNAL_HANDLER damage_data["bonus_damage"] = damage_data["damage"] * (min(bonus_damage_stacks, bonus_damage_cap) / 1000) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 183cdadf17aa..5af9f9c029b4 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -2,6 +2,7 @@ #define ZOMBIE_INFECTION_STAGE_ONE 1 #define ZOMBIE_INFECTION_STAGE_TWO 2 #define ZOMBIE_INFECTION_STAGE_THREE 3 +#define ZOMBIE_INFECTION_STAGE_FOUR 4 #define SLOW_INFECTION_RATE 1 #define FAST_INFECTION_RATE 7 #define STAGE_LEVEL_THRESHOLD 360 @@ -9,7 +10,7 @@ /datum/disease/black_goo name = "Black Goo" - max_stages = 3 + max_stages = 4 cure = "Anti-Zed" cure_id = "antiZed" spread = "Bites" @@ -120,17 +121,23 @@ stage_level += 42 if(ZOMBIE_INFECTION_STAGE_THREE) - //check if the mob is already a zombie and just return to avoid weird stuff, edge case if zombie_is_transforming deoesn't work. + // if zombie or transforming we upgrade it to stage four. if(iszombie(infected_mob)) + stage++ return - - if(infected_mob.stat == DEAD && stage_counter != stage) - to_chat(infected_mob, SPAN_CENTERBOLD("Your zombie infection is now at stage three! Zombie transformation begin!")) - stage_counter = stage - hidden = list(0,0) + // if not a zombie(above check) and isn't transforming then we transform you into a zombie. if(!zombie_is_transforming) + // if your dead we inform you that you're going to turn into a zombie. + if(infected_mob.stat == DEAD && stage_counter != stage) + to_chat(infected_mob, SPAN_CENTERBOLD("Your zombie infection is now at stage three! Zombie transformation begin!")) + stage_counter = stage zombie_transform(infected_mob) - infected_mob.next_move_slowdown = max(infected_mob.next_move_slowdown, 2) + hidden = list(0,0) + infected_mob.next_move_slowdown = max(infected_mob.next_move_slowdown, 2) + + if(ZOMBIE_INFECTION_STAGE_FOUR) + return + // final stage of infection it's to avoid running the above test once you're a zombie for now. maybe more later. /datum/disease/black_goo/proc/zombie_transform(mob/living/carbon/human/human) set waitfor = 0 @@ -149,7 +156,7 @@ playsound(human.loc, 'sound/hallucinations/wail.ogg', 25, 1) human.jitteriness = 0 human.set_species(SPECIES_ZOMBIE) - stage = 3 + stage = 4 human.faction = FACTION_ZOMBIE zombie_is_transforming = FALSE @@ -310,6 +317,7 @@ #undef ZOMBIE_INFECTION_STAGE_ONE #undef ZOMBIE_INFECTION_STAGE_TWO #undef ZOMBIE_INFECTION_STAGE_THREE +#undef ZOMBIE_INFECTION_STAGE_FOUR #undef STAGE_LEVEL_THRESHOLD #undef SLOW_INFECTION_RATE #undef FAST_INFECTION_RATE diff --git a/code/datums/emergency_calls/emergency_call.dm b/code/datums/emergency_calls/emergency_call.dm index 7884d93b18bc..998af015d07c 100644 --- a/code/datums/emergency_calls/emergency_call.dm +++ b/code/datums/emergency_calls/emergency_call.dm @@ -28,6 +28,10 @@ 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/arrival_message = "" //Msg to display about when the shuttle arrives + /// Probability that the message will be replaced with static. - prob(chance_hidden) + var/chance_hidden = 20 + /// Message to display when distress beacon is hidden + var/static_message = "**STATIC** %$#&!- *!%^#$$ ^%%$# +_!@* &*%$## **STATIC** &%$#^*! @!*%$# ^%&$#@ *%&$#^ **STATIC** --SIGNAL LOST" 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 var/probability = 0 @@ -92,12 +96,19 @@ return chosen_call /datum/game_mode/proc/get_specific_call(call_name, quiet_launch = FALSE, announce_incoming = TRUE, info = "") - for(var/datum/emergency_call/E in all_calls) //Loop through all potential candidates - if(E.name == call_name) - var/datum/emergency_call/em_call = new E.type() - em_call.objective_info = info - em_call.activate(quiet_launch, announce_incoming) - return + if(ispath(call_name, /datum/emergency_call)) + var/datum/emergency_call/em_call = new call_name + em_call.objective_info = info + em_call.activate(quiet_launch, announce_incoming) + return + + var/call_path = text2path(call_name) + if(ispath(call_path, /datum/emergency_call)) + var/datum/emergency_call/em_call = new call_path + em_call.objective_info = info + em_call.activate(quiet_launch, announce_incoming) + return + error("get_specific_call could not find emergency call '[call_name]'") return @@ -305,7 +316,10 @@ candidates = list() if(arrival_message && announce_incoming) - marine_announcement(arrival_message, "Intercepted Transmission:") + if(prob(chance_hidden)) + marine_announcement(static_message, "Intercepted Transmission:") + else + marine_announcement(arrival_message, "Intercepted Transmission:") /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/keybinding/xenomorph.dm b/code/datums/keybinding/xenomorph.dm index 9fa525d50002..64acd876b49f 100644 --- a/code/datums/keybinding/xenomorph.dm +++ b/code/datums/keybinding/xenomorph.dm @@ -189,21 +189,9 @@ . = ..() if(.) return - - var/mob/living/carbon/xenomorph/current_xeno = user?.mob - - if(!current_xeno?.hive) - return - - if((!current_xeno.hive.living_xeno_queen || SSmapping.configs[GROUND_MAP].map_name == MAP_WHISKEY_OUTPOST) && !current_xeno.hive.allow_no_queen_actions) //No Hive status on WO - to_chat(current_xeno, SPAN_WARNING("There is no Queen. We are alone.")) - return - - if(current_xeno.interference) - to_chat(current_xeno, SPAN_WARNING("A headhunter temporarily cut off our psychic connection!")) - return - - current_xeno.hive.hive_ui.open_hive_status(current_xeno) + var/mob/living/carbon/xenomorph/xeno = user.mob + xeno.hive_status() + return TRUE /datum/keybinding/xenomorph/hide hotkey_keys = list("Unbound") diff --git a/code/datums/mob_hud.dm b/code/datums/mob_hud.dm index 778ec2b75a36..b7b5544777b3 100644 --- a/code/datums/mob_hud.dm +++ b/code/datums/mob_hud.dm @@ -10,7 +10,7 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list( MOB_HUD_XENO_INFECTION = new /datum/mob_hud/xeno_infection(), MOB_HUD_XENO_STATUS = new /datum/mob_hud/xeno(), MOB_HUD_XENO_HOSTILE = new /datum/mob_hud/xeno_hostile(), - MOB_HUD_FACTION_USCM = new /datum/mob_hud/faction(), + MOB_HUD_FACTION_MARINE = new /datum/mob_hud/faction(), MOB_HUD_FACTION_OBSERVER = new /datum/mob_hud/faction/observer(), MOB_HUD_FACTION_UPP = new /datum/mob_hud/faction/upp(), MOB_HUD_FACTION_WY = new /datum/mob_hud/faction/wy(), diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 98bcf296755b..0eba86add45d 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -62,43 +62,30 @@ locate(.[MAP_MAXX], .[MAP_MAXY], .[MAP_MAXZ])) for(var/i in 1 to turfs.len) var/turf/place = turfs[i] + + // ================== CM Change ================== + // We perform atom initialization of the docking_ports BEFORE skipping space, + // because our lifeboats have their corners as object props and still + // reside on space turfs. Notably the bottom left corner, which also contains + // the docking port. + + for(var/obj/docking_port/mobile/port in place) + SSatoms.InitializeAtoms(list(port)) + if(register) + port.register() + if(istype(place, /turf/open/space)) // This assumes all shuttles are loaded in a single spot then moved to their real destination. continue if(length(place.baseturfs) < 2) // Some snowflake shuttle shit continue place.baseturfs.Insert(3, /turf/baseturf_skipover/shuttle) - - for(var/obj/docking_port/mobile/port in place) - if(register) - port.register() - if(isnull(port_x_offset)) - continue - switch(port.dir) // Yeah this looks a little ugly but mappers had to do this in their head before - if(NORTH) - port.width = width - port.height = height - port.dwidth = port_x_offset - 1 - port.dheight = port_y_offset - 1 - if(EAST) - port.width = height - port.height = width - port.dwidth = height - port_y_offset - port.dheight = port_x_offset - 1 - if(SOUTH) - port.width = width - port.height = height - port.dwidth = width - port_x_offset - port.dheight = height - port_y_offset - if(WEST) - port.width = height - port.height = width - port.dwidth = port_y_offset - 1 - port.dheight = width - port_x_offset + // =============== END CM Change ================= //Whatever special stuff you want -/datum/map_template/shuttle/proc/post_load(obj/docking_port/mobile/M) +/datum/map_template/shuttle/post_load(obj/docking_port/mobile/M) if(movement_force) M.movement_force = movement_force.Copy() + M.linkup() /datum/map_template/shuttle/vehicle @@ -115,3 +102,9 @@ /datum/map_template/shuttle/trijent_elevator/B elevator_network = "B" + +/datum/map_template/shuttle/trijent_elevator/post_load(obj/docking_port/mobile/M) + . = ..() + var/obj/docking_port/mobile/trijent_elevator/elev = M + elev.elevator_network = elevator_network + log_debug("Adding network [elevator_network] to [M.id]") diff --git a/code/datums/supply_packs/ammo.dm b/code/datums/supply_packs/ammo.dm index 326ca075a343..0929f24f7c95 100644 --- a/code/datums/supply_packs/ammo.dm +++ b/code/datums/supply_packs/ammo.dm @@ -346,15 +346,15 @@ //------------------------Sentries Ammo---------------- -/datum/supply_packs/ammo_sentry - name = "UA 571-C sentry ammunition (x2)" +/datum/supply_packs/ammo_sentry_shotgun + name = "UA 12-G sentry shotgun ammunition (x2)" contains = list( - /obj/item/ammo_magazine/sentry, - /obj/item/ammo_magazine/sentry, + /obj/item/ammo_magazine/sentry/shotgun, + /obj/item/ammo_magazine/sentry/shotgun, ) cost = 40 containertype = /obj/structure/closet/crate/ammo - containername = "\improper sentry ammo crate" + containername = "\improper sentry shotgun ammo crate" group = "Ammo" /datum/supply_packs/ammo_sentry_flamer @@ -368,15 +368,37 @@ containername = "\improper sentry flamer ammo crate" group = "Ammo" -/datum/supply_packs/ammo_sentry_shotgun - name = "UA 12-G sentry shotgun ammunition (x2)" +/datum/supply_packs/ammo_mini_sentry_flamer + name = "UA 45-F mini sentry flamer ammunition (x2)" contains = list( - /obj/item/ammo_magazine/sentry/shotgun, - /obj/item/ammo_magazine/sentry/shotgun, + /obj/item/ammo_magazine/sentry_flamer/mini, + /obj/item/ammo_magazine/sentry_flamer/mini, ) cost = 40 containertype = /obj/structure/closet/crate/ammo - containername = "\improper sentry shotgun ammo crate" + containername = "\improper mini sentry flamer ammo crate" + group = "Ammo" + +/datum/supply_packs/ammo_glob_sentry_flamer + name = "UA 60-FP sentry plasma incinerator tank (x2)" + contains = list( + /obj/item/ammo_magazine/sentry_flamer/glob, + /obj/item/ammo_magazine/sentry_flamer/glob, + ) + cost = 40 + containertype = /obj/structure/closet/crate/ammo + containername = "\improper sentry plasma incinerator ammo crate" + group = "Ammo" + +/datum/supply_packs/ammo_sentry + name = "UA 571-C sentry ammunition (x2)" + contains = list( + /obj/item/ammo_magazine/sentry, + /obj/item/ammo_magazine/sentry, + ) + cost = 40 + containertype = /obj/structure/closet/crate/ammo + containername = "\improper sentry ammo crate" group = "Ammo" //------------------------M240 flamer tanks---------------- @@ -419,6 +441,28 @@ containertype = /obj/structure/closet/crate/ammo/alt/flame group = "Ammo" +//------------------------Mounted guns ammo---------------- +/datum/supply_packs/ammo_m2c + name = "M2C ammunition crate (x2)" + contains = list( + /obj/item/ammo_magazine/m2c, + /obj/item/ammo_magazine/m2c, + ) + cost = 25 + containertype = /obj/structure/closet/crate/ammo + containername = "\improper m2c ammunition crate" + group = "Ammo" + +/datum/supply_packs/ammo_m56d + name = "M56D drum magazine crate (x1)" + contains = list( + /obj/item/ammo_magazine/m56d, + ) + cost = 25 + containertype = /obj/structure/closet/crate/ammo + containername = "\improper m56d drum magazine crate" + group = "Ammo" + //This crate has a little bit of everything, mostly okay stuff, but it does have some really unique picks. /datum/supply_packs/ammo_surplus name = "Surplus ammo crate (various USCM magazines x10)" diff --git a/code/datums/tutorial/_tutorial.dm b/code/datums/tutorial/_tutorial.dm index 7dd7ac85c04d..f6e70e33cdd9 100644 --- a/code/datums/tutorial/_tutorial.dm +++ b/code/datums/tutorial/_tutorial.dm @@ -50,12 +50,12 @@ GLOBAL_LIST_EMPTY_TYPED(ongoing_tutorials, /datum/tutorial) tutorial_mob = starting_mob - reservation = SSmapping.RequestBlockReservation(initial(tutorial_template.width), initial(tutorial_template.height)) + reservation = SSmapping.request_turf_block_reservation(initial(tutorial_template.width), initial(tutorial_template.height), 1) if(!reservation) abort_tutorial() return FALSE - var/turf/bottom_left_corner_reservation = locate(reservation.bottom_left_coords[1], reservation.bottom_left_coords[2], reservation.bottom_left_coords[3]) + var/turf/bottom_left_corner_reservation = reservation.bottom_left_turfs[1] var/datum/map_template/tutorial/template = new tutorial_template template.load(bottom_left_corner_reservation, FALSE, TRUE) var/obj/landmark = locate(/obj/effect/landmark/tutorial_bottom_left) in GLOB.landmarks_list @@ -98,11 +98,7 @@ GLOBAL_LIST_EMPTY_TYPED(ongoing_tutorials, /datum/tutorial) /// Verify the template loaded fully and without error. /datum/tutorial/proc/verify_template_loaded() // We subtract 1 from x and y because the bottom left corner doesn't start at the walls. - var/turf/true_bottom_left_corner = locate( - reservation.bottom_left_coords[1], - reservation.bottom_left_coords[2], - reservation.bottom_left_coords[3], - ) + var/turf/true_bottom_left_corner = reservation.bottom_left_turfs[1] // We subtract 1 from x and y here because the bottom left corner counts as the first tile var/turf/top_right_corner = locate( true_bottom_left_corner.x + initial(tutorial_template.width) - 1, diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm index 8acad9821cdd..c3898283cbbb 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -2,6 +2,7 @@ // Fore = West | Aft = East // // Port = South | Starboard = North // // Bow = Western|Stern = Eastern //(those are the front and back small sections) +// Naming convention is to start by port or starboard then put eitheir (bow,fore,midship,aft,stern) /area/almayer icon = 'icons/turf/area_almayer.dmi' // ambience = list('sound/ambience/shipambience.ogg') @@ -29,26 +30,6 @@ if(hijack_evacuation_area) SShijack.progress_areas[src] = power_equip -/area/shuttle/almayer/elevator_maintenance/upperdeck - name = "\improper Upper Deck Maintenance Elevator" - icon_state = "shuttle" - fake_zlevel = 1 - -/area/shuttle/almayer/elevator_maintenance/lowerdeck - name = "\improper Lower Deck Maintenance Elevator" - icon_state = "shuttle" - fake_zlevel = 2 - -/area/shuttle/almayer/elevator_hangar/lowerdeck - name = "\improper Hangar Elevator" - icon_state = "shuttle" - fake_zlevel = 2 // lowerdeck - -/area/shuttle/almayer/elevator_hangar/underdeck - name = "\improper Hangar Elevator" - icon_state = "shuttle" - fake_zlevel = 3 - /obj/structure/machinery/computer/shuttle_control/almayer/hangar name = "Elevator Console" icon = 'icons/obj/structures/machinery/computer.dmi' @@ -260,8 +241,11 @@ /area/almayer/shipboard/brig/armory name = "\improper Brig Armory" -/area/almayer/shipboard/brig/main_office - name = "\improper Brig Main Office" +/area/almayer/shipboard/brig/mp_bunks + name = "\improper Brig MP Bunks" + +/area/almayer/shipboard/brig/starboard_hallway + name = "\improper Brig Starboard Hallway" /area/almayer/shipboard/brig/perma name = "\improper Brig Perma Cells" @@ -269,8 +253,11 @@ /area/almayer/shipboard/brig/cryo name = "\improper Brig Cryo Pods" -/area/almayer/shipboard/brig/surgery - name = "\improper Brig Surgery" +/area/almayer/shipboard/brig/medical + name = "\improper Brig Medical" + +/area/almayer/shipboard/brig/interrogation + name = "\improper Brig Interrogation Room" /area/almayer/shipboard/brig/general_equipment name = "\improper Brig General Equipment" @@ -281,11 +268,15 @@ /area/almayer/shipboard/brig/execution name = "\improper Brig Execution Room" +/area/almayer/shipboard/brig/execution_storage + name = "\improper Brig Execution Storage" + /area/almayer/shipboard/brig/cic_hallway name = "\improper Brig CiC Hallway" /area/almayer/shipboard/brig/dress name = "\improper CIC Dress Uniform Room" + /area/almayer/shipboard/brig/processing name = "\improper Brig Processing and Holding" @@ -297,6 +288,10 @@ name = "\improper Brig Chief MP Office" icon_state = "chiefmpoffice" +/area/almayer/shipboard/brig/warden_office + name = "\improper Brig Warden Office" + icon_state = "chiefmpoffice" + /area/almayer/shipboard/sea_office name = "\improper Lower Deck Senior Enlisted Advisor Office" icon_state = "chiefmpoffice" @@ -312,10 +307,6 @@ icon_state = "firingrange" fake_zlevel = 2 // lowerdeck -/area/almayer/shipboard/sensors - name = "\improper Sensor Room" - icon_state = "sensor" - /area/almayer/hallways/hangar name = "\improper Hangar" icon_state = "hangar" @@ -323,79 +314,62 @@ soundscape_playlist = SCAPE_PL_HANGAR soundscape_interval = 50 -/area/almayer/hallways/vehiclehangar - name = "\improper Lower Deck Vehicle Storage" - icon_state = "exoarmor" - fake_zlevel = 2 - -/area/almayer/living - minimap_color = MINIMAP_AREA_COLONY - -/area/almayer/living/tankerbunks - name = "\improper Lower Deck Vehicle Crew Bunks" - icon_state = "livingspace" - fake_zlevel = 2 - -/area/almayer/living/auxiliary_officer_office - name = "\improper Lower Deck Auxiliary Support Officer office" - icon_state = "livingspace" - fake_zlevel = 2 - -/area/almayer/squads/tankdeliveries - name = "\improper Lower Deck Vehicle ASRS" - icon_state = "req" - fake_zlevel = 2 +/area/almayer/hallways/lower + fake_zlevel = 2 // lowerdeck -/area/almayer/hallways/exoarmor - name = "\improper Lower Deck Vehicle Armor Storage" +/area/almayer/hallways/lower/vehiclehangar + name = "\improper Lower Deck Vehicle Storage" icon_state = "exoarmor" - fake_zlevel = 2 // lowerdeck -/area/almayer/hallways/repair_bay +/area/almayer/hallways/lower/repair_bay name = "\improper Lower Deck Deployment Workshop" icon_state = "dropshiprepair" - fake_zlevel = 2 // lowerdeck -/area/almayer/hallways/mission_planner - name = "\improper Lower Deck Dropship Central Computer Room" - icon_state = "missionplanner" - fake_zlevel = 2 // lowerdeck - -/area/almayer/hallways/starboard_umbilical +/area/almayer/hallways/lower/starboard_umbilical name = "\improper Lower Deck Starboard Umbilical Hallway" icon_state = "starboardumbilical" - fake_zlevel = 2 // lowerdeck -/area/almayer/hallways/port_umbilical +/area/almayer/hallways/lower/port_umbilical name = "\improper Lower Deck Port Umbilical Hallway" icon_state = "portumbilical" - fake_zlevel = 2 // lowerdeck -/area/almayer/hallways/aft_hallway - name = "\improper Upper Deck Aft Hallway" - icon_state = "aft" - fake_zlevel = 1 // upperdeck +//port +/area/almayer/hallways/lower/port_fore_hallway + name = "\improper Lower Deck Port-Fore Hallway" + icon_state = "port" -/area/almayer/hallways/stern_hallway - name = "\improper Upper Deck Stern Hallway" - icon_state = "stern" - fake_zlevel = 1 // upperdeck +/area/almayer/hallways/lower/port_midship_hallway + name = "\improper Lower Deck Port-Midship Hallway" + icon_state = "port" -/area/almayer/hallways/port_hallway - name = "\improper Lower Deck Port Hallway" +/area/almayer/hallways/lower/port_aft_hallway + name = "\improper Lower Deck Port-Aft Hallway" icon_state = "port" - fake_zlevel = 2 // lowerdeck -/area/almayer/hallways/starboard_hallway - name = "\improper Lower Deck Starboard Hallway" +//starboard +/area/almayer/hallways/lower/starboard_fore_hallway + name = "\improper Lower Deck Starboard-Fore Hallway" icon_state = "starboard" - fake_zlevel = 2 // lowerdeck -//new hallways areas +/area/almayer/hallways/lower/starboard_midship_hallway + name = "\improper Lower Deck Starboard-Midship Hallway" + icon_state = "starboard" + +/area/almayer/hallways/lower/starboard_aft_hallway + name = "\improper Lower Deck Starboard-Aft Hallway" + icon_state = "starboard" /area/almayer/hallways/upper fake_zlevel = 1 // upperdeck +/area/almayer/hallways/upper/aft_hallway + name = "\improper Upper Deck Aft Hallway" + icon_state = "aft" + +/area/almayer/hallways/upper/stern_hallway + name = "\improper Upper Deck Stern Hallway" + icon_state = "stern" + /area/almayer/hallways/upper/port name = "\improper Upper Deck Port Hallway" icon_state = "port" @@ -404,6 +378,7 @@ name = "\improper Upper Deck Starboard Hallway" icon_state = "starboard" +//area that are used for transition between decks. /area/almayer/stair_clone name = "\improper Lower Deck Stairs" icon_state = "stairs_lowerdeck" @@ -514,7 +489,7 @@ name = "\improper Upper Deck Starboard-Stern Hull" /area/almayer/maint/hull/upper/u_f_s - name = "\improper Upper Deck Fore-Starboard Hull" + name = "\improper Upper Deck Starboard-Fore Hull" /area/almayer/maint/hull/upper/u_m_s name = "\improper Upper Deck Starboard-Midship Hull" @@ -531,6 +506,19 @@ /area/almayer/maint/hull/upper/u_a_p name = "\improper Upper Deck Port-Aft Hull" +/area/almayer/living + minimap_color = MINIMAP_AREA_COLONY + +/area/almayer/living/tankerbunks + name = "\improper Lower Deck Vehicle Crew Bunks" + icon_state = "livingspace" + fake_zlevel = 2 + +/area/almayer/living/auxiliary_officer_office + name = "\improper Lower Deck Auxiliary Support Officer office" + icon_state = "livingspace" + fake_zlevel = 2 + /area/almayer/living/cryo_cells name = "\improper Lower Deck Cryo Cells" icon_state = "cryo" @@ -704,11 +692,6 @@ icon_state = "science" fake_zlevel = 1 // upperdeck -/area/almayer/medical/testlab - name = "\improper Medical Research workshop" - icon_state = "science" - fake_zlevel = 1 // upperdeck - /area/almayer/medical/containment name = "\improper Medical Research containment" icon_state = "science" @@ -808,27 +791,22 @@ hijack_evacuation_type = EVACUATION_TYPE_ADDITIVE /area/almayer/lifeboat_pumps/north1 - name = "Starboard Fore Lifeboat Fuel Pump" + name = "Starboard-Fore Lifeboat Fuel Pump" /area/almayer/lifeboat_pumps/north2 - name = "Starboard Aft Lifeboat Fuel Pump" + name = "Starboard-Aft Lifeboat Fuel Pump" /area/almayer/lifeboat_pumps/south1 - name = "Port Fore Lifeboat Fuel Pump" + name = "Port-Fore Lifeboat Fuel Pump" /area/almayer/lifeboat_pumps/south2 - name = "Port Aft Lifeboat Fuel Pump" + name = "Port-Aft Lifeboat Fuel Pump" /area/almayer/command/lifeboat name = "\improper Lifeboat Docking Port" icon_state = "selfdestruct" fake_zlevel = 1 // upperdeck -/area/almayer/ert_port - name = "\improper ERT Docking Port" - icon_state = "lifeboat" - flags_area = AREA_NOTUNNEL - /area/space/almayer/lifeboat_dock name = "\improper Port Lifeboat Docking" icon_state = "lifeboat" diff --git a/code/game/area/shuttles.dm b/code/game/area/shuttles.dm index 62c42406e795..3a8d53ab30b7 100644 --- a/code/game/area/shuttles.dm +++ b/code/game/area/shuttles.dm @@ -81,4 +81,4 @@ /area/shuttle/lifeboat icon = 'icons/turf/area_almayer.dmi' icon_state = "lifeboat" - flags_atom = AREA_NOTUNNEL + flags_area = AREA_NOTUNNEL diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 5f36b3b8b390..f2ae11425f42 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -503,7 +503,7 @@ Parameters are passed from New. onclose(usr, "[name]") ///This proc is called on atoms when they are loaded into a shuttle -/atom/proc/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE) +/atom/proc/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) return /** diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index f8c8be5c10ad..30e179949be5 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -934,7 +934,7 @@ Additional game mode variables. var/marine_pop_size = 0 var/uscm_personnel_count = 0 for(var/mob/living/carbon/human/human as anything in GLOB.alive_human_list) - if(human.faction == FACTION_USCM) + if(human.faction == FACTION_MARINE) uscm_personnel_count++ var/datum/job/job = GET_MAPPED_ROLE(human.job) marine_pop_size += GLOB.RoleAuthority.calculate_role_weight(job) diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm index 192277a250cc..ca0f34e64a7b 100644 --- a/code/game/gamemodes/colonialmarines/colonialmarines.dm +++ b/code/game/gamemodes/colonialmarines/colonialmarines.dm @@ -265,7 +265,7 @@ continue if(groundside_humans > (groundside_xenos * GROUNDSIDE_XENO_MULTIPLIER)) - SSticker.mode.get_specific_call("Xenomorphs Groundside (Forsaken)", TRUE, FALSE) + SSticker.mode.get_specific_call(/datum/emergency_call/forsaken_xenos, TRUE, FALSE) // "Xenomorphs Groundside (Forsaken)" TIMER_COOLDOWN_START(src, COOLDOWN_HIJACK_GROUND_CHECK, 1 MINUTES) diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm index f6fbb5f4f900..d216ba762a3e 100644 --- a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm +++ b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm @@ -194,7 +194,7 @@ announce_xeno_wave(wave) if(xeno_wave == 7) //Wave when Marines get reinforcements! - get_specific_call("Marine Reinforcements (Squad)", FALSE, TRUE) + get_specific_call(/datum/emergency_call/wo, FALSE, TRUE) // "Marine Reinforcements (Squad)" xeno_wave = min(xeno_wave + 1, WO_MAX_WAVE) diff --git a/code/game/jobs/job/civilians/other/survivors.dm b/code/game/jobs/job/civilians/other/survivors.dm index a85731aa781a..71dd5f1b96e8 100644 --- a/code/game/jobs/job/civilians/other/survivors.dm +++ b/code/game/jobs/job/civilians/other/survivors.dm @@ -85,6 +85,8 @@ if(hostile) to_chat(survivor, SPAN_HIGHDANGER("You are HOSTILE to the USCM!")) + else if(survivor.faction == FACTION_CLF) + to_chat(survivor, SPAN_HIGHDANGER("You are HOSTILE to the USCM, but NOT to other survivors!")) else to_chat(survivor, SPAN_XENOHIGHDANGER("You are NON-HOSTILE to the USCM!")) diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm index 94769de2158f..c73270944c3a 100644 --- a/code/game/jobs/job/command/cic/staffofficer.dm +++ b/code/game/jobs/job/command/cic/staffofficer.dm @@ -23,8 +23,17 @@ total_positions_so_far = positions return positions -/datum/job/command/bridge/generate_entry_message(mob/living/carbon/human/H) - return ..() + +/datum/job/command/bridge/generate_entry_conditions(mob/living/M, whitelist_status) + . = ..() + if(!islist(GLOB.marine_leaders[JOB_SO])) + GLOB.marine_leaders[JOB_SO] = list() + GLOB.marine_leaders[JOB_SO] += M + RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(cleanup_leader_candidate)) + +/datum/job/command/bridge/proc/cleanup_leader_candidate(mob/M) + SIGNAL_HANDLER + GLOB.marine_leaders[JOB_SO] -= M AddTimelock(/datum/job/command/bridge, list( JOB_SQUAD_LEADER = 1 HOURS, diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 6ccb0b5b18f7..cf7a0a6bc1a8 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -419,11 +419,16 @@ ) SStgui.update_uis(src) + //Print speed based on w_class. + var/obj/item/item = making.path + var/size = initial(item.w_class) + var/print_speed = clamp(size, 2, 5) SECONDS + //Fancy autolathe animation. icon_state = "[base_state]_n" playsound(src, 'sound/machines/print.ogg', 25) - sleep(5 SECONDS) + sleep(print_speed) playsound(src, 'sound/machines/print_off.ogg', 25) icon_state = "[base_state]" diff --git a/code/game/machinery/computer/groundside_operations.dm b/code/game/machinery/computer/groundside_operations.dm index 95ea46177ca2..52ff558cde89 100644 --- a/code/game/machinery/computer/groundside_operations.dm +++ b/code/game/machinery/computer/groundside_operations.dm @@ -1,3 +1,5 @@ +#define COMMAND_SQUAD "Command" + /obj/structure/machinery/computer/groundside_operations name = "groundside operations console" desc = "This can be used for various important functions." @@ -19,6 +21,7 @@ var/lz_selection = TRUE var/has_squad_overwatch = TRUE var/faction = FACTION_MARINE + var/show_command_squad = FALSE /obj/structure/machinery/computer/groundside_operations/Initialize() if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH)) @@ -69,8 +72,11 @@ dat += "
" if(has_squad_overwatch) - dat += "Current Squad: [!isnull(current_squad) ? "[current_squad.name]" : "----------"]
" - if(current_squad) + if(show_command_squad) + dat += "Current Squad: Command
" + else + dat += "Current Squad: [!isnull(current_squad) ? "[current_squad.name]" : "----------"]
" + if(current_squad || show_command_squad) dat += get_overwatch_info() dat += "
Close" @@ -104,98 +110,94 @@ "} - if(!current_squad) - dat += "No Squad selected!
" + if(show_command_squad) + dat += format_list_of_marines(list(GLOB.marine_leaders[JOB_CO], GLOB.marine_leaders[JOB_XO]) + GLOB.marine_leaders[JOB_SO], list(JOB_CO, JOB_XO, JOB_SO)) + else if(current_squad) + dat += format_list_of_marines(current_squad.marines_list, list(JOB_SQUAD_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE)) else - var/leader_text = "" - var/tl_text = "" - var/spec_text = "" - var/medic_text = "" - var/engi_text = "" - var/smart_text = "" - var/marine_text = "" - var/misc_text = "" - var/living_count = 0 - var/almayer_count = 0 - var/SSD_count = 0 - var/helmetless_count = 0 - - for(var/X in current_squad.marines_list) - if(!X) - continue //just to be safe - var/mob_name = "unknown" - var/mob_state = "" - var/role = "unknown" - var/act_sl = "" - var/area_name = "???" - var/mob/living/carbon/human/H - if(ishuman(X)) - H = X - mob_name = H.real_name - var/area/A = get_area(H) - var/turf/M_turf = get_turf(H) - if(A) - area_name = sanitize_area(A.name) - - if(H.job) - role = H.job - else if(istype(H.wear_id, /obj/item/card/id)) //decapitated marine is mindless, - var/obj/item/card/id/ID = H.wear_id //we use their ID to get their role. - if(ID.rank) - role = ID.rank - - switch(H.stat) - if(CONSCIOUS) - mob_state = "Conscious" - living_count++ - if(UNCONSCIOUS) - mob_state = "Unconscious" - living_count++ - else - continue - - if(!is_ground_level(M_turf.z)) - almayer_count++ - continue + dat += "No Squad selected!
" + dat += "
" + dat += "Refresh
" + return dat - if(!istype(H.head, /obj/item/clothing/head/helmet/marine)) - helmetless_count++ +/obj/structure/machinery/computer/groundside_operations/proc/format_list_of_marines(list/mob/living/carbon/human/marine_list, list/jobs_in_order) + var/dat = "" + var/list/job_order = list() + + for(var/job in jobs_in_order) + job_order[job] = "" + + var/misc_text = "" + + var/living_count = 0 + var/almayer_count = 0 + var/SSD_count = 0 + var/helmetless_count = 0 + var/total_count = 0 + + for(var/X in marine_list) + if(!X) + continue //just to be safe + total_count++ + var/mob_name = "unknown" + var/mob_state = "" + var/role = "unknown" + var/area_name = "???" + var/mob/living/carbon/human/H + var/act_sl = "" + if(ishuman(X)) + H = X + mob_name = H.real_name + var/area/A = get_area(H) + var/turf/M_turf = get_turf(H) + if(A) + area_name = sanitize_area(A.name) + + if(H.job) + role = H.job + else if(istype(H.wear_id, /obj/item/card/id)) //decapitated marine is mindless, + var/obj/item/card/id/ID = H.wear_id //we use their ID to get their role. + if(ID.rank) + role = ID.rank + + switch(H.stat) + if(CONSCIOUS) + mob_state = "Conscious" + living_count++ + if(UNCONSCIOUS) + mob_state = "Unconscious" + living_count++ + else continue - if(!H.key || !H.client) - SSD_count++ - continue - if(H == current_squad.squad_leader && role != JOB_SQUAD_LEADER) - act_sl = "(ASL)" - - var/marine_infos = "[mob_name][role][act_sl][mob_state][area_name]" - switch(role) - if(JOB_SQUAD_LEADER) - leader_text += marine_infos - if(JOB_SQUAD_TEAM_LEADER) - tl_text += marine_infos - if(JOB_SQUAD_SPECIALIST) - spec_text += marine_infos - if(JOB_SQUAD_MEDIC) - medic_text += marine_infos - if(JOB_SQUAD_ENGI) - engi_text += marine_infos - if(JOB_SQUAD_SMARTGUN) - smart_text += marine_infos - if(JOB_SQUAD_MARINE) - marine_text += marine_infos - else - misc_text += marine_infos - - dat += "Total: [current_squad.marines_list.len] Deployed
" - dat += "Marines detected: [living_count] ([helmetless_count] no helmet, [SSD_count] SSD, [almayer_count] on Almayer)
" - dat += "
Search:
" - dat += "" - dat += "" - dat += leader_text + tl_text + spec_text + medic_text + engi_text + smart_text + marine_text + misc_text - dat += "
NameRoleStateLocation
" - dat += "
" - dat += "Refresh
" + if(!is_ground_level(M_turf.z)) + almayer_count++ + continue + + if(!istype(H.head, /obj/item/clothing/head/helmet/marine)) + helmetless_count++ + continue + + if(!H.key || !H.client) + SSD_count++ + continue + if(current_squad) + if(H == current_squad.squad_leader && role != JOB_SQUAD_LEADER) + act_sl = " (ASL)" + var/marine_infos = "[mob_name][role][act_sl][mob_state][area_name]" + if(role in job_order) + job_order[role] += marine_infos + else + misc_text += marine_infos + dat += "Total: [total_count] Deployed
" + dat += "Marines detected: [living_count] ([helmetless_count] no helmet, [SSD_count] SSD, [almayer_count] on Almayer)
" + dat += "
Search:
" + dat += "" + dat += "" + for(var/job in job_order) + dat += job_order[job] + dat += misc_text + dat += "
NameRoleStateLocation
" return dat /obj/structure/machinery/computer/groundside_operations/Topic(href, href_list) @@ -272,23 +274,31 @@ for(var/datum/squad/S in GLOB.RoleAuthority.squads) if(S.active && S.faction == faction) squad_list += S.name + squad_list += COMMAND_SQUAD var/name_sel = tgui_input_list(usr, "Which squad would you like to look at?", "Pick Squad", squad_list) if(!name_sel) return - var/datum/squad/selected = get_squad_by_name(name_sel) - if(selected) - current_squad = selected + if(name_sel == COMMAND_SQUAD) + show_command_squad = TRUE + current_squad = null + else - to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("Invalid input. Aborting.")]") + show_command_squad = FALSE + + var/datum/squad/selected = get_squad_by_name(name_sel) + if(selected) + current_squad = selected + else + to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("Invalid input. Aborting.")]") if("use_cam") if(isRemoteControlling(usr)) to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("Unable to override console camera viewer. Track with camera instead. ")]") return - if(current_squad) + if(current_squad || show_command_squad) var/mob/cam_target = locate(href_list["cam_target"]) var/obj/structure/machinery/camera/new_cam = get_camera_from_target(cam_target) if(!new_cam || !new_cam.can_use()) @@ -379,3 +389,5 @@ lz_selection = FALSE has_squad_overwatch = FALSE minimap_type = MINIMAP_FLAG_PMC + +#undef COMMAND_SQUAD diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index 0a179af27803..9e734a0152e7 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -241,10 +241,43 @@ no_panel = 1 not_weldable = 1 var/queen_pryable = TRUE + var/obj/docking_port/mobile/marine_dropship/linked_dropship + /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ex_act(severity) return +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/attackby(obj/item/item, mob/user) + if(HAS_TRAIT(item, TRAIT_TOOL_MULTITOOL)) + var/direction + switch(id) + if("starboard_door") + direction = "starboard" + if("port_door") + direction = "port" + if("aft_door") + direction = "aft" + if(!linked_dropship || !linked_dropship.door_control.door_controllers[direction]) + return ..() + var/datum/door_controller/single/control = linked_dropship.door_control.door_controllers[direction] + if (control.status != SHUTTLE_DOOR_BROKEN) + return ..() + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + to_chat(user, SPAN_WARNING("You don't seem to understand how to restore a remote connection to [src].")) + return + if(user.action_busy) + return + + to_chat(user, SPAN_WARNING("You begin to restore the remote connection to [src].")) + if(!do_after(user, 5 SECONDS, INTERRUPT_ALL, BUSY_ICON_BUILD)) + to_chat(user, SPAN_WARNING("You fail to restore a remote connection to [src].")) + return + unlock(TRUE) + close(FALSE) + control.status = SHUTTLE_DOOR_UNLOCKED + to_chat(user, SPAN_WARNING("You successfully restored the remote connection to [src].")) + return + ..() /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/unlock() if(is_reserved_level(z)) @@ -261,11 +294,26 @@ if(!locked) return ..() + if(xeno.action_busy) + return + to_chat(xeno, SPAN_NOTICE("You try and force the doors open")) if(do_after(xeno, 3 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) unlock(TRUE) open(1) lock(TRUE) + var/direction + switch(id) + if("starboard_door") + direction = "starboard" + if("port_door") + direction = "port" + if("aft_door") + direction = "aft" + if(linked_dropship && linked_dropship.door_control.door_controllers[direction]) + var/datum/door_controller/single/control = linked_dropship.door_control.door_controllers[direction] + control.status = SHUTTLE_DOOR_BROKEN + /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds1 name = "\improper Alamo cargo door" @@ -336,7 +384,7 @@ continue INVOKE_ASYNC(atom_movable, TYPE_PROC_REF(/atom/movable, throw_atom), projected, 1, SPEED_FAST, null, FALSE) -/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) +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) . = ..() if(istype(port, /obj/docking_port/mobile/crashable/lifeboat)) var/obj/docking_port/mobile/crashable/lifeboat/lifeboat = port @@ -569,4 +617,3 @@ icon = 'icons/obj/structures/doors/2x1almayerdoor_glass.dmi' opacity = FALSE glass = TRUE - diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index 53b8736f75f3..b3c981a0cf71 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -87,7 +87,7 @@ GLOBAL_LIST_EMPTY(alldepartments) else to_chat(user, SPAN_NOTICE("\The [src] jammed! It can only accept up to five papers at once.")) playsound(src, "sound/machines/terminal_insert_disc.ogg", 50, TRUE) - flick("faxsend", src) + flick("[initial(icon_state)]send", src) updateUsrDialog() return @@ -245,7 +245,7 @@ GLOBAL_LIST_EMPTY(alldepartments) else to_chat(ui.user, SPAN_NOTICE("\The [src] jammed! It can only accept up to five papers at once.")) playsound(src, "sound/machines/terminal_insert_disc.ogg", 50, TRUE) - flick("faxsend", src) + flick("[initial(icon_state)]send", src) . = TRUE if("ejectid") @@ -408,10 +408,10 @@ GLOBAL_LIST_EMPTY(alldepartments) return if(! (F.inoperable() ) ) - flick("faxreceive", F) + flick("[initial(icon_state)]receive", F) // give the sprite some time to flick - spawn(20) + spawn(30) var/obj/item/paper/P = new(F.loc,faxcontents.photo_list) P.name = "faxed message" P.info = "[faxcontents.data]" @@ -515,6 +515,85 @@ GLOBAL_LIST_EMPTY(alldepartments) target_department = "Brig" network = "USCM High Command Quantum Relay" + +///The deployed fax machine backpack +/obj/structure/machinery/faxmachine/backpack + name = "\improper Portable Press Fax Machine" + desc = "A standard issue portable fax machine for civilian reporters. Functions off of an internal battery. Cannot receive faxes while being worn. It is currently deployed. Click-drag the device towards you to pick it up." + icon_state = "fax_backpack" + needs_power = FALSE + use_power = USE_POWER_NONE + health = 150 + +///The wearable and deployable part of the fax machine backpack +/obj/item/device/fax_backpack + name = "\improper Portable Press Fax Machine" + desc = "A standard issue portable fax machine for civilian reporters. Functions off of an internal battery. Cannot receive faxes while being worn. It is currently undeployed. Activate the device inhand to deploy it." + icon = 'icons/obj/structures/machinery/library.dmi' + icon_state = "fax_backpack" + item_state = "fax_backpack" + w_class = SIZE_HUGE + flags_equip_slot = SLOT_BACK + flags_item = ITEM_OVERRIDE_NORTHFACE + +/obj/item/device/fax_backpack/attack_self(mob/user) //activate item version fax inhand to deploy + if(!ishuman(user)) + return + var/turf/deployturf = get_turf(user) + if(istype(deployturf, /turf/open)) + var/turf/open/floor = deployturf + if(!floor.allow_construction) + to_chat(user, SPAN_WARNING("You cannot deploy [src] here, find a more secure surface!")) + return FALSE + var/fail = FALSE + if(deployturf.density) + fail = TRUE + else + var/static/list/blocking_types = typecacheof(list( + /obj/structure/machinery/defenses, + /obj/structure/window, + /obj/structure/windoor_assembly, + /obj/structure/machinery/door, + )) + for(var/obj/blockingobj in deployturf.contents) + if(blockingobj.density && !(blockingobj.flags_atom & ON_BORDER)) + fail = TRUE + break + if(is_type_in_typecache(blockingobj, blocking_types)) + fail = TRUE + break + if(fail) + to_chat(user, SPAN_WARNING("You can't deploy [src] here, something is in the way.")) + return + to_chat(user, SPAN_NOTICE("You begin to deploy [src]...")) + if(do_after(user, 4.5 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) + to_chat(user, SPAN_NOTICE("You deploy [src].")) + var/obj/structure/machinery/faxmachine/backpack/deployedfax = new(deployturf) + transfer_label_component(deployedfax) + playsound(src.loc, 'sound/machines/print.ogg', 40, 1) + qdel(src) + return + return ..() + +/obj/structure/machinery/faxmachine/backpack/MouseDrop(over_object, src_location, over_location) //Drag the deployed fax onto you to pick it up. + if(!ishuman(usr)) + return + var/mob/living/carbon/human/user = usr + if(over_object == user && in_range(src, user)) + if(original_fax || scan) + to_chat(user, SPAN_NOTICE("There is still something in [src]. Remove it before you pick it up.")) + return + to_chat(user, SPAN_NOTICE("You begin to pick up [src]...")) + if(do_after(user, 4.5 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) + playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1) + to_chat(user, SPAN_NOTICE("You pick up [src].")) + var/obj/item/device/fax_backpack/faxbag = new(loc) + transfer_label_component(faxbag) + user.put_in_hands(faxbag) + qdel(src) + return + return ..() + /datum/fax var/data var/list/photo_list diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index a18f5db8af43..4918df4d9a5b 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -19,15 +19,44 @@ /datum/food_processor_process/process(loc, what) if (src.output && loc) - new src.output(loc) + var/obj/item/reagent_container/food/snacks/created_food = new src.output(loc) + var/obj/item/reagent_container/food/snacks/original_food = what + if(original_food.made_from_player) + created_food.made_from_player = original_food.made_from_player + created_food.name = (created_food.made_from_player + created_food.name) if (what) qdel(what) +/datum/food_processor_process/proc/can_use(mob/user) + // By default, anyone can do it. + return TRUE + /* objs */ + +/datum/food_processor_process/xenomeat + input = /obj/item/reagent_container/food/snacks/meat/xenomeat + output = /obj/item/reagent_container/food/snacks/meat/xenomeat/processed + +/datum/food_processor_process/xenomeat/can_use(mob/user) + if(!skillcheck(user, SKILL_DOMESTIC, SKILL_DOMESTIC_MASTER)) + to_chat(user, SPAN_DANGER("You aren't trained to remove dangerous substances from food!")) + return FALSE + return TRUE + /datum/food_processor_process/meat input = /obj/item/reagent_container/food/snacks/meat output = /obj/item/reagent_container/food/snacks/rawmeatball +/datum/food_processor_process/carpmeat + input = /obj/item/reagent_container/food/snacks/carpmeat + output = /obj/item/reagent_container/food/snacks/carpmeat/processed + +/datum/food_processor_process/carpmeat/can_use(mob/user) + if(!skillcheck(user, SKILL_DOMESTIC, SKILL_DOMESTIC_MASTER)) + to_chat(user, SPAN_DANGER("You aren't trained to remove dangerous substances from food!")) + return FALSE + return TRUE + /datum/food_processor_process/potato input = /obj/item/reagent_container/food/snacks/grown/potato output = /obj/item/reagent_container/food/snacks/rawsticks @@ -88,6 +117,8 @@ if (!P) to_chat(user, SPAN_DANGER("That probably won't blend.")) return 1 + if(!P.can_use(user)) + return 1 user.visible_message("[user] put [what] into [src].", \ "You put [what] into [src].") user.drop_held_item() diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index e87bb56da489..d86a5c0e30d0 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -8,14 +8,23 @@ use_power = USE_POWER_IDLE idle_power_usage = 50 active_power_usage = 50 + can_buckle = TRUE + /// the borg inside var/mob/living/occupant = null - var/max_internal_charge = 15000 // Two charged borgs in a row with default cell - var/current_internal_charge = 15000 // Starts charged, to prevent power surges on round start - var/charging_cap_active = 25000 // Active Cap - When cyborg is inside - var/charging_cap_passive = 2500 // Passive Cap - Recharging internal capacitor when no cyborg is inside - var/icon_update_tick = 0 // Used to update icon only once every 10 ticks + /// Two charged borgs in a row with default cell + var/max_internal_charge = 15000 + /// Starts charged, to prevent power surges on round start + var/current_internal_charge = 15000 + /// Active Cap - When cyborg is inside + var/charging_cap_active = 25000 + /// Passive Cap - Recharging internal capacitor when no cyborg is inside + var/charging_cap_passive = 2500 + /// Used to update icon only once every 10 ticks + var/icon_update_tick = 0 + /// implants to not remove var/known_implants = list(/obj/item/implant/chem, /obj/item/implant/death_alarm, /obj/item/implant/loyalty, /obj/item/implant/tracking, /obj/item/implant/neurostim) - can_buckle = TRUE + ///stun time upon exiting, if at all + var/exit_stun = 2 /obj/structure/machinery/recharge_station/Initialize(mapload, ...) @@ -183,18 +192,23 @@ /obj/structure/machinery/recharge_station/proc/go_out() - if(!( src.occupant )) + if(!occupant) return - //for(var/obj/O in src) - // O.forceMove(src.loc) - if (src.occupant.client) - src.occupant.client.eye = src.occupant.client.mob - src.occupant.client.perspective = MOB_PERSPECTIVE - src.occupant.forceMove(loc) - src.occupant = null + var/mob/living/synth = occupant + + if(synth.client) + synth.client.eye = synth.client.mob + synth.client.perspective = MOB_PERSPECTIVE + + synth.forceMove(loc) + if(exit_stun) + synth.Stun(exit_stun) //Action delay when going out of a closet + if(synth.mobility_flags & MOBILITY_MOVE) + synth.visible_message(SPAN_WARNING("[synth] suddenly gets out of [src]!"), SPAN_WARNING("You get out of [src] and get your bearings!")) + + occupant = null update_icon() update_use_power(USE_POWER_IDLE) - return /obj/structure/machinery/recharge_station/verb/move_eject() set category = "Object" diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index c97a28932262..7a9f5babbd7a 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -267,7 +267,7 @@ GLOBAL_LIST_EMPTY(all_static_telecomms_towers) to_chat(user, SPAN_WARNING("\The [src.name] needs repairs to have frequencies added to its software!")) return var/choice = tgui_input_list(user, "What do you wish to do?", "TC-3T comms tower", list("Wipe communication frequencies", "Add your faction's frequencies")) - if(choice == "Wipe frequencies") + if(choice == "Wipe communication frequencies") freq_listening = null to_chat(user, SPAN_NOTICE("You wipe the preexisting frequencies from \the [src].")) return @@ -277,12 +277,16 @@ GLOBAL_LIST_EMPTY(all_static_telecomms_towers) switch(user.faction) if(FACTION_SURVIVOR) freq_listening |= COLONY_FREQ + if(FACTION_MARINE in user.faction_group) //FORECON survivors + freq_listening |= SOF_FREQ if(FACTION_CLF) freq_listening |= CLF_FREQS if(FACTION_UPP) freq_listening |= UPP_FREQS if(FACTION_WY,FACTION_PMC) freq_listening |= PMC_FREQS + if(FACTION_TWE) + freq_listening |= RMC_FREQ if(FACTION_YAUTJA) to_chat(user, SPAN_WARNING("You decide to leave the human machine alone.")) return diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index 0a7b85cae7e2..92ba81af4d94 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -200,25 +200,30 @@ /obj/item/storage/fancy/cigarettes/arcturian_ace = 15, /obj/item/storage/fancy/cigarettes/emeraldgreen = 15, /obj/item/storage/fancy/cigarettes/wypacket = 15, + /obj/item/storage/fancy/cigarettes/trading_card = 15, /obj/item/storage/fancy/cigarettes/lady_finger = 15, /obj/item/storage/fancy/cigarettes/blackpack = 10, /obj/item/storage/fancy/cigar/tarbacks = 5, + /obj/item/storage/box/matches = 10, /obj/item/tool/lighter/random = 20, /obj/item/tool/lighter/zippo = 5, + ) prices = list( /obj/item/storage/fancy/cigarettes/kpack = 40, /obj/item/storage/fancy/cigarettes/arcturian_ace = 25, /obj/item/storage/fancy/cigarettes/emeraldgreen = 35, - /obj/item/storage/fancy/cigarettes/wypacket = 35, + /obj/item/storage/fancy/cigarettes/wypacket = 30, + /obj/item/storage/fancy/cigarettes/trading_card = 35, /obj/item/storage/fancy/cigarettes/lady_finger = 30, /obj/item/storage/fancy/cigarettes/blackpack = 75, /obj/item/storage/fancy/cigar/tarbacks = 35, /obj/item/storage/box/matches = 1, /obj/item/tool/lighter/random = 10, /obj/item/tool/lighter/zippo = 25, + ) /obj/structure/machinery/vending/security @@ -407,7 +412,7 @@ name = "\improper Rec-Vend" desc = "Contains Weyland-Yutani approved recreational items, like Walkmans and Cards." icon_state = "walkman" - product_ads = "The only place to have fun in the entire Marine Corps!;You'll find no better music from here to Arcturus!;Instructions not included with decks of cards!;No volume controls - you don't need them!;All products responsibly made by people having just as much fun as you will be!" + product_ads = "The only place to have fun in the entire Marine Corps!;You'll find no better music from here to Arcturus!;Instructions not included with decks of cards!;No volume controls - you don't need them!;All products responsibly made by people having just as much fun as you will be!;Say goodbye to the lucky strike military tobacco monopoly, with the new Weyland Yutani Military Trading Card Gold cigarette pack!" vend_delay = 0.5 SECONDS idle_power_usage = 200 @@ -436,6 +441,10 @@ /obj/item/tool/pen/blue = 10, /obj/item/tool/pen/red = 10, /obj/item/tool/pen/fountain = 3, + /obj/item/storage/fancy/cigarettes/trading_card = 20, + /obj/item/storage/fancy/trading_card = 20, + /obj/item/toy/trading_card = 50, + ) contraband = list(/obj/item/toy/sword = 2) @@ -463,6 +472,10 @@ /obj/item/tool/pen/blue = 2, /obj/item/tool/pen/red = 2, /obj/item/tool/pen/fountain = 30, + /obj/item/storage/fancy/cigarettes/trading_card = 30, + /obj/item/storage/fancy/trading_card = 20, + /obj/item/toy/trading_card = 5, + ) product_type = VENDOR_PRODUCT_TYPE_RECREATIONAL diff --git a/code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm b/code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm new file mode 100644 index 000000000000..b0894ca2a5a2 --- /dev/null +++ b/code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm @@ -0,0 +1,51 @@ +//------------ CC CLOTHING VENDOR--------------- + +GLOBAL_LIST_INIT(cm_vending_clothing_combat_correspondent, list( + list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), + list("Essential Reporter's Set", 0, /obj/effect/essentials_set/cc, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), + list("Portable Press Fax Machine", 0, /obj/item/device/fax_backpack, CIVILIAN_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED), + list("Press Broadcasting Camera", 0, /obj/item/device/camera/broadcasting, CIVILIAN_CAN_BUY_UTILITY, VENDOR_ITEM_RECOMMENDED), + list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + + list("UNIFORM (CHOOSE 1)", 0, null, null, null), + list("Black Uniform", 0, /obj/item/clothing/under/marine/reporter/black, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Orange Uniform", 0, /obj/item/clothing/under/marine/reporter/orange, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Red Uniform", 0, /obj/item/clothing/under/marine/reporter/red, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + + list("ARMOR (CHOOSE 1)", 0, null, null, null), + list("Combat Correspondent's Armor", 0, /obj/item/clothing/suit/storage/marine/light/reporter, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), + list("Blue Vest", 0, /obj/item/clothing/suit/storage/jacket/marine/reporter/blue, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Black Vest", 0, /obj/item/clothing/suit/storage/hazardvest/black, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Black Coat", 0, /obj/item/clothing/suit/storage/jacket/marine/reporter/black, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Green Coat", 0, /obj/item/clothing/suit/storage/jacket/marine/reporter/green, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + + list("HELMET (CHOOSE 1)", 0, null, null, null), + list("Combat Correspondent's Helmet", 0, /obj/item/clothing/head/helmet/marine/reporter, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), + list("Combat Correspondent's Cap", 0, /obj/item/clothing/head/cmcap/reporter, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Fedora", 0, /obj/item/clothing/head/fedora, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + + list("REFILLS", 0, null, null, null), + list("Camera", 10, /obj/item/device/camera, null, VENDOR_ITEM_REGULAR), + list("Camera Film", 5, /obj/item/device/camera_film, null, VENDOR_ITEM_REGULAR), + list("Toner", 5, /obj/item/device/toner, null, VENDOR_ITEM_REGULAR), + list("Regulation Tapes", 15, /obj/item/storage/box/tapes, null, VENDOR_ITEM_REGULAR), + list("Paper Bin", 10, /obj/item/paper_bin/uscm, null, VENDOR_ITEM_REGULAR), + )) + +/obj/structure/machinery/cm_vending/clothing/combat_correspondent + name = "\improper ColMarTech Combat Correspondent Equipment Rack" + desc = "An automated rack hooked up to a colossal storage of Reporter standard-issue equipment." + req_access = list(ACCESS_PRESS) + vendor_role = list(JOB_COMBAT_REPORTER) + +/obj/structure/machinery/cm_vending/clothing/combat_correspondent/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_combat_correspondent + +/obj/effect/essentials_set/cc + spawned_gear_list = list( + /obj/item/device/flashlight, + /obj/item/tool/pen, + /obj/item/device/binoculars, + /obj/item/notepad, + /obj/item/device/taperecorder, + ) diff --git a/code/game/machinery/vending/vendor_types/crew/engineering.dm b/code/game/machinery/vending/vendor_types/crew/engineering.dm new file mode 100644 index 000000000000..9d5a809e52f7 --- /dev/null +++ b/code/game/machinery/vending/vendor_types/crew/engineering.dm @@ -0,0 +1,74 @@ +//------------ MT CLOTHING VENDOR--------------- + +GLOBAL_LIST_INIT(cm_vending_clothing_maintenance_technician, list( + list("MAINTENANCE SET (MANDATORY)", 0, null, null, null), + list("Essential Maintenance Set", 0, /obj/effect/essentials_set/maintenance, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), + + list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), + list("Insulated Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), + list("Headset", 0, /obj/item/device/radio/headset/almayer/mt, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), + list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), + + list("HELMET (CHOOSE 1)", 0, null, null, null), + list("Beret, Engineering", 0, /obj/item/clothing/head/beret/eng, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("White Hardhat", 0, /obj/item/clothing/head/hardhat/white, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Orange Hardhat", 0, /obj/item/clothing/head/hardhat/orange, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Blue Hardhat", 0, /obj/item/clothing/head/hardhat/dblue, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Welding Helmet", 0, /obj/item/clothing/head/welding, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + + list("SUIT (CHOOSE 1)", 0, null, null, null), + list("Black Hazard Vest", 0, /obj/item/clothing/suit/storage/hazardvest/black, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Blue Hazard Vest", 0, /obj/item/clothing/suit/storage/hazardvest/blue, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Orange Hazard Vest", 0, /obj/item/clothing/suit/storage/hazardvest, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Yellow Hazard Vest", 0, /obj/item/clothing/suit/storage/hazardvest/yellow, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + + list("BACKPACK (CHOOSE 1)", 0, null, null, null), + list("Technician Backpack", 0, /obj/item/storage/backpack/marine/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + list("Technician Satchel", 0, /obj/item/storage/backpack/marine/satchel/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + list("Technician Welderpack", 0, /obj/item/storage/backpack/marine/engineerpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + list("Technician Welder-Satchel", 0, /obj/item/storage/backpack/marine/engineerpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED), + list("Technician Welder Chestrig", 0, /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + + 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), + list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), + + list("POUCHES (CHOOSE 2)", 0, null, null, null), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + + list("MASK (CHOOSE 1)", 0, null, null, null), + list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Rebreather", 0, /obj/item/clothing/mask/rebreather, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + )) + +/obj/structure/machinery/cm_vending/clothing/maintenance_technician + name = "\improper ColMarTech Maintenance Technician Equipment Rack" + desc = "An automated rack hooked up to a colossal storage of Maintenance Technician standard-issue equipment." + req_access = list(ACCESS_MARINE_ENGINEERING) + vendor_role = list(JOB_MAINT_TECH) + +/obj/structure/machinery/cm_vending/clothing/maintenance_technician/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_maintenance_technician + +/obj/effect/essentials_set/maintenance + spawned_gear_list = list( + /obj/item/device/lightreplacer, + /obj/item/device/demo_scanner, + /obj/item/storage/bag/trash, + /obj/item/storage/toolbox/mechanical, + /obj/item/device/flashlight, + ) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm index 4053b9294c13..95864404f4e8 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm @@ -51,7 +51,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list( list("ARMORS", 0, null, null, null), list("M3 B12 Pattern Marine Armor", 24, /obj/item/clothing/suit/storage/marine/medium/leader, null, VENDOR_ITEM_REGULAR), - list("M4 Pattern Armor", 30, /obj/item/clothing/suit/storage/marine/medium/rto, null, VENDOR_ITEM_REGULAR), + list("M4 Pattern Armor", 16, /obj/item/clothing/suit/storage/marine/medium/rto, null, VENDOR_ITEM_REGULAR), list("RESTRICTED FIREARMS", 0, null, null, null), list("VP78 Pistol", 8, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm index 845d169a701a..0039d5b03250 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm @@ -16,7 +16,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list( list("Basic Engineering Supplies", 0, /obj/item/storage/box/kit/engineering_supply_kit, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), list("ARMORS", 0, null, null, null), - list("M4 Pattern Armor", 30, /obj/item/clothing/suit/storage/marine/medium/rto, null, VENDOR_ITEM_REGULAR), + list("M4 Pattern Armor", 16, /obj/item/clothing/suit/storage/marine/medium/rto, null, VENDOR_ITEM_REGULAR), list("CLOTHING ITEMS", 0, null, null, null), list("Machete Scabbard (Full)", 4, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index 7d16d15af6fd..b29b528ded13 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -72,8 +72,8 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("VP78 Magazine", 3, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR), list("ARMORS", 0, null, null, null), - list("M3 B12 Pattern Marine Armor", 28, /obj/item/clothing/suit/storage/marine/medium/leader, null, VENDOR_ITEM_REGULAR), - list("M4 Pattern Armor", 28, /obj/item/clothing/suit/storage/marine/medium/rto, null, VENDOR_ITEM_REGULAR), + list("M3 B12 Pattern Marine Armor", 24, /obj/item/clothing/suit/storage/marine/medium/leader, null, VENDOR_ITEM_REGULAR), + list("M4 Pattern Armor", 16, /obj/item/clothing/suit/storage/marine/medium/rto, null, VENDOR_ITEM_REGULAR), list("RESTRICTED FIREARMS", 0, null, null, null), list("VP78 Pistol", 8, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm index b132d8d4f13d..0b980fc31960 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm @@ -82,13 +82,13 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( list("ARMORS", 0, null, null, null), list("M3 B12 Pattern Marine Armor", 30, /obj/item/clothing/suit/storage/marine/medium/leader, null, VENDOR_ITEM_REGULAR), - list("M4 Pattern Armor", 30, /obj/item/clothing/suit/storage/marine/medium/rto, null, VENDOR_ITEM_REGULAR), + list("M4 Pattern Armor", 20, /obj/item/clothing/suit/storage/marine/medium/rto, null, VENDOR_ITEM_REGULAR), list("CLOTHING ITEMS", 0, null, null, null), list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), list("Brown Webbing Vest", 15, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_REGULAR), list("Black Webbing Vest", 15, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 15, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), list("Shoulder Holster", 15, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), list("Machete Scabbard (Full)", 15, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR), list("Machete Pouch (Full)", 15, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index a7afb80ef080..bf3b952edcf5 100644 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -90,9 +90,11 @@ return GLOB.nightmare_landmarks[insert_tag] = get_turf(src) /obj/effect/landmark/nightmare/Destroy() - if(insert_tag && autoremove \ - && GLOB.nightmare_landmarks[insert_tag] == get_turf(src)) - GLOB.nightmare_landmarks.Remove(insert_tag) + if(insert_tag) + var/turf/turf = get_turf(src) + if(autoremove && GLOB.nightmare_landmarks[insert_tag] == turf) + GLOB.nightmare_landmarks.Remove(insert_tag) + GLOB.nightmare_landmark_tags_removed += insert_tag return ..() /obj/effect/landmark/ert_spawns/distress diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm index 39c7dbffa6ee..a22198d3d703 100644 --- a/code/game/objects/effects/landmarks/survivor_spawner.dm +++ b/code/game/objects/effects/landmarks/survivor_spawner.dm @@ -70,6 +70,28 @@ spawn_priority = SPAWN_PRIORITY_VERY_HIGH +//Weyland-Yutani Survivors// + +/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_cl + equipment = /datum/equipment_preset/survivor/wy/executive + synth_equipment = /datum/equipment_preset/synth/survivor/wy/security_synth + intro_text = list("

You are the last alive Executive of Lazarus Landing!

",\ + "You are aware of the xenomorph threat.",\ + "Your primary objective is to survive the outbreak.") + story_text = "You are a Corporate Liaison stationed on LV-624 from Weyland-Yutani. You were tipped off about some very peculiar looking eggs recovered from the alien temple North-East of the colony. Being the smart Executive the Company hired you to be, you decided to prepare your office for the worst when the first 'facehugger' was born in the vats of the Research Dome. Turned out, you were right, everyone who called you crazy and called these the new 'synthetics' is now dead, you along with your Corporate Security detail are the only survivors due to your paranoia. The xenomorph onslaught was relentless, a fuel tank was shot by one of the Officers, leading to the destruction of a part of the dome, along with alot of the defences being melted. You must survive and find a way to contact Weyland-Yutani." + + spawn_priority = SPAWN_PRIORITY_VERY_HIGH + +/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon + equipment = /datum/equipment_preset/survivor/goon + synth_equipment = /datum/equipment_preset/synth/survivor/wy/security_synth + intro_text = list("

You are a Corporate Security Officer!

",\ + "You are aware of the xenomorph threat.",\ + "Your primary objective is to survive the outbreak.") + story_text = "You are a Corporate Security Officer stationed on LV-624 from Weyland-Yutani. Suddenly one day you were pulled aside by the Corporate Liaison and told to bring supplies from both Engineering and the Marshals Offices to their office, and fast. You began fortifying the Corporate Dome and was told by the Executive that something big will ravage the entire colony, excluding you. Turns out, the Liaison was right, these so called 'xenomorphs' broke containment from the Research Dome and began destroying the entire colony. Once they came for the Dome and tried to kill all of you, you barely managed to hold them off even after losing one Officer and alot of the defences. The Liaison said they will soon find a way to contact Weyland-Yutani and to remain steadfast until rescue arrives." + + spawn_priority = SPAWN_PRIORITY_HIGH + /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc equipment = /datum/equipment_preset/survivor/pmc synth_equipment = /datum/equipment_preset/synth/survivor/pmc @@ -122,6 +144,47 @@ spawn_priority = SPAWN_PRIORITY_VERY_HIGH +/obj/effect/landmark/survivor_spawner/shivas_panic_room_cl + equipment = /datum/equipment_preset/survivor/wy/asstmanager + synth_equipment = /datum/equipment_preset/synth/survivor/wy/corporate_synth + intro_text = list("

You are the last alive Senior Administrator on the Colony!

",\ + "You are aware of the xenomorph threat.",\ + "Your primary objective is to survive the outbreak.") + story_text = "You are the Assistant Operations Manager stationed on 'Ifrit' by Weyland-Yutani. This whole outbreak has been a giant mess, you and all other Company personnel ran to the Operations Panic Room, until you heard shooting outside and closed the shutters. You are running low on food, water and ammunition for the weapons you one-day said were 'useless' and a waste of Company dollars. You remember that Administrator Stahl sent out a distress beacon to any ship in range, hoping to get picked up by the Company, he ran to the Spaceport. You have not seen him since. In their attempts at trying to breach in, the so called 'xenomorphs' have tried attacking the shutters, but to no avail. They will soon try again. You must survive and find a way to contact Weyland-Yutani." + + spawn_priority = SPAWN_PRIORITY_VERY_HIGH + +/obj/effect/landmark/survivor_spawner/shivas_panic_room_doc + equipment = /datum/equipment_preset/survivor/doctor + synth_equipment = /datum/equipment_preset/synth/survivor/emt_synth + intro_text = list("

You are a Medical Doctor on the Colony!

",\ + "You are aware of the xenomorph threat.",\ + "Your primary objective is to survive the outbreak.") + story_text = "You are a Doctor working on 'Ifrit' for Weyland-Yutani. This whole outbreak has been a giant mess, you and all other Company personnel ran to the Operations Panic Room, until you heard shooting outside and closed the shutters. You are running low on food, water and ammunition for the weapons. You remember that the xenomorphs have a sort of implanter which latches on to your face and then... something bursts out of your chest, through the rib cage. You had plenty of those cases at the Medical Bay. In their attempts at trying to breach in, the so called 'xenomorphs' have tried attacking the shutters, but to no avail. They will soon try again. You must survive and find a way to contact Weyland-Yutani." + + spawn_priority = SPAWN_PRIORITY_HIGH + +/obj/effect/landmark/survivor_spawner/shivas_panic_room_sci + equipment = /datum/equipment_preset/survivor/scientist + synth_equipment = /datum/equipment_preset/synth/survivor/scientist_synth + intro_text = list("

You are a Weyland-Yutani Scientist on the Colony!

",\ + "You are aware of the xenomorph threat.",\ + "Your primary objective is to survive the outbreak.") + story_text = "You are a Scientist working on 'Ifrit' for Weyland-Yutani. This whole outbreak has been a giant mess, you and all other Company personnel ran to the Operations Panic Room, until you heard shooting outside and closed the shutters. You are running low on food, water and ammunition for the weapons. You remember that the XX-121 species, codenamed that by Research Director Clarke, have a variety of different species, what you can assume a 'leader' of some sort and that their acid is deadly should it come in contact with you or the shutters. You ran far from the labs and have not seen some your coworkers since. In their attempts at trying to breach in, these so called 'xenomorphs' have tried attacking the shutters, but to no avail. They will soon try again. You must survive and find a way to contact Weyland-Yutani." + + spawn_priority = SPAWN_PRIORITY_HIGH + +/obj/effect/landmark/survivor_spawner/shivas_panic_room_civ + equipment = /datum/equipment_preset/survivor/civilian + synth_equipment = /datum/equipment_preset/synth/survivor/chef_synth + intro_text = list("

You are a worker on the Colony!

",\ + "You are aware of the xenomorph threat.",\ + "Your primary objective is to survive the outbreak.") + story_text = "You are a civilian working on 'Ifrit' for Weyland-Yutani. This whole outbreak has been a giant mess, you and all other Company personnel ran to the Operations Panic Room, until you heard shooting outside and closed the shutters. You are running low on food, water and ammunition for the weapons. You remember hearing the alarms blaring and decided to run with a couple others to the Panic Room, hoping to be safe from the threat until rescue arrives. Now you wait along with others for their second attack on the Panic Room. In their first attempt at trying to breach in, the so called 'xenomorphs' have tried attacking the shutters, but to no avail. They will soon try again. You must survive and find a way to contact Weyland-Yutani." + + spawn_priority = SPAWN_PRIORITY_MEDIUM + + //Military Survivors// /obj/effect/landmark/survivor_spawner/lv522_forecon_tech diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 58e86998f39a..2af343c8de26 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -238,7 +238,7 @@ desc = "A red USCM issued flare. There are instructions on the side, it reads 'pull cord, make light'." w_class = SIZE_SMALL light_power = 2 - light_range = 7 + light_range = 5 icon_state = "flare" item_state = "flare" actions = list() //just pull it manually, neckbeard. diff --git a/code/game/objects/items/devices/helmet_visors.dm b/code/game/objects/items/devices/helmet_visors.dm index 05d75a9fefd6..4d1b38491791 100644 --- a/code/game/objects/items/devices/helmet_visors.dm +++ b/code/game/objects/items/devices/helmet_visors.dm @@ -6,7 +6,7 @@ w_class = SIZE_TINY ///The type of HUD our visor shows - var/hud_type = MOB_HUD_FACTION_USCM + var/hud_type = MOB_HUD_FACTION_MARINE ///The sound when toggling on the visor var/toggle_on_sound = 'sound/handling/hud_on.ogg' @@ -302,7 +302,7 @@ /obj/item/device/helmet_visor/night_vision/marine_raider name = "advanced night vision optic" desc = "An insertable visor HUD into a standard USCM helmet. This type gives a form of night vision and is standard issue in special forces units." - hud_type = list(MOB_HUD_FACTION_USCM, MOB_HUD_MEDICAL_ADVANCED) + hud_type = list(MOB_HUD_FACTION_MARINE, MOB_HUD_MEDICAL_ADVANCED) helmet_overlay = "nvg_sight_right_raider" power_use = 0 visor_glows = FALSE diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 7b987752011c..00f0ad16220c 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -35,7 +35,7 @@ var/headset_hud_on = FALSE var/locate_setting = TRACKER_SL var/misc_tracking = FALSE - var/hud_type = MOB_HUD_FACTION_USCM + var/hud_type = MOB_HUD_FACTION_MARINE var/default_freq ///The type of minimap this headset is added to @@ -233,7 +233,7 @@ ), PROC_REF(turn_on)) wearer = user RegisterSignal(user, COMSIG_MOB_STAT_SET_ALIVE, PROC_REF(update_minimap_icon)) - RegisterSignal(user, COMSIG_MOB_LOGIN, PROC_REF(add_hud_tracker)) + RegisterSignal(user, COMSIG_MOB_LOGGED_IN, PROC_REF(add_hud_tracker)) RegisterSignal(user, COMSIG_MOB_DEATH, PROC_REF(update_minimap_icon)) RegisterSignal(user, COMSIG_HUMAN_SET_UNDEFIBBABLE, PROC_REF(update_minimap_icon)) if(headset_hud_on) @@ -250,7 +250,7 @@ UnregisterSignal(user, list( COMSIG_LIVING_REJUVENATED, COMSIG_HUMAN_REVIVED, - COMSIG_MOB_LOGIN, + COMSIG_MOB_LOGGED_IN, COMSIG_MOB_DEATH, COMSIG_HUMAN_SET_UNDEFIBBABLE, COMSIG_MOB_STAT_SET_ALIVE @@ -341,7 +341,7 @@ var/z_level = turf_gotten.z if(wearer.assigned_equipment_preset.always_minimap_visible == TRUE || wearer.stat == DEAD) //We show to all marines if we have this flag, separated by faction - if(hud_type == MOB_HUD_FACTION_USCM) + if(hud_type == MOB_HUD_FACTION_MARINE) marker_flags = MINIMAP_FLAG_USCM else if(hud_type == MOB_HUD_FACTION_UPP) marker_flags = MINIMAP_FLAG_UPP @@ -1013,7 +1013,7 @@ icon_state = "cmb_headset" initial_keys = list(/obj/item/device/encryptionkey/cmb) has_hud = TRUE - hud_type = MOB_HUD_FACTION_USCM + hud_type = MOB_HUD_FACTION_MARINE /obj/item/device/radio/headset/distress/CMB/limited name = "\improper Damaged CMB Earpiece" @@ -1058,7 +1058,7 @@ initial_keys = list(/obj/item/device/encryptionkey/soc/forecon) volume = RADIO_VOLUME_QUIET has_hud = TRUE - hud_type = MOB_HUD_FACTION_USCM + hud_type = MOB_HUD_FACTION_MARINE /obj/item/device/radio/headset/almayer/mcom/vc name = "marine vehicle crew radio headset" diff --git a/code/game/objects/items/fulton.dm b/code/game/objects/items/fulton.dm index e36d269c8b90..664c7871ba7f 100644 --- a/code/game/objects/items/fulton.dm +++ b/code/game/objects/items/fulton.dm @@ -140,10 +140,12 @@ GLOBAL_LIST_EMPTY(deployed_fultons) sleep(30) original_location = get_turf(attached_atom) playsound(loc, 'sound/items/fulton.ogg', 50, 1) - reservation = SSmapping.RequestBlockReservation(3, 3, turf_type_override = /turf/open/space) - var/middle_x = reservation.bottom_left_coords[1] + Floor((reservation.top_right_coords[1] - reservation.bottom_left_coords[1]) / 2) - var/middle_y = reservation.bottom_left_coords[2] + Floor((reservation.top_right_coords[2] - reservation.bottom_left_coords[2]) / 2) - var/turf/space_tile = locate(middle_x, middle_y, reservation.bottom_left_coords[3]) + reservation = SSmapping.request_turf_block_reservation(3, 3, 1, turf_type_override = /turf/open/space) + var/turf/bottom_left_turf = reservation.bottom_left_turfs[1] + var/turf/top_right_turf = reservation.top_right_turfs[1] + var/middle_x = bottom_left_turf.x + Floor((top_right_turf.x - bottom_left_turf.x) / 2) + var/middle_y = bottom_left_turf.y + Floor((top_right_turf.y - bottom_left_turf.y) / 2) + var/turf/space_tile = locate(middle_x, middle_y, bottom_left_turf.z) if(!space_tile) visible_message(SPAN_WARNING("[src] begins beeping like crazy. Something is wrong!")) return diff --git a/code/game/objects/items/handheld_distress_beacon.dm b/code/game/objects/items/handheld_distress_beacon.dm index 91d6a6aa945f..5764604c9a2f 100644 --- a/code/game/objects/items/handheld_distress_beacon.dm +++ b/code/game/objects/items/handheld_distress_beacon.dm @@ -12,9 +12,9 @@ ///Tells the user who the beacon will be sent to IC var/recipient = "the USCSS Royce" ///The name of the ERT that will be passed to get_specific_call - var/list/ert_full_name = list("Weyland-Yutani PMC (Chemical Investigation Squad)") + var/list/ert_paths = list(/datum/emergency_call/pmc/chem_retrieval) // "Weyland-Yutani PMC (Chemical Investigation Squad)" ///The clickable version that will be sent in message_admins - var/list/ert_short_name = list("SEND PMCs") + var/list/ert_short_names = list("SEND PMCs") ///Whether beacon can be used, or has already been used var/active = FALSE @@ -41,13 +41,13 @@ active = TRUE update_icon() - if(!ert_full_name || !ert_short_name || (length(ert_full_name) != length(ert_short_name))) //Make sure they are greater than 0, and both are same length + if(!ert_paths || !ert_short_names || (length(ert_paths) != length(ert_short_names))) //Make sure they are greater than 0, and both are same length to_chat(user, SPAN_BOLDWARNING("[src] is broken!")) CRASH("[src] was improperly set, and has been disabled.") //For the runtime logs var/beacon_call_buttons - for(var/current_ert_num in 1 to length(ert_full_name)) - beacon_call_buttons += "([ert_short_name[current_ert_num]]) " + for(var/current_ert_num in 1 to length(ert_paths)) + beacon_call_buttons += "([ert_short_names[current_ert_num]]) " for(var/client/admin_client in GLOB.admins) if((R_ADMIN|R_MOD) & admin_client.admin_holder.rights) @@ -62,8 +62,9 @@ beacon_type = "CMB beacon" recipient = "Anchorpoint Station" - ert_full_name = list("CMB - Patrol Team - Marshals in Distress (Friendly)", "CMB - Anchorpoint Station Colonial Marine QRF (Friendly)") - ert_short_name = list("SEND CMB", "SEND QRF") + // "CMB - Patrol Team - Marshals in Distress (Friendly)", "CMB - Anchorpoint Station Colonial Marine QRF (Friendly)" + ert_paths = list(/datum/emergency_call/cmb/alt, /datum/emergency_call/cmb/anchorpoint) + ert_short_names = list("SEND CMB", "SEND QRF") // Corporate Lawyer beacon available for 50 points at the CLs briefcase /obj/item/handheld_distress_beacon/lawyer @@ -72,8 +73,8 @@ beacon_type = "Lawyer beacon" recipient = "the Corporate Affairs Division" - ert_full_name = list("Lawyers - Corporate") - ert_short_name = list("SEND LAWYERS") + ert_paths = list(/datum/emergency_call/inspection_wy/lawyer) // "Lawyers - Corporate" + ert_short_names = list("SEND LAWYERS") // Corporate Security Bodyguard beacon available for 50 points at the CLs briefcase /obj/item/handheld_distress_beacon/bodyguard @@ -82,5 +83,5 @@ beacon_type = "Bodyguard beacon" recipient = "the Corporate Security Division" - ert_full_name = list("Weyland-Yutani Goon (Executive Bodyguard Detail)") - ert_short_name = list("SEND BODYGUARD") + ert_paths = list(/datum/emergency_call/goon/bodyguard) // "Weyland-Yutani Goon (Executive Bodyguard Detail)" + ert_short_names = list("SEND BODYGUARD") diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index 3ae57723668f..112a8e40e85b 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -641,9 +641,17 @@ /obj/item/reagent_container/food/snacks/carpmeat/Initialize() . = ..() reagents.add_reagent("fish", 3) - reagents.add_reagent("carpotoxin", 3) + reagents.add_reagent("carpotoxin", 6) src.bitesize = 6 +/obj/item/reagent_container/food/snacks/carpmeat/processed + name = "processed carp fillet" + desc = "A fillet of spess carp meat. This one has been processed to remove carpotoxin." + +/obj/item/reagent_container/food/snacks/carpmeat/processed/Initialize() + . = ..() + reagents.remove_reagent("carpotoxin", 6) + /obj/item/reagent_container/food/snacks/fishfingers name = "Fish Fingers" desc = "A finger of fish." @@ -653,7 +661,6 @@ /obj/item/reagent_container/food/snacks/fishfingers/Initialize() . = ..() reagents.add_reagent("fish", 4) - reagents.add_reagent("carpotoxin", 3) bitesize = 3 /obj/item/reagent_container/food/snacks/hugemushroomslice @@ -802,7 +809,6 @@ . = ..() reagents.add_reagent("bread", 3) reagents.add_reagent("fish", 3) - reagents.add_reagent("carpotoxin", 3) bitesize = 3 /obj/item/reagent_container/food/snacks/tofuburger @@ -850,7 +856,6 @@ . = ..() reagents.add_reagent("bread", 3) reagents.add_reagent("meatprotein", 3) - reagents.add_reagent("xenoblood", 3) bitesize = 3 /obj/item/reagent_container/food/snacks/clownburger @@ -1070,7 +1075,6 @@ . = ..() reagents.add_reagent("bread", 4) reagents.add_reagent("meatprotein", 2) - reagents.add_reagent("xenoblood", 4) bitesize = 2 /obj/item/reagent_container/food/snacks/wingfangchu @@ -1084,7 +1088,6 @@ . = ..() reagents.add_reagent("soysauce", 4) reagents.add_reagent("meatprotein", 4) - reagents.add_reagent("xenoblood", 4) bitesize = 2 /obj/item/reagent_container/food/snacks/human/kabob @@ -1133,7 +1136,6 @@ /obj/item/reagent_container/food/snacks/cubancarp/Initialize() . = ..() reagents.add_reagent("fish", 6) - reagents.add_reagent("carpotoxin", 3) reagents.add_reagent("hotsauce", 3) bitesize = 3 @@ -1690,7 +1692,6 @@ /obj/item/reagent_container/food/snacks/fishandchips/Initialize() . = ..() reagents.add_reagent("fish", 6) - reagents.add_reagent("carpotoxin", 3) bitesize = 3 /obj/item/reagent_container/food/snacks/sandwich @@ -2172,7 +2173,6 @@ reagents.add_reagent("bread", 10) reagents.add_reagent("meatprotein", 10) reagents.add_reagent("cheese", 10) - reagents.add_reagent("xenoblood", 10) bitesize = 2 /obj/item/reagent_container/food/snacks/xenomeatbreadslice diff --git a/code/game/objects/items/reagent_containers/food/snacks/meat.dm b/code/game/objects/items/reagent_containers/food/snacks/meat.dm index f459d1b169ae..f68f488f268d 100644 --- a/code/game/objects/items/reagent_containers/food/snacks/meat.dm +++ b/code/game/objects/items/reagent_containers/food/snacks/meat.dm @@ -57,9 +57,16 @@ /obj/item/reagent_container/food/snacks/meat/xenomeat/Initialize() . = ..() - reagents.add_reagent("xenoblood", 3) + reagents.add_reagent("xenoblood", 6) src.bitesize = 6 +/obj/item/reagent_container/food/snacks/meat/xenomeat/processed + desc = "A slab of acrid smelling meat. This one has been processed to remove acid." + +/obj/item/reagent_container/food/snacks/meat/xenomeat/processed/Initialize() + . = ..() + reagents.remove_reagent("xenoblood", 6) + //fishable atoms meat // todo: rewrite this into a procgen'ed item when gutting fish? May be incompatible with recipe code if done that way and not hardcoded. /obj/item/reagent_container/food/snacks/meat/fish diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index f7ada8ce220c..5d7aecbc03db 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -218,6 +218,46 @@ default_cig_type = /obj/item/clothing/mask/cigarette/ucigarette storage_slots = 4 +/obj/item/storage/fancy/cigarettes/trading_card + name = "\improper WeyYu Gold Military Trading Card packet" + desc = "Gotta collect 'em all, and smoke 'em all! This fancy military trading card version of Weyland Yutani Gold cigarette packs has one card that is apart of the 3 available 5-card sets." + icon_state = "collectpacket" + item_state = "collectpacket" + storage_slots = 21 + can_hold = list( + /obj/item/clothing/mask/cigarette, + /obj/item/clothing/mask/cigarette/ucigarette, + /obj/item/clothing/mask/cigarette/bcigarette, + /obj/item/tool/lighter, + /obj/item/toy/trading_card, + ) + var/obj/item/toy/trading_card/trading_card + +/obj/item/storage/fancy/cigarettes/trading_card/fill_preset_inventory() + flags_atom |= NOREACT + for(var/i = 1 to (storage_slots-1)) + new default_cig_type(src) + trading_card = new(src) + +/obj/item/storage/fancy/cigarettes/trading_card/attack_hand(mob/user, mods) + if(trading_card?.loc == src && loc == user) + to_chat(user, SPAN_NOTICE("You pull a [trading_card.collection_color] trading card out of the cigarette pack.")) + //have to take two disparate systems n' ram 'em together + remove_from_storage(trading_card, user.loc) + user.put_in_hands(trading_card) + trading_card = null + + return ..() + +/obj/item/storage/fancy/cigarettes/trading_card/attackby(obj/item/attacked_by_item, mob/user) + if(istype(attacked_by_item, /obj/item/toy/trading_card)) + trading_card = attacked_by_item + + return ..() + +///////////// +//CIGAR BOX// +///////////// // CIGAR BOX /obj/item/storage/fancy/cigar @@ -409,3 +449,73 @@ /obj/item/storage/lockbox/vials/attackby(obj/item/W as obj, mob/user as mob) ..() update_icon() + +// Trading Card Pack + +/obj/item/storage/fancy/trading_card + name = "pack of Red WeyYu Military Trading Cards" + desc = "A 5 pack of Red Weyland Yutani Military Trading Cards." + icon = 'icons/obj/items/playing_cards.dmi' + icon_state = "trading_red_pack_closed" + storage_slots = 5 + icon_type = "trading card" + can_hold = list(/obj/item/toy/trading_card) + foldable = /obj/item/stack/sheet/cardboard + var/collection_color = null + var/obj/item/toy/trading_card/top_trading_card + +/obj/item/storage/fancy/trading_card/Initialize() + if(!collection_color) + collection_color = pick("red", "green", "blue") // because of vodoo shenanigans with fill_preset_inventory happening during parent's initalize this'll have to run prior to that + + . = ..() + + name = "pack of [capitalize(collection_color)] WeyYu Military Trading Cards" + desc = "A 5 pack of [capitalize(collection_color)] Weyland Yutani Military Trading Cards." + icon_state = "trading_[collection_color]_pack_closed" + + +/obj/item/storage/fancy/trading_card/fill_preset_inventory() + + for(var/i in 1 to storage_slots) + top_trading_card = new /obj/item/toy/trading_card(src) + +/obj/item/storage/fancy/trading_card/update_icon() + if(!(top_trading_card)) + icon_state = "trading_[collection_color]_pack_empty" + return + if(length(contents) == storage_slots) + icon_state = "trading_[collection_color]_pack_closed" + return + icon_state = "trading_[collection_color]_pack_open" + +/obj/item/storage/fancy/trading_card/attack_hand(mob/user, mods) + if(top_trading_card?.loc == src && loc == user) + to_chat(user, SPAN_NOTICE("You pull a [top_trading_card.collection_color] trading card out of the pack.")) + //have to take two disparate systems n' ram 'em together + remove_from_storage(top_trading_card, user.loc) + user.put_in_hands(top_trading_card) + if(!(length(contents))) + top_trading_card = null + update_icon() + return + top_trading_card = contents[(length(contents))] + update_icon() + return + + return ..() + +/obj/item/storage/fancy/trading_card/attackby(obj/item/attacked_by_item, mob/user) + if(istype(attacked_by_item, /obj/item/toy/trading_card)) + top_trading_card = attacked_by_item + + return ..() + +/obj/item/storage/fancy/trading_card/red + collection_color = "red" + +/obj/item/storage/fancy/trading_card/green + collection_color = "green" + +/obj/item/storage/fancy/trading_card/blue + collection_color = "blue" diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm index 3f653926f8b3..09885db34fc9 100644 --- a/code/game/objects/items/storage/large_holster.dm +++ b/code/game/objects/items/storage/large_holster.dm @@ -64,6 +64,7 @@ can_hold = list( /obj/item/weapon/gun/shotgun/pump, /obj/item/weapon/gun/shotgun/combat, + /obj/item/weapon/gun/shotgun/double/mou53, ) has_gamemode_skin = TRUE diff --git a/code/game/objects/items/toys/trading_cards.dm b/code/game/objects/items/toys/trading_cards.dm new file mode 100644 index 000000000000..9fb83cd1e5e1 --- /dev/null +++ b/code/game/objects/items/toys/trading_cards.dm @@ -0,0 +1,61 @@ +/obj/item/toy/trading_card + name = "WeyYu Military Trading Card" + icon = 'icons/obj/items/playing_cards.dmi' + icon_state = "trading_red" + w_class = SIZE_TINY + + var/trading_card_number = "1" + var/picture_description = "barrel charger" + var/collection_color + var/is_front = FALSE + var/back_name = "Red WeyYu Military Trading Card" + var/front_name = "Red WeyYu Military Trading Card Number One" + var/back_description = "The back of a red trading card with the text: WeyYu Military Trading Cards! GOTTA COLLECT EM ALL!" + var/front_description = "A red trading card with a picture of the United Americas flag emblazoned on it. It is number one out of the five red cards." + var/back_icon_state = "trading_red" + var/front_icon_state = "trading_red_one" + var/picture_descriptions = list("5" = list("red" = "a fanatical colonial seditionist", "green" = "Almirante Joelle De La Cruz (the United Americas Secretary of Defense)", "blue" = "the United Americas flag"), + "4" = list("red" = "a UPPA soldier", "green" = "Marechal-do-ar Enzo Gabriel Lurdes (the Chief of Naval Operations of the Latin American Colonial Navy)", "blue" = "the Union of Progressive Peoples flag"), + "3" = list("red" = "a UPPA minigunner", "green" = "Generale d'armee Felix Couture (the Commandant of the Canadian Colonial Armed Forces)", "blue" = "the Three World Empire flag"), + "2" = list("red" = "a UPPA officer", "green" = "General Diego Dellamarggio (the Commandant of the United States Colonial Marines)", "blue" = "the Weyland Yutani logo"), + "1" = list("red" = "a Holy Order of the HEFA cultist", "green" = "General Delyla S. Vaughn (the Assistant Commandant of the United States Colonial Marines)", "blue" = "the Independent Core System Colonies logo",) + ) + +/obj/item/toy/trading_card/Initialize() + . = ..() + + if(istype(loc, /obj/item/storage/fancy/trading_card)) + var/obj/item/storage/fancy/trading_card/packet = loc + collection_color = packet.collection_color + + if(!collection_color) + collection_color = pick("red", "green", "blue") + trading_card_number = pick_weight(list("5" = 25, "4" = 20, "3" = 15, "2" = 10, "1" = 5)) + picture_description = picture_descriptions[trading_card_number][collection_color] + + name = "[capitalize(collection_color)] WeyYu Military Trading Card" + back_name = "[capitalize(collection_color)] WeyYu Military Trading Card" + front_name = "[capitalize(collection_color)] WeyYu Military Trading Card #[trading_card_number]" + + desc = "The back of a [collection_color] trading card with the text: WeyYu Military Trading Cards! GOTTA COLLECT EM ALL!" + back_description = "The back of a [collection_color] trading card with the text: WeyYu Military Trading Cards! GOTTA COLLECT EM ALL!" + front_description = "A [collection_color] trading card with a picture of [picture_description] emblazoned on it. It is #[trading_card_number] out of the five [collection_color] cards." + + icon_state = "trading_[collection_color]" + back_icon_state = "trading_[collection_color]" + front_icon_state = "trading_[collection_color]_[trading_card_number]" + +/obj/item/toy/trading_card/attack_self(mob/user) + if(loc == user) + if(is_front) + name = back_name + desc = back_description + icon_state = back_icon_state + is_front = FALSE + else + to_chat(user, SPAN_NOTICE("You reveal the card. It has a picture of [picture_description] on it!")) + name = front_name + desc = front_description + icon_state = front_icon_state + is_front = TRUE + return ..() diff --git a/code/game/objects/structures/barricade/barricade.dm b/code/game/objects/structures/barricade/barricade.dm index 0a37e4bcec59..313067ca6a56 100644 --- a/code/game/objects/structures/barricade/barricade.dm +++ b/code/game/objects/structures/barricade/barricade.dm @@ -5,21 +5,28 @@ climbable = TRUE anchored = TRUE density = TRUE - throwpass = TRUE //You can throw objects over this, despite its density. + /// You can throw objects over this, despite its density. + throwpass = TRUE layer = BELOW_OBJ_LAYER flags_atom = ON_BORDER - var/stack_type //The type of stack the barricade dropped when disassembled if any. - var/stack_amount = 5 //The amount of stack dropped when disassembled at full health - var/destroyed_stack_amount //to specify a non-zero amount of stack to drop when destroyed + /// The type of stack the barricade dropped when disassembled if any. + var/stack_type + /// The amount of stack dropped when disassembled at full health + var/stack_amount = 5 + /// to specify a non-zero amount of stack to drop when destroyed + var/destroyed_stack_amount health = 100 //Pretty tough. Changes sprites at 300 and 150 - var/maxhealth = 100 //Basic code functions + var/maxhealth = 100 /// Used for calculating some stuff related to maxhealth as it constantly changes due to e.g. barbed wire. set to 100 to avoid possible divisions by zero var/starting_maxhealth = 100 - var/crusher_resistant = TRUE //Whether a crusher can ram through it. - var/force_level_absorption = 5 //How much force an item needs to even damage it at all. + /// Whether a crusher can ram through it. + var/crusher_resistant = TRUE + /// How much force an item needs to even damage it at all. + var/force_level_absorption = 5 var/barricade_hitsound var/barricade_type = "barricade" //"metal", "plasteel", etc. - var/wire_icon = 'icons/obj/structures/barricades.dmi' //! Icon file used for the wiring + /// ! Icon file used for the wiring + var/wire_icon = 'icons/obj/structures/barricades.dmi' var/can_change_dmg_state = TRUE var/damage_state = BARRICADE_DMG_NONE var/closed = FALSE @@ -35,6 +42,8 @@ var/burn_flame_multiplier = 1 var/repair_materials = list() var/metallic = TRUE + /// Lower limit of damage beyond which the barricade cannot be fixed by welder. Compared to damage_state. If null it can be repaired at any damage_state. + var/welder_lower_damage_limit = null /obj/structure/barricade/Initialize(mapload, mob/user) . = ..() @@ -357,9 +366,8 @@ if(50 to 75) damage_state = BARRICADE_DMG_SLIGHT if(75 to INFINITY) damage_state = BARRICADE_DMG_NONE -/obj/structure/barricade/proc/weld_cade(obj/item/tool/weldingtool/welder, mob/user) - if(!metallic) - user.visible_message(SPAN_WARNING("You can't weld \the [src]!")) +/obj/structure/barricade/proc/try_weld_cade(obj/item/tool/weldingtool/welder, mob/user, repeat = TRUE, skip_check = FALSE) + if(!skip_check && !can_weld(welder, user)) return FALSE if(!(welder.remove_fuel(2, user))) @@ -378,6 +386,16 @@ user.count_niche_stat(STATISTICS_NICHE_REPAIR_CADES) update_health(-200) playsound(src.loc, 'sound/items/Welder2.ogg', 25, TRUE) + + var/current_tool = user.get_active_hand() + if(current_tool != welder) + return TRUE // Swapped hands or tool + if(repeat && can_weld(welder, user, silent = TRUE)) + // Assumption: The implementation of can_weld will return false if fully repaired + if(!try_weld_cade(welder, user, repeat = TRUE, skip_check = TRUE)) + // If this returned false, then we were interrupted or ran out of fuel, so stop looping + return TRUE + return TRUE /obj/structure/barricade/verb/count_rotate() @@ -466,3 +484,29 @@ nailgun.in_chamber = null nailgun.load_into_chamber() return TRUE + +/obj/structure/barricade/proc/can_weld(obj/item/item, mob/user, silent) + if(user.action_busy) + return FALSE + + if(!metallic) + if(!silent) + user.visible_message(SPAN_WARNING("You can't weld \the [src]!")) + return FALSE + + if(!HAS_TRAIT(item, TRAIT_TOOL_BLOWTORCH)) + if(!silent) + to_chat(user, SPAN_WARNING("You need a stronger blowtorch!")) + return FALSE + + if(health == maxhealth) + if(!silent) + to_chat(user, SPAN_WARNING("[src] doesn't need repairs.")) + return FALSE + + if(!(isnull(damage_state)) && !(isnull(welder_lower_damage_limit)) && damage_state >= welder_lower_damage_limit) + if(!silent) + to_chat(user, SPAN_WARNING("[src] has sustained too much structural damage to be repaired.")) + return FALSE + + return TRUE diff --git a/code/game/objects/structures/barricade/deployable.dm b/code/game/objects/structures/barricade/deployable.dm index 0d5275f98a3d..ca35f82bdde5 100644 --- a/code/game/objects/structures/barricade/deployable.dm +++ b/code/game/objects/structures/barricade/deployable.dm @@ -24,40 +24,28 @@ . += SPAN_INFO("Drag its sprite onto yourself to undeploy.") /obj/structure/barricade/deployable/attackby(obj/item/item, mob/user) - if(iswelder(item)) - if(!HAS_TRAIT(item, TRAIT_TOOL_BLOWTORCH)) - to_chat(user, SPAN_WARNING("You need a stronger blowtorch!")) - return - if(user.action_busy) - return - var/obj/item/tool/weldingtool/welder = item - if(health == maxhealth) - to_chat(user, SPAN_WARNING("[src] doesn't need repairs.")) - return - - weld_cade(welder, user) + try_weld_cade(item, user) return - else if(HAS_TRAIT(item, TRAIT_TOOL_CROWBAR)) + if(HAS_TRAIT(item, TRAIT_TOOL_CROWBAR)) if(user.action_busy) return if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You do not know how to collapse [src] using a crowbar...")) return + user.visible_message(SPAN_NOTICE("[user] starts collapsing [src]."), \ + SPAN_NOTICE("You begin collapsing [src]...")) + playsound(loc, 'sound/items/Crowbar.ogg', 25, 1) + if(do_after(user, 1.5 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, src)) + collapse(usr) else - user.visible_message(SPAN_NOTICE("[user] starts collapsing [src]."), \ - SPAN_NOTICE("You begin collapsing [src]...")) - playsound(loc, 'sound/items/Crowbar.ogg', 25, 1) - if(do_after(user, 1.5 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, src)) - collapse(usr) - else - to_chat(user, SPAN_WARNING("You stop collapsing [src].")) + to_chat(user, SPAN_WARNING("You stop collapsing [src].")) if(try_nailgun_usage(item, user)) return - . = ..() + return ..() /obj/structure/barricade/deployable/MouseDrop(obj/over_object as obj) if(!ishuman(usr)) @@ -202,7 +190,7 @@ to_chat(user, SPAN_INFO("You transfer [to_transfer] between the stacks.")) return - else if(iswelder(item)) + if(iswelder(item)) if(!HAS_TRAIT(item, TRAIT_TOOL_BLOWTORCH)) to_chat(user, SPAN_WARNING("You need a stronger blowtorch!")) return @@ -248,7 +236,7 @@ playsound(loc, 'sound/items/Welder2.ogg', 25, TRUE) return - . = ..() + return ..() /obj/item/stack/folding_barricade/attack_hand(mob/user) var/mob/living/carbon/human/human = user diff --git a/code/game/objects/structures/barricade/handrail.dm b/code/game/objects/structures/barricade/handrail.dm index ae166dbbf985..1d641479c3d9 100644 --- a/code/game/objects/structures/barricade/handrail.dm +++ b/code/game/objects/structures/barricade/handrail.dm @@ -67,7 +67,7 @@ reinforced = !reinforced update_icon() -/obj/structure/barricade/handrail/attackby(obj/item/W, mob/user) +/obj/structure/barricade/handrail/attackby(obj/item/item, mob/user) for(var/obj/effect/xenomorph/acid/A in src.loc) if(A.acid_t == src) to_chat(user, "You can't get near that, it's melting!") @@ -75,7 +75,7 @@ switch(build_state) if(BARRICADE_BSTATE_SECURED) //Non-reinforced. Wrench to unsecure. Screwdriver to disassemble into metal. 1 metal to reinforce. - if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH)) // Make unsecure + if(HAS_TRAIT(item, TRAIT_TOOL_WRENCH)) // Make unsecure if(user.action_busy) return if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED)) @@ -89,7 +89,7 @@ build_state = BARRICADE_BSTATE_UNSECURED update_icon() return - if(istype(W, /obj/item/stack/sheet/metal)) // Start reinforcing + if(istype(item, /obj/item/stack/sheet/metal)) // Start reinforcing if(!can_be_reinforced) return if(user.action_busy) @@ -97,7 +97,7 @@ if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED)) to_chat(user, SPAN_WARNING("You are not trained to reinforce [src]...")) return - var/obj/item/stack/sheet/metal/M = W + var/obj/item/stack/sheet/metal/M = item playsound(src.loc, 'sound/items/Screwdriver2.ogg', 25, 1) if(M.amount >= 1 && do_after(user, 30, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) //Shouldnt be possible, but doesnt hurt to check if(!M.use(1)) @@ -109,7 +109,7 @@ return if(BARRICADE_BSTATE_UNSECURED) - if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH)) // Secure again + if(HAS_TRAIT(item, TRAIT_TOOL_WRENCH)) // Secure again if(user.action_busy) return if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED)) @@ -123,7 +123,7 @@ build_state = BARRICADE_BSTATE_SECURED update_icon() return - if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER)) // Disassemble into metal + if(HAS_TRAIT(item, TRAIT_TOOL_SCREWDRIVER)) // Disassemble into metal if(user.action_busy) return if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED)) @@ -141,7 +141,7 @@ if(BARRICADE_BSTATE_FORTIFIED) if(reinforced) - if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR)) // Un-reinforce + if(HAS_TRAIT(item, TRAIT_TOOL_CROWBAR)) // Un-reinforce if(user.action_busy) return if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED)) @@ -155,8 +155,8 @@ reinforce() return else - if(iswelder(W)) // Finish reinforcing - if(!HAS_TRAIT(W, TRAIT_TOOL_BLOWTORCH)) + if(iswelder(item)) // Finish reinforcing + if(!HAS_TRAIT(item, TRAIT_TOOL_BLOWTORCH)) to_chat(user, SPAN_WARNING("You need a stronger blowtorch!")) return if(user.action_busy) diff --git a/code/game/objects/structures/barricade/metal.dm b/code/game/objects/structures/barricade/metal.dm index 4f250eed50e9..3e79af2e21e1 100644 --- a/code/game/objects/structures/barricade/metal.dm +++ b/code/game/objects/structures/barricade/metal.dm @@ -19,6 +19,8 @@ var/build_state = BARRICADE_BSTATE_SECURED //Look at __game.dm for barricade defines var/upgrade = null + welder_lower_damage_limit = BARRICADE_DMG_HEAVY + /obj/structure/barricade/metal/update_icon() . = ..() if(dir > 2) @@ -42,26 +44,20 @@ if(BARRICADE_UPGRADE_ANTIFF) . += SPAN_NOTICE("The cade is protected by a composite upgrade.") -/obj/structure/barricade/metal/attackby(obj/item/item, mob/user) - if(iswelder(item)) - if(!HAS_TRAIT(item, TRAIT_TOOL_BLOWTORCH)) - to_chat(user, SPAN_WARNING("You need a stronger blowtorch!")) - return - if(user.action_busy) - return - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) +/obj/structure/barricade/metal/can_weld(obj/item/item, mob/user, silent) + if(!..()) + return FALSE + + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + if(!silent) to_chat(user, SPAN_WARNING("You're not trained to repair [src]...")) - return - var/obj/item/tool/weldingtool/welder = item - if(damage_state == BARRICADE_DMG_HEAVY) - to_chat(user, SPAN_WARNING("[src] has sustained too much structural damage to be repaired.")) - return + return FALSE - if(health == maxhealth) - to_chat(user, SPAN_WARNING("[src] doesn't need repairs.")) - return + return TRUE - weld_cade(welder, user) +/obj/structure/barricade/metal/attackby(obj/item/item, mob/user) + if(iswelder(item)) + try_weld_cade(item, user) return if(try_nailgun_usage(item, user)) @@ -204,11 +200,13 @@ to_chat(user, SPAN_WARNING("You are not trained to assemble [src]...")) return playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, 1) - if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) return + if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) + return user.visible_message(SPAN_NOTICE("[user] set [src]'s protection panel back."), SPAN_NOTICE("You set [src]'s protection panel back.")) build_state = BARRICADE_BSTATE_SECURED return + if(HAS_TRAIT(item, TRAIT_TOOL_WRENCH)) if(user.action_busy) return @@ -216,13 +214,15 @@ to_chat(user, SPAN_WARNING("You are not trained to disassemble [src]...")) return playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1) - if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) return + if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) + return user.visible_message(SPAN_NOTICE("[user] loosens [src]'s anchor bolts."), SPAN_NOTICE("You loosen [src]'s anchor bolts.")) anchored = FALSE build_state = BARRICADE_BSTATE_MOVABLE update_icon() //unanchored changes layer return + if(BARRICADE_BSTATE_MOVABLE) //Anchor bolts loosened step. Apply crowbar to unseat the panel and take apart the whole thing. Apply wrench to resecure anchor bolts if(HAS_TRAIT(item, TRAIT_TOOL_WRENCH)) if(user.action_busy) @@ -239,13 +239,15 @@ to_chat(user, SPAN_WARNING("[src] must be secured on a proper surface!")) return playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1) - if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) return + if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) + return user.visible_message(SPAN_NOTICE("[user] secures [src]'s anchor bolts."), SPAN_NOTICE("You secure [src]'s anchor bolts.")) build_state = BARRICADE_BSTATE_UNSECURED anchored = TRUE update_icon() //unanchored changes layer return + if(HAS_TRAIT(item, TRAIT_TOOL_CROWBAR)) if(user.action_busy) return @@ -262,7 +264,7 @@ deconstruct(TRUE) //Note : Handles deconstruction too ! return - . = ..() + return ..() /obj/structure/barricade/metal/wired/New() maxhealth += 50 @@ -271,7 +273,7 @@ is_wired = TRUE climbable = FALSE update_icon() - . = ..() + return ..() /obj/structure/barricade/metal/wired/initialize_pass_flags(datum/pass_flags_container/PF) ..() diff --git a/code/game/objects/structures/barricade/misc.dm b/code/game/objects/structures/barricade/misc.dm index 5e0958f974b1..a0465de8f070 100644 --- a/code/game/objects/structures/barricade/misc.dm +++ b/code/game/objects/structures/barricade/misc.dm @@ -44,8 +44,8 @@ user.visible_message(SPAN_NOTICE("\The [user] removes \the [src].")) deconstruct(TRUE) return - else - . = ..() + + return ..() /obj/structure/barricade/snow/hit_barricade(obj/item/I) switch(I.damtype) @@ -101,7 +101,7 @@ if(try_nailgun_usage(W, user)) return - . = ..() + return ..() /obj/structure/barricade/wooden/hit_barricade(obj/item/I) switch(I.damtype) diff --git a/code/game/objects/structures/barricade/plasteel.dm b/code/game/objects/structures/barricade/plasteel.dm index dd95aa3f1baf..1acedae9997d 100644 --- a/code/game/objects/structures/barricade/plasteel.dm +++ b/code/game/objects/structures/barricade/plasteel.dm @@ -20,12 +20,15 @@ repair_materials = list("plasteel" = 0.3) var/build_state = BARRICADE_BSTATE_SECURED //Look at __game.dm for barricade defines - var/tool_cooldown = 0 //Delay to apply tools to prevent spamming - var/busy = FALSE //Standard busy check + /// Delay to apply tools to prevent spamming + var/tool_cooldown = 0 + /// Standard busy check + var/busy = FALSE var/linked = 0 var/recentlyflipped = FALSE var/hasconnectionoverlay = TRUE var/linkable = TRUE + welder_lower_damage_limit = BARRICADE_DMG_HEAVY /obj/structure/barricade/plasteel/update_icon() ..() @@ -44,7 +47,7 @@ if(!closed) // Closed = gate down for plasteel for some reason return ..() else - return 0 + return FALSE /obj/structure/barricade/plasteel/get_examine_text(mob/user) . = ..() @@ -57,35 +60,28 @@ if(BARRICADE_BSTATE_MOVABLE) . += SPAN_INFO("The protection panel has been removed and the anchor bolts loosened. It's ready to be taken apart.") -/obj/structure/barricade/plasteel/weld_cade(obj/item/W, mob/user) +/obj/structure/barricade/plasteel/try_weld_cade(obj/item/item, mob/user, repeat = TRUE, skip_check = FALSE) busy = TRUE ..() busy = FALSE -/obj/structure/barricade/plasteel/attackby(obj/item/W, mob/user) - if(iswelder(W)) - if(!HAS_TRAIT(W, TRAIT_TOOL_BLOWTORCH)) - to_chat(user, SPAN_WARNING("You need a stronger blowtorch!")) - return - if(busy || tool_cooldown > world.time) - return - tool_cooldown = world.time + 10 - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) +/obj/structure/barricade/plasteel/can_weld(obj/item/item, mob/user, silent) + if(!..()) + return FALSE + + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + if(!silent) to_chat(user, SPAN_WARNING("You're not trained to repair [src]...")) - return - var/obj/item/tool/weldingtool/WT = W - if(damage_state == BARRICADE_DMG_HEAVY) - to_chat(user, SPAN_WARNING("[src] has sustained too much structural damage to be repaired.")) - return + return FALSE - if(health == maxhealth) - to_chat(user, SPAN_WARNING("[src] doesn't need repairs.")) - return + return TRUE - weld_cade(WT, user) +/obj/structure/barricade/plasteel/attackby(obj/item/item, mob/user) + if(iswelder(item)) + try_weld_cade(item, user) return - if(try_nailgun_usage(W, user)) + if(try_nailgun_usage(item, user)) return for(var/obj/effect/xenomorph/acid/A in src.loc) @@ -94,8 +90,8 @@ return switch(build_state) - if(2) //Fully constructed step. Use screwdriver to remove the protection panels to reveal the bolts - if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER)) + if(BARRICADE_BSTATE_SECURED) //Fully constructed step. Use screwdriver to remove the protection panels to reveal the bolts + if(HAS_TRAIT(item, TRAIT_TOOL_SCREWDRIVER)) if(busy || tool_cooldown > world.time) return tool_cooldown = world.time + 10 @@ -107,13 +103,15 @@ if(B != src && B.dir == dir) to_chat(user, SPAN_WARNING("There's already a barricade here.")) return - if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) return + if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) + return user.visible_message(SPAN_NOTICE("[user] removes [src]'s protection panel."), SPAN_NOTICE("You remove [src]'s protection panels, exposing the anchor bolts.")) playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, 1) build_state = BARRICADE_BSTATE_UNSECURED return - if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR)) + + if(HAS_TRAIT(item, TRAIT_TOOL_CROWBAR)) if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) to_chat(user, SPAN_WARNING("You are not trained to modify [src]...")) return @@ -132,28 +130,32 @@ for(var/obj/structure/barricade/plasteel/cade in get_step(src, direction)) cade.update_icon() update_icon() - if(1) //Protection panel removed step. Screwdriver to put the panel back, wrench to unsecure the anchor bolts - if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER)) + + if(BARRICADE_BSTATE_UNSECURED) //Protection panel removed step. Screwdriver to put the panel back, wrench to unsecure the anchor bolts + if(HAS_TRAIT(item, TRAIT_TOOL_SCREWDRIVER)) if(busy || tool_cooldown > world.time) return tool_cooldown = world.time + 10 if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) to_chat(user, SPAN_WARNING("You are not trained to assemble [src]...")) return - if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) return + if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) + return user.visible_message(SPAN_NOTICE("[user] set [src]'s protection panel back."), SPAN_NOTICE("You set [src]'s protection panel back.")) playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, 1) build_state = BARRICADE_BSTATE_SECURED return - if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH)) + + if(HAS_TRAIT(item, TRAIT_TOOL_WRENCH)) if(busy || tool_cooldown > world.time) return tool_cooldown = world.time + 10 if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) to_chat(user, SPAN_WARNING("You are not trained to assemble [src]...")) return - if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) return + if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) + return user.visible_message(SPAN_NOTICE("[user] loosens [src]'s anchor bolts."), SPAN_NOTICE("You loosen [src]'s anchor bolts.")) playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1) @@ -162,8 +164,8 @@ update_icon() //unanchored changes layer return - if(0) //Anchor bolts loosened step. Apply crowbar to unseat the panel and take apart the whole thing. Apply wrench to rescure anchor bolts - if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH)) + if(BARRICADE_BSTATE_MOVABLE) //Anchor bolts loosened step. Apply crowbar to unseat the panel and take apart the whole thing. Apply wrench to rescure anchor bolts + if(HAS_TRAIT(item, TRAIT_TOOL_WRENCH)) if(busy || tool_cooldown > world.time) return tool_cooldown = world.time + 10 @@ -174,7 +176,8 @@ if(!(istype(T) && T.allow_construction)) to_chat(user, SPAN_WARNING("[src] must be secured on a proper surface!")) return - if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) return + if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) + return user.visible_message(SPAN_NOTICE("[user] secures [src]'s anchor bolts."), SPAN_NOTICE("You secure [src]'s anchor bolts.")) playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1) @@ -182,7 +185,8 @@ build_state = BARRICADE_BSTATE_UNSECURED update_icon() //unanchored changes layer return - if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR)) + + if(HAS_TRAIT(item, TRAIT_TOOL_CROWBAR)) if(busy || tool_cooldown > world.time) return tool_cooldown = world.time + 10 @@ -194,15 +198,14 @@ playsound(src.loc, 'sound/items/Crowbar.ogg', 25, 1) busy = TRUE if(do_after(user, 50 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) - busy = FALSE user.visible_message(SPAN_NOTICE("[user] takes [src]'s panels apart."), SPAN_NOTICE("You take [src]'s panels apart.")) playsound(loc, 'sound/items/Deconstruct.ogg', 25, 1) deconstruct(TRUE) //Note : Handles deconstruction too ! - else busy = FALSE + busy = FALSE return - . = ..() + return ..() /obj/structure/barricade/plasteel/attack_hand(mob/user as mob) if(isxeno(user)) @@ -264,7 +267,7 @@ is_wired = TRUE climbable = FALSE update_icon() - . = ..() + return ..() /obj/structure/barricade/plasteel/wired/initialize_pass_flags(datum/pass_flags_container/PF) ..() diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 39a659c5f397..5620f106b560 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -22,32 +22,18 @@ playsound(src, unpacking_sound, 35) - /// Store the reference of the crate material - var/obj/item/stack/sheet/material_sheet - if(parts_type) // Create the crate material and store its reference - material_sheet = new parts_type(current_turf, 2) - - // Move the objects back to the turf, above the crate material + // Move the contents back to the turf for(var/atom/movable/moving_atom as anything in contents) moving_atom.forceMove(current_turf) - deconstruct(TRUE) - - // Move the crate material to the bottom of the turf's contents - if(material_sheet) - move_to_bottom(material_sheet, current_turf) + if(parts_type) // Create the crate material + new parts_type(current_turf, 2) -/// Custom proc to move an object to the bottom of the turf's contents -/obj/structure/largecrate/proc/move_to_bottom(obj/moving_down, turf/current_turf) - if(!istype(moving_down) || !istype(current_turf)) - return - for(var/atom/movable/checking_atom in current_turf.contents) - if(checking_atom != moving_down) - checking_atom.layer = max(checking_atom.layer, moving_down.layer + 0.1) + deconstruct(TRUE) /obj/structure/largecrate/deconstruct(disassembled = TRUE) if(!disassembled) - new /obj/item/stack/sheet/wood(loc) + new parts_type(loc) return ..() diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm index 1981dcaba569..a89f35ce38f3 100644 --- a/code/game/objects/structures/reagent_dispensers.dm +++ b/code/game/objects/structures/reagent_dispensers.dm @@ -5,6 +5,7 @@ icon_state = "watertank" density = TRUE anchored = FALSE + drag_delay = 1 health = 100 // Can be destroyed in 2-4 slashes. flags_atom = CAN_BE_SYRINGED wrenchable = TRUE @@ -432,6 +433,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "peppertank" anchored = TRUE + drag_delay = 3 wrenchable = FALSE density = FALSE amount_per_transfer_from_this = 45 @@ -445,6 +447,7 @@ icon_state = "water_cooler" possible_transfer_amounts = null anchored = TRUE + drag_delay = 3 chemical = "water" /obj/structure/reagent_dispensers/water_cooler/walk_past @@ -460,6 +463,7 @@ icon_state = "beertankTEMP" amount_per_transfer_from_this = 10 chemical = "beer" + drag_delay = 3 /obj/structure/reagent_dispensers/beerkeg/alt icon_state = "beertank_alt" @@ -474,6 +478,7 @@ icon_state = "virusfoodtank" amount_per_transfer_from_this = 10 anchored = TRUE + drag_delay = 3 wrenchable = FALSE density = FALSE chemical = "virusfood" diff --git a/code/game/objects/structures/vulture_spotter.dm b/code/game/objects/structures/vulture_spotter.dm index d90a1ec1615a..4d8e5d06749b 100644 --- a/code/game/objects/structures/vulture_spotter.dm +++ b/code/game/objects/structures/vulture_spotter.dm @@ -87,7 +87,7 @@ 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)) + RegisterSignal(user, list(COMSIG_MOB_PICKUP_ITEM, COMSIG_MOB_RESISTED, COMSIG_MOB_DEATH, COMSIG_LIVING_SET_BODY_POSITION), PROC_REF(do_unscope)) user.see_in_dark += darkness_view user.lighting_alpha = 127 user.sync_lighting_plane_alpha() @@ -234,7 +234,7 @@ 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)) + UnregisterSignal(user, list(COMSIG_MOB_PICKUP_ITEM, COMSIG_MOB_RESISTED, COMSIG_MOB_DEATH, COMSIG_LIVING_SET_BODY_POSITION)) user.pixel_x = 0 user.pixel_y = 0 if(user.client) @@ -295,6 +295,10 @@ return rifle.attachments["rail"] +/obj/structure/vulture_spotter_tripod/check_eye(mob/living/user) + if((user.body_position != STANDING_UP) || (get_dist(user, src) > 0) || user.is_mob_incapacitated() || !user.client) + do_unscope() + /datum/action/vulture_tripod_unscope name = "Stop Using Scope" action_icon_state = "vulture_tripod_close" diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 893071c758ed..a059d080e8ee 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -1277,7 +1277,7 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new()) /datum/controller/supply/proc/black_market_investigation() black_market_heat = -1 - SSticker.mode.get_specific_call("Inspection - Colonial Marshal Ledger Investigation Team", TRUE, TRUE) + SSticker.mode.get_specific_call(/datum/emergency_call/inspection_cmb/black_market, TRUE, TRUE) // "Inspection - Colonial Marshals Ledger Investigation Team" log_game("Black Market Inspection auto-triggered.") /obj/structure/machinery/computer/supplycomp/proc/is_buyable(datum/supply_packs/supply_pack) diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm index bf84bc04bf10..abc745dbdd45 100644 --- a/code/game/turfs/closed.dm +++ b/code/game/turfs/closed.dm @@ -15,6 +15,21 @@ icon_state = "black" mouse_opacity = FALSE +/// Cordon turf marking z-level boundaries and surrounding reservations +/turf/closed/cordon + name = "world border" + icon = 'icons/turf/shuttle.dmi' + icon_state = "pclosed" + layer = ABOVE_TURF_LAYER + baseturfs = /turf/closed/cordon + +/// Used as placeholder turf when something went really wrong, as per /tg/ string lists handler +/turf/closed/cordon/debug + name = "debug turf" + desc = "This turf shouldn't be here and probably result of incorrect turf replacement. Adminhelp about it or report it in an issue." + color = "#660088" + baseturfs = /turf/closed/cordon/debug + /turf/closed/mineral //mineral deposits name = "Rock" icon = 'icons/turf/walls/walls.dmi' diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index be58259e17ba..3d15a8c46570 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -24,7 +24,6 @@ */ - /turf icon = 'icons/turf/floors/floors.dmi' var/intact_tile = 1 //used by floors to distinguish floor with/without a floortile(e.g. plating). @@ -47,7 +46,7 @@ var/changing_turf = FALSE var/chemexploded = FALSE // Prevents explosion stacking - var/flags_turf = NO_FLAGS + var/turf_flags = NO_FLAGS /// Whether we've broken through the ceiling yet var/ceiling_debrised = FALSE @@ -57,6 +56,7 @@ ///Lumcount added by sources other than lighting datum objects, such as the overlay lighting component. var/dynamic_lumcount = 0 + ///List of light sources affecting this turf. ///Which directions does this turf block the vision of, taking into account both the turf's opacity and the movable opacity_sources. var/directional_opacity = NONE @@ -145,6 +145,22 @@ /turf/proc/update_icon() //Base parent. - Abby return +/// Call to move a turf from its current area to a new one +/turf/proc/change_area(area/old_area, area/new_area) + //dont waste our time + if(old_area == new_area) + return + + //move the turf + new_area.contents += src + + //changes to make after turf has moved + on_change_area(old_area, new_area) + +/// Allows for reactions to an area change without inherently requiring change_area() be called (I hate maploading) +/turf/proc/on_change_area(area/old_area, area/new_area) + transfer_area_lighting(old_area, new_area) + /turf/proc/add_cleanable_overlays() for(var/cleanable_type in cleanables) var/obj/effect/decal/cleanable/C = cleanables[cleanable_type] @@ -435,6 +451,10 @@ W.levelupdate() return W +//If you modify this function, ensure it works correctly with lateloaded map templates. +/turf/proc/AfterChange(flags, oldType) //called after a turf has been replaced in ChangeTurf() + return // Placeholder. This is mostly used by /tg/ code for atmos updates + // Take off the top layer turf and replace it with the next baseturf down /turf/proc/ScrapeAway(amount=1, flags) if(!amount) @@ -767,6 +787,33 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( change_type = new_baseturfs return ChangeTurf(change_type, null, flags) +/// Places a turf on top - for map loading +/turf/proc/load_on_top(turf/added_layer, flags) + var/area/our_area = get_area(src) + flags = our_area.PlaceOnTopReact(list(baseturfs), added_layer, flags) + + if(flags & CHANGETURF_SKIP) // We haven't been initialized + if(flags_atom & INITIALIZED) + stack_trace("CHANGETURF_SKIP was used in a PlaceOnTop call for a turf that's initialized. This is a mistake. [src]([type])") + assemble_baseturfs() + + var/turf/new_turf + if(!length(baseturfs)) + baseturfs = list(baseturfs) + + var/list/old_baseturfs = baseturfs.Copy() + if(!isclosedturf(src)) + old_baseturfs += type + + new_turf = ChangeTurf(added_layer, null, flags) + new_turf.assemble_baseturfs(initial(added_layer.baseturfs)) // The baseturfs list is created like roundstart + if(!length(new_turf.baseturfs)) + new_turf.baseturfs = list(baseturfs) + + // The old baseturfs are put underneath, and we sort out the unwanted ones + new_turf.baseturfs = baseturfs_string_list(old_baseturfs + (new_turf.baseturfs - GLOB.blacklisted_automated_baseturfs), new_turf) + return new_turf + /turf/proc/insert_self_into_baseturfs() baseturfs += type diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index d546e7274331..a90e821fabbf 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -720,7 +720,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) var/hivenumber = XENO_HIVE_NORMAL var/should_track_build = FALSE var/datum/cause_data/construction_data - flags_turf = TURF_ORGANIC + turf_flags = TURF_ORGANIC /turf/closed/wall/resin/Initialize(mapload) . = ..() diff --git a/code/game/turfs/walls/walls.dm b/code/game/turfs/walls/walls.dm index cb58ad2274a4..251b23ad9c57 100644 --- a/code/game/turfs/walls/walls.dm +++ b/code/game/turfs/walls/walls.dm @@ -173,7 +173,7 @@ if (acided_hole) . += SPAN_WARNING("There's a large hole in the wall that could've been caused by some sort of acid.") - if(flags_turf & TURF_ORGANIC) + if(turf_flags & TURF_ORGANIC) return // Skip the part below. 'Organic' walls aren't deconstructable with tools. switch(d_state) diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index 5871fdc7a152..a73a3b96e5e4 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -17,6 +17,7 @@ FACTION_PMC = 0, FACTION_CLF = 0, FACTION_UPP = 0, + FACTION_TWE = 0, FACTION_FREELANCER = 0, FACTION_SURVIVOR = 0, FACTION_WY_DEATHSQUAD = 0, diff --git a/code/game/world.dm b/code/game/world.dm index 2b7dacee373a..e55741ca71e5 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -125,6 +125,7 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt")) GLOB.world_runtime_log = "[GLOB.log_directory]/runtime.log" GLOB.round_stats = "[GLOB.log_directory]/round_stats.log" GLOB.scheduler_stats = "[GLOB.log_directory]/round_scheduler_stats.log" + GLOB.mapping_log = "[GLOB.log_directory]/mapping.log" GLOB.strain_logs = "[GLOB.log_directory]/strain_logs.log" start_log(GLOB.tgui_log) @@ -134,6 +135,7 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt")) start_log(GLOB.world_runtime_log) start_log(GLOB.round_stats) start_log(GLOB.scheduler_stats) + start_log(GLOB.mapping_log) start_log(GLOB.strain_logs) if(fexists(GLOB.config_error_log)) @@ -317,9 +319,39 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt")) /world/proc/on_tickrate_change() SStimer.reset_buckets() +/** + * Handles incresing the world's maxx var and intializing the new turfs and assigning them to the global area. + * If map_load_z_cutoff is passed in, it will only load turfs up to that z level, inclusive. + * This is because maploading will handle the turfs it loads itself. + */ +/world/proc/increase_max_x(new_maxx, map_load_z_cutoff = maxz) + if(new_maxx <= maxx) + return +// var/old_max = world.maxx + maxx = new_maxx + if(!map_load_z_cutoff) + return +// var/area/global_area = GLOB.areas_by_type[world.area] // We're guaranteed to be touching the global area, so we'll just do this +// var/list/to_add = block( +// locate(old_max + 1, 1, 1), +// locate(maxx, maxy, map_load_z_cutoff)) +// global_area.contained_turfs += to_add + +/world/proc/increase_max_y(new_maxy, map_load_z_cutoff = maxz) + if(new_maxy <= maxy) + return +// var/old_maxy = maxy + maxy = new_maxy + if(!map_load_z_cutoff) + return +// var/area/global_area = GLOB.areas_by_type[world.area] // We're guarenteed to be touching the global area, so we'll just do this +// var/list/to_add = block( +// locate(1, old_maxy + 1, 1), +// locate(maxx, maxy, map_load_z_cutoff)) +// global_area.contained_turfs += to_add + /world/proc/incrementMaxZ() maxz++ - //SSmobs.MaxZChanged() /** For initializing and starting byond-tracy when BYOND_TRACY is defined * byond-tracy is a useful profiling tool that allows the user to view the CPU usage and execution time of procs as they run. @@ -342,6 +374,7 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt")) /world/proc/HandleTestRun() // Wait for the game ticker to initialize Master.sleep_offline_after_initializations = FALSE + SSticker.start_immediately = TRUE UNTIL(SSticker.initialized) //trigger things to run the whole process diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index f3eae1447ba0..b99394a52fee 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -111,6 +111,7 @@ GLOBAL_LIST_INIT(admin_verbs_minor_event, list( /client/proc/cmd_admin_change_custom_event, /datum/admins/proc/admin_force_distress, /datum/admins/proc/admin_force_ERT_shuttle, + /client/proc/enable_event_mob_verbs, /client/proc/force_hijack, /datum/admins/proc/force_predator_round, //Force spawns a predator round. /client/proc/adjust_predator_round, @@ -141,7 +142,6 @@ GLOBAL_LIST_INIT(admin_verbs_minor_event, list( )) GLOBAL_LIST_INIT(admin_verbs_major_event, list( - /client/proc/enable_event_mob_verbs, /client/proc/cmd_admin_dress_all, /client/proc/free_all_mobs_in_view, /client/proc/drop_bomb, @@ -238,6 +238,7 @@ GLOBAL_LIST_INIT(debug_verbs, list( )) GLOBAL_LIST_INIT(admin_verbs_possess, list( + /client/proc/cmd_assume_direct_control, /client/proc/possess, /client/proc/release )) @@ -262,10 +263,7 @@ GLOBAL_LIST_INIT(admin_mob_event_verbs_hideable, list( /client/proc/editappear, /client/proc/cmd_admin_addhud, /client/proc/cmd_admin_change_their_hivenumber, - /client/proc/cmd_assume_direct_control, /client/proc/free_mob_for_ghosts, - /client/proc/possess, - /client/proc/release, /client/proc/cmd_admin_grantfullaccess, /client/proc/cmd_admin_grantallskills, /client/proc/admin_create_account @@ -273,6 +271,7 @@ GLOBAL_LIST_INIT(admin_mob_event_verbs_hideable, list( //verbs which can be hidden - needs work GLOBAL_LIST_INIT(admin_verbs_hideable, list( + /client/proc/cmd_assume_direct_control, /client/proc/release, /client/proc/possess, /client/proc/callproc_datum, diff --git a/code/modules/admin/player_panel/actions/punish.dm b/code/modules/admin/player_panel/actions/punish.dm index eb80632d8afe..1b7d313b6121 100644 --- a/code/modules/admin/player_panel/actions/punish.dm +++ b/code/modules/admin/player_panel/actions/punish.dm @@ -119,6 +119,14 @@ user.admin_holder.player_notes_show(target.ckey) return TRUE +/datum/player_action/check_ckey + action_tag = "check_ckey" + name = "Check Ckey" + + +/datum/player_action/check_ckey/act(client/user, mob/target, list/params) + user.admin_holder.check_ckey(target.ckey) + return TRUE /datum/player_action/reset_xeno_name action_tag = "reset_xeno_name" diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 5f10b8d24d22..4b52f03c1ec8 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -469,6 +469,11 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) /datum/admin_help/proc/Close(key_name = key_name_admin(usr), silent = FALSE) if(state != AHELP_ACTIVE) return + + if(marked_admin != usr.key) + to_chat(usr, SPAN_WARNING("This ticket is currently marked by [marked_admin]. Please override their mark to interact with this ticket!")) + return + RemoveActive() state = AHELP_CLOSED GLOB.ahelp_tickets.ListInsert(src) @@ -483,6 +488,11 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) /datum/admin_help/proc/Resolve(key_name = key_name_admin(usr), silent = FALSE) if(state != AHELP_ACTIVE) return + + if(marked_admin != usr.key) + to_chat(usr, SPAN_WARNING("This ticket is currently marked by [marked_admin]. Please override their mark to interact with this ticket!")) + return + RemoveActive() state = AHELP_RESOLVED GLOB.ahelp_tickets.ListInsert(src) @@ -501,6 +511,10 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) if(state != AHELP_ACTIVE || !initial_message) return + if(marked_admin != usr.key) + to_chat(usr, SPAN_WARNING("This ticket is currently marked by [marked_admin]. Please override their mark to interact with this ticket!")) + return + if(!initiator.current_mhelp) initiator.current_mhelp = new(initiator) @@ -559,6 +573,10 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) if(state != AHELP_ACTIVE) return + if(marked_admin != usr.key) + to_chat(usr, SPAN_WARNING("This ticket is currently marked by [marked_admin]. Please override their mark to interact with this ticket!")) + return + if(initiator) initiator.giveadminhelpverb() @@ -582,6 +600,10 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) to_chat(usr, SPAN_WARNING("This ticket is already closed!")) return + if(marked_admin != usr.key) + to_chat(usr, SPAN_WARNING("This ticket is currently marked by [marked_admin]. Please override their mark to interact with this ticket!")) + return + var/chosen = tgui_input_list(usr, "Which auto response do you wish to send?", "AutoReply", GLOB.adminreplies) var/datum/autoreply/admin/response = GLOB.adminreplies[chosen] diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index e5fed9db2fc4..a9a3a90ff35a 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -60,7 +60,7 @@ var/message_prompt = "Message:" - if((AH?.opening_responders && length(AH.ticket_interactions) == 1 ) || (AH?.marked_admin && AH?.marked_admin != usr.key) && length(AH.ticket_interactions) == 2) + if((AH?.opening_responders && length(AH.ticket_interactions) == 1 ) || ((AH?.marked_admin && AH?.marked_admin != usr.key) && length(AH.ticket_interactions) == 2)) SEND_SOUND(src, sound('sound/machines/buzz-sigh.ogg', volume=30)) message_prompt += "\n\n**This ticket is already being responded to by: [length(AH.opening_responders) ? english_list(AH.opening_responders) : AH.marked_admin]**" diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 535a55ca47b3..60c2092d8dc3 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -115,8 +115,10 @@ var/height if(istype(SSmapping.z_list[cur_z], /datum/space_level)) var/datum/space_level/cur_level = SSmapping.z_list[cur_z] - width = cur_level.x_bounds - half_chunk_size + 2 - height = cur_level.y_bounds - half_chunk_size + 2 + cur_x += cur_level.bounds[MAP_MINX] - 1 + cur_y += cur_level.bounds[MAP_MINY] - 1 + width = cur_level.bounds[MAP_MAXX] - cur_level.bounds[MAP_MINX] - half_chunk_size + 3 + height = cur_level.bounds[MAP_MAXY] - cur_level.bounds[MAP_MINY] - half_chunk_size + 3 else width = world.maxx - half_chunk_size + 2 height = world.maxy - half_chunk_size + 2 @@ -281,6 +283,8 @@ account_user.mind.store_memory(remembered_info) account_user.mind.initial_account = generated_account + log_admin("[key_name(usr)] has created a new bank account for [key_name(account_user)].") + /client/proc/cmd_assume_direct_control(mob/M in GLOB.mob_list) set name = "Control Mob" set desc = "Assume control of the mob" @@ -339,3 +343,20 @@ show_browser(usr, "[str]", "Ticker Count", "tickercount") + +#ifdef TESTING +GLOBAL_LIST_EMPTY(dirty_vars) + +/client/proc/see_dirty_varedits() + set category = "Debug.Mapping" + set name = "Dirty Varedits" + + var/list/dat = list() + dat += "

Abandon all hope ye who enter here



" + for(var/thing in GLOB.dirty_vars) + dat += "[thing]
" + CHECK_TICK + var/datum/browser/popup = new(usr, "dirty_vars", "Dirty Varedits", nwidth = 900, nheight = 750) + popup.set_content(dat.Join()) + popup.open() +#endif diff --git a/code/modules/admin/verbs/load_event_level.dm b/code/modules/admin/verbs/load_event_level.dm index 165506376b9b..72d004e03261 100644 --- a/code/modules/admin/verbs/load_event_level.dm +++ b/code/modules/admin/verbs/load_event_level.dm @@ -24,8 +24,6 @@ // Get dims & guesstimate center turf (in practice, current implem means min is always 1) var/dim_x = boundaries[MAP_MAXX] - boundaries[MAP_MINX] + 1 var/dim_y = boundaries[MAP_MAXY] - boundaries[MAP_MINY] + 1 - var/center_x = boundaries[MAP_MINX] + round(dim_x / 2) // Technically off by 0.5 due to above +1. Whatever - var/center_y = boundaries[MAP_MINY] + round(dim_y / 2) var/prompt = alert(C, "Are you SURE you want to load this template as level ? This is SLOW and can freeze server for a bit. Dimensions are: [dim_x] x [dim_y]", "Template Confirm" ,"Yes","Nope!") if(prompt != "Yes") @@ -40,6 +38,9 @@ to_chat(C, "Failed to load the template to a Z-Level! Sorry!") return + var/center_x = round(loaded.bounds[MAP_MAXX] / 2) // Technically off by 0.5 due to above +1. Whatever + var/center_y = round(loaded.bounds[MAP_MAXY] / 2) + // Now notify the staff of the load - this goes in addition to the generic template load game log message_admins("Successfully loaded template as new Z-Level by ckey: [logckey], template name: [template.name]", center_x, center_y, loaded.z_value) if(isobserver(C?.mob)) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 44820444a955..5796d5ff505e 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -444,7 +444,7 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( view = GLOB.world_view_size - SEND_GLOBAL_SIGNAL(COMSIG_GLOB_CLIENT_LOGIN, src) + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_CLIENT_LOGGED_IN, src) ////////////// //DISCONNECT// diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 221736b5c84f..113d585e44ef 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -245,7 +245,7 @@ GLOBAL_LIST_INIT(bgstate_options, list( var/auto_observe = TRUE /datum/preferences/New(client/C) - key_bindings = deepCopyList(GLOB.hotkey_keybinding_list_by_key) // give them default keybinds and update their movement keys + key_bindings = deep_copy_list(GLOB.hotkey_keybinding_list_by_key) // give them default keybinds and update their movement keys macros = new(C, src) if(istype(C)) owner = C diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 0c1a7a31b5e8..c822bedd0f7b 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -515,6 +515,10 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name) display_name = "Card, Uno Reverse - yellow" path = /obj/item/toy/handcard/uno_reverse_yellow +/datum/gear/toy/card/trading_card + display_name = "Card, random WeyYu Trading" + path = /obj/item/toy/trading_card + /datum/gear/toy/deck display_name = "Deck of cards, regular" path = /obj/item/toy/deck @@ -523,6 +527,10 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name) display_name = "Deck of cards, Uno" path = /obj/item/toy/deck/uno +/datum/gear/toy/trading_card + display_name = "Trading Card Packet" + path = /obj/item/storage/fancy/trading_card + /datum/gear/toy/d6 display_name = "Die, 6 sides" path = /obj/item/toy/dice diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 2261ddf5ebfa..8f3d10c102ce 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -100,7 +100,7 @@ /proc/sanitize_keybindings(value) var/list/base_bindings = sanitize_islist(value, list()) if(!length(base_bindings)) - base_bindings = deepCopyList(GLOB.hotkey_keybinding_list_by_key) + base_bindings = deep_copy_list(GLOB.hotkey_keybinding_list_by_key) for(var/key in base_bindings) base_bindings[key] = base_bindings[key] & GLOB.keybindings_by_name if(!length(base_bindings[key])) diff --git a/code/modules/client/tgui_macro.dm b/code/modules/client/tgui_macro.dm index 5159a8b7414c..cd621cebab84 100644 --- a/code/modules/client/tgui_macro.dm +++ b/code/modules/client/tgui_macro.dm @@ -126,7 +126,7 @@ GLOBAL_LIST_EMPTY(ui_data_keybindings) if(choice == "Cancel") return TRUE prefs.hotkeys = (choice == "Hotkey") - prefs.key_bindings = (prefs.hotkeys) ? deepCopyList(GLOB.hotkey_keybinding_list_by_key) : deepCopyList(GLOB.classic_keybinding_list_by_key) + prefs.key_bindings = (prefs.hotkeys) ? deep_copy_list(GLOB.hotkey_keybinding_list_by_key) : deep_copy_list(GLOB.classic_keybinding_list_by_key) INVOKE_ASYNC(owner, /client/proc/set_macros) prefs.save_preferences() return TRUE diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index 9121485ee76a..86527457bfce 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -416,10 +416,8 @@ /obj/item/clothing/head/cmcap/reporter name = "combat correspondent cap" desc = "A faithful cap for any terrain war correspondents may find themselves in." - icon = 'icons/mob/humans/onmob/contained/war_correspondent.dmi' - icon_state = "wc_flagcap" - item_state = "wc_flagcap" - contained_sprite = TRUE + icon_state = "cc_flagcap" + item_state = "cc_flagcap" flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE flags_marine_hat = HAT_GARB_OVERLAY diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index adfbfb023309..26c92f632ee2 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -511,7 +511,17 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( new_action.give_to(user) return - if(HAS_TRAIT(attacking_item, TRAIT_TOOL_SCREWDRIVER) && length(inserted_visors)) + if(HAS_TRAIT(attacking_item, TRAIT_TOOL_SCREWDRIVER)) + // If there isn't anything to remove, return. + if(!length(inserted_visors)) + // If the user is trying to remove a built-in visor, give them a more helpful failure message. + switch(length(built_in_visors)) + if(1) // Messy plural handling + to_chat(user, SPAN_WARNING("The visor on [src] is built-in!")) + if(2 to INFINITY) + to_chat(user, SPAN_WARNING("The visors on [src] are built-in!")) + return + if(active_visor) var/obj/item/device/helmet_visor/temp_visor_holder = active_visor active_visor = null @@ -1403,10 +1413,8 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/head/helmet/marine/reporter name = "press helmet" desc = "A helmet designed to make it clear that the wearer is safety aware and not looking for a fight." - icon = 'icons/mob/humans/onmob/contained/war_correspondent.dmi' - icon_state = "wc_helm" - item_state = "wc_helm" - contained_sprite = TRUE + icon_state = "cc_helmet" + item_state = "cc_helmet" flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE built_in_visors = list() diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm deleted file mode 100644 index bc29b0a33570..000000000000 --- a/code/modules/clothing/suits/marine_armor.dm +++ /dev/null @@ -1,2008 +0,0 @@ -#define DEBUG_ARMOR_PROTECTION 0 - -#if DEBUG_ARMOR_PROTECTION -/mob/living/carbon/human/verb/check_overall_protection() - set name = "Get Armor Value" - set category = "Debug" - set desc = "Shows the armor value of the bullet category." - - var/armor = 0 - var/counter = 0 - for(var/X in H.limbs) - var/obj/limb/E = X - armor = getarmor_organ(E, ARMOR_BULLET) - to_chat(src, SPAN_DEBUG("[E.name] is protected with [armor] armor against bullets.")) - counter += armor - to_chat(src, SPAN_DEBUG("The overall armor score is: [counter].")) -#endif - -//=======================================================================\\ -//=======================================================================\\ - -#define ALPHA 1 -#define BRAVO 2 -#define CHARLIE 3 -#define DELTA 4 -#define ECHO 5 -#define CRYO 6 -#define SOF 7 -#define NOSQUAD 8 - -// MARINE STORAGE ARMOR - -/obj/item/clothing/suit/storage/marine - name = "\improper M3 pattern marine armor" - desc = "A standard Colonial Marines M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." - icon = 'icons/obj/items/clothing/cm_suits.dmi' - icon_state = "1" - item_state = "marine_armor" //Make unique states for Officer & Intel armors. - item_icons = list( - WEAR_JACKET = 'icons/mob/humans/onmob/suit_1.dmi' - ) - flags_atom = FPRINT|CONDUCT - flags_inventory = BLOCKSHARPOBJ - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS - flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS - flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS - min_cold_protection_temperature = HELMET_MIN_COLD_PROT - max_heat_protection_temperature = HELMET_MAX_HEAT_PROT - blood_overlay_type = "armor" - armor_melee = CLOTHING_ARMOR_MEDIUM - armor_bullet = CLOTHING_ARMOR_MEDIUM - armor_laser = CLOTHING_ARMOR_MEDIUMLOW - armor_energy = CLOTHING_ARMOR_NONE - armor_bomb = CLOTHING_ARMOR_MEDIUMLOW - armor_bio = CLOTHING_ARMOR_MEDIUM - armor_rad = CLOTHING_ARMOR_MEDIUMLOW - armor_internaldamage = CLOTHING_ARMOR_MEDIUM - movement_compensation = SLOWDOWN_ARMOR_LIGHT - storage_slots = 3 - siemens_coefficient = 0.7 - slowdown = SLOWDOWN_ARMOR_MEDIUM - allowed = list( - /obj/item/weapon/gun, - /obj/item/prop/prop_gun, - /obj/item/tank/emergency_oxygen, - /obj/item/device/flashlight, - /obj/item/storage/fancy/cigarettes, - /obj/item/tool/lighter, - /obj/item/storage/bible, - /obj/item/attachable/bayonet, - /obj/item/storage/backpack/general_belt, - /obj/item/storage/large_holster/machete, - /obj/item/storage/belt/gun/type47, - /obj/item/storage/belt/gun/m4a3, - /obj/item/storage/belt/gun/m44, - /obj/item/storage/belt/gun/smartpistol, - /obj/item/storage/belt/gun/flaregun, - /obj/item/device/motiondetector, - /obj/item/device/walkman, - /obj/item/storage/belt/gun/m39, - /obj/item/storage/belt/gun/xm51, - ) - valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_PONCHO) - - light_power = 3 - light_range = 4 - light_system = MOVABLE_LIGHT - - var/flashlight_cooldown = 0 //Cooldown for toggling the light - var/locate_cooldown = 0 //Cooldown for SL locator - var/armor_overlays[] - actions_types = list(/datum/action/item_action/toggle) - var/flags_marine_armor = ARMOR_SQUAD_OVERLAY|ARMOR_LAMP_OVERLAY - var/specialty = "M3 pattern marine" //Same thing here. Give them a specialty so that they show up correctly in vendors. speciality does NOTHING if you have NO_NAME_OVERRIDE - w_class = SIZE_HUGE - uniform_restricted = list(/obj/item/clothing/under/marine) - sprite_sheets = list(SPECIES_MONKEY = 'icons/mob/humans/species/monkeys/onmob/suit_monkey_1.dmi') - time_to_unequip = 20 - time_to_equip = 20 - pickup_sound = "armorequip" - drop_sound = "armorequip" - equip_sounds = list('sound/handling/putting_on_armor1.ogg') - var/armor_variation = 0 - /// The dmi where the grayscale squad overlays are contained - var/squad_overlay_icon = 'icons/mob/humans/onmob/suit_1.dmi' - - var/atom/movable/marine_light/light_holder - -/obj/item/clothing/suit/storage/marine/Initialize(mapload) - . = ..() - if(!(flags_atom & NO_NAME_OVERRIDE)) - name = "[specialty]" - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - name += " snow armor" //Leave marine out so that armors don't have to have "Marine" appended (see: generals). - else - name += " armor" - - if(!(flags_atom & NO_SNOW_TYPE)) - select_gamemode_skin(type) - armor_overlays = list("lamp") //Just one for now, can add more later. - if(armor_variation && mapload) - set_armor_style("Random") - update_icon() - pockets.max_w_class = SIZE_SMALL //Can contain small items AND rifle magazines. - pockets.bypass_w_limit = list( - /obj/item/ammo_magazine/rifle, - /obj/item/ammo_magazine/smg, - /obj/item/ammo_magazine/sniper, - ) - pockets.max_storage_space = 8 - - light_holder = new(src) - -/obj/item/clothing/suit/storage/marine/Destroy() - QDEL_NULL(light_holder) - return ..() - -/obj/item/clothing/suit/storage/marine/update_icon(mob/user) - var/image/I - armor_overlays["lamp"] = null - if(flags_marine_armor & ARMOR_LAMP_OVERLAY) - if(flags_marine_armor & ARMOR_LAMP_ON) - I = image('icons/obj/items/clothing/cm_suits.dmi', src, "lamp-on") - else - I = image('icons/obj/items/clothing/cm_suits.dmi', src, "lamp-off") - armor_overlays["lamp"] = I - overlays += I - else armor_overlays["lamp"] = null - if(user) user.update_inv_wear_suit() - - -/obj/item/clothing/suit/storage/marine/post_vendor_spawn_hook(mob/living/carbon/human/user) //used for randomizing/selecting a variant for armors. - if(!armor_variation) - return - - if(user?.client?.prefs) - // Set the armor style to the user's preference. - set_armor_style(user.client.prefs.preferred_armor) - else - // Or if that isn't possible, just pick a random one. - set_armor_style("Random") - update_icon(user) - -/obj/item/clothing/suit/storage/marine/attack_self(mob/user) - ..() - - if(!isturf(user.loc)) - to_chat(user, SPAN_WARNING("You cannot turn the light [light_on ? "off" : "on"] while in [user.loc].")) //To prevent some lighting anomalies. - return - - if(flashlight_cooldown > world.time) - return - if(!ishuman(user)) - return - - var/mob/living/carbon/human/H = user - if(H.wear_suit != src) - return - - turn_light(user, !light_on) - -/obj/item/clothing/suit/storage/marine/item_action_slot_check(mob/user, slot) - if(!ishuman(user)) - return FALSE - if(slot != WEAR_JACKET) - return FALSE - return TRUE //only give action button when armor is worn. - -/obj/item/clothing/suit/storage/marine/turn_light(mob/user, toggle_on) - . = ..() - if(. != CHECKS_PASSED) - return - set_light_range(initial(light_range)) - set_light_power(Floor(initial(light_power) * 0.5)) - set_light_on(toggle_on) - flags_marine_armor ^= ARMOR_LAMP_ON - - light_holder.set_light_flags(LIGHT_ATTACHED) - light_holder.set_light_range(initial(light_range)) - light_holder.set_light_power(initial(light_power)) - light_holder.set_light_on(toggle_on) - - if(!toggle_on) - playsound(src, 'sound/handling/click_2.ogg', 50, 1) - - playsound(src, 'sound/handling/suitlight_on.ogg', 50, 1) - update_icon(user) - - for(var/X in actions) - var/datum/action/A = X - A.update_button_icon() - -/obj/item/clothing/suit/storage/marine/mob_can_equip(mob/living/carbon/human/M, slot, disable_warning = 0) - . = ..() - if (.) - if(issynth(M) && M.allow_gun_usage == FALSE && !(flags_marine_armor & SYNTH_ALLOWED)) - M.visible_message(SPAN_DANGER("Your programming prevents you from wearing this!")) - return 0 - -/** - * Updates the armor's `icon_state` to the style represented by `new_style`. - * - * Arguments: - * * new_style - The new armor style. May only be one of `GLOB.armor_style_list`'s keys, or `"Random"`. - */ -/obj/item/clothing/suit/storage/marine/proc/set_armor_style(new_style) - // Regex to match one or more digits. - var/static/regex/digits = new("\\d+") - // Integer for the new armor style's `icon_state`. - var/new_look - - if(new_style == "Random") - // The style icon states are all numbers between 1 and `armor_variation`, so this picks a random one. - new_look = rand(1, armor_variation) - else - new_look = GLOB.armor_style_list[new_style] - - // Replace the digits in the current icon state with `new_look`. (E.g. "L6" -> "L2") - icon_state = digits.Replace(icon_state, new_look) - -/obj/item/clothing/suit/storage/marine/medium/padded - name = "M3 pattern padded marine armor" - icon_state = "1" - specialty = "M3 pattern padded marine" - -/obj/item/clothing/suit/storage/marine/medium/padless - name = "M3 pattern padless marine armor" - icon_state = "2" - specialty = "M3 pattern padless marine" - -/obj/item/clothing/suit/storage/marine/medium/padless_lines - name = "M3 pattern ridged marine armor" - icon_state = "3" - specialty = "M3 pattern ridged marine" - -/obj/item/clothing/suit/storage/marine/medium/carrier - name = "M3 pattern carrier marine armor" - icon_state = "4" - specialty = "M3 pattern carrier marine" - -/obj/item/clothing/suit/storage/marine/medium/skull - name = "M3 pattern skull marine armor" - icon_state = "5" - specialty = "M3 pattern skull marine" - -/obj/item/clothing/suit/storage/marine/medium/smooth - name = "M3 pattern smooth marine armor" - icon_state = "6" - specialty = "M3 pattern smooth marine" - -/obj/item/clothing/suit/storage/marine/medium/rto - icon_state = "io" - armor_variation = 0 - name = "\improper M4 pattern marine armor" - desc = "A well tinkered and crafted hybrid of Smart-Gunner mesh and M3 pattern plates. Robust, yet nimble, with room for all your pouches." - armor_bio = CLOTHING_ARMOR_MEDIUMHIGH - armor_rad = CLOTHING_ARMOR_MEDIUM - storage_slots = 4 - light_range = 5 //slightly higher - specialty = "M4 pattern marine" - -/obj/item/clothing/suit/storage/marine/medium/rto/intel - name = "\improper XM4 pattern intelligence officer armor" - uniform_restricted = list(/obj/item/clothing/under/marine/officer/intel) - specialty = "XM4 pattern intel" - desc = "Tougher than steel, quieter than whispers, the XM4 Intel Armor provides capable protection combined with an experimental integrated motion tracker. It took an R&D team a weekend to develop and costs more than the Chinook Station... probably. When worn, uniform accessories such as webbing cannot be attached due to the motion sensors occupying the clips." - desc_lore = "ARMAT Perfection. The XM4 Soldier Awareness System mixes M4-style hard armor and a distributed series of motion sensors clipped onto the breastplate. When connected to any HUD optic, it replicates the effects of an M314 Motion Detector unit, increasing user situational awareness. It is currently undergoing field trials by intelligence operatives." - storage_slots = 5 - /// XM4 Integral Motion Detector Ability - actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/intel/toggle_motion_detector) - var/motion_detector = FALSE - var/obj/item/device/motiondetector/xm4/proximity - var/long_range_cooldown = 2 - var/recycletime = 120 - -/obj/item/clothing/suit/storage/marine/medium/rto/intel/Initialize(mapload, ...) - . = ..() - proximity = new(src) - update_icon() - -/datum/action/item_action/intel/action_activate() - if(!ishuman(owner)) - return - -/datum/action/item_action/intel/update_button_icon() - return - -/datum/action/item_action/intel/toggle_motion_detector/New(Target, obj/item/holder) - . = ..() - name = "Toggle Motion Detector" - action_icon_state = "motion_detector" - button.name = name - button.overlays.Cut() - button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state) - -/datum/action/item_action/intel/toggle_motion_detector/action_activate() - . = ..() - var/obj/item/clothing/suit/storage/marine/medium/rto/intel/recon = holder_item - recon.toggle_motion_detector(owner) - -/datum/action/item_action/intel/toggle_motion_detector/proc/update_icon() - if(!holder_item) - return - var/obj/item/clothing/suit/storage/marine/medium/rto/intel/recon = holder_item - if(recon.motion_detector) - button.icon_state = "template_on" - else - button.icon_state = "template" - -/obj/item/clothing/suit/storage/marine/medium/rto/intel/process() - if(!motion_detector) - STOP_PROCESSING(SSobj, src) - if(motion_detector) - recycletime-- - if(!recycletime) - recycletime = initial(recycletime) - proximity.refresh_blip_pool() - long_range_cooldown-- - if(long_range_cooldown) - return - long_range_cooldown = initial(long_range_cooldown) - proximity.scan() - -/obj/item/clothing/suit/storage/marine/medium/rto/intel/proc/toggle_motion_detector(mob/user) - to_chat(user,SPAN_NOTICE("You [motion_detector? "disable" : "enable"] \the [src]'s motion detector.")) - if(!motion_detector) - playsound(loc,'sound/items/detector_turn_on.ogg', 25, 1) - else - playsound(loc,'sound/items/detector_turn_off.ogg', 25, 1) - motion_detector = !motion_detector - var/datum/action/item_action/intel/toggle_motion_detector/TMD = locate(/datum/action/item_action/intel/toggle_motion_detector) in actions - TMD.update_icon() - motion_detector() - -/obj/item/clothing/suit/storage/marine/medium/rto/intel/proc/motion_detector() - if(motion_detector) - START_PROCESSING(SSobj, src) - else - STOP_PROCESSING(SSobj, src) - -/obj/item/clothing/suit/storage/marine/medium/rto/intel/mob_can_equip(mob/living/carbon/human/user, slot, disable_warning) //Thanks to Drathek for the help on this part! - if(!..()) - return FALSE - - // Only equip if uniform doesn't already have a utility accessory slot equipped - var/obj/item/clothing/under/uniform = user.w_uniform - var/accessory = locate(/obj/item/clothing/accessory/storage) in uniform.accessories - if(accessory) - to_chat(user, SPAN_WARNING("[src] can't be worn with [accessory].")) - return FALSE - // Only equip if user has expert intel skill level - if(!skillcheck(user, SKILL_INTEL, SKILL_INTEL_EXPERT)) - to_chat(user, SPAN_WARNING("You don't seem to know how to use [src]...")) - return FALSE - return TRUE - -/obj/item/clothing/suit/storage/marine/medium/rto/intel/equipped(mob/user, slot, silent) //When XM4 is equipped this removes ACCESSORY_SLOT_UTILITY as a valid accessory for the uniform - . = ..() - if(slot == WEAR_JACKET) - var/mob/living/carbon/human/human = user - var/obj/item/clothing/under/uniform = human.w_uniform - if(uniform?.valid_accessory_slots) - uniform?.valid_accessory_slots -= ACCESSORY_SLOT_UTILITY - -/obj/item/clothing/suit/storage/marine/medium/rto/intel/unequipped(mob/user, slot) //When unequipped this adds the ACCESSORY_SLOT_UTILITY back as a valid accessory - . = ..() - if(slot == WEAR_JACKET) - var/mob/living/carbon/human/human = user - var/obj/item/clothing/under/uniform = human.w_uniform - if(uniform) - // Figure out if the uniform originally allowed ACCESSORY_SLOT_UTILITY - var/obj/item/clothing/under/temp_uniform = new uniform.type - if(temp_uniform.valid_accessory_slots) - for(var/allowed in temp_uniform.valid_accessory_slots) - if(allowed == ACCESSORY_SLOT_UTILITY) - // It was allowed previously, now add it back - uniform.valid_accessory_slots += ACCESSORY_SLOT_UTILITY - break - qdel(temp_uniform) - -/obj/item/clothing/suit/storage/marine/MP - name = "\improper M2 pattern MP armor" - desc = "A standard Colonial Marines M2 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." - icon_state = "mp_armor" - armor_melee = CLOTHING_ARMOR_MEDIUMHIGH - armor_bullet = CLOTHING_ARMOR_LOW - armor_laser = CLOTHING_ARMOR_LOW - armor_energy = CLOTHING_ARMOR_LOW - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_bio = CLOTHING_ARMOR_MEDIUMLOW - armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW - storage_slots = 2 - slowdown = SLOWDOWN_ARMOR_LIGHT - allowed = list( - /obj/item/weapon/gun, - /obj/item/tank/emergency_oxygen, - /obj/item/device/flashlight, - /obj/item/ammo_magazine/, - /obj/item/storage/fancy/cigarettes, - /obj/item/tool/lighter, - /obj/item/weapon/baton, - /obj/item/handcuffs, - /obj/item/explosive/grenade, - /obj/item/device/binoculars, - /obj/item/attachable/bayonet, - /obj/item/storage/backpack/general_belt, - /obj/item/device/hailer, - /obj/item/storage/belt/gun, - /obj/item/weapon/sword/ceremonial, - /obj/item/device/motiondetector, - /obj/item/device/walkman, - ) - uniform_restricted = list(/obj/item/clothing/under/marine/mp) - specialty = "M2 pattern MP" - item_state_slots = list(WEAR_JACKET = "mp_armor") - black_market_value = 20 - -/obj/item/clothing/suit/storage/marine/MP/warden - icon_state = "warden" - name = "\improper M3 pattern warden MP armor" - desc = "A well-crafted suit of M3 Pattern Armor typically distributed to Wardens. Useful for letting your men know who is in charge." - armor_bio = CLOTHING_ARMOR_MEDIUMLOW - armor_rad = CLOTHING_ARMOR_MEDIUMLOW - uniform_restricted = list(/obj/item/clothing/under/marine/warden) - specialty = "M3 pattern warden MP" - item_state_slots = list(WEAR_JACKET = "warden") - -/obj/item/clothing/suit/storage/marine/MP/WO - icon_state = "warrant_officer" - name = "\improper M3 pattern chief MP armor" - desc = "A well-crafted suit of M3 Pattern Armor typically distributed to Chief MPs. Useful for letting your men know who is in charge." - uniform_restricted = list(/obj/item/clothing/under/marine/officer/warrant) - specialty = "M3 pattern chief MP" - item_state_slots = list(WEAR_JACKET = "warrant_officer") - black_market_value = 30 - -/obj/item/clothing/suit/storage/marine/MP/general - name = "\improper M3 pattern general officer armor" - desc = "A well-crafted suit of M3 Pattern Armor with a gold shine. It looks very expensive, but shockingly fairly easy to carry and wear." - icon_state = "general" - armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH - armor_bio = CLOTHING_ARMOR_MEDIUM - uniform_restricted = list(/obj/item/clothing/under/marine/officer/general) - specialty = "M3 pattern general" - item_state_slots = list(WEAR_JACKET = "general") - w_class = SIZE_MEDIUM - -/obj/item/clothing/suit/storage/marine/MP/SO - name = "\improper M3 pattern officer armor" - desc = "A well-crafted suit of M3 Pattern Armor typically found in the hands of higher-ranking officers. Useful for letting your men know who is in charge when taking to the field." - icon_state = "officer" - storage_slots = 3 - flags_atom = null - uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/qm_suit, /obj/item/clothing/under/rank/chief_medical_officer, /obj/item/clothing/under/marine/dress) - specialty = "M3 pattern officer" - item_state_slots = list(WEAR_JACKET = "officer") - -//Making a new object because we might want to edit armor values and such. -//Or give it its own sprite. It's more for the future. -/obj/item/clothing/suit/storage/marine/MP/CO - name = "\improper M3 pattern commanding officer armor" - desc = "A robust, well-polished suit of armor for the Commanding Officer. Custom-made to fit its owner with special straps to operate a smartgun. Show those Marines who's really in charge." - icon_state = "co_officer" - item_state = "co_officer" - armor_bullet = CLOTHING_ARMOR_HIGH - storage_slots = 3 - flags_atom = NO_SNOW_TYPE - flags_inventory = BLOCKSHARPOBJ|SMARTGUN_HARNESS - uniform_restricted = list(/obj/item/clothing/under/marine, /obj/item/clothing/under/rank/qm_suit) - specialty = "M3 pattern captain" - item_state_slots = list(WEAR_JACKET = "co_officer") - valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_RANK, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_PONCHO) - black_market_value = 35 - - -/obj/item/clothing/suit/storage/marine/MP/CO/jacket - name = "\improper M3 pattern commanding officer armored coat" - desc = "A robust, well-polished suit of armor for the Commanding Officer. Custom-made to fit its owner with special straps to operate a smartgun. Show those Marines who's really in charge. This one has a coat over it for added warmth." - icon_state = "bridge_coat_armored" - item_state = "bridge_coat_armored" - item_state_slots = list(WEAR_JACKET = "bridge_coat_armored") - valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_RANK) - - -/obj/item/clothing/suit/storage/marine/smartgunner - name = "\improper M56 combat harness" - desc = "A heavy protective vest designed to be worn with the M56 Smartgun System. \nIt has specially designed straps and reinforcement to carry the Smartgun and accessories." - icon_state = "8" - item_state = "armor" - armor_laser = CLOTHING_ARMOR_LOW - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_rad = CLOTHING_ARMOR_MEDIUM - storage_slots = 2 - slowdown = SLOWDOWN_ARMOR_LIGHT - flags_inventory = BLOCKSHARPOBJ|SMARTGUN_HARNESS - allowed = list( - /obj/item/tank/emergency_oxygen, - /obj/item/device/flashlight, - /obj/item/ammo_magazine, - /obj/item/explosive/mine, - /obj/item/attachable/bayonet, - /obj/item/weapon/gun/smartgun, - /obj/item/storage/backpack/general_belt, - /obj/item/device/motiondetector, - /obj/item/device/walkman, - ) - -/obj/item/clothing/suit/storage/marine/smartgunner/Initialize() - . = ..() - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD] && name == "M56 combat harness") - name = "M56 snow combat harness" - else - name = "M56 combat harness" - //select_gamemode_skin(type) - -/obj/item/clothing/suit/storage/marine/smartgunner/mob_can_equip(mob/equipping_mob, slot, disable_warning = FALSE) - . = ..() - - if(equipping_mob.back) - to_chat(equipping_mob, SPAN_WARNING("You can't equip [src] while wearing a backpack.")) - return FALSE - -/obj/item/clothing/suit/storage/marine/smartgunner/equipped(mob/user, slot, silent) - . = ..() - - if(slot == WEAR_JACKET) - RegisterSignal(user, COMSIG_HUMAN_ATTEMPTING_EQUIP, PROC_REF(check_equipping)) - -/obj/item/clothing/suit/storage/marine/smartgunner/proc/check_equipping(mob/living/carbon/human/equipping_human, obj/item/equipping_item, slot) - SIGNAL_HANDLER - - if(slot != WEAR_BACK) - return - - . = COMPONENT_HUMAN_CANCEL_ATTEMPT_EQUIP - - if(equipping_item.flags_equip_slot == SLOT_BACK) - to_chat(equipping_human, SPAN_WARNING("You can't equip [equipping_item] on your back while wearing [src].")) - return - -/obj/item/clothing/suit/storage/marine/smartgunner/unequipped(mob/user, slot) - . = ..() - - UnregisterSignal(user, COMSIG_HUMAN_ATTEMPTING_EQUIP) - -/obj/item/clothing/suit/storage/marine/medium/leader - name = "\improper B12 pattern marine armor" - desc = "A lightweight suit of carbon fiber body armor built for quick movement. Designed in a lovely forest green. Use it to toggle the built-in flashlight." - icon_state = "7" - armor_variation = 0 - armor_melee = CLOTHING_ARMOR_MEDIUMHIGH - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_bio = CLOTHING_ARMOR_MEDIUMHIGH - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH - specialty = "B12 pattern marine" - light_range = 5 - -/obj/item/clothing/suit/storage/marine/tanker - name = "\improper M3 pattern tanker armor" - desc = "A modified and refashioned suit of M3 Pattern armor designed to be worn by the loader of a USCM vehicle crew. While the suit is a bit more encumbering to wear with the crewman uniform, it offers the loader a degree of protection that would otherwise not be enjoyed." - icon_state = "tanker" - uniform_restricted = list(/obj/item/clothing/under/marine/officer/tanker) - specialty = "M3 pattern tanker" - storage_slots = 2 - -//===========================//PFC ARMOR CLASSES\\================================\\ -//=================================================================================\\ - -/obj/item/clothing/suit/storage/marine/medium - armor_variation = 6 - light_power = 4 - -/obj/item/clothing/suit/storage/marine/medium/padded - name = "M3 pattern padded marine armor" - icon_state = "1" - armor_variation = 0 - specialty = "M3 pattern padded marine" - -/obj/item/clothing/suit/storage/marine/medium/padless - name = "M3 pattern padless marine armor" - icon_state = "2" - armor_variation = 0 - specialty = "M3 pattern padless marine" - -/obj/item/clothing/suit/storage/marine/medium/padless_lines - name = "M3 pattern ridged marine armor" - icon_state = "3" - armor_variation = 0 - specialty = "M3 pattern ridged marine" - -/obj/item/clothing/suit/storage/marine/medium/carrier - name = "M3 pattern carrier marine armor" - icon_state = "4" - armor_variation = 0 - specialty = "M3 pattern carrier marine" - -/obj/item/clothing/suit/storage/marine/medium/skull - name = "M3 pattern skull marine armor" - icon_state = "5" - armor_variation = 0 - specialty = "M3 pattern skull marine" - -/obj/item/clothing/suit/storage/marine/medium/smooth - name = "M3 pattern smooth marine armor" - icon_state = "6" - armor_variation = 0 - specialty = "M3 pattern smooth marine" - -/obj/item/clothing/suit/storage/marine/light - name = "\improper M3-L pattern light armor" - desc = "A lighter, cut down version of the standard M3 pattern armor. It sacrifices durability for more speed." - specialty = "\improper M3-L pattern light" - icon_state = "L1" - armor_variation = 6 - slowdown = SLOWDOWN_ARMOR_LIGHT - armor_melee = CLOTHING_ARMOR_MEDIUMLOW - armor_bullet = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_bio = CLOTHING_ARMOR_MEDIUMLOW - armor_rad = CLOTHING_ARMOR_MEDIUMHIGH - armor_internaldamage = CLOTHING_ARMOR_LOW - storage_slots = 2 - -/obj/item/clothing/suit/storage/marine/light/padded - icon_state = "L1" - armor_variation = 0 - -/obj/item/clothing/suit/storage/marine/light/padless - icon_state = "L2" - armor_variation = 0 - -/obj/item/clothing/suit/storage/marine/light/padless_lines - icon_state = "L3" - armor_variation = 0 - -/obj/item/clothing/suit/storage/marine/light/carrier - icon_state = "L4" - armor_variation = 0 - -/obj/item/clothing/suit/storage/marine/light/skull - icon_state = "L5" - armor_variation = 0 - -/obj/item/clothing/suit/storage/marine/light/smooth - icon_state = "L6" - armor_variation = 0 - -/obj/item/clothing/suit/storage/marine/light/vest - name = "\improper M3-VL pattern ballistics vest" - desc = "Up until 2182 USCM non-combat personnel were issued non-standardized ballistics vests, though the lack of IMP compatibility and suit lamps proved time and time again inefficient. This modified M3-L shell is the result of a 6-year R&D program; It provides utility, protection, AND comfort to all USCM non-combat personnel." - icon_state = "VL" - flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE - flags_marine_armor = ARMOR_LAMP_OVERLAY //No squad colors when wearing this since it'd look funny. - armor_melee = CLOTHING_ARMOR_MEDIUMLOW - armor_bullet = CLOTHING_ARMOR_HIGH - armor_energy = CLOTHING_ARMOR_LOW - armor_bomb = CLOTHING_ARMOR_LOW - armor_bio = CLOTHING_ARMOR_VERYLOW - armor_rad = CLOTHING_ARMOR_NONE - armor_internaldamage = CLOTHING_ARMOR_MEDIUM - storage_slots = 1 - time_to_unequip = 0.5 SECONDS - time_to_equip = 1 SECONDS - siemens_coefficient = 0.7 - uniform_restricted = null - -/obj/item/clothing/suit/storage/marine/light/vest/dcc - name = "\improper M3-VL pattern flak vest" - desc = "A combination of the standard non-combat M3-VL ballistics vest and M70 flak jacket, this piece of armor has been distributed to dropship crew to keep them safe from threats external and internal..." - icon_state = "VL_FLAK" - storage_slots = 2 - -/obj/item/clothing/suit/storage/marine/light/synvest - name = "\improper M3A1 Synthetic Utility Vest" - desc = "This variant of the ubiquitous M3 pattern ballistics vest has been extensively modified, providing no protection in exchange for maximum mobility and storage space. Synthetic programming compliant." - icon_state = "VL_syn_camo" - flags_atom = NO_NAME_OVERRIDE - flags_marine_armor = ARMOR_LAMP_OVERLAY|SYNTH_ALLOWED //No squad colors + can be worn by synths. - armor_melee = CLOTHING_ARMOR_NONE - armor_bullet = CLOTHING_ARMOR_NONE - armor_laser = CLOTHING_ARMOR_NONE - armor_energy = CLOTHING_ARMOR_NONE - armor_bomb = CLOTHING_ARMOR_NONE - armor_bio = CLOTHING_ARMOR_NONE - armor_rad = CLOTHING_ARMOR_NONE - armor_internaldamage = CLOTHING_ARMOR_NONE - storage_slots = 3 - slowdown = SLOWDOWN_ARMOR_VERY_LIGHT - time_to_unequip = 0.5 SECONDS - time_to_equip = 1 SECONDS - uniform_restricted = null - -/obj/item/clothing/suit/storage/marine/light/synvest/grey - icon_state = "VL_syn" - flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE - -/obj/item/clothing/suit/storage/marine/light/synvest/jungle - icon_state = "VL_syn_camo" - flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE - -/obj/item/clothing/suit/storage/marine/light/synvest/snow - icon_state = "s_VL_syn_camo" - flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE - -/obj/item/clothing/suit/storage/marine/light/synvest/desert - icon_state = "d_VL_syn_camo" - flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE - -/obj/item/clothing/suit/storage/marine/light/synvest/dgrey - icon_state = "c_VL_syn_camo" - flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE - -/obj/item/clothing/suit/storage/marine/heavy - name = "\improper M3-EOD pattern heavy armor" - desc = "A heavier version of the standard M3 pattern armor, the armor is primarily designed to withstand ballistic, explosive, and internal damage, with the drawback of increased bulk and thus reduced movement speed, alongside little additional protection from standard blunt force impacts and biological threats." - desc_lore = "This configuration of the iconic armor was developed during the Canton War in 2160 between the UPP and USCM - Designed in response to a need for higher protection for ComTechs assigned as EODs during the conflict, this is the pinnacle of protection for your average marine. The shoulders and kneepads have both been expanded upon heavily, covering up the arteries on each limb. A special spall liner was developed for this suit, with the same technology being used in the M70 Flak Jacket being developed at the same time." - specialty = "\improper M3-EOD pattern" - icon_state = "H1" - armor_variation = 6 - armor_melee = CLOTHING_ARMOR_MEDIUMHIGH - armor_bullet = CLOTHING_ARMOR_HIGHPLUS - armor_bomb = CLOTHING_ARMOR_HIGHPLUS - armor_bio = CLOTHING_ARMOR_MEDIUMHIGH - armor_rad = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH - storage_slots = 2 - slowdown = SLOWDOWN_ARMOR_LOWHEAVY - movement_compensation = SLOWDOWN_ARMOR_MEDIUM - light_power = 4 - light_range = 5 - -/obj/item/clothing/suit/storage/marine/heavy/padded - icon_state = "H1" - armor_variation = 0 - -/obj/item/clothing/suit/storage/marine/heavy/padless - icon_state = "H2" - armor_variation = 0 - -/obj/item/clothing/suit/storage/marine/heavy/padless_lines - icon_state = "H3" - armor_variation = 0 - -/obj/item/clothing/suit/storage/marine/heavy/carrier - icon_state = "H4" - armor_variation = 0 - -/obj/item/clothing/suit/storage/marine/heavy/skull - icon_state = "H5" - armor_variation = 0 - -/obj/item/clothing/suit/storage/marine/heavy/smooth - icon_state = "H6" - armor_variation = 0 - -//===========================//SPECIALIST\\================================\\ -//=======================================================================\\ - -/obj/item/clothing/suit/storage/marine/specialist - name = "\improper B18 defensive armor" - desc = "A heavy, rugged set of armor plates for when you really, really need to not die horribly. Slows you down though.\nComes with two tricord injectors in each arm guard." - icon_state = "xarmor" - armor_melee = CLOTHING_ARMOR_HIGH - armor_bullet = CLOTHING_ARMOR_HIGH - armor_bomb = CLOTHING_ARMOR_VERYHIGH - armor_bio = CLOTHING_ARMOR_MEDIUMLOW - armor_rad = CLOTHING_ARMOR_MEDIUMHIGH - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH - storage_slots = 2 - flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN - 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 - slowdown = SLOWDOWN_ARMOR_HEAVY - specialty = "B18 defensive" - unacidable = TRUE - var/injections = 4 - -/obj/item/clothing/suit/storage/marine/specialist/verb/inject() - set name = "Create Injector" - set category = "Object" - set src in usr - - if(usr.is_mob_incapacitated()) - return 0 - - if(!injections) - to_chat(usr, "Your armor is all out of injectors.") - return 0 - - if(usr.get_active_hand()) - to_chat(usr, "Your active hand must be empty.") - return 0 - - to_chat(usr, "You feel a faint hiss and an injector drops into your hand.") - var/obj/item/reagent_container/hypospray/autoinjector/skillless/O = new(usr) - usr.put_in_active_hand(O) - injections-- - playsound(src,'sound/machines/click.ogg', 15, 1) - return - -/obj/item/clothing/suit/storage/marine/M3G - name = "\improper M3-G4 grenadier armor" - desc = "A custom set of M3 armor packed to the brim with padding, plating, and every form of ballistic protection under the sun. Used exclusively by USCM Grenadiers." - icon_state = "grenadier" - armor_melee = CLOTHING_ARMOR_MEDIUMHIGH - armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH - armor_bomb = CLOTHING_ARMOR_VERYHIGH - armor_bio = CLOTHING_ARMOR_MEDIUMLOW - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH - flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN - flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE - 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 - slowdown = SLOWDOWN_ARMOR_HEAVY - specialty = "M3-G4 grenadier" - unacidable = TRUE - -/obj/item/clothing/suit/storage/marine/M3T - name = "\improper M3-T light armor" - desc = "A custom set of M3 armor designed for users of long-ranged explosive weaponry." - icon_state = "demolitionist" - armor_bomb = CLOTHING_ARMOR_HIGH - slowdown = SLOWDOWN_ARMOR_LIGHT - specialty = "M3-T light" - flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE - unacidable = TRUE - -/obj/item/clothing/suit/storage/marine/M3S - name = "\improper M3-S light armor" - desc = "A custom set of M3 armor designed for USCM Scouts." - icon_state = "scout_armor" - armor_melee = CLOTHING_ARMOR_MEDIUMHIGH - slowdown = SLOWDOWN_ARMOR_LIGHT - specialty = "M3-S light" - flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE - unacidable = TRUE - -#define FIRE_SHIELD_CD 150 - -/obj/item/clothing/suit/storage/marine/M35 - name = "\improper M35 pyrotechnician armor" - desc = "A custom set of M35 armor designed for use by USCM Pyrotechnicians." - icon_state = "pyro_armor" - armor_bio = CLOTHING_ARMOR_MEDIUMHIGH - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH - fire_intensity_resistance = BURN_LEVEL_TIER_1 - 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 - flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE - specialty = "M35 pyrotechnician" - actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/specialist/fire_shield) - unacidable = TRUE - var/fire_shield_on = FALSE - var/can_activate = TRUE - -/obj/item/clothing/suit/storage/marine/M35/equipped(mob/user, slot) - if(slot == WEAR_JACKET) - RegisterSignal(user, COMSIG_LIVING_FLAMER_CROSSED, PROC_REF(flamer_fire_callback)) - ..() - -/obj/item/clothing/suit/storage/marine/M35/verb/fire_shield() - set name = "Activate Fire Shield" - set desc = "Activate your armor's FIREWALK protocol for a short duration." - set category = "Pyro" - set src in usr - if(!usr || usr.is_mob_incapacitated(TRUE)) - return - if(!ishuman(usr)) - return - var/mob/living/carbon/human/H = usr - - if(H.wear_suit != src) - to_chat(H, SPAN_WARNING("You must be wearing the M35 pyro armor to activate FIREWALK protocol!")) - return - - if(!skillcheck(H, SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL) && H.skills.get_skill_level(SKILL_SPEC_WEAPONS) != SKILL_SPEC_PYRO) - to_chat(H, SPAN_WARNING("You don't seem to know how to use [src]...")) - return - - if(fire_shield_on) - to_chat(H, SPAN_WARNING("You already have FIREWALK protocol activated!")) - return - - if(!can_activate) - to_chat(H, SPAN_WARNING("FIREWALK protocol was recently activated, wait before trying to activate it again.")) - return - - to_chat(H, SPAN_NOTICE("FIREWALK protocol has been activated. You will now be immune to fire for 6 seconds!")) - RegisterSignal(H, COMSIG_LIVING_PREIGNITION, PROC_REF(fire_shield_is_on)) - RegisterSignal(H, list( - COMSIG_LIVING_FLAMER_FLAMED, - ), PROC_REF(flamer_fire_callback)) - fire_shield_on = TRUE - can_activate = FALSE - for(var/X in actions) - var/datum/action/A = X - A.update_button_icon() - addtimer(CALLBACK(src, PROC_REF(end_fire_shield), H), 6 SECONDS) - - H.add_filter("firewalk_on", 1, list("type" = "outline", "color" = "#03fcc6", "size" = 1)) - -/obj/item/clothing/suit/storage/marine/M35/proc/end_fire_shield(mob/living/carbon/human/user) - if(!istype(user)) - return - to_chat(user, SPAN_NOTICE("FIREWALK protocol has finished.")) - UnregisterSignal(user, list( - COMSIG_LIVING_PREIGNITION, - COMSIG_LIVING_FLAMER_FLAMED, - )) - fire_shield_on = FALSE - - user.remove_filter("firewalk_on") - - addtimer(CALLBACK(src, PROC_REF(enable_fire_shield), user), FIRE_SHIELD_CD) - -/obj/item/clothing/suit/storage/marine/M35/proc/enable_fire_shield(mob/living/carbon/human/user) - if(!istype(user)) - return - to_chat(user, SPAN_NOTICE("FIREWALK protocol can be activated again.")) - can_activate = TRUE - - for(var/X in actions) - var/datum/action/A = X - A.update_button_icon() - -/// This proc is solely so that IgniteMob() fails -/obj/item/clothing/suit/storage/marine/M35/proc/fire_shield_is_on(mob/living/L) - SIGNAL_HANDLER - - if(L.fire_reagent?.fire_penetrating) - return - - return COMPONENT_CANCEL_IGNITION - -/obj/item/clothing/suit/storage/marine/M35/proc/flamer_fire_callback(mob/living/L, datum/reagent/R) - SIGNAL_HANDLER - - if(R.fire_penetrating) - return - - . = COMPONENT_NO_IGNITE - if(fire_shield_on) - . |= COMPONENT_NO_BURN - -/obj/item/clothing/suit/storage/marine/M35/dropped(mob/user) - if (!istype(user)) - return - UnregisterSignal(user, list( - COMSIG_LIVING_PREIGNITION, - COMSIG_LIVING_FLAMER_CROSSED, - COMSIG_LIVING_FLAMER_FLAMED, - )) - ..() - -#undef FIRE_SHIELD_CD - -/datum/action/item_action/specialist/fire_shield - ability_primacy = SPEC_PRIMARY_ACTION_2 - -/datum/action/item_action/specialist/fire_shield/New(mob/living/user, obj/item/holder) - ..() - name = "Activate Fire Shield" - button.name = name - button.overlays.Cut() - var/image/IMG = image('icons/obj/items/clothing/cm_suits.dmi', button, "pyro_armor") - button.overlays += IMG - -/datum/action/item_action/specialist/fire_shield/action_cooldown_check() - var/obj/item/clothing/suit/storage/marine/M35/armor = holder_item - if (!istype(armor)) - return FALSE - - return !armor.can_activate - -/datum/action/item_action/specialist/fire_shield/can_use_action() - var/mob/living/carbon/human/H = owner - if(istype(H) && !H.is_mob_incapacitated() && H.wear_suit == holder_item) - return TRUE - -/datum/action/item_action/specialist/fire_shield/action_activate() - var/obj/item/clothing/suit/storage/marine/M35/armor = holder_item - if (!istype(armor)) - return - - armor.fire_shield() - -#define FULL_CAMOUFLAGE_ALPHA 15 - -/obj/item/clothing/suit/storage/marine/ghillie - name = "\improper M45 pattern ghillie armor" - desc = "A lightweight ghillie camouflage suit, used by USCM snipers on recon missions. Very lightweight, but doesn't protect much." - icon_state = "ghillie_armor" - armor_bio = CLOTHING_ARMOR_MEDIUMHIGH - slowdown = SLOWDOWN_ARMOR_LIGHT - flags_marine_armor = ARMOR_LAMP_OVERLAY - flags_item = MOB_LOCK_ON_EQUIP - specialty = "M45 pattern ghillie" - valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_PONCHO) - restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND) - - var/camo_active = FALSE - var/hide_in_progress = FALSE - var/full_camo_alpha = FULL_CAMOUFLAGE_ALPHA - var/incremental_shooting_camo_penalty = 35 - var/current_camo = FULL_CAMOUFLAGE_ALPHA - var/camouflage_break = 5 SECONDS - var/camouflage_enter_delay = 4 SECONDS - var/can_camo = TRUE - - actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/specialist/prepare_position) - -/obj/item/clothing/suit/storage/marine/ghillie/dropped(mob/user) - if(ishuman(user) && !issynth(user)) - deactivate_camouflage(user, FALSE) - - . = ..() - -/obj/item/clothing/suit/storage/marine/ghillie/verb/camouflage() - set name = "Prepare Position" - set desc = "Use the ghillie suit and the nearby environment to become near invisible." - set category = "Object" - set src in usr - if(!usr || usr.is_mob_incapacitated(TRUE)) - return - - if(!ishuman(usr) || hide_in_progress || !can_camo) - return - var/mob/living/carbon/human/H = usr - if(!skillcheck(H, SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL) && H.skills.get_skill_level(SKILL_SPEC_WEAPONS) != SKILL_SPEC_SNIPER && !(GLOB.character_traits[/datum/character_trait/skills/spotter] in H.traits)) - to_chat(H, SPAN_WARNING("You don't seem to know how to use [src]...")) - return - if(H.wear_suit != src) - to_chat(H, SPAN_WARNING("You must be wearing the ghillie suit to activate it!")) - return - - if(camo_active) - deactivate_camouflage(H) - return - - H.visible_message(SPAN_DANGER("[H] goes prone, and begins adjusting \his ghillie suit!"), SPAN_NOTICE("You go prone, and begins adjusting your ghillie suit."), max_distance = 4) - hide_in_progress = TRUE - H.unset_interaction() // If we're sticking to a machine gun or what not. - if(!do_after(H, camouflage_enter_delay, INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) - hide_in_progress = FALSE - return - hide_in_progress = FALSE - RegisterSignal(H, list( - COMSIG_MOB_FIRED_GUN, - COMSIG_MOB_FIRED_GUN_ATTACHMENT) - , PROC_REF(fade_in)) - RegisterSignal(H, list( - COMSIG_MOB_DEATH, - COMSIG_HUMAN_EXTINGUISH - ), PROC_REF(deactivate_camouflage)) - camo_active = TRUE - H.alpha = full_camo_alpha - H.FF_hit_evade = 1000 - ADD_TRAIT(H, TRAIT_UNDENSE, SPECIALIST_GEAR_TRAIT) - - RegisterSignal(H, COMSIG_MOB_MOVE_OR_LOOK, PROC_REF(handle_mob_move_or_look)) - - var/datum/mob_hud/security/advanced/SA = GLOB.huds[MOB_HUD_SECURITY_ADVANCED] - SA.remove_from_hud(H) - var/datum/mob_hud/xeno_infection/XI = GLOB.huds[MOB_HUD_XENO_INFECTION] - XI.remove_from_hud(H) - - anim(H.loc, H, 'icons/mob/mob.dmi', null, "cloak", null, H.dir) - - -/obj/item/clothing/suit/storage/marine/ghillie/proc/deactivate_camouflage(mob/user) - SIGNAL_HANDLER - var/mob/living/carbon/human/H = user - if(!istype(H)) - return FALSE - - if(!camo_active) - return - - UnregisterSignal(H, list( - COMSIG_MOB_FIRED_GUN, - COMSIG_MOB_FIRED_GUN_ATTACHMENT, - COMSIG_MOB_DEATH, - COMSIG_HUMAN_EXTINGUISH, - COMSIG_MOB_MOVE_OR_LOOK - )) - - camo_active = FALSE - animate(H, alpha = initial(H.alpha), flags = ANIMATION_END_NOW) - H.FF_hit_evade = initial(H.FF_hit_evade) - REMOVE_TRAIT(H, TRAIT_UNDENSE, SPECIALIST_GEAR_TRAIT) - - var/datum/mob_hud/security/advanced/SA = GLOB.huds[MOB_HUD_SECURITY_ADVANCED] - SA.add_to_hud(H) - var/datum/mob_hud/xeno_infection/XI = GLOB.huds[MOB_HUD_XENO_INFECTION] - XI.add_to_hud(H) - - H.visible_message(SPAN_DANGER("[H]'s camouflage fails!"), SPAN_WARNING("Your camouflage fails!"), max_distance = 4) - -/obj/item/clothing/suit/storage/marine/ghillie/proc/fade_in(mob/user) - SIGNAL_HANDLER - var/mob/living/carbon/human/H = user - if(camo_active) - if(current_camo < full_camo_alpha) - current_camo = full_camo_alpha - current_camo = clamp(current_camo + incremental_shooting_camo_penalty, full_camo_alpha, 255) - H.alpha = current_camo - addtimer(CALLBACK(src, PROC_REF(fade_out_finish), H), camouflage_break, TIMER_OVERRIDE|TIMER_UNIQUE) - animate(H, alpha = full_camo_alpha + 5, time = camouflage_break, easing = LINEAR_EASING, flags = ANIMATION_END_NOW) - -/obj/item/clothing/suit/storage/marine/ghillie/proc/fade_out_finish(mob/living/carbon/human/H) - if(camo_active && H.wear_suit == src) - to_chat(H, SPAN_BOLDNOTICE("The smoke clears and your position is once again hidden completely!")) - animate(H, alpha = full_camo_alpha) - current_camo = full_camo_alpha - -/obj/item/clothing/suit/storage/marine/ghillie/proc/handle_mob_move_or_look(mob/living/mover, actually_moving, direction, specific_direction) - SIGNAL_HANDLER - - if(camo_active && actually_moving) - deactivate_camouflage(mover) - -/datum/action/item_action/specialist/prepare_position - ability_primacy = SPEC_PRIMARY_ACTION_1 - -/datum/action/item_action/specialist/prepare_position/New(mob/living/user, obj/item/holder) - ..() - name = "Prepare Position" - button.name = name - button.overlays.Cut() - var/image/IMG = image('icons/mob/hud/actions.dmi', button, "prepare_position") - button.overlays += IMG - -/datum/action/item_action/specialist/prepare_position/can_use_action() - var/mob/living/carbon/human/H = owner - if(istype(H) && !H.is_mob_incapacitated() && H.body_position == STANDING_UP && holder_item == H.wear_suit) - return TRUE - -/datum/action/item_action/specialist/prepare_position/action_activate() - var/obj/item/clothing/suit/storage/marine/ghillie/GS = holder_item - GS.camouflage() - -#undef FULL_CAMOUFLAGE_ALPHA - -/obj/item/clothing/suit/storage/marine/ghillie/forecon - name = "UDEP Thermal Poncho" - desc = "UDEP or the Ultra Diffusive Environmental Poncho is a camouflaged rain-cover worn to protect against the elements and chemical spills. It's commonly treated with an infrared absorbing coating, making a marine almost invisible in the rain. Favoured by USCM specialists for it's comfort and practicality." - icon_state = "mercenary_miner_armor" - flags_atom = MOB_LOCK_ON_EQUIP|NO_SNOW_TYPE|NO_NAME_OVERRIDE - -/obj/item/clothing/suit/storage/marine/sof - name = "\improper SOF Armor" - desc = "A heavily customized suit of M3 armor. Used by Marine Raiders." - icon_state = "marsoc" - armor_melee = CLOTHING_ARMOR_HIGH - armor_bullet = CLOTHING_ARMOR_HIGH - armor_bomb = CLOTHING_ARMOR_VERYHIGH - armor_bio = CLOTHING_ARMOR_MEDIUMLOW - armor_rad = CLOTHING_ARMOR_MEDIUMHIGH - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH - slowdown = SLOWDOWN_ARMOR_LIGHT - unacidable = TRUE - flags_atom = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE|NO_SNOW_TYPE - storage_slots = 4 - -//=============================//pmcS\\==================================\\ -//=======================================================================\\ - -/obj/item/clothing/suit/storage/marine/veteran - flags_marine_armor = ARMOR_LAMP_OVERLAY - flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE //Let's make these keep their name and icon. - -/obj/item/clothing/suit/storage/marine/veteran/pmc - name = "\improper M4 pattern PMC armor" - desc = "A modification of the standard Armat Systems M3 armor. Designed for high-profile security operators and corporate mercenaries in mind." - icon_state = "pmc_armor" - armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH - armor_energy = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_rad = CLOTHING_ARMOR_MEDIUM - storage_slots = 2 - slowdown = SLOWDOWN_ARMOR_LIGHT - flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE - allowed = list( - /obj/item/weapon/gun, - /obj/item/tank/emergency_oxygen, - /obj/item/device/flashlight, - /obj/item/ammo_magazine/, - /obj/item/weapon/baton, - /obj/item/handcuffs, - /obj/item/storage/fancy/cigarettes, - /obj/item/tool/lighter, - /obj/item/explosive/grenade, - /obj/item/storage/bible, - /obj/item/tool/crowbar, - /obj/item/storage/large_holster/katana, - /obj/item/storage/large_holster/machete, - /obj/item/weapon/sword/machete, - /obj/item/attachable/bayonet, - /obj/item/device/motiondetector, - /obj/item/tool/crew_monitor, - /obj/item/device/walkman, - ) - uniform_restricted = list(/obj/item/clothing/under/marine/veteran/pmc) - item_state_slots = list(WEAR_JACKET = "pmc_armor") - -/obj/item/clothing/suit/storage/marine/veteran/pmc/light - name = "\improper M4 pattern light PMC armor" - desc = "A modification of the standard Armat Systems M3 armor. Designed for high-profile security operators and corporate mercenaries in mind. Has some armor plating removed for extra mobility." - icon_state = "pmc_sniper" - armor_melee = CLOTHING_ARMOR_MEDIUMLOW - armor_bullet = CLOTHING_ARMOR_MEDIUM - armor_energy = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_MEDIUMLOW - armor_rad = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW - slowdown = SLOWDOWN_ARMOR_VERY_LIGHT - item_state_slots = list(WEAR_JACKET = "pmc_sniper") - -/obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate - name = "\improper M1 pattern corporate security armor" - desc = "A basic vest with a Weyland-Yutani badge on the right breast. This is commonly worn by low-level guards protecting Weyland-Yutani facilities." - icon = 'icons/mob/humans/onmob/contained/wy_goons.dmi' - icon_state = "armor" - item_state = "armor" - item_state_slots = null - contained_sprite = TRUE - - flags_armor_protection = BODY_FLAG_CHEST - flags_cold_protection = BODY_FLAG_CHEST - flags_heat_protection = BODY_FLAG_CHEST - - slowdown = SLOWDOWN_ARMOR_NONE // only protects chest, but enables rapid movement - -/obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead - desc = "A basic vest with a Weyland-Yutani badge on the right breast. This variant is worn by low-level guards that have elevated in rank due to 'good conduct in the field', also known as corporate bootlicking." - icon_state = "lead_armor" - item_state = "lead_armor" - -/obj/item/clothing/suit/storage/marine/veteran/pmc/leader - name = "\improper M4 pattern PMC leader armor" - desc = "A modification of the standard Armat Systems M3 armor. Designed for high-profile security operators and corporate mercenaries in mind. This particular suit looks like it belongs to a high-ranking officer." - icon_state = "officer_armor" - uniform_restricted = list(/obj/item/clothing/under/marine/veteran/pmc/leader) - item_state_slots = list(WEAR_JACKET = "officer_armor") - -/obj/item/clothing/suit/storage/marine/veteran/pmc/sniper - name = "\improper M4 pattern PMC sniper armor" - icon_state = "pmc_sniper" - armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH - armor_energy = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_rad = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_MEDIUM - flags_inv_hide = HIDELOWHAIR - item_state_slots = list(WEAR_JACKET = "pmc_sniper") - -/obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth - name = "\improper M4 Synthetic PMC armor" - desc = "A serious modification of the standard Armat Systems M3 armor. This variant was designed for PMC Support Units in the field, with every armor insert removed. It's designed with the idea of a high speed lifesaver in mind." - time_to_unequip = 0.5 SECONDS - time_to_equip = 1 SECONDS - armor_melee = CLOTHING_ARMOR_NONE - armor_bullet = CLOTHING_ARMOR_NONE - armor_laser = CLOTHING_ARMOR_NONE - armor_energy = CLOTHING_ARMOR_NONE - armor_bomb = CLOTHING_ARMOR_NONE - armor_bio = CLOTHING_ARMOR_NONE - armor_rad = CLOTHING_ARMOR_NONE - armor_internaldamage = CLOTHING_ARMOR_NONE - storage_slots = 3 - slowdown = SLOWDOWN_ARMOR_SUPER_LIGHT - -/obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth/Initialize() - flags_atom |= NO_NAME_OVERRIDE - flags_marine_armor |= SYNTH_ALLOWED - return ..() - -/obj/item/clothing/suit/storage/marine/smartgunner/veteran/pmc - name = "\improper PMC gunner armor" - desc = "A modification of the standard Armat Systems M3 armor. Hooked up with harnesses and straps allowing the user to carry an M56 Smartgun." - icon_state = "heavy_armor" - flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN|SMARTGUN_HARNESS - flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE - armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH - armor_laser = CLOTHING_ARMOR_MEDIUMLOW - armor_energy = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_rad = CLOTHING_ARMOR_MEDIUM - item_state_slots = list(WEAR_JACKET = "heavy_armor") - -/obj/item/clothing/suit/storage/marine/smartgunner/veteran/pmc/terminator - name = "\improper M5Xg exoskeleton gunner armor" - desc = "A complex system of overlapping plates intended to render the wearer all but impervious to small arms fire. A passive exoskeleton supports the weight of the armor, allowing a human to carry its massive bulk. This variant is designed to support a M56 Smartgun." - icon_state = "commando_armor" - slowdown = SLOWDOWN_ARMOR_MEDIUM - movement_compensation = SLOWDOWN_ARMOR_VERY_HEAVY - armor_melee = CLOTHING_ARMOR_HIGH - armor_bullet = CLOTHING_ARMOR_ULTRAHIGH - armor_laser = CLOTHING_ARMOR_MEDIUM - armor_energy = CLOTHING_ARMOR_MEDIUM - armor_bomb = CLOTHING_ARMOR_VERYHIGH - armor_rad = CLOTHING_ARMOR_MEDIUMHIGH - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET - uniform_restricted = list(/obj/item/clothing/under/marine/veteran/pmc/commando) - item_state_slots = list(WEAR_JACKET = "commando_armor") - unacidable = TRUE - -/obj/item/clothing/suit/storage/marine/veteran/pmc/commando - name = "\improper M5X exoskeleton armor" - desc = "A complex system of overlapping plates intended to render the wearer all but impervious to small arms fire. A passive exoskeleton supports the weight of the armor, allowing a human to carry its massive bulk." - icon_state = "commando_armor" - slowdown = SLOWDOWN_ARMOR_MEDIUM - movement_compensation = SLOWDOWN_ARMOR_VERY_HEAVY - armor_melee = CLOTHING_ARMOR_VERYHIGH - armor_bullet = CLOTHING_ARMOR_ULTRAHIGH - armor_energy = CLOTHING_ARMOR_MEDIUM - armor_bomb = CLOTHING_ARMOR_VERYHIGH - armor_rad = CLOTHING_ARMOR_MEDIUMHIGH - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH - flags_inventory = BLOCK_KNOCKDOWN - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET - uniform_restricted = list(/obj/item/clothing/under/marine/veteran/pmc/commando) - item_state_slots = list(WEAR_JACKET = "commando_armor") - unacidable = TRUE - -//===========================//DISTRESS\\================================\\ -//=======================================================================\\ - -/obj/item/clothing/suit/storage/marine/veteran/bear - name = "\improper H1 Iron Bears vest" - desc = "A protective vest worn by Iron Bears mercenaries." - icon_state = "bear_armor" - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN - armor_energy = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_rad = CLOTHING_ARMOR_MEDIUM - storage_slots = 2 - slowdown = SLOWDOWN_ARMOR_VERY_LIGHT - uniform_restricted = list(/obj/item/clothing/under/marine/veteran/bear) - -/obj/item/clothing/suit/storage/marine/veteran/dutch - name = "\improper D2 armored vest" - desc = "A protective vest worn by some seriously experienced mercs." - icon_state = "dutch_armor" - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS //Makes no sense but they need leg/arm armor too. - armor_melee = CLOTHING_ARMOR_HIGH - armor_bullet = CLOTHING_ARMOR_HIGHPLUS - armor_energy = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_HIGH - armor_rad = CLOTHING_ARMOR_MEDIUM - storage_slots = 2 - light_range = 7 - slowdown = SLOWDOWN_ARMOR_VERY_LIGHT - uniform_restricted = list(/obj/item/clothing/under/marine/veteran/dutch) - -/obj/item/clothing/suit/storage/marine/veteran/van_bandolier - name = "safari jacket" - desc = "A tailored hunting jacket, cunningly lined with segmented armor plates. Sometimes the game shoots back." - icon_state = "van_bandolier" - item_state = "van_bandolier_jacket" - blood_overlay_type = "coat" - flags_marine_armor = NO_FLAGS //No shoulder light. - actions_types = list() - slowdown = SLOWDOWN_ARMOR_LIGHT - storage_slots = 2 - movement_compensation = SLOWDOWN_ARMOR_LIGHT - uniform_restricted = list(/obj/item/clothing/under/marine/veteran/van_bandolier) - allowed = list( - /obj/item/weapon/gun, - /obj/item/tank/emergency_oxygen, - /obj/item/device/flashlight, - /obj/item/storage/fancy/cigarettes, - /obj/item/tool/lighter, - /obj/item/storage/bible, - /obj/item/attachable/bayonet, - /obj/item/storage/backpack/general_belt, - /obj/item/storage/large_holster/machete, - /obj/item/storage/belt/gun/m4a3, - /obj/item/storage/belt/gun/m44, - /obj/item/storage/belt/gun/smartpistol, - /obj/item/storage/belt/gun/flaregun, - /obj/item/device/motiondetector, - /obj/item/device/walkman, - /obj/item/storage/belt/shotgun/van_bandolier, - ) - -//===========================//U.P.P\\================================\\ -//=====================================================================\\ - -/obj/item/clothing/suit/storage/marine/faction - flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS - flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS - flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS - min_cold_protection_temperature = HELMET_MIN_COLD_PROT - max_heat_protection_temperature = HELMET_MAX_HEAT_PROT - blood_overlay_type = "armor" - armor_melee = CLOTHING_ARMOR_MEDIUM - armor_bullet = CLOTHING_ARMOR_MEDIUM - armor_laser = CLOTHING_ARMOR_MEDIUMLOW - armor_energy = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_bio = CLOTHING_ARMOR_MEDIUM - armor_rad = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH - slowdown = SLOWDOWN_ARMOR_MEDIUM - movement_compensation = SLOWDOWN_ARMOR_LIGHT - - -/obj/item/clothing/suit/storage/marine/faction/UPP - name = "\improper UM5 personal armor" - desc = "Standard body armor of the UPP military, the UM5 (Union Medium MK5) is a medium body armor, roughly on par with the M3 pattern body armor in service with the USCM, specialized towards ballistics protection. Unlike the M3, however, the plate has a heavier neckplate. This has earned many UA members to refer to UPP soldiers as 'tin men'." - icon_state = "upp_armor" - armor_bullet = CLOTHING_ARMOR_HIGH - armor_energy = CLOTHING_ARMOR_MEDIUM - armor_bio = CLOTHING_ARMOR_MEDIUMLOW - armor_rad = CLOTHING_ARMOR_MEDIUMLOW - armor_internaldamage = CLOTHING_ARMOR_HIGH - storage_slots = 1 - uniform_restricted = list(/obj/item/clothing/under/marine/veteran/UPP, /obj/item/clothing/under/marine/veteran/UPP/medic, /obj/item/clothing/under/marine/veteran/UPP/engi) - -/obj/item/clothing/suit/storage/marine/faction/UPP/support - name = "\improper UL6 personal armor" - desc = "Standard body armor of the UPP military, the UL6 (Union Light MK6) is a light body armor, slightly weaker than the M3 pattern body armor in service with the USCM, specialized towards ballistics protection. This set of personal armor lacks the iconic neck piece and some of the armor in favor of user mobility." - storage_slots = 3 - icon_state = "upp_armor_support" - slowdown = SLOWDOWN_ARMOR_LIGHT - armor_melee = CLOTHING_ARMOR_HIGH - armor_energy = CLOTHING_ARMOR_MEDIUM - armor_bio = CLOTHING_ARMOR_MEDIUMLOW - armor_rad = CLOTHING_ARMOR_MEDIUMLOW - armor_internaldamage = CLOTHING_ARMOR_HIGH - -/obj/item/clothing/suit/storage/marine/faction/UPP/commando - name = "\improper UM5CU personal armor" - desc = "A modification of the UM5, designed for stealth operations." - icon_state = "upp_armor_commando" - storage_slots = 2 - slowdown = SLOWDOWN_ARMOR_LIGHT - -/obj/item/clothing/suit/storage/marine/faction/UPP/heavy - name = "\improper UH7 heavy plated armor" - desc = "An extremely heavy-duty set of body armor in service with the UPP military, the UH7 (Union Heavy MK7) is known for having powerful ballistic protection, alongside a noticeable neck guard, fortified in order to allow the wearer to endure the stresses of the bulky helmet." - icon_state = "upp_armor_heavy" - storage_slots = 3 - slowdown = SLOWDOWN_ARMOR_HEAVY - flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN - flags_armor_protection = BODY_FLAG_ALL_BUT_HEAD - armor_melee = CLOTHING_ARMOR_MEDIUMHIGH - armor_bullet = CLOTHING_ARMOR_HIGHPLUS - armor_laser = CLOTHING_ARMOR_MEDIUMLOW - armor_energy = CLOTHING_ARMOR_MEDIUM - armor_bomb = CLOTHING_ARMOR_HIGH - armor_bio = CLOTHING_ARMOR_MEDIUM - armor_rad = CLOTHING_ARMOR_MEDIUMLOW - armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS - -/obj/item/clothing/suit/storage/marine/faction/UPP/heavy/Initialize() - . = ..() - pockets.bypass_w_limit = list( - /obj/item/ammo_magazine/minigun, - /obj/item/ammo_magazine/pkp, - ) - -/obj/item/clothing/suit/storage/marine/faction/UPP/officer - name = "\improper UL4 officer jacket" - desc = "A lightweight jacket, issued to officers of the UPP's military. Slightly protective from incoming damage, best off with proper armor however." - icon_state = "upp_coat_officer" - slowdown = SLOWDOWN_ARMOR_NONE - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS - armor_melee = CLOTHING_ARMOR_LOW //wear actual armor if you go into combat - armor_bullet = CLOTHING_ARMOR_LOW - armor_energy = CLOTHING_ARMOR_LOW - armor_bomb = CLOTHING_ARMOR_LOW - armor_bio = CLOTHING_ARMOR_LOW - armor_rad = CLOTHING_ARMOR_LOW - armor_internaldamage = CLOTHING_ARMOR_LOW - storage_slots = 3 - uniform_restricted = list(/obj/item/clothing/under/marine/veteran/UPP/officer) - -/obj/item/clothing/suit/storage/marine/faction/UPP/kapitan - name = "\improper UL4 senior officer jacket" - desc = "A lightweight jacket, issued to senior officers of the UPP's military. Made of high-quality materials, even going as far as having the ranks and insignia of the Kapitan and their Company emblazoned on the shoulders and front of the jacket. Slightly protective from incoming damage, best off with proper armor however." - icon_state = "upp_coat_kapitan" - slowdown = SLOWDOWN_ARMOR_NONE - armor_melee = CLOTHING_ARMOR_LOW //wear actual armor if you go into combat - armor_bullet = CLOTHING_ARMOR_LOW - armor_energy = CLOTHING_ARMOR_LOW - armor_bomb = CLOTHING_ARMOR_LOW - armor_bio = CLOTHING_ARMOR_LOW - armor_rad = CLOTHING_ARMOR_LOW - armor_internaldamage = CLOTHING_ARMOR_LOW - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS - storage_slots = 4 - uniform_restricted = list(/obj/item/clothing/under/marine/veteran/UPP/officer) - -/obj/item/clothing/suit/storage/marine/faction/UPP/mp - name = "\improper UL4 camouflaged jacket" - desc = "A lightweight jacket, issued to troops when they're not expected to engage in combat. Still studded to the brim with kevlar shards, though the synthread construction reduces its effectiveness." - icon_state = "upp_coat_mp" - slowdown = SLOWDOWN_ARMOR_NONE - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS - armor_melee = CLOTHING_ARMOR_LOW //wear actual armor if you go into combat - armor_bullet = CLOTHING_ARMOR_LOW - armor_energy = CLOTHING_ARMOR_LOW - armor_bomb = CLOTHING_ARMOR_LOW - armor_bio = CLOTHING_ARMOR_LOW - armor_rad = CLOTHING_ARMOR_LOW - armor_internaldamage = CLOTHING_ARMOR_LOW - storage_slots = 4 - uniform_restricted = list(/obj/item/clothing/under/marine/veteran/UPP) - valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL) - restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND) - -/obj/item/clothing/suit/storage/marine/faction/UPP/jacket/ivan - name = "\improper UH4 Camo Jacket" - desc = "An experimental heavily armored variant of the UL4 given to only the most elite units... usually." - slowdown = SLOWDOWN_ARMOR_MEDIUM - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS|BODY_FLAG_HANDS|BODY_FLAG_FEET - armor_melee = CLOTHING_ARMOR_HIGH - armor_energy = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_HIGH - armor_bio = CLOTHING_ARMOR_MEDIUM - armor_rad = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_HIGH - storage_slots = 2 - - -//===========================//FREELANCER\\================================\\ -//=====================================================================\\ - -/obj/item/clothing/suit/storage/marine/faction/freelancer - name = "freelancer cuirass" - desc = "An armored protective chestplate scrapped together from various plates. It keeps up remarkably well, as the craftsmanship is solid, and the design mirrors such armors in the UPP and the USCM. The many skilled craftsmen in the freelancers ranks produce these vests at a rate about one a month." - icon_state = "freelancer_armor" - slowdown = SLOWDOWN_ARMOR_LIGHT - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS - armor_melee = CLOTHING_ARMOR_MEDIUMHIGH - armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH - armor_energy = CLOTHING_ARMOR_MEDIUMLOW - storage_slots = 2 - uniform_restricted = list(/obj/item/clothing/under/marine/veteran/freelancer) - -//this one is for CLF -/obj/item/clothing/suit/storage/militia - name = "colonial militia hauberk" - desc = "The hauberk of a colonist militia member, created from boiled leather and some modern armored plates. While not the most powerful form of armor, and primitive compared to most modern suits of armor, it gives the wearer almost perfect mobility, which suits the needs of the local colonists. It is also quick to don, easy to hide, and cheap to produce in large workshops." - icon = 'icons/obj/items/clothing/cm_suits.dmi' - icon_state = "rebel_armor" - item_icons = list( - WEAR_JACKET = 'icons/mob/humans/onmob/suit_1.dmi' - ) - sprite_sheets = list(SPECIES_MONKEY = 'icons/mob/humans/species/monkeys/onmob/suit_monkey_1.dmi') - slowdown = SLOWDOWN_ARMOR_VERY_LIGHT - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS - movement_compensation = SLOWDOWN_ARMOR_MEDIUM - armor_melee = CLOTHING_ARMOR_MEDIUM - armor_bullet = CLOTHING_ARMOR_MEDIUMLOW - armor_laser = CLOTHING_ARMOR_MEDIUMLOW - armor_energy = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_bio = CLOTHING_ARMOR_MEDIUMLOW - armor_rad = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_MEDIUM - storage_slots = 2 - uniform_restricted = list(/obj/item/clothing/under/colonist) - allowed = list( - /obj/item/weapon/gun, - /obj/item/tank/emergency_oxygen, - /obj/item/device/flashlight, - /obj/item/ammo_magazine, - /obj/item/explosive/grenade, - /obj/item/device/binoculars, - /obj/item/attachable/bayonet, - /obj/item/storage/backpack/general_belt, - /obj/item/storage/large_holster/machete, - /obj/item/weapon/baseballbat, - /obj/item/weapon/baseballbat/metal, - /obj/item/device/motiondetector, - /obj/item/device/walkman, - ) - flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS - min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROT - valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL) - -/obj/item/clothing/suit/storage/militia/Initialize() - . = ..() - pockets.max_w_class = SIZE_SMALL //Can contain small items AND rifle magazines. - pockets.bypass_w_limit = list( - /obj/item/ammo_magazine/rifle, - /obj/item/ammo_magazine/smg, - /obj/item/ammo_magazine/sniper, - ) - pockets.max_storage_space = 8 - -/obj/item/clothing/suit/storage/militia/vest - name = "colonial militia vest" - desc = "The hauberk of a colonist militia member, created from boiled leather and some modern armored plates. While not the most powerful form of armor, and primitive compared to most modern suits of armor, it gives the wearer almost perfect mobility, which suits the needs of the local colonists. It is also quick to don, easy to hide, and cheap to produce in large workshops. This extremely light variant protects only the chest and abdomen." - icon_state = "clf_2" - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN - flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN - slowdown = 0.2 - movement_compensation = SLOWDOWN_ARMOR_MEDIUM - -/obj/item/clothing/suit/storage/militia/brace - name = "colonial militia brace" - desc = "The hauberk of a colonist militia member, created from boiled leather and some modern armored plates. While not the most powerful form of armor, and primitive compared to most modern suits of armor, it gives the wearer almost perfect mobility, which suits the needs of the local colonists. It is also quick to don, easy to hide, and cheap to produce in large workshops. This extremely light variant has some of the chest pieces removed." - icon_state = "clf_3" - flags_armor_protection = BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS - flags_cold_protection = BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS - slowdown = 0.2 - movement_compensation = SLOWDOWN_ARMOR_MEDIUM - -/obj/item/clothing/suit/storage/militia/partial - name = "colonial militia partial hauberk" - desc = "The hauberk of a colonist militia member, created from boiled leather and some modern armored plates. While not the most powerful form of armor, and primitive compared to most modern suits of armor, it gives the wearer almost perfect mobility, which suits the needs of the local colonists. It is also quick to don, easy to hide, and cheap to produce in large workshops. This even lighter variant has some of the arm pieces removed." - icon_state = "clf_4" - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS - flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS - slowdown = 0.2 - -/obj/item/clothing/suit/storage/militia/smartgun - name = "colonial militia harness" - desc = "The hauberk of a colonist militia member, created from boiled leather and some modern armored plates. While not the most powerful form of armor, and primitive compared to most modern suits of armor, it gives the wearer almost perfect mobility, which suits the needs of the local colonists. It is also quick to don, easy to hide, and cheap to produce in large workshops. This one has straps interweaved with the plates, that allow the user to fire a captured smartgun, if a bit uncomfortably." - flags_inventory = BLOCKSHARPOBJ|SMARTGUN_HARNESS - -/obj/item/clothing/suit/storage/CMB - name = "\improper CMB jacket" - desc = "A black jacket worn by Colonial Marshals. The back is enscribed with the powerful letters of 'MARSHAL' representing justice, authority, and protection in the outer rim. The laws of the Earth stretch beyond the Sol." - icon_state = "CMB_jacket" - blood_overlay_type = "coat" - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS - flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS - armor_melee = CLOTHING_ARMOR_MEDIUMLOW - armor_bullet = CLOTHING_ARMOR_MEDIUMLOW - armor_energy = CLOTHING_ARMOR_LOW - armor_bomb = CLOTHING_ARMOR_LOW - armor_bio = CLOTHING_ARMOR_LOW - armor_internaldamage = CLOTHING_ARMOR_LOW - allowed = list( - /obj/item/weapon/gun, - /obj/item/storage/fancy/cigarettes, - /obj/item/tool/lighter, - /obj/item/weapon/baton, - /obj/item/handcuffs, - /obj/item/device/binoculars, - /obj/item/attachable/bayonet, - /obj/item/device/flashlight, - /obj/item/device/healthanalyzer, - /obj/item/device/radio, - /obj/item/tank/emergency_oxygen, - /obj/item/tool/crowbar, - /obj/item/tool/crew_monitor, - /obj/item/tool/pen, - /obj/item/storage/belt/gun/m4a3, - /obj/item/storage/belt/gun/m44, - /obj/item/storage/belt/gun/mateba, - /obj/item/storage/belt/gun/smartpistol, - /obj/item/storage/large_holster/machete, - /obj/item/storage/large_holster/katana, - /obj/item/device/motiondetector, - /obj/item/device/walkman, - ) - valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR) - restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND) - -/obj/item/clothing/suit/storage/CMB/Initialize() - . = ..() - pockets.max_w_class = SIZE_SMALL //Can contain small items AND rifle magazines. - pockets.bypass_w_limit = list( - /obj/item/ammo_magazine/rifle, - /obj/item/ammo_magazine/smg, - /obj/item/ammo_magazine/sniper, - ) - pockets.max_storage_space = 8 - -/obj/item/clothing/suit/storage/RO - name = "quartermaster jacket" - desc = "A green jacket worn by USCM personnel. The back has the flag of the United Americas on it." - icon_state = "RO_jacket" - blood_overlay_type = "coat" - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS - valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL) - restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND) - -//===========================//HELGHAST - MERCENARY\\================================\\ -//=====================================================================\\ - -/obj/item/clothing/suit/storage/marine/veteran/mercenary - name = "\improper K12 ceramic plated armor" - desc = "A set of grey, heavy ceramic armor with dark blue highlights. It is the standard uniform of an unknown mercenary group working in the sector." - icon_state = "mercenary_heavy_armor" - flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN - armor_melee = CLOTHING_ARMOR_VERYHIGH - armor_bullet = CLOTHING_ARMOR_VERYHIGH - armor_energy = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_bio = CLOTHING_ARMOR_HIGHPLUS - armor_rad = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS - storage_slots = 2 - slowdown = SLOWDOWN_ARMOR_LIGHT - allowed = list( - /obj/item/weapon/gun, - /obj/item/tank/emergency_oxygen, - /obj/item/device/flashlight, - /obj/item/ammo_magazine/, - /obj/item/weapon/baton, - /obj/item/handcuffs, - /obj/item/storage/fancy/cigarettes, - /obj/item/tool/lighter, - /obj/item/explosive/grenade, - /obj/item/storage/bible, - /obj/item/weapon/sword/machete, - /obj/item/attachable/bayonet, - /obj/item/device/motiondetector, - /obj/item/device/walkman, - ) - uniform_restricted = list(/obj/item/clothing/under/marine/veteran/mercenary) - item_state_slots = list(WEAR_JACKET = "mercenary_heavy_armor") - -/obj/item/clothing/suit/storage/marine/veteran/mercenary/heavy - name = "\improper Modified K12 ceramic plated armor" - desc = "A set of grey, heavy ceramic armor with dark blue highlights. It has been modified with extra ceramic plates placed in its storage pouch, and seems intended to support an extremely heavy weapon." - armor_melee = CLOTHING_ARMOR_ULTRAHIGH - armor_bullet = CLOTHING_ARMOR_ULTRAHIGHPLUS - armor_bomb = CLOTHING_ARMOR_HIGHPLUS - armor_bio = CLOTHING_ARMOR_HIGHPLUS - armor_rad = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_VERYHIGHPLUS - storage_slots = 1 - -/obj/item/clothing/suit/storage/marine/veteran/mercenary/miner - name = "\improper Y8 armored miner vest" - desc = "A set of beige, light armor built for protection while mining. It is a specialized uniform of an unknown mercenary group working in the sector." - icon_state = "mercenary_miner_armor" - storage_slots = 3 - allowed = list( - /obj/item/weapon/gun, - /obj/item/tank/emergency_oxygen, - /obj/item/device/flashlight, - /obj/item/ammo_magazine/, - /obj/item/weapon/baton, - /obj/item/handcuffs, - /obj/item/storage/fancy/cigarettes, - /obj/item/tool/lighter, - /obj/item/explosive/grenade, - /obj/item/storage/bible, - /obj/item/weapon/sword/machete, - /obj/item/attachable/bayonet, - /obj/item/device/motiondetector, - /obj/item/device/walkman, - ) - uniform_restricted = list(/obj/item/clothing/under/marine/veteran/mercenary) - item_state_slots = list(WEAR_JACKET = "mercenary_miner_armor") - -/obj/item/clothing/suit/storage/marine/veteran/mercenary/support - name = "\improper Z7 armored vest" - desc = "A set of blue armor with yellow highlights built for protection while building or carrying out medical treatment in highly dangerous environments. It is a specialized uniform of an unknown mercenary group working in the sector." - icon_state = "mercenary_engineer_armor" - item_state_slots = list(WEAR_JACKET = "mercenary_engineer_armor") - -/obj/item/clothing/suit/storage/marine/M3G/hefa - name = "\improper HEFA Knight armor" - desc = "A thick piece of armor adorning a HEFA. Usually seen on a HEFA knight." - specialty = "HEFA Knight" - icon_state = "hefadier" - flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE - flags_item = NO_CRYO_STORE - flags_marine_armor = ARMOR_LAMP_OVERLAY - armor_bullet = CLOTHING_ARMOR_VERYHIGH - armor_melee = CLOTHING_ARMOR_VERYHIGH - armor_bomb = CLOTHING_ARMOR_GIGAHIGH - - -//=========================//PROVOST\\================================\\ -//=======================================================================\\ - -/obj/item/clothing/suit/storage/marine/MP/provost - name = "\improper M3 pattern Provost armor" - desc = "A standard Provost M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." - icon_state = "pvmedium" - item_state_slots = list(WEAR_JACKET = "pvmedium") - slowdown = SLOWDOWN_ARMOR_LIGHT - armor_bullet = CLOTHING_ARMOR_MEDIUM - armor_laser = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_MEDIUMHIGH - armor_bio = CLOTHING_ARMOR_MEDIUMHIGH - armor_internaldamage = CLOTHING_ARMOR_MEDIUM - flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE - storage_slots = 3 - -/obj/item/clothing/suit/storage/marine/MP/provost/tml - name = "\improper M3 pattern Senior Provost armor" - desc = "A more refined Provost M3 Pattern Chestplate for senior officers. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." - icon_state = "pvleader" - item_state_slots = list(WEAR_JACKET = "pvleader") - -/obj/item/clothing/suit/storage/marine/MP/provost/marshal - name = "\improper M5 pattern Provost Marshal armor" - desc = "A custom fit luxury armor suit for Provost Marshals. Useful for letting your men know who is in charge when taking to the field." - icon_state = "pvmarshal" - item_state_slots = list(WEAR_JACKET = "pvmarshal") - w_class = SIZE_MEDIUM - storage_slots = 4 - -/obj/item/clothing/suit/storage/marine/MP/provost/light - name = "\improper M3 pattern Provost light armor" - desc = "A lighter Provost M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." - icon_state = "pvlight" - item_state_slots = list(WEAR_JACKET = "pvlight") - slowdown = SLOWDOWN_ARMOR_VERY_LIGHT - -/obj/item/clothing/suit/storage/marine/MP/provost/light/flexi - name = "\improper M3 pattern Provost flexi-armor" - desc = "A flexible and easy to store M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." - w_class = SIZE_MEDIUM - icon_state = "pvlight_2" - item_state_slots = list(WEAR_JACKET = "pvlight_2") - storage_slots = 2 - -//================//UNITED AMERICAS ALLIED COMMAND\\=====================\\ -//=======================================================================\\ - -/obj/item/clothing/suit/storage/marine/uaac/tis/sa - name = "\improper M3 pattern UAAC-TIS Special Agent Armor" - desc = "A modified luxury armor, originally meant for a USCM Provost Marshall, modified to use the colors and insignia of the TIS. The Three Eyes is technically able to requisition any equipment or personnel to fulfill its mission and often uses this privilege to outfit their agents with high-quality gear from other UA military forces." - icon_state = "tis" - item_state_slots = list(WEAR_JACKET = "tis") - armor_melee = CLOTHING_ARMOR_MEDIUMHIGH - armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH - armor_laser = CLOTHING_ARMOR_LOW - armor_energy = CLOTHING_ARMOR_LOW - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW - storage_slots = 2 - slowdown = SLOWDOWN_ARMOR_LIGHT - flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE - allowed = list( - /obj/item/weapon/gun, - /obj/item/tank/emergency_oxygen, - /obj/item/device/flashlight, - /obj/item/ammo_magazine/, - /obj/item/storage/fancy/cigarettes, - /obj/item/tool/lighter, - /obj/item/weapon/baton, - /obj/item/handcuffs, - /obj/item/explosive/grenade, - /obj/item/device/binoculars, - /obj/item/attachable/bayonet, - /obj/item/storage/backpack/general_belt, - /obj/item/device/hailer, - /obj/item/storage/belt/gun, - /obj/item/weapon/sword/ceremonial, - /obj/item/device/motiondetector, - /obj/item/device/walkman, - ) - uniform_restricted = list(/obj/item/clothing/under/uaac/tis) - -//================//UNITED AMERICAS RIOT CONTROL\\=====================\\ -//=======================================================================\\ - -/obj/item/clothing/suit/storage/marine/veteran/ua_riot - name = "\improper UA-M1 body armor" - desc = "Based on the M-3 pattern employed by the USCM, the UA-M1 body armor is employed by UA security, riot control and union-busting teams. While robust against melee and bullet attacks, it critically lacks coverage of the legs and arms." - icon_state = "ua_riot" - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN - flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN - flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN - armor_melee = CLOTHING_ARMOR_MEDIUMHIGH - armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH - armor_energy = CLOTHING_ARMOR_MEDIUM - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_rad = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH - slowdown = SLOWDOWN_ARMOR_VERY_LIGHT // it's lighter - uniform_restricted = list(/obj/item/clothing/under/marine/ua_riot) - flags_atom = NO_SNOW_TYPE - -//==================War Correspondent==================\\ - -/obj/item/clothing/suit/storage/marine/light/reporter - name = "press body armor" - desc = "Body armor used by war correspondents in battles and wars across the universe." - icon = 'icons/mob/humans/onmob/contained/war_correspondent.dmi' - icon_state = "wc_armor" - flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE - contained_sprite = TRUE - - -//=ROYAL MARINES=\\ - -/obj/item/clothing/suit/storage/marine/veteran/royal_marine - name = "kestrel armoured vest" - desc = "A customizable personal armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the USCMC's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines." - icon_state = "rmc_light" - item_state = "rmc_light" - flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE - allowed = list( - /obj/item/weapon/gun, - /obj/item/tank/emergency_oxygen, - /obj/item/device/flashlight, - /obj/item/ammo_magazine/, - /obj/item/weapon/baton, - /obj/item/handcuffs, - /obj/item/storage/fancy/cigarettes, - /obj/item/tool/lighter, - /obj/item/explosive/grenade, - /obj/item/storage/bible, - /obj/item/weapon/sword/machete, - /obj/item/attachable/bayonet, - /obj/item/device/motiondetector, - /obj/item/device/walkman, - ) - -/obj/item/clothing/suit/storage/marine/veteran/royal_marine/light //RMC Rifleman Armor - icon_state = "rmc_light" - item_state = "rmc_light" - armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH - armor_energy = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_rad = CLOTHING_ARMOR_MEDIUM - slowdown = SLOWDOWN_ARMOR_LIGHT - -/obj/item/clothing/suit/storage/marine/veteran/royal_marine/light/team_leader //RMC TL & LT Armor - name = "kestrel armoured carry vest" - icon_state = "rmc_light_padded" - item_state = "rmc_light_padded" - storage_slots = 7 - -/obj/item/clothing/suit/storage/marine/veteran/royal_marine/smartgun //Smartgun Spec Armor - name = "kestrel armoured smartgun harness" - icon_state = "rmc_smartgun" - item_state = "rmc_smartgun" - flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN|SMARTGUN_HARNESS - -/obj/item/clothing/suit/storage/marine/veteran/royal_marine/pointman //Pointman Spec Armor - name = "kestrel pointman armour" - desc = "A heavier version of the armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the USCMC's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines." - icon_state = "rmc_pointman" - item_state = "rmc_pointman" - armor_melee = CLOTHING_ARMOR_HIGH - armor_bullet = CLOTHING_ARMOR_HIGHPLUS - armor_bomb = CLOTHING_ARMOR_HIGHPLUS - armor_bio = CLOTHING_ARMOR_MEDIUM - armor_rad = CLOTHING_ARMOR_MEDIUM - armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH - storage_slots = 7 - slowdown = SLOWDOWN_ARMOR_LOWHEAVY - movement_compensation = SLOWDOWN_ARMOR_MEDIUM - -/atom/movable/marine_light - light_system = DIRECTIONAL_LIGHT - -//CBRN -/obj/item/clothing/suit/storage/marine/cbrn - name = "\improper M3-M armor" - desc = "While lacking the appearance of the M3 pattern armor worn in regular service, this armor piece is still a derivative of it. It has been heavily modified to fit over the MOPP suit with additional padding and Venlar composite layers removed, so as not to restrict the wearer’s movement. However, with the reduction of composite layers, the personal protection offered is less than desired with complaints having been lodged since 2165." - icon_state = "cbrn" - item_state = "cbrn" - slowdown = SLOWDOWN_ARMOR_HEAVY - armor_melee = CLOTHING_ARMOR_MEDIUM - armor_bullet = CLOTHING_ARMOR_MEDIUM - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_bio = CLOTHING_ARMOR_LOW - armor_rad =CLOTHING_ARMOR_MEDIUMLOW - armor_internaldamage = CLOTHING_ARMOR_LOW - flags_marine_armor = NO_FLAGS - flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE - flags_inventory = BLOCKSHARPOBJ - flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN - flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN - flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN - uniform_restricted = list(/obj/item/clothing/under/marine/cbrn) - -/obj/item/clothing/suit/storage/marine/cbrn/advanced - slowdown = SLOWDOWN_ARMOR_LOWHEAVY - armor_melee = CLOTHING_ARMOR_HIGH - armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH - armor_bomb = CLOTHING_ARMOR_ULTRAHIGH - armor_bio = CLOTHING_ARMOR_GIGAHIGHPLUS - armor_rad = CLOTHING_ARMOR_GIGAHIGHPLUS - armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm new file mode 100644 index 000000000000..fd926c4ffd50 --- /dev/null +++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm @@ -0,0 +1,668 @@ +#define DEBUG_ARMOR_PROTECTION 0 + +#if DEBUG_ARMOR_PROTECTION +/mob/living/carbon/human/verb/check_overall_protection() + set name = "Get Armor Value" + set category = "Debug" + set desc = "Shows the armor value of the bullet category." + + var/armor = 0 + var/counter = 0 + for(var/X in H.limbs) + var/obj/limb/E = X + armor = getarmor_organ(E, ARMOR_BULLET) + to_chat(src, SPAN_DEBUG("[E.name] is protected with [armor] armor against bullets.")) + counter += armor + to_chat(src, SPAN_DEBUG("The overall armor score is: [counter].")) +#endif + +//=======================================================================\\ +//=======================================================================\\ + +#define ALPHA 1 +#define BRAVO 2 +#define CHARLIE 3 +#define DELTA 4 +#define ECHO 5 +#define CRYO 6 +#define SOF 7 +#define NOSQUAD 8 + +// MARINE STORAGE ARMOR + +/obj/item/clothing/suit/storage/marine + name = "\improper M3 pattern marine armor" + desc = "A standard Colonial Marines M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." + icon = 'icons/obj/items/clothing/cm_suits.dmi' + icon_state = "1" + item_state = "marine_armor" //Make unique states for Officer & Intel armors. + item_icons = list( + WEAR_JACKET = 'icons/mob/humans/onmob/suit_1.dmi' + ) + flags_atom = FPRINT|CONDUCT + flags_inventory = BLOCKSHARPOBJ + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS + flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS + flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS + min_cold_protection_temperature = HELMET_MIN_COLD_PROT + max_heat_protection_temperature = HELMET_MAX_HEAT_PROT + blood_overlay_type = "armor" + armor_melee = CLOTHING_ARMOR_MEDIUM + armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_laser = CLOTHING_ARMOR_MEDIUMLOW + armor_energy = CLOTHING_ARMOR_NONE + armor_bomb = CLOTHING_ARMOR_MEDIUMLOW + armor_bio = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_MEDIUMLOW + armor_internaldamage = CLOTHING_ARMOR_MEDIUM + movement_compensation = SLOWDOWN_ARMOR_LIGHT + storage_slots = 3 + siemens_coefficient = 0.7 + slowdown = SLOWDOWN_ARMOR_MEDIUM + allowed = list( + /obj/item/weapon/gun, + /obj/item/prop/prop_gun, + /obj/item/tank/emergency_oxygen, + /obj/item/device/flashlight, + /obj/item/storage/fancy/cigarettes, + /obj/item/tool/lighter, + /obj/item/storage/bible, + /obj/item/attachable/bayonet, + /obj/item/storage/backpack/general_belt, + /obj/item/storage/large_holster/machete, + /obj/item/storage/belt/gun/type47, + /obj/item/storage/belt/gun/m4a3, + /obj/item/storage/belt/gun/m44, + /obj/item/storage/belt/gun/smartpistol, + /obj/item/storage/belt/gun/flaregun, + /obj/item/device/motiondetector, + /obj/item/device/walkman, + /obj/item/storage/belt/gun/m39, + /obj/item/storage/belt/gun/xm51, + ) + valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_PONCHO) + + light_power = 3 + light_range = 4 + light_system = MOVABLE_LIGHT + + var/flashlight_cooldown = 0 //Cooldown for toggling the light + var/locate_cooldown = 0 //Cooldown for SL locator + var/armor_overlays[] + actions_types = list(/datum/action/item_action/toggle) + var/flags_marine_armor = ARMOR_SQUAD_OVERLAY|ARMOR_LAMP_OVERLAY + var/specialty = "M3 pattern marine" //Same thing here. Give them a specialty so that they show up correctly in vendors. speciality does NOTHING if you have NO_NAME_OVERRIDE + w_class = SIZE_HUGE + uniform_restricted = list(/obj/item/clothing/under/marine) + sprite_sheets = list(SPECIES_MONKEY = 'icons/mob/humans/species/monkeys/onmob/suit_monkey_1.dmi') + time_to_unequip = 20 + time_to_equip = 20 + pickup_sound = "armorequip" + drop_sound = "armorequip" + equip_sounds = list('sound/handling/putting_on_armor1.ogg') + var/armor_variation = 0 + /// The dmi where the grayscale squad overlays are contained + var/squad_overlay_icon = 'icons/mob/humans/onmob/suit_1.dmi' + + var/atom/movable/marine_light/light_holder + +/obj/item/clothing/suit/storage/marine/Initialize(mapload) + . = ..() + if(!(flags_atom & NO_NAME_OVERRIDE)) + name = "[specialty]" + if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) + name += " snow armor" //Leave marine out so that armors don't have to have "Marine" appended (see: generals). + else + name += " armor" + + if(!(flags_atom & NO_SNOW_TYPE)) + select_gamemode_skin(type) + armor_overlays = list("lamp") //Just one for now, can add more later. + if(armor_variation && mapload) + set_armor_style("Random") + update_icon() + pockets.max_w_class = SIZE_SMALL //Can contain small items AND rifle magazines. + pockets.bypass_w_limit = list( + /obj/item/ammo_magazine/rifle, + /obj/item/ammo_magazine/smg, + /obj/item/ammo_magazine/sniper, + ) + pockets.max_storage_space = 8 + + light_holder = new(src) + +/obj/item/clothing/suit/storage/marine/Destroy() + QDEL_NULL(light_holder) + return ..() + +/obj/item/clothing/suit/storage/marine/update_icon(mob/user) + var/image/I + armor_overlays["lamp"] = null + if(flags_marine_armor & ARMOR_LAMP_OVERLAY) + if(flags_marine_armor & ARMOR_LAMP_ON) + I = image('icons/obj/items/clothing/cm_suits.dmi', src, "lamp-on") + else + I = image('icons/obj/items/clothing/cm_suits.dmi', src, "lamp-off") + armor_overlays["lamp"] = I + overlays += I + else armor_overlays["lamp"] = null + if(user) user.update_inv_wear_suit() + + +/obj/item/clothing/suit/storage/marine/post_vendor_spawn_hook(mob/living/carbon/human/user) //used for randomizing/selecting a variant for armors. + if(!armor_variation) + return + + if(user?.client?.prefs) + // Set the armor style to the user's preference. + set_armor_style(user.client.prefs.preferred_armor) + else + // Or if that isn't possible, just pick a random one. + set_armor_style("Random") + update_icon(user) + +/obj/item/clothing/suit/storage/marine/attack_self(mob/user) + ..() + + if(!isturf(user.loc)) + to_chat(user, SPAN_WARNING("You cannot turn the light [light_on ? "off" : "on"] while in [user.loc].")) //To prevent some lighting anomalies. + return + + if(flashlight_cooldown > world.time) + return + if(!ishuman(user)) + return + + var/mob/living/carbon/human/H = user + if(H.wear_suit != src) + return + + turn_light(user, !light_on) + +/obj/item/clothing/suit/storage/marine/item_action_slot_check(mob/user, slot) + if(!ishuman(user)) + return FALSE + if(slot != WEAR_JACKET) + return FALSE + return TRUE //only give action button when armor is worn. + +/obj/item/clothing/suit/storage/marine/turn_light(mob/user, toggle_on) + . = ..() + if(. != CHECKS_PASSED) + return + set_light_range(initial(light_range)) + set_light_power(Floor(initial(light_power) * 0.5)) + set_light_on(toggle_on) + flags_marine_armor ^= ARMOR_LAMP_ON + + light_holder.set_light_flags(LIGHT_ATTACHED) + light_holder.set_light_range(initial(light_range)) + light_holder.set_light_power(initial(light_power)) + light_holder.set_light_on(toggle_on) + + if(!toggle_on) + playsound(src, 'sound/handling/click_2.ogg', 50, 1) + + playsound(src, 'sound/handling/suitlight_on.ogg', 50, 1) + update_icon(user) + + for(var/X in actions) + var/datum/action/A = X + A.update_button_icon() + +/obj/item/clothing/suit/storage/marine/mob_can_equip(mob/living/carbon/human/M, slot, disable_warning = 0) + . = ..() + if (.) + if(issynth(M) && M.allow_gun_usage == FALSE && !(flags_marine_armor & SYNTH_ALLOWED)) + M.visible_message(SPAN_DANGER("Your programming prevents you from wearing this!")) + return 0 + +/** + * Updates the armor's `icon_state` to the style represented by `new_style`. + * + * Arguments: + * * new_style - The new armor style. May only be one of `GLOB.armor_style_list`'s keys, or `"Random"`. + */ +/obj/item/clothing/suit/storage/marine/proc/set_armor_style(new_style) + // Regex to match one or more digits. + var/static/regex/digits = new("\\d+") + // Integer for the new armor style's `icon_state`. + var/new_look + + if(new_style == "Random") + // The style icon states are all numbers between 1 and `armor_variation`, so this picks a random one. + new_look = rand(1, armor_variation) + else + new_look = GLOB.armor_style_list[new_style] + + // Replace the digits in the current icon state with `new_look`. (E.g. "L6" -> "L2") + icon_state = digits.Replace(icon_state, new_look) + +/obj/item/clothing/suit/storage/marine/medium/rto + icon_state = "io" + armor_variation = 0 + name = "\improper M4 pattern marine armor" + desc = "A well tinkered and crafted hybrid of Smart-Gunner mesh and M3 pattern plates. Robust, yet nimble, with room for all your pouches." + armor_bio = CLOTHING_ARMOR_MEDIUMHIGH + armor_rad = CLOTHING_ARMOR_MEDIUM + storage_slots = 4 + light_range = 5 //slightly higher + specialty = "M4 pattern marine" + +/obj/item/clothing/suit/storage/marine/MP + name = "\improper M2 pattern MP armor" + desc = "A standard Colonial Marines M2 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." + icon_state = "mp_armor" + armor_melee = CLOTHING_ARMOR_MEDIUMHIGH + armor_bullet = CLOTHING_ARMOR_LOW + armor_laser = CLOTHING_ARMOR_LOW + armor_energy = CLOTHING_ARMOR_LOW + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_bio = CLOTHING_ARMOR_MEDIUMLOW + armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW + storage_slots = 2 + slowdown = SLOWDOWN_ARMOR_LIGHT + allowed = list( + /obj/item/weapon/gun, + /obj/item/tank/emergency_oxygen, + /obj/item/device/flashlight, + /obj/item/ammo_magazine/, + /obj/item/storage/fancy/cigarettes, + /obj/item/tool/lighter, + /obj/item/weapon/baton, + /obj/item/handcuffs, + /obj/item/explosive/grenade, + /obj/item/device/binoculars, + /obj/item/attachable/bayonet, + /obj/item/storage/backpack/general_belt, + /obj/item/device/hailer, + /obj/item/storage/belt/gun, + /obj/item/weapon/sword/ceremonial, + /obj/item/device/motiondetector, + /obj/item/device/walkman, + ) + uniform_restricted = list(/obj/item/clothing/under/marine/mp) + specialty = "M2 pattern MP" + item_state_slots = list(WEAR_JACKET = "mp_armor") + black_market_value = 20 + +/obj/item/clothing/suit/storage/marine/MP/warden + icon_state = "warden" + name = "\improper M3 pattern warden MP armor" + desc = "A well-crafted suit of M3 Pattern Armor typically distributed to Wardens. Useful for letting your men know who is in charge." + armor_bio = CLOTHING_ARMOR_MEDIUMLOW + armor_rad = CLOTHING_ARMOR_MEDIUMLOW + uniform_restricted = list(/obj/item/clothing/under/marine/warden) + specialty = "M3 pattern warden MP" + item_state_slots = list(WEAR_JACKET = "warden") + +/obj/item/clothing/suit/storage/marine/MP/WO + icon_state = "warrant_officer" + name = "\improper M3 pattern chief MP armor" + desc = "A well-crafted suit of M3 Pattern Armor typically distributed to Chief MPs. Useful for letting your men know who is in charge." + uniform_restricted = list(/obj/item/clothing/under/marine/officer/warrant) + specialty = "M3 pattern chief MP" + item_state_slots = list(WEAR_JACKET = "warrant_officer") + black_market_value = 30 + +/obj/item/clothing/suit/storage/marine/MP/general + name = "\improper M3 pattern general officer armor" + desc = "A well-crafted suit of M3 Pattern Armor with a gold shine. It looks very expensive, but shockingly fairly easy to carry and wear." + icon_state = "general" + armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH + armor_bio = CLOTHING_ARMOR_MEDIUM + uniform_restricted = list(/obj/item/clothing/under/marine/officer/general) + specialty = "M3 pattern general" + item_state_slots = list(WEAR_JACKET = "general") + w_class = SIZE_MEDIUM + +/obj/item/clothing/suit/storage/marine/MP/SO + name = "\improper M3 pattern officer armor" + desc = "A well-crafted suit of M3 Pattern Armor typically found in the hands of higher-ranking officers. Useful for letting your men know who is in charge when taking to the field." + icon_state = "officer" + storage_slots = 3 + flags_atom = null + uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/qm_suit, /obj/item/clothing/under/rank/chief_medical_officer, /obj/item/clothing/under/marine/dress) + specialty = "M3 pattern officer" + item_state_slots = list(WEAR_JACKET = "officer") + +//Making a new object because we might want to edit armor values and such. +//Or give it its own sprite. It's more for the future. +/obj/item/clothing/suit/storage/marine/MP/CO + name = "\improper M3 pattern commanding officer armor" + desc = "A robust, well-polished suit of armor for the Commanding Officer. Custom-made to fit its owner with special straps to operate a smartgun. Show those Marines who's really in charge." + icon_state = "co_officer" + item_state = "co_officer" + armor_bullet = CLOTHING_ARMOR_HIGH + storage_slots = 3 + flags_atom = NO_SNOW_TYPE + flags_inventory = BLOCKSHARPOBJ|SMARTGUN_HARNESS + uniform_restricted = list(/obj/item/clothing/under/marine, /obj/item/clothing/under/rank/qm_suit) + specialty = "M3 pattern captain" + item_state_slots = list(WEAR_JACKET = "co_officer") + valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_RANK, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_PONCHO) + black_market_value = 35 + + +/obj/item/clothing/suit/storage/marine/MP/CO/jacket + name = "\improper M3 pattern commanding officer armored coat" + desc = "A robust, well-polished suit of armor for the Commanding Officer. Custom-made to fit its owner with special straps to operate a smartgun. Show those Marines who's really in charge. This one has a coat over it for added warmth." + icon_state = "bridge_coat_armored" + item_state = "bridge_coat_armored" + item_state_slots = list(WEAR_JACKET = "bridge_coat_armored") + valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_RANK) + +/obj/item/clothing/suit/storage/marine/medium/leader + name = "\improper B12 pattern marine armor" + desc = "A lightweight suit of carbon fiber body armor built for quick movement. Designed in a lovely forest green. Use it to toggle the built-in flashlight." + icon_state = "7" + armor_variation = 0 + armor_melee = CLOTHING_ARMOR_MEDIUMHIGH + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_bio = CLOTHING_ARMOR_MEDIUMHIGH + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + specialty = "B12 pattern marine" + light_range = 5 + +/obj/item/clothing/suit/storage/marine/tanker + name = "\improper M3 pattern tanker armor" + desc = "A modified and refashioned suit of M3 Pattern armor designed to be worn by the loader of a USCM vehicle crew. While the suit is a bit more encumbering to wear with the crewman uniform, it offers the loader a degree of protection that would otherwise not be enjoyed." + icon_state = "tanker" + uniform_restricted = list(/obj/item/clothing/under/marine/officer/tanker) + specialty = "M3 pattern tanker" + storage_slots = 2 + +//===========================//PFC ARMOR CLASSES\\================================\\ +//=================================================================================\\ + +// M3 pattern marine armor +/obj/item/clothing/suit/storage/marine/medium + armor_variation = 6 + light_power = 4 + +/obj/item/clothing/suit/storage/marine/medium/padded + name = "M3 pattern padded marine armor" + icon_state = "1" + armor_variation = 0 + specialty = "M3 pattern padded marine" + +/obj/item/clothing/suit/storage/marine/medium/padless + name = "M3 pattern padless marine armor" + icon_state = "2" + armor_variation = 0 + specialty = "M3 pattern padless marine" + +/obj/item/clothing/suit/storage/marine/medium/padless_lines + name = "M3 pattern ridged marine armor" + icon_state = "3" + armor_variation = 0 + specialty = "M3 pattern ridged marine" + +/obj/item/clothing/suit/storage/marine/medium/carrier + name = "M3 pattern carrier marine armor" + icon_state = "4" + armor_variation = 0 + specialty = "M3 pattern carrier marine" + +/obj/item/clothing/suit/storage/marine/medium/skull + name = "M3 pattern skull marine armor" + icon_state = "5" + armor_variation = 0 + specialty = "M3 pattern skull marine" + +/obj/item/clothing/suit/storage/marine/medium/smooth + name = "M3 pattern smooth marine armor" + icon_state = "6" + armor_variation = 0 + specialty = "M3 pattern smooth marine" + +// M3-L pattern light armor +/obj/item/clothing/suit/storage/marine/light + name = "\improper M3-L pattern light armor" + desc = "A lighter, cut down version of the standard M3 pattern armor. It sacrifices durability for more speed." + specialty = "\improper M3-L pattern light" + icon_state = "L1" + armor_variation = 6 + slowdown = SLOWDOWN_ARMOR_LIGHT + armor_melee = CLOTHING_ARMOR_MEDIUMLOW + armor_bullet = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_bio = CLOTHING_ARMOR_MEDIUMLOW + armor_rad = CLOTHING_ARMOR_MEDIUMHIGH + armor_internaldamage = CLOTHING_ARMOR_LOW + storage_slots = 2 + +/obj/item/clothing/suit/storage/marine/light/padded + icon_state = "L1" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/light/padless + icon_state = "L2" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/light/padless_lines + icon_state = "L3" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/light/carrier + icon_state = "L4" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/light/skull + icon_state = "L5" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/light/smooth + icon_state = "L6" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/light/vest + name = "\improper M3-VL pattern ballistics vest" + desc = "Up until 2182 USCM non-combat personnel were issued non-standardized ballistics vests, though the lack of IMP compatibility and suit lamps proved time and time again inefficient. This modified M3-L shell is the result of a 6-year R&D program; It provides utility, protection, AND comfort to all USCM non-combat personnel." + icon_state = "VL" + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + flags_marine_armor = ARMOR_LAMP_OVERLAY //No squad colors when wearing this since it'd look funny. + armor_melee = CLOTHING_ARMOR_MEDIUMLOW + armor_bullet = CLOTHING_ARMOR_HIGH + armor_energy = CLOTHING_ARMOR_LOW + armor_bomb = CLOTHING_ARMOR_LOW + armor_bio = CLOTHING_ARMOR_VERYLOW + armor_rad = CLOTHING_ARMOR_NONE + armor_internaldamage = CLOTHING_ARMOR_MEDIUM + storage_slots = 1 + time_to_unequip = 0.5 SECONDS + time_to_equip = 1 SECONDS + siemens_coefficient = 0.7 + uniform_restricted = null + +/obj/item/clothing/suit/storage/marine/light/vest/dcc + name = "\improper M3-VL pattern flak vest" + desc = "A combination of the standard non-combat M3-VL ballistics vest and M70 flak jacket, this piece of armor has been distributed to dropship crew to keep them safe from threats external and internal..." + icon_state = "VL_FLAK" + storage_slots = 2 + +/obj/item/clothing/suit/storage/marine/light/synvest + name = "\improper M3A1 Synthetic Utility Vest" + desc = "This variant of the ubiquitous M3 pattern ballistics vest has been extensively modified, providing no protection in exchange for maximum mobility and storage space. Synthetic programming compliant." + icon_state = "VL_syn_camo" + flags_atom = NO_NAME_OVERRIDE + flags_marine_armor = ARMOR_LAMP_OVERLAY|SYNTH_ALLOWED //No squad colors + can be worn by synths. + armor_melee = CLOTHING_ARMOR_NONE + armor_bullet = CLOTHING_ARMOR_NONE + armor_laser = CLOTHING_ARMOR_NONE + armor_energy = CLOTHING_ARMOR_NONE + armor_bomb = CLOTHING_ARMOR_NONE + armor_bio = CLOTHING_ARMOR_NONE + armor_rad = CLOTHING_ARMOR_NONE + armor_internaldamage = CLOTHING_ARMOR_NONE + storage_slots = 3 + slowdown = SLOWDOWN_ARMOR_VERY_LIGHT + time_to_unequip = 0.5 SECONDS + time_to_equip = 1 SECONDS + uniform_restricted = null + +/obj/item/clothing/suit/storage/marine/light/synvest/grey + icon_state = "VL_syn" + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + +/obj/item/clothing/suit/storage/marine/light/synvest/jungle + icon_state = "VL_syn_camo" + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + +/obj/item/clothing/suit/storage/marine/light/synvest/snow + icon_state = "s_VL_syn_camo" + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + +/obj/item/clothing/suit/storage/marine/light/synvest/desert + icon_state = "d_VL_syn_camo" + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + +/obj/item/clothing/suit/storage/marine/light/synvest/dgrey + icon_state = "c_VL_syn_camo" + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + +// M3-EOD pattern heavy armor +/obj/item/clothing/suit/storage/marine/heavy + name = "\improper M3-EOD pattern heavy armor" + desc = "A heavier version of the standard M3 pattern armor, the armor is primarily designed to withstand ballistic, explosive, and internal damage, with the drawback of increased bulk and thus reduced movement speed, alongside little additional protection from standard blunt force impacts and biological threats." + desc_lore = "This configuration of the iconic armor was developed during the Canton War in 2160 between the UPP and USCM - Designed in response to a need for higher protection for ComTechs assigned as EODs during the conflict, this is the pinnacle of protection for your average marine. The shoulders and kneepads have both been expanded upon heavily, covering up the arteries on each limb. A special spall liner was developed for this suit, with the same technology being used in the M70 Flak Jacket being developed at the same time." + specialty = "\improper M3-EOD pattern" + icon_state = "H1" + armor_variation = 6 + armor_melee = CLOTHING_ARMOR_MEDIUMHIGH + armor_bullet = CLOTHING_ARMOR_HIGHPLUS + armor_bomb = CLOTHING_ARMOR_HIGHPLUS + armor_bio = CLOTHING_ARMOR_MEDIUMHIGH + armor_rad = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + storage_slots = 2 + slowdown = SLOWDOWN_ARMOR_LOWHEAVY + movement_compensation = SLOWDOWN_ARMOR_MEDIUM + light_power = 4 + light_range = 5 + +/obj/item/clothing/suit/storage/marine/heavy/padded + icon_state = "H1" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/heavy/padless + icon_state = "H2" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/heavy/padless_lines + icon_state = "H3" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/heavy/carrier + icon_state = "H4" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/heavy/skull + icon_state = "H5" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/heavy/smooth + icon_state = "H6" + armor_variation = 0 + +//===========================//SPECIALIST\\================================\\ +//=======================================================================\\ + +/obj/item/clothing/suit/storage/marine/specialist + name = "\improper B18 defensive armor" + desc = "A heavy, rugged set of armor plates for when you really, really need to not die horribly. Slows you down though.\nComes with two tricord injectors in each arm guard." + icon_state = "xarmor" + armor_melee = CLOTHING_ARMOR_HIGH + armor_bullet = CLOTHING_ARMOR_HIGH + armor_bomb = CLOTHING_ARMOR_VERYHIGH + armor_bio = CLOTHING_ARMOR_MEDIUMLOW + armor_rad = CLOTHING_ARMOR_MEDIUMHIGH + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + storage_slots = 2 + flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN + 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 + slowdown = SLOWDOWN_ARMOR_HEAVY + specialty = "B18 defensive" + unacidable = TRUE + var/injections = 4 + +/obj/item/clothing/suit/storage/marine/specialist/verb/inject() + set name = "Create Injector" + set category = "Object" + set src in usr + + if(usr.is_mob_incapacitated()) + return 0 + + if(!injections) + to_chat(usr, "Your armor is all out of injectors.") + return 0 + + if(usr.get_active_hand()) + to_chat(usr, "Your active hand must be empty.") + return 0 + + to_chat(usr, "You feel a faint hiss and an injector drops into your hand.") + var/obj/item/reagent_container/hypospray/autoinjector/skillless/O = new(usr) + usr.put_in_active_hand(O) + injections-- + playsound(src,'sound/machines/click.ogg', 15, 1) + return + +/obj/item/clothing/suit/storage/marine/M3G + name = "\improper M3-G4 grenadier armor" + desc = "A custom set of M3 armor packed to the brim with padding, plating, and every form of ballistic protection under the sun. Used exclusively by USCM Grenadiers." + icon_state = "grenadier" + armor_melee = CLOTHING_ARMOR_MEDIUMHIGH + armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH + armor_bomb = CLOTHING_ARMOR_VERYHIGH + armor_bio = CLOTHING_ARMOR_MEDIUMLOW + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN + flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE + 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 + slowdown = SLOWDOWN_ARMOR_HEAVY + specialty = "M3-G4 grenadier" + unacidable = TRUE + +/obj/item/clothing/suit/storage/marine/M3T + name = "\improper M3-T light armor" + desc = "A custom set of M3 armor designed for users of long-ranged explosive weaponry." + icon_state = "demolitionist" + armor_bomb = CLOTHING_ARMOR_HIGH + slowdown = SLOWDOWN_ARMOR_LIGHT + specialty = "M3-T light" + flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE + unacidable = TRUE + +/obj/item/clothing/suit/storage/marine/M3S + name = "\improper M3-S light armor" + desc = "A custom set of M3 armor designed for USCM Scouts." + icon_state = "scout_armor" + armor_melee = CLOTHING_ARMOR_MEDIUMHIGH + slowdown = SLOWDOWN_ARMOR_LIGHT + specialty = "M3-S light" + flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE + unacidable = TRUE + +/obj/item/clothing/suit/storage/RO + name = "quartermaster jacket" + desc = "A green jacket worn by USCM personnel. The back has the flag of the United Americas on it." + icon_state = "RO_jacket" + blood_overlay_type = "coat" + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS + valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL) + restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND) + +//==================Combat Correspondent==================\\ + +/obj/item/clothing/suit/storage/marine/light/reporter + name = "press body armor" + desc = "Body armor used by war correspondents in battles and wars across the universe." + icon_state = "cc_armor" + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + diff --git a/code/modules/clothing/suits/marine_armor/ert.dm b/code/modules/clothing/suits/marine_armor/ert.dm new file mode 100644 index 000000000000..19009606db35 --- /dev/null +++ b/code/modules/clothing/suits/marine_armor/ert.dm @@ -0,0 +1,828 @@ +//=============================//Marine Raiders\\==================================\\ +//=======================================================================\\ + +/obj/item/clothing/suit/storage/marine/sof + name = "\improper SOF Armor" + desc = "A heavily customized suit of M3 armor. Used by Marine Raiders." + icon_state = "marsoc" + armor_melee = CLOTHING_ARMOR_HIGH + armor_bullet = CLOTHING_ARMOR_HIGH + armor_bomb = CLOTHING_ARMOR_VERYHIGH + armor_bio = CLOTHING_ARMOR_MEDIUMLOW + armor_rad = CLOTHING_ARMOR_MEDIUMHIGH + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + slowdown = SLOWDOWN_ARMOR_LIGHT + unacidable = TRUE + flags_atom = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE|NO_SNOW_TYPE + storage_slots = 4 + + +//=============================//PMCs\\==================================\\ +//=======================================================================\\ + +/obj/item/clothing/suit/storage/marine/veteran + flags_marine_armor = ARMOR_LAMP_OVERLAY + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE //Let's make these keep their name and icon. + +/obj/item/clothing/suit/storage/marine/veteran/pmc + name = "\improper M4 pattern PMC armor" + desc = "A modification of the standard Armat Systems M3 armor. Designed for high-profile security operators and corporate mercenaries in mind." + icon_state = "pmc_armor" + armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH + armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_MEDIUM + storage_slots = 2 + slowdown = SLOWDOWN_ARMOR_LIGHT + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + allowed = list( + /obj/item/weapon/gun, + /obj/item/tank/emergency_oxygen, + /obj/item/device/flashlight, + /obj/item/ammo_magazine/, + /obj/item/weapon/baton, + /obj/item/handcuffs, + /obj/item/storage/fancy/cigarettes, + /obj/item/tool/lighter, + /obj/item/explosive/grenade, + /obj/item/storage/bible, + /obj/item/tool/crowbar, + /obj/item/storage/large_holster/katana, + /obj/item/storage/large_holster/machete, + /obj/item/weapon/sword/machete, + /obj/item/attachable/bayonet, + /obj/item/device/motiondetector, + /obj/item/tool/crew_monitor, + /obj/item/device/walkman, + ) + uniform_restricted = list(/obj/item/clothing/under/marine/veteran/pmc) + item_state_slots = list(WEAR_JACKET = "pmc_armor") + +/obj/item/clothing/suit/storage/marine/veteran/pmc/light + name = "\improper M4 pattern light PMC armor" + desc = "A modification of the standard Armat Systems M3 armor. Designed for high-profile security operators and corporate mercenaries in mind. Has some armor plating removed for extra mobility." + icon_state = "pmc_sniper" + armor_melee = CLOTHING_ARMOR_MEDIUMLOW + armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_MEDIUMLOW + armor_rad = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW + slowdown = SLOWDOWN_ARMOR_VERY_LIGHT + item_state_slots = list(WEAR_JACKET = "pmc_sniper") + +/obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate + name = "\improper M1 pattern corporate security armor" + desc = "A basic vest with a Weyland-Yutani badge on the right breast. This is commonly worn by low-level guards protecting Weyland-Yutani facilities." + icon = 'icons/mob/humans/onmob/contained/wy_goons.dmi' + icon_state = "armor" + item_state = "armor" + item_state_slots = null + contained_sprite = TRUE + + flags_armor_protection = BODY_FLAG_CHEST + flags_cold_protection = BODY_FLAG_CHEST + flags_heat_protection = BODY_FLAG_CHEST + + slowdown = SLOWDOWN_ARMOR_NONE // only protects chest, but enables rapid movement + +/obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead + desc = "A basic vest with a Weyland-Yutani badge on the right breast. This variant is worn by low-level guards that have elevated in rank due to 'good conduct in the field', also known as corporate bootlicking." + icon_state = "lead_armor" + item_state = "lead_armor" + +/obj/item/clothing/suit/storage/marine/veteran/pmc/leader + name = "\improper M4 pattern PMC leader armor" + desc = "A modification of the standard Armat Systems M3 armor. Designed for high-profile security operators and corporate mercenaries in mind. This particular suit looks like it belongs to a high-ranking officer." + icon_state = "officer_armor" + uniform_restricted = list(/obj/item/clothing/under/marine/veteran/pmc/leader) + item_state_slots = list(WEAR_JACKET = "officer_armor") + +/obj/item/clothing/suit/storage/marine/veteran/pmc/sniper + name = "\improper M4 pattern PMC sniper armor" + icon_state = "pmc_sniper" + armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH + armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_MEDIUM + flags_inv_hide = HIDELOWHAIR + item_state_slots = list(WEAR_JACKET = "pmc_sniper") + +/obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth + name = "\improper M4 Synthetic PMC armor" + desc = "A serious modification of the standard Armat Systems M3 armor. This variant was designed for PMC Support Units in the field, with every armor insert removed. It's designed with the idea of a high speed lifesaver in mind." + time_to_unequip = 0.5 SECONDS + time_to_equip = 1 SECONDS + armor_melee = CLOTHING_ARMOR_NONE + armor_bullet = CLOTHING_ARMOR_NONE + armor_laser = CLOTHING_ARMOR_NONE + armor_energy = CLOTHING_ARMOR_NONE + armor_bomb = CLOTHING_ARMOR_NONE + armor_bio = CLOTHING_ARMOR_NONE + armor_rad = CLOTHING_ARMOR_NONE + armor_internaldamage = CLOTHING_ARMOR_NONE + storage_slots = 3 + slowdown = SLOWDOWN_ARMOR_SUPER_LIGHT + +/obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth/Initialize() + flags_atom |= NO_NAME_OVERRIDE + flags_marine_armor |= SYNTH_ALLOWED + return ..() + +/obj/item/clothing/suit/storage/marine/smartgunner/veteran/pmc + name = "\improper PMC gunner armor" + desc = "A modification of the standard Armat Systems M3 armor. Hooked up with harnesses and straps allowing the user to carry an M56 Smartgun." + icon_state = "heavy_armor" + flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN|SMARTGUN_HARNESS + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH + armor_laser = CLOTHING_ARMOR_MEDIUMLOW + armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_MEDIUM + item_state_slots = list(WEAR_JACKET = "heavy_armor") + +/obj/item/clothing/suit/storage/marine/smartgunner/veteran/pmc/terminator + name = "\improper M5Xg exoskeleton gunner armor" + desc = "A complex system of overlapping plates intended to render the wearer all but impervious to small arms fire. A passive exoskeleton supports the weight of the armor, allowing a human to carry its massive bulk. This variant is designed to support a M56 Smartgun." + icon_state = "commando_armor" + slowdown = SLOWDOWN_ARMOR_MEDIUM + movement_compensation = SLOWDOWN_ARMOR_VERY_HEAVY + armor_melee = CLOTHING_ARMOR_HIGH + armor_bullet = CLOTHING_ARMOR_ULTRAHIGH + armor_laser = CLOTHING_ARMOR_MEDIUM + armor_energy = CLOTHING_ARMOR_MEDIUM + armor_bomb = CLOTHING_ARMOR_VERYHIGH + armor_rad = CLOTHING_ARMOR_MEDIUMHIGH + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET + uniform_restricted = list(/obj/item/clothing/under/marine/veteran/pmc/commando) + item_state_slots = list(WEAR_JACKET = "commando_armor") + unacidable = TRUE + +/obj/item/clothing/suit/storage/marine/veteran/pmc/commando + name = "\improper M5X exoskeleton armor" + desc = "A complex system of overlapping plates intended to render the wearer all but impervious to small arms fire. A passive exoskeleton supports the weight of the armor, allowing a human to carry its massive bulk." + icon_state = "commando_armor" + slowdown = SLOWDOWN_ARMOR_MEDIUM + movement_compensation = SLOWDOWN_ARMOR_VERY_HEAVY + armor_melee = CLOTHING_ARMOR_VERYHIGH + armor_bullet = CLOTHING_ARMOR_ULTRAHIGH + armor_energy = CLOTHING_ARMOR_MEDIUM + armor_bomb = CLOTHING_ARMOR_VERYHIGH + armor_rad = CLOTHING_ARMOR_MEDIUMHIGH + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + flags_inventory = BLOCK_KNOCKDOWN + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET + uniform_restricted = list(/obj/item/clothing/under/marine/veteran/pmc/commando) + item_state_slots = list(WEAR_JACKET = "commando_armor") + unacidable = TRUE + + +//===========================//DISTRESS\\================================\\ +//=======================================================================\\ + +/obj/item/clothing/suit/storage/marine/veteran/bear + name = "\improper H1 Iron Bears vest" + desc = "A protective vest worn by Iron Bears mercenaries." + icon_state = "bear_armor" + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN + armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_MEDIUM + storage_slots = 2 + slowdown = SLOWDOWN_ARMOR_VERY_LIGHT + uniform_restricted = list(/obj/item/clothing/under/marine/veteran/bear) + +/obj/item/clothing/suit/storage/marine/veteran/dutch + name = "\improper D2 armored vest" + desc = "A protective vest worn by some seriously experienced mercs." + icon_state = "dutch_armor" + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS //Makes no sense but they need leg/arm armor too. + armor_melee = CLOTHING_ARMOR_HIGH + armor_bullet = CLOTHING_ARMOR_HIGHPLUS + armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_HIGH + armor_rad = CLOTHING_ARMOR_MEDIUM + storage_slots = 2 + light_range = 7 + slowdown = SLOWDOWN_ARMOR_VERY_LIGHT + uniform_restricted = list(/obj/item/clothing/under/marine/veteran/dutch) + +/obj/item/clothing/suit/storage/marine/veteran/van_bandolier + name = "safari jacket" + desc = "A tailored hunting jacket, cunningly lined with segmented armor plates. Sometimes the game shoots back." + icon_state = "van_bandolier" + item_state = "van_bandolier_jacket" + blood_overlay_type = "coat" + flags_marine_armor = NO_FLAGS //No shoulder light. + actions_types = list() + slowdown = SLOWDOWN_ARMOR_LIGHT + storage_slots = 2 + movement_compensation = SLOWDOWN_ARMOR_LIGHT + uniform_restricted = list(/obj/item/clothing/under/marine/veteran/van_bandolier) + allowed = list( + /obj/item/weapon/gun, + /obj/item/tank/emergency_oxygen, + /obj/item/device/flashlight, + /obj/item/storage/fancy/cigarettes, + /obj/item/tool/lighter, + /obj/item/storage/bible, + /obj/item/attachable/bayonet, + /obj/item/storage/backpack/general_belt, + /obj/item/storage/large_holster/machete, + /obj/item/storage/belt/gun/m4a3, + /obj/item/storage/belt/gun/m44, + /obj/item/storage/belt/gun/smartpistol, + /obj/item/storage/belt/gun/flaregun, + /obj/item/device/motiondetector, + /obj/item/device/walkman, + /obj/item/storage/belt/shotgun/van_bandolier, + ) + +//===========================//U.P.P\\================================\\ +//=====================================================================\\ + +/obj/item/clothing/suit/storage/marine/faction + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS + flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS + flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS + min_cold_protection_temperature = HELMET_MIN_COLD_PROT + max_heat_protection_temperature = HELMET_MAX_HEAT_PROT + blood_overlay_type = "armor" + armor_melee = CLOTHING_ARMOR_MEDIUM + armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_laser = CLOTHING_ARMOR_MEDIUMLOW + armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_bio = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + slowdown = SLOWDOWN_ARMOR_MEDIUM + movement_compensation = SLOWDOWN_ARMOR_LIGHT + + +/obj/item/clothing/suit/storage/marine/faction/UPP + name = "\improper UM5 personal armor" + desc = "Standard body armor of the UPP military, the UM5 (Union Medium MK5) is a medium body armor, roughly on par with the M3 pattern body armor in service with the USCM, specialized towards ballistics protection. Unlike the M3, however, the plate has a heavier neckplate. This has earned many UA members to refer to UPP soldiers as 'tin men'." + icon_state = "upp_armor" + armor_bullet = CLOTHING_ARMOR_HIGH + armor_energy = CLOTHING_ARMOR_MEDIUM + armor_bio = CLOTHING_ARMOR_MEDIUMLOW + armor_rad = CLOTHING_ARMOR_MEDIUMLOW + armor_internaldamage = CLOTHING_ARMOR_HIGH + storage_slots = 1 + uniform_restricted = list(/obj/item/clothing/under/marine/veteran/UPP, /obj/item/clothing/under/marine/veteran/UPP/medic, /obj/item/clothing/under/marine/veteran/UPP/engi) + +/obj/item/clothing/suit/storage/marine/faction/UPP/support + name = "\improper UL6 personal armor" + desc = "Standard body armor of the UPP military, the UL6 (Union Light MK6) is a light body armor, slightly weaker than the M3 pattern body armor in service with the USCM, specialized towards ballistics protection. This set of personal armor lacks the iconic neck piece and some of the armor in favor of user mobility." + storage_slots = 3 + icon_state = "upp_armor_support" + slowdown = SLOWDOWN_ARMOR_LIGHT + armor_melee = CLOTHING_ARMOR_HIGH + armor_energy = CLOTHING_ARMOR_MEDIUM + armor_bio = CLOTHING_ARMOR_MEDIUMLOW + armor_rad = CLOTHING_ARMOR_MEDIUMLOW + armor_internaldamage = CLOTHING_ARMOR_HIGH + +/obj/item/clothing/suit/storage/marine/faction/UPP/commando + name = "\improper UM5CU personal armor" + desc = "A modification of the UM5, designed for stealth operations." + icon_state = "upp_armor_commando" + storage_slots = 2 + slowdown = SLOWDOWN_ARMOR_LIGHT + +/obj/item/clothing/suit/storage/marine/faction/UPP/heavy + name = "\improper UH7 heavy plated armor" + desc = "An extremely heavy-duty set of body armor in service with the UPP military, the UH7 (Union Heavy MK7) is known for having powerful ballistic protection, alongside a noticeable neck guard, fortified in order to allow the wearer to endure the stresses of the bulky helmet." + icon_state = "upp_armor_heavy" + storage_slots = 3 + slowdown = SLOWDOWN_ARMOR_HEAVY + flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN + flags_armor_protection = BODY_FLAG_ALL_BUT_HEAD + armor_melee = CLOTHING_ARMOR_MEDIUMHIGH + armor_bullet = CLOTHING_ARMOR_HIGHPLUS + armor_laser = CLOTHING_ARMOR_MEDIUMLOW + armor_energy = CLOTHING_ARMOR_MEDIUM + armor_bomb = CLOTHING_ARMOR_HIGH + armor_bio = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_MEDIUMLOW + armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS + +/obj/item/clothing/suit/storage/marine/faction/UPP/heavy/Initialize() + . = ..() + pockets.bypass_w_limit = list( + /obj/item/ammo_magazine/minigun, + /obj/item/ammo_magazine/pkp, + ) + +/obj/item/clothing/suit/storage/marine/faction/UPP/officer + name = "\improper UL4 officer jacket" + desc = "A lightweight jacket, issued to officers of the UPP's military. Slightly protective from incoming damage, best off with proper armor however." + icon_state = "upp_coat_officer" + slowdown = SLOWDOWN_ARMOR_NONE + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS + armor_melee = CLOTHING_ARMOR_LOW //wear actual armor if you go into combat + armor_bullet = CLOTHING_ARMOR_LOW + armor_energy = CLOTHING_ARMOR_LOW + armor_bomb = CLOTHING_ARMOR_LOW + armor_bio = CLOTHING_ARMOR_LOW + armor_rad = CLOTHING_ARMOR_LOW + armor_internaldamage = CLOTHING_ARMOR_LOW + storage_slots = 3 + uniform_restricted = list(/obj/item/clothing/under/marine/veteran/UPP/officer) + +/obj/item/clothing/suit/storage/marine/faction/UPP/kapitan + name = "\improper UL4 senior officer jacket" + desc = "A lightweight jacket, issued to senior officers of the UPP's military. Made of high-quality materials, even going as far as having the ranks and insignia of the Kapitan and their Company emblazoned on the shoulders and front of the jacket. Slightly protective from incoming damage, best off with proper armor however." + icon_state = "upp_coat_kapitan" + slowdown = SLOWDOWN_ARMOR_NONE + armor_melee = CLOTHING_ARMOR_LOW //wear actual armor if you go into combat + armor_bullet = CLOTHING_ARMOR_LOW + armor_energy = CLOTHING_ARMOR_LOW + armor_bomb = CLOTHING_ARMOR_LOW + armor_bio = CLOTHING_ARMOR_LOW + armor_rad = CLOTHING_ARMOR_LOW + armor_internaldamage = CLOTHING_ARMOR_LOW + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS + storage_slots = 4 + uniform_restricted = list(/obj/item/clothing/under/marine/veteran/UPP/officer) + +/obj/item/clothing/suit/storage/marine/faction/UPP/mp + name = "\improper UL4 camouflaged jacket" + desc = "A lightweight jacket, issued to troops when they're not expected to engage in combat. Still studded to the brim with kevlar shards, though the synthread construction reduces its effectiveness." + icon_state = "upp_coat_mp" + slowdown = SLOWDOWN_ARMOR_NONE + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS + armor_melee = CLOTHING_ARMOR_LOW //wear actual armor if you go into combat + armor_bullet = CLOTHING_ARMOR_LOW + armor_energy = CLOTHING_ARMOR_LOW + armor_bomb = CLOTHING_ARMOR_LOW + armor_bio = CLOTHING_ARMOR_LOW + armor_rad = CLOTHING_ARMOR_LOW + armor_internaldamage = CLOTHING_ARMOR_LOW + storage_slots = 4 + uniform_restricted = list(/obj/item/clothing/under/marine/veteran/UPP) + valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL) + restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND) + +/obj/item/clothing/suit/storage/marine/faction/UPP/jacket/ivan + name = "\improper UH4 Camo Jacket" + desc = "An experimental heavily armored variant of the UL4 given to only the most elite units... usually." + slowdown = SLOWDOWN_ARMOR_MEDIUM + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS|BODY_FLAG_HANDS|BODY_FLAG_FEET + armor_melee = CLOTHING_ARMOR_HIGH + armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_HIGH + armor_bio = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_HIGH + storage_slots = 2 + + +//===========================//FREELANCER\\================================\\ +//=====================================================================\\ + +/obj/item/clothing/suit/storage/marine/faction/freelancer + name = "freelancer cuirass" + desc = "An armored protective chestplate scrapped together from various plates. It keeps up remarkably well, as the craftsmanship is solid, and the design mirrors such armors in the UPP and the USCM. The many skilled craftsmen in the freelancers ranks produce these vests at a rate about one a month." + icon_state = "freelancer_armor" + slowdown = SLOWDOWN_ARMOR_LIGHT + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS + armor_melee = CLOTHING_ARMOR_MEDIUMHIGH + armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH + armor_energy = CLOTHING_ARMOR_MEDIUMLOW + storage_slots = 2 + uniform_restricted = list(/obj/item/clothing/under/marine/veteran/freelancer) + +//this one is for CLF +/obj/item/clothing/suit/storage/militia + name = "colonial militia hauberk" + desc = "The hauberk of a colonist militia member, created from boiled leather and some modern armored plates. While not the most powerful form of armor, and primitive compared to most modern suits of armor, it gives the wearer almost perfect mobility, which suits the needs of the local colonists. It is also quick to don, easy to hide, and cheap to produce in large workshops." + icon = 'icons/obj/items/clothing/cm_suits.dmi' + icon_state = "rebel_armor" + item_icons = list( + WEAR_JACKET = 'icons/mob/humans/onmob/suit_1.dmi' + ) + sprite_sheets = list(SPECIES_MONKEY = 'icons/mob/humans/species/monkeys/onmob/suit_monkey_1.dmi') + slowdown = SLOWDOWN_ARMOR_VERY_LIGHT + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS + movement_compensation = SLOWDOWN_ARMOR_MEDIUM + armor_melee = CLOTHING_ARMOR_MEDIUM + armor_bullet = CLOTHING_ARMOR_MEDIUMLOW + armor_laser = CLOTHING_ARMOR_MEDIUMLOW + armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_bio = CLOTHING_ARMOR_MEDIUMLOW + armor_rad = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_MEDIUM + storage_slots = 2 + uniform_restricted = list(/obj/item/clothing/under/colonist) + allowed = list( + /obj/item/weapon/gun, + /obj/item/tank/emergency_oxygen, + /obj/item/device/flashlight, + /obj/item/ammo_magazine, + /obj/item/explosive/grenade, + /obj/item/device/binoculars, + /obj/item/attachable/bayonet, + /obj/item/storage/backpack/general_belt, + /obj/item/storage/large_holster/machete, + /obj/item/weapon/baseballbat, + /obj/item/weapon/baseballbat/metal, + /obj/item/device/motiondetector, + /obj/item/device/walkman, + ) + flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROT + valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL) + +/obj/item/clothing/suit/storage/militia/Initialize() + . = ..() + pockets.max_w_class = SIZE_SMALL //Can contain small items AND rifle magazines. + pockets.bypass_w_limit = list( + /obj/item/ammo_magazine/rifle, + /obj/item/ammo_magazine/smg, + /obj/item/ammo_magazine/sniper, + ) + pockets.max_storage_space = 8 + +/obj/item/clothing/suit/storage/militia/vest + name = "colonial militia vest" + desc = "The hauberk of a colonist militia member, created from boiled leather and some modern armored plates. While not the most powerful form of armor, and primitive compared to most modern suits of armor, it gives the wearer almost perfect mobility, which suits the needs of the local colonists. It is also quick to don, easy to hide, and cheap to produce in large workshops. This extremely light variant protects only the chest and abdomen." + icon_state = "clf_2" + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN + flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN + slowdown = 0.2 + movement_compensation = SLOWDOWN_ARMOR_MEDIUM + +/obj/item/clothing/suit/storage/militia/brace + name = "colonial militia brace" + desc = "The hauberk of a colonist militia member, created from boiled leather and some modern armored plates. While not the most powerful form of armor, and primitive compared to most modern suits of armor, it gives the wearer almost perfect mobility, which suits the needs of the local colonists. It is also quick to don, easy to hide, and cheap to produce in large workshops. This extremely light variant has some of the chest pieces removed." + icon_state = "clf_3" + flags_armor_protection = BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS + flags_cold_protection = BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS + slowdown = 0.2 + movement_compensation = SLOWDOWN_ARMOR_MEDIUM + +/obj/item/clothing/suit/storage/militia/partial + name = "colonial militia partial hauberk" + desc = "The hauberk of a colonist militia member, created from boiled leather and some modern armored plates. While not the most powerful form of armor, and primitive compared to most modern suits of armor, it gives the wearer almost perfect mobility, which suits the needs of the local colonists. It is also quick to don, easy to hide, and cheap to produce in large workshops. This even lighter variant has some of the arm pieces removed." + icon_state = "clf_4" + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS + flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS + slowdown = 0.2 + +/obj/item/clothing/suit/storage/militia/smartgun + name = "colonial militia harness" + desc = "The hauberk of a colonist militia member, created from boiled leather and some modern armored plates. While not the most powerful form of armor, and primitive compared to most modern suits of armor, it gives the wearer almost perfect mobility, which suits the needs of the local colonists. It is also quick to don, easy to hide, and cheap to produce in large workshops. This one has straps interweaved with the plates, that allow the user to fire a captured smartgun, if a bit uncomfortably." + flags_inventory = BLOCKSHARPOBJ|SMARTGUN_HARNESS + +/obj/item/clothing/suit/storage/CMB + name = "\improper CMB Deputy jacket" + desc = "A thick and stylish black leather jacket with a Marshal's Deputy badge pinned to it. The back is enscribed with the powerful letters of 'DEPUTY' representing justice, authority, and protection in the outer rim. The laws of the Earth stretch beyond the Sol." + icon_state = "CMB_jacket" + item_state = "CMB_jacket" + blood_overlay_type = "coat" + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS + flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS + armor_melee = CLOTHING_ARMOR_MEDIUMLOW + armor_bullet = CLOTHING_ARMOR_MEDIUMLOW + armor_energy = CLOTHING_ARMOR_LOW + armor_bomb = CLOTHING_ARMOR_LOW + armor_bio = CLOTHING_ARMOR_LOW + armor_internaldamage = CLOTHING_ARMOR_LOW + allowed = list( + /obj/item/weapon/gun, + /obj/item/storage/fancy/cigarettes, + /obj/item/tool/lighter, + /obj/item/weapon/baton, + /obj/item/handcuffs, + /obj/item/device/binoculars, + /obj/item/attachable/bayonet, + /obj/item/device/flashlight, + /obj/item/device/healthanalyzer, + /obj/item/device/radio, + /obj/item/tank/emergency_oxygen, + /obj/item/tool/crowbar, + /obj/item/tool/crew_monitor, + /obj/item/tool/pen, + /obj/item/storage/belt/gun/m4a3, + /obj/item/storage/belt/gun/m44, + /obj/item/storage/belt/gun/mateba, + /obj/item/storage/belt/gun/smartpistol, + /obj/item/storage/large_holster/machete, + /obj/item/storage/large_holster/katana, + /obj/item/device/motiondetector, + /obj/item/device/walkman, + ) + valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR) + restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND) + +/obj/item/clothing/suit/storage/CMB/Initialize() + . = ..() + pockets.max_w_class = SIZE_SMALL //Can contain small items AND rifle magazines. + pockets.bypass_w_limit = list( + /obj/item/ammo_magazine/rifle, + /obj/item/ammo_magazine/smg, + /obj/item/ammo_magazine/sniper, + ) + pockets.max_storage_space = 8 + +/obj/item/clothing/suit/storage/CMB/marshal + name = "\improper CMB Marshal jacket" + desc = "A thick and stylish black leather jacket with a Marshal's badge pinned to it. The back is enscribed with the powerful letters of 'MARSHAL' representing justice, authority, and protection in the outer rim. The laws of the Earth stretch beyond the Sol." + icon_state = "CMB_jacket_marshal" + item_state = "CMB_jacket_marshal" + +//===========================//HELGHAST - MERCENARY\\================================\\ +//=====================================================================\\ + +/obj/item/clothing/suit/storage/marine/veteran/mercenary + name = "\improper K12 ceramic plated armor" + desc = "A set of grey, heavy ceramic armor with dark blue highlights. It is the standard uniform of an unknown mercenary group working in the sector." + icon_state = "mercenary_heavy_armor" + flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN + armor_melee = CLOTHING_ARMOR_VERYHIGH + armor_bullet = CLOTHING_ARMOR_VERYHIGH + armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_bio = CLOTHING_ARMOR_HIGHPLUS + armor_rad = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS + storage_slots = 2 + slowdown = SLOWDOWN_ARMOR_LIGHT + allowed = list( + /obj/item/weapon/gun, + /obj/item/tank/emergency_oxygen, + /obj/item/device/flashlight, + /obj/item/ammo_magazine/, + /obj/item/weapon/baton, + /obj/item/handcuffs, + /obj/item/storage/fancy/cigarettes, + /obj/item/tool/lighter, + /obj/item/explosive/grenade, + /obj/item/storage/bible, + /obj/item/weapon/sword/machete, + /obj/item/attachable/bayonet, + /obj/item/device/motiondetector, + /obj/item/device/walkman, + ) + uniform_restricted = list(/obj/item/clothing/under/marine/veteran/mercenary) + item_state_slots = list(WEAR_JACKET = "mercenary_heavy_armor") + +/obj/item/clothing/suit/storage/marine/veteran/mercenary/heavy + name = "\improper Modified K12 ceramic plated armor" + desc = "A set of grey, heavy ceramic armor with dark blue highlights. It has been modified with extra ceramic plates placed in its storage pouch, and seems intended to support an extremely heavy weapon." + armor_melee = CLOTHING_ARMOR_ULTRAHIGH + armor_bullet = CLOTHING_ARMOR_ULTRAHIGHPLUS + armor_bomb = CLOTHING_ARMOR_HIGHPLUS + armor_bio = CLOTHING_ARMOR_HIGHPLUS + armor_rad = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_VERYHIGHPLUS + storage_slots = 1 + +/obj/item/clothing/suit/storage/marine/veteran/mercenary/miner + name = "\improper Y8 armored miner vest" + desc = "A set of beige, light armor built for protection while mining. It is a specialized uniform of an unknown mercenary group working in the sector." + icon_state = "mercenary_miner_armor" + storage_slots = 3 + allowed = list( + /obj/item/weapon/gun, + /obj/item/tank/emergency_oxygen, + /obj/item/device/flashlight, + /obj/item/ammo_magazine/, + /obj/item/weapon/baton, + /obj/item/handcuffs, + /obj/item/storage/fancy/cigarettes, + /obj/item/tool/lighter, + /obj/item/explosive/grenade, + /obj/item/storage/bible, + /obj/item/weapon/sword/machete, + /obj/item/attachable/bayonet, + /obj/item/device/motiondetector, + /obj/item/device/walkman, + ) + uniform_restricted = list(/obj/item/clothing/under/marine/veteran/mercenary) + item_state_slots = list(WEAR_JACKET = "mercenary_miner_armor") + +/obj/item/clothing/suit/storage/marine/veteran/mercenary/support + name = "\improper Z7 armored vest" + desc = "A set of blue armor with yellow highlights built for protection while building or carrying out medical treatment in highly dangerous environments. It is a specialized uniform of an unknown mercenary group working in the sector." + icon_state = "mercenary_engineer_armor" + item_state_slots = list(WEAR_JACKET = "mercenary_engineer_armor") + +/obj/item/clothing/suit/storage/marine/M3G/hefa + name = "\improper HEFA Knight armor" + desc = "A thick piece of armor adorning a HEFA. Usually seen on a HEFA knight." + specialty = "HEFA Knight" + icon_state = "hefadier" + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE + flags_item = NO_CRYO_STORE + flags_marine_armor = ARMOR_LAMP_OVERLAY + armor_bullet = CLOTHING_ARMOR_VERYHIGH + armor_melee = CLOTHING_ARMOR_VERYHIGH + armor_bomb = CLOTHING_ARMOR_GIGAHIGH + + +//=========================//PROVOST\\================================\\ +//=======================================================================\\ + +/obj/item/clothing/suit/storage/marine/MP/provost + name = "\improper M3 pattern Provost armor" + desc = "A standard Provost M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." + icon_state = "pvmedium" + item_state_slots = list(WEAR_JACKET = "pvmedium") + slowdown = SLOWDOWN_ARMOR_LIGHT + armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_laser = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_MEDIUMHIGH + armor_bio = CLOTHING_ARMOR_MEDIUMHIGH + armor_internaldamage = CLOTHING_ARMOR_MEDIUM + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + storage_slots = 3 + +/obj/item/clothing/suit/storage/marine/MP/provost/tml + name = "\improper M3 pattern Senior Provost armor" + desc = "A more refined Provost M3 Pattern Chestplate for senior officers. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." + icon_state = "pvleader" + item_state_slots = list(WEAR_JACKET = "pvleader") + +/obj/item/clothing/suit/storage/marine/MP/provost/marshal + name = "\improper M5 pattern Provost Marshal armor" + desc = "A custom fit luxury armor suit for Provost Marshals. Useful for letting your men know who is in charge when taking to the field." + icon_state = "pvmarshal" + item_state_slots = list(WEAR_JACKET = "pvmarshal") + w_class = SIZE_MEDIUM + storage_slots = 4 + +/obj/item/clothing/suit/storage/marine/MP/provost/light + name = "\improper M3 pattern Provost light armor" + desc = "A lighter Provost M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." + icon_state = "pvlight" + item_state_slots = list(WEAR_JACKET = "pvlight") + slowdown = SLOWDOWN_ARMOR_VERY_LIGHT + +/obj/item/clothing/suit/storage/marine/MP/provost/light/flexi + name = "\improper M3 pattern Provost flexi-armor" + desc = "A flexible and easy to store M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage." + w_class = SIZE_MEDIUM + icon_state = "pvlight_2" + item_state_slots = list(WEAR_JACKET = "pvlight_2") + storage_slots = 2 + +//================//UNITED AMERICAS ALLIED COMMAND\\=====================\\ +//=======================================================================\\ + +/obj/item/clothing/suit/storage/marine/uaac/tis/sa + name = "\improper M3 pattern UAAC-TIS Special Agent Armor" + desc = "A modified luxury armor, originally meant for a USCM Provost Marshall, modified to use the colors and insignia of the TIS. The Three Eyes is technically able to requisition any equipment or personnel to fulfill its mission and often uses this privilege to outfit their agents with high-quality gear from other UA military forces." + icon_state = "tis" + item_state_slots = list(WEAR_JACKET = "tis") + armor_melee = CLOTHING_ARMOR_MEDIUMHIGH + armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH + armor_laser = CLOTHING_ARMOR_LOW + armor_energy = CLOTHING_ARMOR_LOW + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW + storage_slots = 2 + slowdown = SLOWDOWN_ARMOR_LIGHT + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + allowed = list( + /obj/item/weapon/gun, + /obj/item/tank/emergency_oxygen, + /obj/item/device/flashlight, + /obj/item/ammo_magazine/, + /obj/item/storage/fancy/cigarettes, + /obj/item/tool/lighter, + /obj/item/weapon/baton, + /obj/item/handcuffs, + /obj/item/explosive/grenade, + /obj/item/device/binoculars, + /obj/item/attachable/bayonet, + /obj/item/storage/backpack/general_belt, + /obj/item/device/hailer, + /obj/item/storage/belt/gun, + /obj/item/weapon/sword/ceremonial, + /obj/item/device/motiondetector, + /obj/item/device/walkman, + ) + uniform_restricted = list(/obj/item/clothing/under/uaac/tis) + +//================//UNITED AMERICAS RIOT CONTROL\\=====================\\ +//=======================================================================\\ + +/obj/item/clothing/suit/storage/marine/veteran/ua_riot + name = "\improper UA-M1 body armor" + desc = "Based on the M-3 pattern employed by the USCM, the UA-M1 body armor is employed by UA security, riot control and union-busting teams. While robust against melee and bullet attacks, it critically lacks coverage of the legs and arms." + icon_state = "ua_riot" + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN + flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN + flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN + armor_melee = CLOTHING_ARMOR_MEDIUMHIGH + armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH + armor_energy = CLOTHING_ARMOR_MEDIUM + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + slowdown = SLOWDOWN_ARMOR_VERY_LIGHT // it's lighter + uniform_restricted = list(/obj/item/clothing/under/marine/ua_riot) + flags_atom = NO_SNOW_TYPE + +//================//=ROYAL MARINES=\\====================================\\ +//=======================================================================\\ + +/obj/item/clothing/suit/storage/marine/veteran/royal_marine + name = "kestrel armoured vest" + desc = "A customizable personal armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the USCMC's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines." + icon_state = "rmc_light" + item_state = "rmc_light" + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE + allowed = list( + /obj/item/weapon/gun, + /obj/item/tank/emergency_oxygen, + /obj/item/device/flashlight, + /obj/item/ammo_magazine/, + /obj/item/weapon/baton, + /obj/item/handcuffs, + /obj/item/storage/fancy/cigarettes, + /obj/item/tool/lighter, + /obj/item/explosive/grenade, + /obj/item/storage/bible, + /obj/item/weapon/sword/machete, + /obj/item/attachable/bayonet, + /obj/item/device/motiondetector, + /obj/item/device/walkman, + ) + +/obj/item/clothing/suit/storage/marine/veteran/royal_marine/light //RMC Rifleman Armor + icon_state = "rmc_light" + item_state = "rmc_light" + armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH + armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_MEDIUM + slowdown = SLOWDOWN_ARMOR_LIGHT + +/obj/item/clothing/suit/storage/marine/veteran/royal_marine/light/team_leader //RMC TL & LT Armor + name = "kestrel armoured carry vest" + icon_state = "rmc_light_padded" + item_state = "rmc_light_padded" + storage_slots = 7 + +/obj/item/clothing/suit/storage/marine/veteran/royal_marine/smartgun //Smartgun Spec Armor + name = "kestrel armoured smartgun harness" + icon_state = "rmc_smartgun" + item_state = "rmc_smartgun" + flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN|SMARTGUN_HARNESS + +/obj/item/clothing/suit/storage/marine/veteran/royal_marine/pointman //Pointman Spec Armor + name = "kestrel pointman armour" + desc = "A heavier version of the armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the USCMC's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines." + icon_state = "rmc_pointman" + item_state = "rmc_pointman" + armor_melee = CLOTHING_ARMOR_HIGH + armor_bullet = CLOTHING_ARMOR_HIGHPLUS + armor_bomb = CLOTHING_ARMOR_HIGHPLUS + armor_bio = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + storage_slots = 7 + slowdown = SLOWDOWN_ARMOR_LOWHEAVY + movement_compensation = SLOWDOWN_ARMOR_MEDIUM + +/atom/movable/marine_light + light_system = DIRECTIONAL_LIGHT + +//CBRN +/obj/item/clothing/suit/storage/marine/cbrn + name = "\improper M3-M armor" + desc = "While lacking the appearance of the M3 pattern armor worn in regular service, this armor piece is still a derivative of it. It has been heavily modified to fit over the MOPP suit with additional padding and Venlar composite layers removed, so as not to restrict the wearer’s movement. However, with the reduction of composite layers, the personal protection offered is less than desired with complaints having been lodged since 2165." + icon_state = "cbrn" + item_state = "cbrn" + slowdown = SLOWDOWN_ARMOR_HEAVY + armor_melee = CLOTHING_ARMOR_MEDIUM + armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_bio = CLOTHING_ARMOR_LOW + armor_rad =CLOTHING_ARMOR_MEDIUMLOW + armor_internaldamage = CLOTHING_ARMOR_LOW + flags_marine_armor = NO_FLAGS + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE + flags_inventory = BLOCKSHARPOBJ + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN + flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN + flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN + uniform_restricted = list(/obj/item/clothing/under/marine/cbrn) + +/obj/item/clothing/suit/storage/marine/cbrn/advanced + slowdown = SLOWDOWN_ARMOR_LOWHEAVY + armor_melee = CLOTHING_ARMOR_HIGH + armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH + armor_bomb = CLOTHING_ARMOR_ULTRAHIGH + armor_bio = CLOTHING_ARMOR_GIGAHIGHPLUS + armor_rad = CLOTHING_ARMOR_GIGAHIGHPLUS + armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS diff --git a/code/modules/clothing/suits/marine_armor/ghillie.dm b/code/modules/clothing/suits/marine_armor/ghillie.dm new file mode 100644 index 000000000000..1f1b71227655 --- /dev/null +++ b/code/modules/clothing/suits/marine_armor/ghillie.dm @@ -0,0 +1,162 @@ +#define FULL_CAMOUFLAGE_ALPHA 15 + +/obj/item/clothing/suit/storage/marine/ghillie + name = "\improper M45 pattern ghillie armor" + desc = "A lightweight ghillie camouflage suit, used by USCM snipers on recon missions. Very lightweight, but doesn't protect much." + icon_state = "ghillie_armor" + armor_bio = CLOTHING_ARMOR_MEDIUMHIGH + slowdown = SLOWDOWN_ARMOR_LIGHT + flags_marine_armor = ARMOR_LAMP_OVERLAY + flags_item = MOB_LOCK_ON_EQUIP + specialty = "M45 pattern ghillie" + valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_PONCHO) + restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND) + + var/camo_active = FALSE + var/hide_in_progress = FALSE + var/full_camo_alpha = FULL_CAMOUFLAGE_ALPHA + var/incremental_shooting_camo_penalty = 35 + var/current_camo = FULL_CAMOUFLAGE_ALPHA + var/camouflage_break = 5 SECONDS + var/camouflage_enter_delay = 4 SECONDS + var/can_camo = TRUE + + actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/specialist/prepare_position) + +/obj/item/clothing/suit/storage/marine/ghillie/dropped(mob/user) + if(ishuman(user) && !issynth(user)) + deactivate_camouflage(user, FALSE) + + . = ..() + +/obj/item/clothing/suit/storage/marine/ghillie/verb/camouflage() + set name = "Prepare Position" + set desc = "Use the ghillie suit and the nearby environment to become near invisible." + set category = "Object" + set src in usr + if(!usr || usr.is_mob_incapacitated(TRUE)) + return + + if(!ishuman(usr) || hide_in_progress || !can_camo) + return + var/mob/living/carbon/human/H = usr + if(!skillcheck(H, SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL) && H.skills.get_skill_level(SKILL_SPEC_WEAPONS) != SKILL_SPEC_SNIPER && !(GLOB.character_traits[/datum/character_trait/skills/spotter] in H.traits)) + to_chat(H, SPAN_WARNING("You don't seem to know how to use [src]...")) + return + if(H.wear_suit != src) + to_chat(H, SPAN_WARNING("You must be wearing the ghillie suit to activate it!")) + return + + if(camo_active) + deactivate_camouflage(H) + return + + H.visible_message(SPAN_DANGER("[H] goes prone, and begins adjusting \his ghillie suit!"), SPAN_NOTICE("You go prone, and begins adjusting your ghillie suit."), max_distance = 4) + hide_in_progress = TRUE + H.unset_interaction() // If we're sticking to a machine gun or what not. + if(!do_after(H, camouflage_enter_delay, INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) + hide_in_progress = FALSE + return + hide_in_progress = FALSE + RegisterSignal(H, list( + COMSIG_MOB_FIRED_GUN, + COMSIG_MOB_FIRED_GUN_ATTACHMENT) + , PROC_REF(fade_in)) + RegisterSignal(H, list( + COMSIG_MOB_DEATH, + COMSIG_HUMAN_EXTINGUISH + ), PROC_REF(deactivate_camouflage)) + camo_active = TRUE + H.alpha = full_camo_alpha + H.FF_hit_evade = 1000 + ADD_TRAIT(H, TRAIT_UNDENSE, SPECIALIST_GEAR_TRAIT) + + RegisterSignal(H, COMSIG_MOB_MOVE_OR_LOOK, PROC_REF(handle_mob_move_or_look)) + + var/datum/mob_hud/security/advanced/SA = GLOB.huds[MOB_HUD_SECURITY_ADVANCED] + SA.remove_from_hud(H) + var/datum/mob_hud/xeno_infection/XI = GLOB.huds[MOB_HUD_XENO_INFECTION] + XI.remove_from_hud(H) + + anim(H.loc, H, 'icons/mob/mob.dmi', null, "cloak", null, H.dir) + + +/obj/item/clothing/suit/storage/marine/ghillie/proc/deactivate_camouflage(mob/user) + SIGNAL_HANDLER + var/mob/living/carbon/human/H = user + if(!istype(H)) + return FALSE + + if(!camo_active) + return + + UnregisterSignal(H, list( + COMSIG_MOB_FIRED_GUN, + COMSIG_MOB_FIRED_GUN_ATTACHMENT, + COMSIG_MOB_DEATH, + COMSIG_HUMAN_EXTINGUISH, + COMSIG_MOB_MOVE_OR_LOOK + )) + + camo_active = FALSE + animate(H, alpha = initial(H.alpha), flags = ANIMATION_END_NOW) + H.FF_hit_evade = initial(H.FF_hit_evade) + REMOVE_TRAIT(H, TRAIT_UNDENSE, SPECIALIST_GEAR_TRAIT) + + var/datum/mob_hud/security/advanced/SA = GLOB.huds[MOB_HUD_SECURITY_ADVANCED] + SA.add_to_hud(H) + var/datum/mob_hud/xeno_infection/XI = GLOB.huds[MOB_HUD_XENO_INFECTION] + XI.add_to_hud(H) + + H.visible_message(SPAN_DANGER("[H]'s camouflage fails!"), SPAN_WARNING("Your camouflage fails!"), max_distance = 4) + +/obj/item/clothing/suit/storage/marine/ghillie/proc/fade_in(mob/user) + SIGNAL_HANDLER + var/mob/living/carbon/human/H = user + if(camo_active) + if(current_camo < full_camo_alpha) + current_camo = full_camo_alpha + current_camo = clamp(current_camo + incremental_shooting_camo_penalty, full_camo_alpha, 255) + H.alpha = current_camo + addtimer(CALLBACK(src, PROC_REF(fade_out_finish), H), camouflage_break, TIMER_OVERRIDE|TIMER_UNIQUE) + animate(H, alpha = full_camo_alpha + 5, time = camouflage_break, easing = LINEAR_EASING, flags = ANIMATION_END_NOW) + +/obj/item/clothing/suit/storage/marine/ghillie/proc/fade_out_finish(mob/living/carbon/human/H) + if(camo_active && H.wear_suit == src) + to_chat(H, SPAN_BOLDNOTICE("The smoke clears and your position is once again hidden completely!")) + animate(H, alpha = full_camo_alpha) + current_camo = full_camo_alpha + +/obj/item/clothing/suit/storage/marine/ghillie/proc/handle_mob_move_or_look(mob/living/mover, actually_moving, direction, specific_direction) + SIGNAL_HANDLER + + if(camo_active && actually_moving) + deactivate_camouflage(mover) + +/datum/action/item_action/specialist/prepare_position + ability_primacy = SPEC_PRIMARY_ACTION_1 + +/datum/action/item_action/specialist/prepare_position/New(mob/living/user, obj/item/holder) + ..() + name = "Prepare Position" + button.name = name + button.overlays.Cut() + var/image/IMG = image('icons/mob/hud/actions.dmi', button, "prepare_position") + button.overlays += IMG + +/datum/action/item_action/specialist/prepare_position/can_use_action() + var/mob/living/carbon/human/H = owner + if(istype(H) && !H.is_mob_incapacitated() && H.body_position == STANDING_UP && holder_item == H.wear_suit) + return TRUE + +/datum/action/item_action/specialist/prepare_position/action_activate() + var/obj/item/clothing/suit/storage/marine/ghillie/GS = holder_item + GS.camouflage() + +#undef FULL_CAMOUFLAGE_ALPHA + +/obj/item/clothing/suit/storage/marine/ghillie/forecon + name = "UDEP Thermal Poncho" + desc = "UDEP or the Ultra Diffusive Environmental Poncho is a camouflaged rain-cover worn to protect against the elements and chemical spills. It's commonly treated with an infrared absorbing coating, making a marine almost invisible in the rain. Favoured by USCM specialists for it's comfort and practicality." + icon_state = "mercenary_miner_armor" + flags_atom = MOB_LOCK_ON_EQUIP|NO_SNOW_TYPE|NO_NAME_OVERRIDE diff --git a/code/modules/clothing/suits/marine_armor/intel.dm b/code/modules/clothing/suits/marine_armor/intel.dm new file mode 100644 index 000000000000..b3f0f93e004d --- /dev/null +++ b/code/modules/clothing/suits/marine_armor/intel.dm @@ -0,0 +1,118 @@ +/obj/item/clothing/suit/storage/marine/medium/rto/intel + name = "\improper XM4 pattern intelligence officer armor" + uniform_restricted = list(/obj/item/clothing/under/marine/officer/intel) + specialty = "XM4 pattern intel" + desc = "Tougher than steel, quieter than whispers, the XM4 Intel Armor provides capable protection combined with an experimental integrated motion tracker. It took an R&D team a weekend to develop and costs more than the Chinook Station... probably. When worn, uniform accessories such as webbing cannot be attached due to the motion sensors occupying the clips." + desc_lore = "ARMAT Perfection. The XM4 Soldier Awareness System mixes M4-style hard armor and a distributed series of motion sensors clipped onto the breastplate. When connected to any HUD optic, it replicates the effects of an M314 Motion Detector unit, increasing user situational awareness. It is currently undergoing field trials by intelligence operatives." + storage_slots = 5 + /// XM4 Integral Motion Detector Ability + actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/intel/toggle_motion_detector) + var/motion_detector = FALSE + var/obj/item/device/motiondetector/xm4/proximity + var/long_range_cooldown = 2 + var/recycletime = 120 + +/obj/item/clothing/suit/storage/marine/medium/rto/intel/Initialize(mapload, ...) + . = ..() + proximity = new(src) + update_icon() + +/datum/action/item_action/intel/action_activate() + if(!ishuman(owner)) + return + +/datum/action/item_action/intel/update_button_icon() + return + +/datum/action/item_action/intel/toggle_motion_detector/New(Target, obj/item/holder) + . = ..() + name = "Toggle Motion Detector" + action_icon_state = "motion_detector" + button.name = name + button.overlays.Cut() + button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state) + +/datum/action/item_action/intel/toggle_motion_detector/action_activate() + . = ..() + var/obj/item/clothing/suit/storage/marine/medium/rto/intel/recon = holder_item + recon.toggle_motion_detector(owner) + +/datum/action/item_action/intel/toggle_motion_detector/proc/update_icon() + if(!holder_item) + return + var/obj/item/clothing/suit/storage/marine/medium/rto/intel/recon = holder_item + if(recon.motion_detector) + button.icon_state = "template_on" + else + button.icon_state = "template" + +/obj/item/clothing/suit/storage/marine/medium/rto/intel/process() + if(!motion_detector) + STOP_PROCESSING(SSobj, src) + if(motion_detector) + recycletime-- + if(!recycletime) + recycletime = initial(recycletime) + proximity.refresh_blip_pool() + long_range_cooldown-- + if(long_range_cooldown) + return + long_range_cooldown = initial(long_range_cooldown) + proximity.scan() + +/obj/item/clothing/suit/storage/marine/medium/rto/intel/proc/toggle_motion_detector(mob/user) + to_chat(user,SPAN_NOTICE("You [motion_detector? "disable" : "enable"] \the [src]'s motion detector.")) + if(!motion_detector) + playsound(loc,'sound/items/detector_turn_on.ogg', 25, 1) + else + playsound(loc,'sound/items/detector_turn_off.ogg', 25, 1) + motion_detector = !motion_detector + var/datum/action/item_action/intel/toggle_motion_detector/TMD = locate(/datum/action/item_action/intel/toggle_motion_detector) in actions + TMD.update_icon() + motion_detector() + +/obj/item/clothing/suit/storage/marine/medium/rto/intel/proc/motion_detector() + if(motion_detector) + START_PROCESSING(SSobj, src) + else + STOP_PROCESSING(SSobj, src) + +/obj/item/clothing/suit/storage/marine/medium/rto/intel/mob_can_equip(mob/living/carbon/human/user, slot, disable_warning) //Thanks to Drathek for the help on this part! + if(!..()) + return FALSE + + // Only equip if uniform doesn't already have a utility accessory slot equipped + var/obj/item/clothing/under/uniform = user.w_uniform + var/accessory = locate(/obj/item/clothing/accessory/storage) in uniform.accessories + if(accessory) + to_chat(user, SPAN_WARNING("[src] can't be worn with [accessory].")) + return FALSE + // Only equip if user has expert intel skill level + if(!skillcheck(user, SKILL_INTEL, SKILL_INTEL_EXPERT)) + to_chat(user, SPAN_WARNING("You don't seem to know how to use [src]...")) + return FALSE + return TRUE + +/obj/item/clothing/suit/storage/marine/medium/rto/intel/equipped(mob/user, slot, silent) //When XM4 is equipped this removes ACCESSORY_SLOT_UTILITY as a valid accessory for the uniform + . = ..() + if(slot == WEAR_JACKET) + var/mob/living/carbon/human/human = user + var/obj/item/clothing/under/uniform = human.w_uniform + if(uniform?.valid_accessory_slots) + uniform?.valid_accessory_slots -= ACCESSORY_SLOT_UTILITY + +/obj/item/clothing/suit/storage/marine/medium/rto/intel/unequipped(mob/user, slot) //When unequipped this adds the ACCESSORY_SLOT_UTILITY back as a valid accessory + . = ..() + if(slot == WEAR_JACKET) + var/mob/living/carbon/human/human = user + var/obj/item/clothing/under/uniform = human.w_uniform + if(uniform) + // Figure out if the uniform originally allowed ACCESSORY_SLOT_UTILITY + var/obj/item/clothing/under/temp_uniform = new uniform.type + if(temp_uniform.valid_accessory_slots) + for(var/allowed in temp_uniform.valid_accessory_slots) + if(allowed == ACCESSORY_SLOT_UTILITY) + // It was allowed previously, now add it back + uniform.valid_accessory_slots += ACCESSORY_SLOT_UTILITY + break + qdel(temp_uniform) diff --git a/code/modules/clothing/suits/marine_armor/smartgunner.dm b/code/modules/clothing/suits/marine_armor/smartgunner.dm new file mode 100644 index 000000000000..430942fbbef8 --- /dev/null +++ b/code/modules/clothing/suits/marine_armor/smartgunner.dm @@ -0,0 +1,60 @@ +/obj/item/clothing/suit/storage/marine/smartgunner + name = "\improper M56 combat harness" + desc = "A heavy protective vest designed to be worn with the M56 Smartgun System. \nIt has specially designed straps and reinforcement to carry the Smartgun and accessories." + icon_state = "8" + item_state = "armor" + armor_laser = CLOTHING_ARMOR_LOW + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_MEDIUM + storage_slots = 2 + slowdown = SLOWDOWN_ARMOR_LIGHT + flags_inventory = BLOCKSHARPOBJ|SMARTGUN_HARNESS + allowed = list( + /obj/item/tank/emergency_oxygen, + /obj/item/device/flashlight, + /obj/item/ammo_magazine, + /obj/item/explosive/mine, + /obj/item/attachable/bayonet, + /obj/item/weapon/gun/smartgun, + /obj/item/storage/backpack/general_belt, + /obj/item/device/motiondetector, + /obj/item/device/walkman, + ) + +/obj/item/clothing/suit/storage/marine/smartgunner/Initialize() + . = ..() + if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD] && name == "M56 combat harness") + name = "M56 snow combat harness" + else + name = "M56 combat harness" + //select_gamemode_skin(type) + +/obj/item/clothing/suit/storage/marine/smartgunner/mob_can_equip(mob/equipping_mob, slot, disable_warning = FALSE) + . = ..() + + if(equipping_mob.back) + to_chat(equipping_mob, SPAN_WARNING("You can't equip [src] while wearing a backpack.")) + return FALSE + +/obj/item/clothing/suit/storage/marine/smartgunner/equipped(mob/user, slot, silent) + . = ..() + + if(slot == WEAR_JACKET) + RegisterSignal(user, COMSIG_HUMAN_ATTEMPTING_EQUIP, PROC_REF(check_equipping)) + +/obj/item/clothing/suit/storage/marine/smartgunner/proc/check_equipping(mob/living/carbon/human/equipping_human, obj/item/equipping_item, slot) + SIGNAL_HANDLER + + if(slot != WEAR_BACK) + return + + . = COMPONENT_HUMAN_CANCEL_ATTEMPT_EQUIP + + if(equipping_item.flags_equip_slot == SLOT_BACK) + to_chat(equipping_human, SPAN_WARNING("You can't equip [equipping_item] on your back while wearing [src].")) + return + +/obj/item/clothing/suit/storage/marine/smartgunner/unequipped(mob/user, slot) + . = ..() + + UnregisterSignal(user, COMSIG_HUMAN_ATTEMPTING_EQUIP) diff --git a/code/modules/clothing/suits/marine_armor/spec_fire.dm b/code/modules/clothing/suits/marine_armor/spec_fire.dm new file mode 100644 index 000000000000..4d577cc98b15 --- /dev/null +++ b/code/modules/clothing/suits/marine_armor/spec_fire.dm @@ -0,0 +1,150 @@ +#define FIRE_SHIELD_CD 150 + +/obj/item/clothing/suit/storage/marine/M35 + name = "\improper M35 pyrotechnician armor" + desc = "A custom set of M35 armor designed for use by USCM Pyrotechnicians." + icon_state = "pyro_armor" + armor_bio = CLOTHING_ARMOR_MEDIUMHIGH + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + fire_intensity_resistance = BURN_LEVEL_TIER_1 + 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 + flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE + specialty = "M35 pyrotechnician" + actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/specialist/fire_shield) + unacidable = TRUE + var/fire_shield_on = FALSE + var/can_activate = TRUE + +/obj/item/clothing/suit/storage/marine/M35/equipped(mob/user, slot) + if(slot == WEAR_JACKET) + RegisterSignal(user, COMSIG_LIVING_FLAMER_CROSSED, PROC_REF(flamer_fire_callback)) + ..() + +/obj/item/clothing/suit/storage/marine/M35/verb/fire_shield() + set name = "Activate Fire Shield" + set desc = "Activate your armor's FIREWALK protocol for a short duration." + set category = "Pyro" + set src in usr + if(!usr || usr.is_mob_incapacitated(TRUE)) + return + if(!ishuman(usr)) + return + var/mob/living/carbon/human/H = usr + + if(H.wear_suit != src) + to_chat(H, SPAN_WARNING("You must be wearing the M35 pyro armor to activate FIREWALK protocol!")) + return + + if(!skillcheck(H, SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL) && H.skills.get_skill_level(SKILL_SPEC_WEAPONS) != SKILL_SPEC_PYRO) + to_chat(H, SPAN_WARNING("You don't seem to know how to use [src]...")) + return + + if(fire_shield_on) + to_chat(H, SPAN_WARNING("You already have FIREWALK protocol activated!")) + return + + if(!can_activate) + to_chat(H, SPAN_WARNING("FIREWALK protocol was recently activated, wait before trying to activate it again.")) + return + + to_chat(H, SPAN_NOTICE("FIREWALK protocol has been activated. You will now be immune to fire for 6 seconds!")) + RegisterSignal(H, COMSIG_LIVING_PREIGNITION, PROC_REF(fire_shield_is_on)) + RegisterSignal(H, list( + COMSIG_LIVING_FLAMER_FLAMED, + ), PROC_REF(flamer_fire_callback)) + fire_shield_on = TRUE + can_activate = FALSE + for(var/X in actions) + var/datum/action/A = X + A.update_button_icon() + addtimer(CALLBACK(src, PROC_REF(end_fire_shield), H), 6 SECONDS) + + H.add_filter("firewalk_on", 1, list("type" = "outline", "color" = "#03fcc6", "size" = 1)) + +/obj/item/clothing/suit/storage/marine/M35/proc/end_fire_shield(mob/living/carbon/human/user) + if(!istype(user)) + return + to_chat(user, SPAN_NOTICE("FIREWALK protocol has finished.")) + UnregisterSignal(user, list( + COMSIG_LIVING_PREIGNITION, + COMSIG_LIVING_FLAMER_FLAMED, + )) + fire_shield_on = FALSE + + user.remove_filter("firewalk_on") + + addtimer(CALLBACK(src, PROC_REF(enable_fire_shield), user), FIRE_SHIELD_CD) + +/obj/item/clothing/suit/storage/marine/M35/proc/enable_fire_shield(mob/living/carbon/human/user) + if(!istype(user)) + return + to_chat(user, SPAN_NOTICE("FIREWALK protocol can be activated again.")) + can_activate = TRUE + + for(var/X in actions) + var/datum/action/A = X + A.update_button_icon() + +/// This proc is solely so that IgniteMob() fails +/obj/item/clothing/suit/storage/marine/M35/proc/fire_shield_is_on(mob/living/L) + SIGNAL_HANDLER + + if(L.fire_reagent?.fire_penetrating) + return + + return COMPONENT_CANCEL_IGNITION + +/obj/item/clothing/suit/storage/marine/M35/proc/flamer_fire_callback(mob/living/L, datum/reagent/R) + SIGNAL_HANDLER + + if(R.fire_penetrating) + return + + . = COMPONENT_NO_IGNITE + if(fire_shield_on) + . |= COMPONENT_NO_BURN + +/obj/item/clothing/suit/storage/marine/M35/dropped(mob/user) + if (!istype(user)) + return + UnregisterSignal(user, list( + COMSIG_LIVING_PREIGNITION, + COMSIG_LIVING_FLAMER_CROSSED, + COMSIG_LIVING_FLAMER_FLAMED, + )) + ..() + +#undef FIRE_SHIELD_CD + +/datum/action/item_action/specialist/fire_shield + ability_primacy = SPEC_PRIMARY_ACTION_2 + +/datum/action/item_action/specialist/fire_shield/New(mob/living/user, obj/item/holder) + ..() + name = "Activate Fire Shield" + button.name = name + button.overlays.Cut() + var/image/IMG = image('icons/obj/items/clothing/cm_suits.dmi', button, "pyro_armor") + button.overlays += IMG + +/datum/action/item_action/specialist/fire_shield/action_cooldown_check() + var/obj/item/clothing/suit/storage/marine/M35/armor = holder_item + if (!istype(armor)) + return FALSE + + return !armor.can_activate + +/datum/action/item_action/specialist/fire_shield/can_use_action() + var/mob/living/carbon/human/H = owner + if(istype(H) && !H.is_mob_incapacitated() && H.wear_suit == holder_item) + return TRUE + +/datum/action/item_action/specialist/fire_shield/action_activate() + var/obj/item/clothing/suit/storage/marine/M35/armor = holder_item + if (!istype(armor)) + return + + armor.fire_shield() diff --git a/code/modules/clothing/suits/marine_coat.dm b/code/modules/clothing/suits/marine_coat.dm index 49569ec1295d..2dd93eb66aee 100644 --- a/code/modules/clothing/suits/marine_coat.dm +++ b/code/modules/clothing/suits/marine_coat.dm @@ -278,15 +278,29 @@ icon_state = "o_jacket" item_state = "o_jacket" -//==================War Correspondent==================\\ +//==================Combat Correspondent==================\\ /obj/item/clothing/suit/storage/jacket/marine/reporter name = "combat correspondent jacket" desc = "A jacket for the most fashionable war correspondents." - icon = 'icons/mob/humans/onmob/contained/war_correspondent.dmi' - icon_state = "wc_suit" - item_state = "wc_suit" - contained_sprite = TRUE + icon_state = "cc_brown" + item_state = "cc_brown" + flags_atom = NO_SNOW_TYPE + has_buttons = FALSE + +/obj/item/clothing/suit/storage/jacket/marine/reporter/green + icon_state = "cc_green" + item_state = "cc_green" + + +/obj/item/clothing/suit/storage/jacket/marine/reporter/black + icon_state = "cc_black" + item_state = "cc_black" + +/obj/item/clothing/suit/storage/jacket/marine/reporter/blue + icon_state = "cc_blue" + item_state = "cc_blue" + //==================Corporate Liaison==================\\ diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index b5859bb6f2d4..54148d4f7076 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -143,8 +143,8 @@ valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL) /obj/item/clothing/suit/storage/apron/overalls - name = "coveralls" - desc = "A set of denim overalls." + name = "blue coveralls" + desc = "A pair of denim overalls. With a large pocket in the front these overalls are popular with workers of all kinds." icon_state = "overalls" item_state = "overalls" flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS @@ -167,6 +167,18 @@ ) valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL) +/obj/item/clothing/suit/storage/apron/overalls/tan + name = "tan coveralls" + desc = "A pair of tan overalls. With a large pocket in the front these overalls are popular with workers of all kinds." + icon_state = "overalls_tan" + item_state = "overalls_tan" + +/obj/item/clothing/suit/storage/apron/overalls/red + name = "red coveralls" + desc = "A pair of reddish-brown overalls. With a large pocket in the front these overalls are popular with workers of all kinds." + icon_state = "overalls_red" + item_state = "overalls_red" + /obj/item/clothing/suit/syndicatefake name = "red space suit replica" icon_state = "syndicate" diff --git a/code/modules/clothing/under/gimmick.dm b/code/modules/clothing/under/gimmick.dm index d8e0a16fc7a2..793bc0593735 100644 --- a/code/modules/clothing/under/gimmick.dm +++ b/code/modules/clothing/under/gimmick.dm @@ -11,6 +11,10 @@ has_sensor = UNIFORM_NO_SENSORS displays_id = 0 + item_icons = list( + WEAR_BODY = 'icons/mob/humans/onmob/uniform_1.dmi', + ) + //JASON /obj/item/clothing/under/gimmick/jason name = "dirty work attire" diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index d09b1984420e..4f0c06273d9e 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -692,6 +692,40 @@ has_sensor = UNIFORM_HAS_SENSORS sensor_faction = FACTION_COLONIST +/obj/item/clothing/under/colonist/workwear + name = "grey workwear" + desc = "A pair of black slacks and a short-sleeve grey workshirt. Standard uniform for Weyland Yutani employees working in colony operations and administration." + icon_state = "workwear_grey" + worn_state = "workwear_grey" + +/obj/item/clothing/under/colonist/workwear/khaki + name = "khaki workwear" + desc = "A pair of jeans paired with a khaki workshirt. A common pairing among blue-collar workers due to its drab look." + icon_state = "workwear_khaki" + worn_state = "workwear_khaki" + flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE + +/obj/item/clothing/under/colonist/workwear/pink + name = "pink workwear" + desc = "A pair of jeans paired with a pink workshirt. Pink? Your wife might not think so, but such outlandish attire deserves questioning by corporate security. What are you, some kind of free-thinking anarchist?" + icon_state = "workwear_pink" + worn_state = "workwear_pink" + flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE + +/obj/item/clothing/under/colonist/workwear/blue + name = "blue workwear" + desc = "A pair of brown canvas workpants paired with a dark blue workshirt. A common pairing among blue-collar workers." + icon_state = "workwear_blue" + worn_state = "workwear_blue" + flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE + +/obj/item/clothing/under/colonist/workwear/green + name = "green workwear" + desc = "A pair of brown canvas workpants paired with a green workshirt. An common pairing among blue-collar workers." + icon_state = "workwear_green" + worn_state = "workwear_green" + flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE + /obj/item/clothing/under/colonist/clf name = "\improper Colonial Liberation Front uniform" desc = "A stylish grey-green jumpsuit - standard issue for colonists. This version appears to have the symbol of the Colonial Liberation Front emblazoned in select areas." @@ -735,6 +769,7 @@ displays_id = FALSE has_sensor = UNIFORM_HAS_SENSORS sensor_faction = FACTION_MARINE + /obj/item/clothing/under/tshirt/gray_blu name = "gray T-shirt and jeans" desc = "A comfortable gray T-shirt and blue jeans." @@ -755,7 +790,7 @@ /obj/item/clothing/under/CM_uniform name = "\improper Colonial Marshal uniform" - desc = "A blue shirt and tan trousers - the official uniform for a Colonial Marshal." + desc = "A pair of off-white slacks and a blue button-down shirt with a dark brown tie; the standard uniform of the Colonial Marshals." icon_state = "marshal" worn_state = "marshal" armor_melee = CLOTHING_ARMOR_LOW @@ -766,7 +801,7 @@ armor_bio = CLOTHING_ARMOR_NONE armor_rad = CLOTHING_ARMOR_NONE armor_internaldamage = CLOTHING_ARMOR_LOW - + flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE /obj/item/clothing/under/liaison_suit name = "liaison's tan suit" @@ -847,11 +882,24 @@ /obj/item/clothing/under/marine/reporter name = "combat correspondent uniform" desc = "A relaxed and robust uniform fit for any potential reporting needs." - icon = 'icons/mob/humans/onmob/contained/war_correspondent.dmi' - icon_state = "wc_uniform" - worn_state = "wc_uniform" - contained_sprite = TRUE - flags_atom = NO_NAME_OVERRIDE + icon_state = "cc_white" + worn_state = "cc_white" + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + item_icons = list( + WEAR_BODY = 'icons/mob/humans/onmob/uniform_1.dmi', + ) + +/obj/item/clothing/under/marine/reporter/black + icon_state = "cc_black" + worn_state = "cc_black" + +/obj/item/clothing/under/marine/reporter/orange + icon_state = "cc_orange" + worn_state = "cc_orange" + +/obj/item/clothing/under/marine/reporter/red + icon_state = "cc_red" + worn_state = "cc_red" /obj/item/clothing/under/twe_suit name = "representative's fine suit" @@ -988,7 +1036,7 @@ /obj/item/clothing/under/marine/cbrn //CBRN MOPP suit name = "\improper M3 MOPP suit" - desc = "M3 MOPP suits are specially designed and engineered to protect the wearer from unshielded exposure to any Chemical, Biological, Radiological, or Nuclear (CBRN) threats in the field. Despite somewhat resembling commonplace synthetic rubber HAZMAT suits, the Venlar composition provides a significantly more dense and durable baseline material, allowing for modifications without the loss of its air-tight nature. The wearer’s comfort has been significantly taken into consideration, with the suit providing sufficient freedom of movement for even delicate maneuvers and movements once it is donned. As the sealed environment retains many issues from the past, measures have been taken to significantly reduce the suit's passive heat absorption and increase internal absorbance through linings, as well as the capability to fully integrate with external cooling, air cycling, and other life support systems. Strips of M11 detector paper are included with each suit, designed to be slotted into the dominant arm of the wearer’s protective suit, the non-dominant wrist, and then back to the knee, providing at-a-glance warning signs across alternating sides of the body while working. The arm and knee markers are intended to be on the user's dominant The papers change color upon contact with harmful chemical agents, displaying a clear white initially and turning red when activated. The suit has a recommended lifespan of twenty-four hours once contact with a toxic environment is made, but depending on the severity this can be shortened to eight hours or less. Beyond that point, the accuracy of the detector papers deteriorates significantly, as does the protection of the suit itself." + desc = "M3 MOPP suits are specially designed and engineered to protect the wearer from unshielded exposure to any Chemical, Biological, Radiological, or Nuclear (CBRN) threats in the field. The suit has a recommended lifespan of twenty-four hours once contact with a toxic environment is made, but depending on the severity this can be shortened to eight hours or less." desc_lore = "Since the outbreak of the New Earth Plague in 2157 and the subsequent Interstellar Commerce Commission (ICC) sanctioned decontamination of the colony and its 40 million inhabitants, the abandoned colony has been left under a strict quarantine blockade to prevent any potential scavengers from spreading what’s left of the highly-durable airborne flesh-eating bacteria. Following those events, the three major superpowers have been investing heavily in the development and procurement of CBRN equipment, in no small part due to the extensive damage that the plague and other similar bioweapons could do. The \"Marine 70\" upgrade package and the launch of the M3 pattern armor series saw the first M3-M prototypes approved for CBRN usage." flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE icon_state = "cbrn" diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm index 1f27df25fc52..c014fbf9c211 100644 --- a/code/modules/cm_aliens/XenoStructures.dm +++ b/code/modules/cm_aliens/XenoStructures.dm @@ -94,7 +94,12 @@ else playsound(loc, "alien_resin_break", 25) - health -= (M.melee_damage_upper + 50) //Beef up the damage a bit + var/damage_to_structure = M.melee_damage_upper + XENO_DAMAGE_TIER_7 + // Builders can destroy beefy things in maximum 5 hits + if(isxeno_builder(M)) + health -= max(initial(health) * 0.2, damage_to_structure) + else + health -= damage_to_structure healthcheck() return XENO_ATTACK_ACTION @@ -573,6 +578,9 @@ if(current_mob.stat == DEAD) return FALSE + if(HAS_TRAIT(current_mob, TRAIT_NESTED)) + return FALSE + var/turf/current_turf var/turf/last_turf = loc var/atom/temp_atom = new acid_type() diff --git a/code/modules/cm_aliens/structures/trap.dm b/code/modules/cm_aliens/structures/trap.dm index e4b021e98f46..297dd5ff2e0f 100644 --- a/code/modules/cm_aliens/structures/trap.dm +++ b/code/modules/cm_aliens/structures/trap.dm @@ -4,7 +4,7 @@ /obj/effect/alien/resin/trap desc = "It looks like a hiding hole." - name = "resin hole" + name = "resin trap" icon_state = "trap0" density = FALSE opacity = FALSE @@ -12,7 +12,7 @@ health = 5 layer = RESIN_STRUCTURE_LAYER var/list/tripwires = list() - var/hivenumber = XENO_HIVE_NORMAL //Hivenumber of the xeno that planted it OR the last Facehugger that was placed (essentially taking over the hole) + var/hivenumber = XENO_HIVE_NORMAL //Hivenumber of the xeno that planted it OR the last Facehugger that was placed (essentially taking over the trap) var/trap_type = RESIN_TRAP_EMPTY var/armed = 0 var/created_by // ckey @@ -247,7 +247,7 @@ to_chat(B, SPAN_XENOWARNING("You must produce more plasma before doing this.")) return XENO_NO_DELAY_ACTION - to_chat(X, SPAN_XENONOTICE("You begin charging the resin hole with acid gas.")) + to_chat(X, SPAN_XENONOTICE("You begin charging the resin trap with acid gas.")) xeno_attack_delay(X) if(!do_after(B, 30, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, src)) return XENO_NO_DELAY_ACTION @@ -268,8 +268,8 @@ playsound(loc, 'sound/effects/refill.ogg', 25, 1) set_state(RESIN_TRAP_GAS) cause_data = create_cause_data("resin gas trap", B) - B.visible_message(SPAN_XENOWARNING("\The [B] pressurises the resin hole with acid gas!"), \ - SPAN_XENOWARNING("You pressurise the resin hole with acid gas!"), null, 5) + B.visible_message(SPAN_XENOWARNING("\The [B] pressurises the resin trap with acid gas!"), \ + SPAN_XENOWARNING("You pressurise the resin trap with acid gas!"), null, 5) else //Non-boiler acid types var/acid_cost = 70 @@ -282,7 +282,7 @@ to_chat(X, SPAN_XENOWARNING("You must produce more plasma before doing this.")) return XENO_NO_DELAY_ACTION - to_chat(X, SPAN_XENONOTICE("You begin charging the resin hole with acid.")) + to_chat(X, SPAN_XENONOTICE("You begin charging the resin trap with acid.")) xeno_attack_delay(X) if(!do_after(X, 3 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, src)) return XENO_NO_DELAY_ACTION @@ -300,8 +300,8 @@ else set_state(RESIN_TRAP_ACID1 + X.acid_level - 1) - X.visible_message(SPAN_XENOWARNING("\The [X] pressurises the resin hole with acid!"), \ - SPAN_XENOWARNING("You pressurise the resin hole with acid!"), null, 5) + X.visible_message(SPAN_XENOWARNING("\The [X] pressurises the resin trap with acid!"), \ + SPAN_XENOWARNING("You pressurise the resin trap with acid!"), null, 5) return XENO_NO_DELAY_ACTION @@ -310,15 +310,15 @@ for(var/turf/T in orange(1,loc)) if(T.density) continue - var/obj/effect/hole_tripwire/HT = new /obj/effect/hole_tripwire(T) - HT.linked_trap = src - tripwires += HT + var/obj/effect/trap_tripwire/new_tripwire = new /obj/effect/trap_tripwire(T) + new_tripwire.linked_trap = src + tripwires += new_tripwire /obj/effect/alien/resin/trap/attackby(obj/item/W, mob/user) if(!(istype(W, /obj/item/clothing/mask/facehugger) && isxeno(user))) return ..() if(trap_type != RESIN_TRAP_EMPTY) - to_chat(user, SPAN_XENOWARNING("You can't put a hugger in this hole!")) + to_chat(user, SPAN_XENOWARNING("You can't put a hugger in this trap!")) return var/obj/item/clothing/mask/facehugger/FH = W if(FH.stat == DEAD) @@ -329,7 +329,7 @@ return if (X.hivenumber != hivenumber) - to_chat(user, SPAN_XENOWARNING("This resin hole doesn't belong to your hive!")) + to_chat(user, SPAN_XENOWARNING("This resin trap doesn't belong to your hive!")) return if (FH.hivenumber != hivenumber) @@ -343,31 +343,34 @@ to_chat(user, SPAN_XENONOTICE("You place a facehugger in [src].")) qdel(FH) +/obj/effect/alien/resin/trap/healthcheck() + if(trap_type != RESIN_TRAP_EMPTY && loc) + trigger_trap() + ..() + /obj/effect/alien/resin/trap/Crossed(atom/A) if(ismob(A) || isVehicleMultitile(A)) HasProximity(A) /obj/effect/alien/resin/trap/Destroy() - if(trap_type != RESIN_TRAP_EMPTY && loc) - trigger_trap() QDEL_NULL_LIST(tripwires) . = ..() -/obj/effect/hole_tripwire - name = "hole tripwire" +/obj/effect/trap_tripwire + name = "trap tripwire" anchored = TRUE mouse_opacity = MOUSE_OPACITY_TRANSPARENT invisibility = 101 unacidable = TRUE //You never know var/obj/effect/alien/resin/trap/linked_trap -/obj/effect/hole_tripwire/Destroy() +/obj/effect/trap_tripwire/Destroy() if(linked_trap) linked_trap.tripwires -= src linked_trap = null . = ..() -/obj/effect/hole_tripwire/Crossed(atom/A) +/obj/effect/trap_tripwire/Crossed(atom/A) if(!linked_trap) qdel(src) return diff --git a/code/modules/cm_aliens/weeds.dm b/code/modules/cm_aliens/weeds.dm index 5298e7ab02f1..d614d87bf9b9 100644 --- a/code/modules/cm_aliens/weeds.dm +++ b/code/modules/cm_aliens/weeds.dm @@ -123,7 +123,7 @@ update_icon() /obj/effect/alien/weeds/node/weak - name = "weak resin node" + name = "weak weed node" health = WEED_HEALTH_STANDARD alpha = 127 @@ -469,7 +469,7 @@ /obj/effect/alien/weeds/node - name = "resin node" + name = "weed node" desc = "A weird, pulsating node." icon_state = "weednode" // Weed nodes start out with normal weed health and become stronger once they've stopped spreading diff --git a/code/modules/cm_marines/Donator_Items.dm b/code/modules/cm_marines/Donator_Items.dm index 17669b0157dc..e534997ddd42 100644 --- a/code/modules/cm_marines/Donator_Items.dm +++ b/code/modules/cm_marines/Donator_Items.dm @@ -972,8 +972,11 @@ icon_state = null item_state = null min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT - //DON'T GRAB STUFF BETWEEN THIS LINE - //AND THIS LINE + + item_icons = list( + WEAR_BODY = 'icons/mob/humans/onmob/uniform_1.dmi', + ) + //END UNIFORM TEMPLATE /obj/item/clothing/under/marine/fluff/marinemedic //UNUSED diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm index 19086b36c957..93768e218375 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -427,7 +427,7 @@ max_ammo_count = 1 ammo_name = "area denial sentry" travelling_time = 0 // handled by droppod - point_cost = 800 + point_cost = 800 //handled by printer accuracy_range = 0 // pinpoint max_inaccuracy = 0 /// Special structures it needs to break with drop pod diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index b162fb7c6a87..bd40076ea500 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -21,6 +21,7 @@ var/skill_required = SKILL_PILOT_TRAINED var/combat_equipment = TRUE + /obj/structure/dropship_equipment/Destroy() QDEL_NULL(ammo_equipped) if(linked_shuttle) @@ -35,6 +36,7 @@ linked_console = null . = ..() + /obj/structure/dropship_equipment/attack_alien(mob/living/carbon/xenomorph/current_xenomorph) if(unslashable) return XENO_NO_DELAY_ACTION diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm index 0cf097cb9b4c..22999e97fda2 100644 --- a/code/modules/cm_marines/equipment/guncases.dm +++ b/code/modules/cm_marines/equipment/guncases.dm @@ -348,6 +348,30 @@ new /obj/item/device/vulture_spotter_scope/skillless(src, WEAKREF(rifle)) new /obj/item/tool/screwdriver(src) // Spotter scope needs a screwdriver to disassemble +/obj/item/storage/box/guncase/vulture/holo_target + name = "\improper M707 holo-targetting anti-materiel rifle case" + desc = "A gun case containing the M707 \"Vulture\" anti-materiel rifle and its requisite spotting tools. This variant is pre-loaded with IFF-CAPABLE holo-targeting rounds." + +/obj/item/storage/box/guncase/vulture/holo_target/fill_preset_inventory() + var/obj/item/weapon/gun/boltaction/vulture/holo_target/rifle = new(src) + new /obj/item/ammo_magazine/rifle/boltaction/vulture/holo_target(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) + new /obj/item/pamphlet/trait/vulture(src) + new /obj/item/pamphlet/trait/vulture(src) + +/obj/item/storage/box/guncase/vulture/holo_target/skillless + storage_slots = 5 + +/obj/item/storage/box/guncase/vulture/holo_target/skillless/fill_preset_inventory() + var/obj/item/weapon/gun/boltaction/vulture/holo_target/skillless/rifle = new(src) + new /obj/item/ammo_magazine/rifle/boltaction/vulture/holo_target(src) + new /obj/item/device/vulture_spotter_tripod(src) + new /obj/item/device/vulture_spotter_scope/skillless(src, WEAKREF(rifle)) + new /obj/item/tool/screwdriver(src) + + /obj/item/storage/box/guncase/xm51 name = "\improper XM51 breaching scattergun case" desc = "A gun case containing the XM51 Breaching Scattergun. Comes with two spare magazines, two spare shell boxes, an optional stock and a belt to holster the weapon." diff --git a/code/modules/cm_marines/vehicle_part_fabricator.dm b/code/modules/cm_marines/vehicle_part_fabricator.dm index 0095ff54a2ab..fd9b0faafa61 100644 --- a/code/modules/cm_marines/vehicle_part_fabricator.dm +++ b/code/modules/cm_marines/vehicle_part_fabricator.dm @@ -10,8 +10,8 @@ icon_state = "drone_fab_idle" var/busy = FALSE var/generate_points = TRUE - var/valid_parts = null - var/valid_ammo = null + var/omnisentry_price_scale = 100 + var/omnisentry_price = 300 /obj/structure/machinery/part_fabricator/New() ..() @@ -28,7 +28,8 @@ /obj/structure/machinery/part_fabricator/dropship/ui_data(mob/user) return list( - "points" = get_point_store() + "points" = get_point_store(), + "omnisentrygun_price" = omnisentry_price ) /obj/structure/machinery/part_fabricator/power_change() @@ -53,11 +54,15 @@ /obj/structure/machinery/part_fabricator/proc/build_part(part_type, cost, mob/user) set waitfor = 0 if(stat & NOPOWER) return + if(ispath(part_type,/obj/structure/ship_ammo/sentry)) + cost = omnisentry_price if(get_point_store() < cost) to_chat(user, SPAN_WARNING("You don't have enough points to build that.")) return visible_message(SPAN_NOTICE("[src] starts printing something.")) spend_point_store(cost) + if(ispath(part_type,/obj/structure/ship_ammo/sentry)) + omnisentry_price += omnisentry_price_scale icon_state = "drone_fab_active" busy = TRUE addtimer(CALLBACK(src, PROC_REF(do_build_part), part_type), 10 SECONDS) @@ -68,7 +73,7 @@ new part_type(get_step(src, SOUTHEAST)) icon_state = "drone_fab_idle" -/obj/structure/machinery/part_fabricator/ui_act(action, params) +/obj/structure/machinery/part_fabricator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return @@ -77,27 +82,33 @@ to_chat(usr, SPAN_WARNING("The [name] is busy. Please wait for completion of previous operation.")) return - if(action == "produce") - var/produce = text2path(params["path"]) - var/cost = text2num(params["cost"]) - var/exploiting = TRUE - - if (valid_parts && ispath(produce, valid_parts)) - exploiting = FALSE - else if (valid_ammo && ispath(produce, valid_ammo)) - exploiting = FALSE + var/mob/user = ui.user - if (cost < 0) - exploiting = TRUE + if(action == "produce") + var/cost = 0 + var/is_ammo = params["is_ammo"] + var/index = params["index"] + + if(is_ammo == 0) + var/obj/structure/dropship_equipment/produce = (typesof(/obj/structure/dropship_equipment))[index] + if(SSticker.mode && MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_COMBAT_CAS) && produce.combat_equipment) + log_admin("Bad topic: [user] may be trying to HREF exploit [src] to bypass no combat cas") + return + cost = initial(produce.point_cost) + build_part(produce, cost, user) + return - if (exploiting) - log_admin("Bad topic: [usr] may be trying to HREF exploit [src] with [produce], [cost]") + else + var/obj/structure/ship_ammo/produce = (typesof(/obj/structure/ship_ammo))[index] + if(SSticker.mode && MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_COMBAT_CAS) && produce.combat_equipment) + log_admin("Bad topic: [user] may be trying to HREF exploit [src] to bypass no combat cas") + return + cost = initial(produce.point_cost) + build_part(produce, cost, user) return - build_part(produce, cost, usr) - return else - log_admin("Bad topic: [usr] may be trying to HREF exploit [src]") + log_admin("Bad topic: [user] may be trying to HREF exploit [src]") return /obj/structure/machinery/part_fabricator/attack_hand(mob/user) @@ -116,12 +127,11 @@ name = "dropship part fabricator" desc = "A large automated 3D printer for producing dropship parts. You can recycle parts or ammo in it, and get 80% of your points back, by clicking it while holding them in a powerloader claw." req_access = list(ACCESS_MARINE_DROPSHIP) - valid_parts = /obj/structure/dropship_equipment - valid_ammo = /obj/structure/ship_ammo unslashable = TRUE unacidable = TRUE + /obj/structure/machinery/part_fabricator/dropship/get_point_store() return GLOB.supply_controller.dropship_points @@ -134,86 +144,100 @@ /obj/structure/machinery/part_fabricator/dropship/ui_static_data(mob/user) var/list/static_data = list() static_data["Equipment"] = list() + var/is_ammo = 0 + var/index = 1 for(var/build_type in typesof(/obj/structure/dropship_equipment)) - var/obj/structure/dropship_equipment/DE = build_type - if(SSticker.mode && MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_COMBAT_CAS) && initial(DE.combat_equipment)) + var/obj/structure/dropship_equipment/dropship_equipment_data = build_type + if(SSticker.mode && MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_COMBAT_CAS) && dropship_equipment_data.combat_equipment) + index += 1 continue - var/build_name = initial(DE.name) - var/build_description = initial(DE.desc) - var/build_cost = initial(DE.point_cost) + var/build_name = initial(dropship_equipment_data.name) + var/build_description = initial(dropship_equipment_data.desc) + var/build_cost = initial(dropship_equipment_data.point_cost) if(build_cost) static_data["Equipment"] += list(list( "name" = capitalize_first_letters(build_name), "desc" = build_description, - "path" = build_type, - "cost" = build_cost + "cost" = build_cost, + "index" = index, + "is_ammo" = is_ammo )) + index += 1 static_data["Ammo"] = list() + is_ammo = 1 + index = 1 for(var/build_type in typesof(/obj/structure/ship_ammo)) - var/obj/structure/ship_ammo/SA = build_type - if(SSticker.mode && MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_COMBAT_CAS) && initial(SA.combat_equipment)) + var/obj/structure/ship_ammo/ship_ammo_data = build_type + if(SSticker.mode && MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_COMBAT_CAS) && ship_ammo_data.combat_equipment) + index = index + 1 continue - var/build_name = initial(SA.name) - var/build_description = initial(SA.desc) - var/build_cost = initial(SA.point_cost) + var/build_name = initial(ship_ammo_data.name) + var/build_description = initial(ship_ammo_data.desc) + var/build_cost = initial(ship_ammo_data.point_cost) if(build_cost) static_data["Ammo"] += list(list( "name" = capitalize_first_letters(build_name), "desc" = build_description, - "path" = build_type, - "cost" = build_cost + "cost" = build_cost, + "index" = index, + "is_ammo" = is_ammo )) + index += 1 return static_data /obj/structure/machinery/part_fabricator/dropship/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/powerloader_clamp)) - var/obj/item/powerloader_clamp/PC = I - recycle_equipment(PC, user) + var/obj/item/powerloader_clamp/powerloader_clamp_used = I + recycle_equipment(powerloader_clamp_used, user) return return ..() -/obj/structure/machinery/part_fabricator/dropship/proc/recycle_equipment(obj/item/powerloader_clamp/PC, mob/living/user) - if(!PC.loaded) - to_chat(user, SPAN_WARNING("There is nothing loaded in \the [PC].")) +/obj/structure/machinery/part_fabricator/dropship/proc/recycle_equipment(obj/item/powerloader_clamp/powerloader_clamp_used, mob/living/user) + if(!powerloader_clamp_used.loaded) + to_chat(user, SPAN_WARNING("There is nothing loaded in \the [powerloader_clamp_used].")) return var/recycle_points - if(istype(PC.loaded, /obj/structure/dropship_equipment)) - var/obj/structure/dropship_equipment/SE = PC.loaded - recycle_points = SE.point_cost - else if(istype(PC.loaded, /obj/structure/ship_ammo)) - var/obj/structure/ship_ammo/SE = PC.loaded - if(!SE.ammo_count) - to_chat(user, SPAN_WARNING("\The [SE] is empty!")) + if(istype(powerloader_clamp_used.loaded, /obj/structure/dropship_equipment)) + var/obj/structure/dropship_equipment/sold_eqipment = powerloader_clamp_used.loaded + recycle_points = sold_eqipment.point_cost + else if(istype(powerloader_clamp_used.loaded, /obj/structure/ship_ammo)) + var/obj/structure/ship_ammo/sold_eqipment = powerloader_clamp_used.loaded + if(!sold_eqipment.ammo_count) + to_chat(user, SPAN_WARNING("\The [sold_eqipment] is empty!")) return - if(SE.ammo_count != SE.max_ammo_count) - recycle_points = (SE.point_cost * (SE.ammo_count / SE.max_ammo_count)) - to_chat(user, SPAN_WARNING("\The [SE] is not fully loaded, and less points will be able to be refunded.")) + if(sold_eqipment.ammo_count != sold_eqipment.max_ammo_count) + recycle_points = (sold_eqipment.point_cost * (sold_eqipment.ammo_count / sold_eqipment.max_ammo_count)) + to_chat(user, SPAN_WARNING("\The [sold_eqipment] is not fully loaded, and less points will be able to be refunded.")) else - recycle_points = SE.point_cost + recycle_points = sold_eqipment.point_cost + if(istype(powerloader_clamp_used.loaded, /obj/structure/ship_ammo/sentry)) + recycle_points = omnisentry_price - omnisentry_price_scale if(!recycle_points) - to_chat(user, SPAN_WARNING("\The [PC.loaded] can't be recycled!")) + to_chat(user, SPAN_WARNING("\The [powerloader_clamp_used.loaded] can't be recycled!")) return - var/thing_to_recycle = PC.loaded - to_chat(user, SPAN_WARNING("You start recycling \the [PC.loaded]!")) + var/thing_to_recycle = powerloader_clamp_used.loaded + to_chat(user, SPAN_WARNING("You start recycling \the [powerloader_clamp_used.loaded]!")) playsound(loc, 'sound/machines/hydraulics_1.ogg', 40, 1) - if(!user || !do_after(user, (7 SECONDS) * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_HOSTILE, PC.loaded, INTERRUPT_ALL)) + if(!user || !do_after(user, (7 SECONDS) * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_HOSTILE, powerloader_clamp_used.loaded, INTERRUPT_ALL)) to_chat(user, SPAN_NOTICE("You stop recycling \the [thing_to_recycle].")) return - for(var/obj/thing as anything in PC.loaded) + if(istype(powerloader_clamp_used.loaded, /obj/structure/ship_ammo/sentry)) + omnisentry_price -= omnisentry_price_scale + for(var/obj/thing as anything in powerloader_clamp_used.loaded) thing.forceMove(loc) // no sentries popping out when we qdel please qdel(thing) - qdel(PC.loaded) - PC.loaded = null + qdel(powerloader_clamp_used.loaded) + powerloader_clamp_used.loaded = null to_chat(user, SPAN_NOTICE("You recycle \the [thing_to_recycle] into [src], and get back [round(recycle_points * 0.8)] points.")) msg_admin_niche("[key_name(user)] recycled a [thing_to_recycle] into \the [src] for [round(recycle_points * 0.8)] points.") add_to_point_store(round(recycle_points * 0.8)) playsound(loc, 'sound/machines/fax.ogg', 40, 1) - PC.update_icon() + powerloader_clamp_used.update_icon() // WARNING: IF YOU DECIDE TO READD THIS, GIVE THE HARDPOINTS POINT COSTS @@ -223,8 +247,6 @@ desc = "A large automated 3D printer for producing vehicle parts." req_access = list(ACCESS_MARINE_CREWMAN) generate_points = FALSE - valid_parts = /obj/item/hardpoint - valid_ammo = /obj/item/ammo_magazine/hardpoint unacidable = TRUE indestructible = TRUE @@ -242,9 +264,9 @@ var/list/static_data = list() static_data["Equipment"] = list() for(var/build_type in typesof(/obj/item/hardpoint)) - var/obj/item/hardpoint/TE = build_type - var/build_name = initial(TE.name) - var/build_description = initial(TE.desc) + var/obj/item/hardpoint/hardpoint_data = build_type + var/build_name = initial(hardpoint_data.name) + var/build_description = initial(hardpoint_data.desc) var/build_cost = 0 if(build_cost) static_data["Equipment"] += list(list( @@ -256,9 +278,9 @@ static_data["Ammo"] = list() for(var/build_type in typesof(/obj/item/ammo_magazine/hardpoint)) - var/obj/item/ammo_magazine/hardpoint/TA = build_type - var/build_name = initial(TA.name) - var/build_description = initial(TA.desc) + var/obj/item/ammo_magazine/hardpoint/ammo_data = build_type + var/build_name = initial(ammo_data.name) + var/build_description = initial(ammo_data.desc) var/build_cost = 0 if(build_cost) static_data["Ammo"] += list(list( diff --git a/code/modules/cm_preds/yaut_weapons.dm b/code/modules/cm_preds/yaut_weapons.dm index 9cb8a8bef3fc..34233f2ee9cd 100644 --- a/code/modules/cm_preds/yaut_weapons.dm +++ b/code/modules/cm_preds/yaut_weapons.dm @@ -938,7 +938,7 @@ /obj/item/weapon/gun/energy/yautja/plasmarifle/set_gun_config_values() ..() - set_fire_delay(FIRE_DELAY_TIER_6*2) + set_fire_delay(FIRE_DELAY_TIER_4*2) accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_10 accuracy_mult_unwielded = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_10 scatter = SCATTER_AMOUNT_TIER_6 diff --git a/code/modules/cm_tech/techs/marine/tier3/cryo_spec.dm b/code/modules/cm_tech/techs/marine/tier3/cryo_spec.dm index 16f0f26576a3..acee904af305 100644 --- a/code/modules/cm_tech/techs/marine/tier3/cryo_spec.dm +++ b/code/modules/cm_tech/techs/marine/tier3/cryo_spec.dm @@ -21,4 +21,4 @@ /datum/tech/cryomarine/on_unlock() . = ..() - SSticker.mode.get_specific_call("Marine Cryo Reinforcement (Spec)", TRUE, FALSE) + SSticker.mode.get_specific_call(/datum/emergency_call/cryo_spec, TRUE, FALSE) // "Marine Cryo Reinforcement (Spec)" diff --git a/code/modules/cm_tech/techs/marine/tier3/cryorine.dm b/code/modules/cm_tech/techs/marine/tier3/cryorine.dm index 49b4eea8f525..404fbd07c2ae 100644 --- a/code/modules/cm_tech/techs/marine/tier3/cryorine.dm +++ b/code/modules/cm_tech/techs/marine/tier3/cryorine.dm @@ -23,4 +23,4 @@ /datum/tech/repeatable/cryomarine/on_unlock() . = ..() - SSticker.mode.get_specific_call("Marine Cryo Reinforcements (Tech)", TRUE, FALSE) + SSticker.mode.get_specific_call(/datum/emergency_call/cryo_squad/tech, TRUE, FALSE) // "Marine Cryo Reinforcements (Tech)" diff --git a/code/modules/defenses/bell_tower.dm b/code/modules/defenses/bell_tower.dm index 6939557342f0..b4741734e0f4 100644 --- a/code/modules/defenses/bell_tower.dm +++ b/code/modules/defenses/bell_tower.dm @@ -18,11 +18,11 @@ can_be_near_defense = TRUE choice_categories = list( - SENTRY_CATEGORY_IFF = list(FACTION_USCM, FACTION_WEYLAND, FACTION_HUMAN), + SENTRY_CATEGORY_IFF = list(FACTION_MARINE, FACTION_WEYLAND, FACTION_HUMAN), ) selected_categories = list( - SENTRY_CATEGORY_IFF = FACTION_USCM, + SENTRY_CATEGORY_IFF = FACTION_MARINE, ) diff --git a/code/modules/defenses/defenses.dm b/code/modules/defenses/defenses.dm index fefd3c640c65..aedbad2d46e9 100644 --- a/code/modules/defenses/defenses.dm +++ b/code/modules/defenses/defenses.dm @@ -134,7 +134,7 @@ */ /obj/structure/machinery/defenses/proc/handle_iff(selection) switch(selection) - if(FACTION_USCM) + if(FACTION_MARINE) faction_group = FACTION_LIST_MARINE if(FACTION_WEYLAND) faction_group = FACTION_LIST_MARINE_WY diff --git a/code/modules/defenses/planted_flag.dm b/code/modules/defenses/planted_flag.dm index fac725047fa9..12bcab9b0475 100644 --- a/code/modules/defenses/planted_flag.dm +++ b/code/modules/defenses/planted_flag.dm @@ -16,11 +16,11 @@ can_be_near_defense = TRUE choice_categories = list( - SENTRY_CATEGORY_IFF = list(FACTION_USCM, FACTION_WEYLAND, FACTION_HUMAN), + SENTRY_CATEGORY_IFF = list(FACTION_MARINE, FACTION_WEYLAND, FACTION_HUMAN), ) selected_categories = list( - SENTRY_CATEGORY_IFF = FACTION_USCM, + SENTRY_CATEGORY_IFF = FACTION_MARINE, ) diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index bfb44a38a6a5..a02e4e7808c9 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -45,12 +45,12 @@ /// action list is configurable for all subtypes, this is just an example choice_categories = list( // SENTRY_CATEGORY_ROF = list(ROF_SINGLE, ROF_BURST, ROF_FULL_AUTO), - SENTRY_CATEGORY_IFF = list(FACTION_USCM, FACTION_WEYLAND, FACTION_HUMAN), + SENTRY_CATEGORY_IFF = list(FACTION_MARINE, FACTION_WEYLAND, FACTION_HUMAN), ) selected_categories = list( // SENTRY_CATEGORY_ROF = ROF_SINGLE, - SENTRY_CATEGORY_IFF = FACTION_USCM, + SENTRY_CATEGORY_IFF = FACTION_MARINE, ) /obj/structure/machinery/defenses/sentry/Initialize() @@ -478,7 +478,7 @@ /obj/structure/machinery/defenses/sentry/premade/Initialize() . = ..() if(selected_categories[SENTRY_CATEGORY_IFF]) - selected_categories[SENTRY_CATEGORY_IFF] = FACTION_USCM + selected_categories[SENTRY_CATEGORY_IFF] = FACTION_MARINE /obj/structure/machinery/defenses/sentry/premade/get_examine_text(mob/user) . = ..() @@ -562,11 +562,11 @@ handheld_type = /obj/item/defenses/handheld/sentry/dmr choice_categories = list( - SENTRY_CATEGORY_IFF = list(FACTION_USCM, FACTION_WEYLAND, FACTION_HUMAN), + SENTRY_CATEGORY_IFF = list(FACTION_MARINE, FACTION_WEYLAND, FACTION_HUMAN), ) selected_categories = list( - SENTRY_CATEGORY_IFF = FACTION_USCM, + SENTRY_CATEGORY_IFF = FACTION_MARINE, ) diff --git a/code/modules/defenses/sentry_flamer.dm b/code/modules/defenses/sentry_flamer.dm index 9ae794e3c811..f884b4ec5d14 100644 --- a/code/modules/defenses/sentry_flamer.dm +++ b/code/modules/defenses/sentry_flamer.dm @@ -11,12 +11,12 @@ choice_categories = list( // SENTRY_CATEGORY_ROF = list(ROF_SINGLE, ROF_FULL_AUTO), - SENTRY_CATEGORY_IFF = list(FACTION_USCM, FACTION_WEYLAND, FACTION_HUMAN), + SENTRY_CATEGORY_IFF = list(FACTION_MARINE, FACTION_WEYLAND, FACTION_HUMAN), ) selected_categories = list( SENTRY_CATEGORY_ROF = ROF_SINGLE, - SENTRY_CATEGORY_IFF = FACTION_USCM, + SENTRY_CATEGORY_IFF = FACTION_MARINE, ) /obj/structure/machinery/defenses/sentry/flamer/handle_rof(level) diff --git a/code/modules/defenses/tesla_coil.dm b/code/modules/defenses/tesla_coil.dm index 4c0888e28f6d..cb0646b29775 100644 --- a/code/modules/defenses/tesla_coil.dm +++ b/code/modules/defenses/tesla_coil.dm @@ -20,11 +20,11 @@ has_camera = FALSE choice_categories = list( - SENTRY_CATEGORY_IFF = list(FACTION_USCM, FACTION_WEYLAND, FACTION_HUMAN), + SENTRY_CATEGORY_IFF = list(FACTION_MARINE, FACTION_WEYLAND, FACTION_HUMAN), ) selected_categories = list( - SENTRY_CATEGORY_IFF = FACTION_USCM, + SENTRY_CATEGORY_IFF = FACTION_MARINE, ) diff --git a/code/modules/escape_menu/escape_menu.dm b/code/modules/escape_menu/escape_menu.dm index c31234678b62..b61bbd5b3f36 100644 --- a/code/modules/escape_menu/escape_menu.dm +++ b/code/modules/escape_menu/escape_menu.dm @@ -49,7 +49,7 @@ GLOBAL_LIST_EMPTY(escape_menus) show_page() RegisterSignal(client, COMSIG_PARENT_QDELETING, PROC_REF(on_client_qdel)) - RegisterSignal(client, COMSIG_CLIENT_MOB_LOGIN, PROC_REF(on_client_mob_login)) + RegisterSignal(client, COMSIG_CLIENT_MOB_LOGGED_IN, PROC_REF(on_client_mob_login)) if (!isnull(ckey)) GLOB.escape_menus[ckey] = src diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index 5a5ecea2d03d..92c5e5549611 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -149,9 +149,9 @@ load_skills(new_human, mob_client) //skills are set before equipment because of skill restrictions on certain clothes. load_languages(new_human, mob_client) load_age(new_human, mob_client) + load_id(new_human, mob_client) if(show_job_gear) load_gear(new_human, mob_client) - load_id(new_human, mob_client) load_status(new_human, mob_client) load_vanity(new_human, mob_client) load_traits(new_human, mob_client) diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm index 7748f4e0c558..392cb63646f6 100644 --- a/code/modules/gear_presets/clf.dm +++ b/code/modules/gear_presets/clf.dm @@ -745,36 +745,42 @@ /datum/equipment_preset/clf/synth/load_race(mob/living/carbon/human/new_human) new_human.set_species(SYNTH_COLONY_GEN_ONE) -/datum/equipment_preset/clf/synth/load_gear(mob/living/carbon/human/new_human) - load_name(new_human) - var/obj/item/clothing/under/colonist/clf/CLF = new() - var/obj/item/clothing/accessory/storage/webbing/W = new() - CLF.attach_accessory(new_human, W) - new_human.equip_to_slot_or_del(CLF, WEAR_BODY) +/datum/equipment_preset/clf/synth/load_skills(mob/living/carbon/human/new_human) + new_human.allow_gun_usage = FALSE +/datum/equipment_preset/clf/synth/load_gear(mob/living/carbon/human/new_human) + //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/full/with_suture_and_graft, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - - spawn_weapon(/obj/item/weapon/gun/rifle/mar40/carbine, /obj/item/ammo_magazine/rifle/mar40/extended, new_human, 0, 10) - new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet/upp, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/synth, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_R_STORE) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet/upp, WEAR_FACE) if(new_human.disabilities & NEARSIGHTED) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES) else new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) + //head + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/jan, WEAR_HEAD) + //body + var/obj/item/clothing/under/colonist/clf/CLF = new() + var/obj/item/clothing/accessory/storage/webbing/webbing = new() + CLF.attach_accessory(new_human, webbing) + new_human.equip_to_slot_or_del(CLF, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia, WEAR_JACKET) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/full/with_suture_and_graft, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human), WEAR_IN_BELT) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) + //pockets + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/synth, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_R_STORE) /datum/equipment_preset/clf/synth/get_antag_clothing_equipment() return list( diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index 9de9d11607c2..7bf6cbb8325d 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -51,7 +51,7 @@ var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) uniform.has_sensor = UNIFORM_HAS_SENSORS - uniform.sensor_faction = FACTION_USCM + uniform.sensor_faction = FACTION_MARINE return ..() //*****************************************************************************************************/ @@ -162,7 +162,7 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/marshal, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717, WEAR_J_STORE) @@ -242,7 +242,6 @@ new_human.set_species(SYNTH_COLONY) /datum/equipment_preset/cmb/synth/load_gear(mob/living/carbon/human/new_human) - load_name(new_human) //backpack new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/security, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_BACK) diff --git a/code/modules/gear_presets/contractor.dm b/code/modules/gear_presets/contractor.dm index bbea2a74339f..3f0cdecb9ac2 100644 --- a/code/modules/gear_presets/contractor.dm +++ b/code/modules/gear_presets/contractor.dm @@ -289,10 +289,10 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) //Line in vest. new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_BACK) //*****************************************************************************************************/ @@ -395,7 +395,6 @@ new_human.set_species(SYNTH_GEN_THREE) /datum/equipment_preset/contractor/duty/synth/load_gear(mob/living/carbon/human/new_human) - load_name(new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smartpack/black, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) //1 @@ -782,7 +781,6 @@ new_human.set_species(SYNTH_GEN_THREE) /datum/equipment_preset/contractor/covert/synth/load_gear(mob/living/carbon/human/new_human) - load_name(new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smartpack/black, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) //1 diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index cfec62a3c65b..cbe8bc0abce4 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -988,7 +988,7 @@ paygrade = PAY_SHORT_ME5 idtype = /obj/item/card/id/dogtag role_comm_title = "FORECON" - faction_group = list(FACTION_USCM, FACTION_SURVIVOR) + faction_group = list(FACTION_MARINE, FACTION_SURVIVOR) access = list( ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_ENGINEERING, diff --git a/code/modules/gear_presets/royal_marines.dm b/code/modules/gear_presets/royal_marines.dm index b916a52c4b6f..aa33eac97733 100644 --- a/code/modules/gear_presets/royal_marines.dm +++ b/code/modules/gear_presets/royal_marines.dm @@ -1,7 +1,7 @@ /datum/equipment_preset/twe name = "Three World Empire" faction = FACTION_TWE - faction_group = list(FACTION_TWE, FACTION_USCM) + faction_group = list(FACTION_TWE, FACTION_MARINE) languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) /datum/equipment_preset/twe/royal_marine/load_name(mob/living/carbon/human/new_human, randomise) diff --git a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm index 34cbc8e0ab9c..c4e08af9dcfa 100644 --- a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm +++ b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm @@ -5,7 +5,7 @@ idtype = /obj/item/card/id/dogtag role_comm_title = "FORECON" rank = JOB_SURVIVOR - faction_group = list(FACTION_USCM, FACTION_SURVIVOR) + faction_group = list(FACTION_MARINE, FACTION_SURVIVOR) flags = EQUIPMENT_PRESET_START_OF_ROUND access = list( ACCESS_CIVILIAN_PUBLIC, diff --git a/code/modules/gear_presets/survivors/lv_624/corporate_dome_insert_lv624.dm b/code/modules/gear_presets/survivors/lv_624/corporate_dome_insert_lv624.dm new file mode 100644 index 000000000000..2c8ec04594ad --- /dev/null +++ b/code/modules/gear_presets/survivors/lv_624/corporate_dome_insert_lv624.dm @@ -0,0 +1,51 @@ +// /obj/effect/landmark/survivor_spawner/lv624_corporate_dome/cl +// corporatedomehold.dmm + +/datum/equipment_preset/survivor/wy/executive + name = "Survivor - LV-624 Paranoid Corporate Liaison" + flags = EQUIPMENT_PRESET_START_OF_ROUND + paygrade = PAY_SHORT_WYC5 + skills = /datum/skills/civilian/survivor/manager + assignment = "LV-624 Corporate Liaison" + idtype = /obj/item/card/id/silver/clearance_badge/cl + faction_group = list(FACTION_WY, FACTION_SURVIVOR) + access = list( + ACCESS_WY_GENERAL, + ACCESS_WY_COLONIAL, + ACCESS_WY_MEDICAL, + ACCESS_WY_SECURITY, + ACCESS_WY_RESEARCH, + ACCESS_WY_ARMORY, + ACCESS_CIVILIAN_PUBLIC, + ACCESS_CIVILIAN_RESEARCH, + ACCESS_CIVILIAN_ENGINEERING, + ACCESS_CIVILIAN_LOGISTICS, + ACCESS_CIVILIAN_BRIG, + ACCESS_CIVILIAN_MEDBAY, + ACCESS_CIVILIAN_COMMAND, + ) + languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_RUSSIAN) + + survivor_variant = CORPORATE_SURVIVOR + +/datum/equipment_preset/survivor/wy/executive/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/field(new_human), WEAR_BODY) + if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) + add_ice_colony_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/prescription(new_human), WEAR_EYES) + else + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/secure/briefcase(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/med_small_stack(new_human), WEAR_IN_BACK) + add_random_cl_survivor_loot(new_human) + add_random_cl_survivor_loot(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/document(new_human), WEAR_R_STORE) diff --git a/code/modules/gear_presets/survivors/shivas_snowball/panic_room_insert_shivas.dm b/code/modules/gear_presets/survivors/shivas_snowball/panic_room_insert_shivas.dm new file mode 100644 index 000000000000..9f1e2c705efb --- /dev/null +++ b/code/modules/gear_presets/survivors/shivas_snowball/panic_room_insert_shivas.dm @@ -0,0 +1,43 @@ +// /obj/effect/landmark/survivor_spawner/shivas_assistant_manager +// panic_room_insert_shivas.dmm + +/datum/equipment_preset/survivor/wy/asstmanager + name = "Survivor - Corporate Assistant Manager" + flags = EQUIPMENT_PRESET_EXTRA + paygrade = PAY_SHORT_WYC7 + skills = /datum/skills/civilian/survivor/manager + assignment = "Assistant Operations Manager" + idtype = /obj/item/card/id/silver/clearance_badge/manager + faction_group = list(FACTION_WY, FACTION_SURVIVOR) + access = list( + ACCESS_WY_GENERAL, + ACCESS_WY_COLONIAL, + ACCESS_WY_MEDICAL, + ACCESS_WY_SECURITY, + ACCESS_WY_RESEARCH, + ACCESS_WY_ARMORY, + ACCESS_CIVILIAN_PUBLIC, + ACCESS_CIVILIAN_RESEARCH, + ACCESS_CIVILIAN_ENGINEERING, + ACCESS_CIVILIAN_LOGISTICS, + ACCESS_CIVILIAN_BRIG, + ACCESS_CIVILIAN_MEDBAY, + ACCESS_CIVILIAN_COMMAND, + ) + languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) + + survivor_variant = CORPORATE_SURVIVOR + +/datum/equipment_preset/survivor/wy/asstmanager/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/manager(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/grant, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/navy(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE) + add_survivor_weapon_civilian(new_human) + ..() diff --git a/code/modules/gear_presets/survivors/solaris/preset_solaris.dm b/code/modules/gear_presets/survivors/solaris/preset_solaris.dm index 91dd05ef8154..2d0f634a6948 100644 --- a/code/modules/gear_presets/survivors/solaris/preset_solaris.dm +++ b/code/modules/gear_presets/survivors/solaris/preset_solaris.dm @@ -6,7 +6,7 @@ /datum/equipment_preset/survivor/trucker/solaris/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/worker_overalls(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/red(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/trucker/red(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big(new_human), WEAR_EYES) ..() diff --git a/code/modules/gear_presets/survivors/survivors.dm b/code/modules/gear_presets/survivors/survivors.dm index 9240d1782912..0cecaccce43d 100644 --- a/code/modules/gear_presets/survivors/survivors.dm +++ b/code/modules/gear_presets/survivors/survivors.dm @@ -301,6 +301,7 @@ Everything bellow is a parent used as a base for one or multiple maps. skills = /datum/skills/civilian/survivor flags = EQUIPMENT_PRESET_START_OF_ROUND paygrade = PAY_SHORT_WYC2 + faction_group = FACTION_LIST_SURVIVOR_WY idtype = /obj/item/card/id/silver/clearance_badge/cl access = list( ACCESS_CIVILIAN_PUBLIC, @@ -381,7 +382,7 @@ Everything bellow is a parent used as a base for one or multiple maps. access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_LOGISTICS,ACCESS_WY_FLIGHT) /datum/equipment_preset/survivor/flight_control_operator/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/lawyer/bluesuit(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/khaki(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) add_ice_colony_survivor_equipment(new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_brown(new_human), WEAR_JACKET) @@ -425,10 +426,11 @@ Everything bellow is a parent used as a base for one or multiple maps. name = "Survivor - Interstellar Commerce Commission Liaison" assignment = "Interstellar Commerce Commission Corporate Liaison" skills = /datum/skills/civilian/survivor - idtype = /obj/item/card/id/silver/cl + flags = EQUIPMENT_PRESET_START_OF_ROUND paygrade = PAY_SHORT_ICCL + faction_group = FACTION_LIST_SURVIVOR_WY + idtype = /obj/item/card/id/silver/cl role_comm_title = "ICC Rep." - flags = EQUIPMENT_PRESET_START_OF_ROUND survivor_variant = CORPORATE_SURVIVOR diff --git a/code/modules/gear_presets/survivors/trijent/preset_trijent.dm b/code/modules/gear_presets/survivors/trijent/preset_trijent.dm index f62010539d77..405496d8f496 100644 --- a/code/modules/gear_presets/survivors/trijent/preset_trijent.dm +++ b/code/modules/gear_presets/survivors/trijent/preset_trijent.dm @@ -64,7 +64,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/trucker(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank(new_human), WEAR_IN_BACK) ..() diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 0b3b4d4ecfb5..74bd9d8483fb 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -2590,7 +2590,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/upp/synth - name = "UPP Combat Synthetic" + name = "UPP Synthetic" flags = EQUIPMENT_PRESET_EXTRA languages = ALL_SYNTH_LANGUAGES_UPP @@ -2599,7 +2599,7 @@ assignment = JOB_UPP_COMBAT_SYNTH rank = JOB_UPP_COMBAT_SYNTH paygrade = PAY_SHORT_SYN - idtype = /obj/item/card/id/gold + idtype = /obj/item/card/id/dogtag /datum/equipment_preset/upp/synth/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(50;MALE,50;FEMALE) @@ -2637,8 +2637,10 @@ /datum/equipment_preset/upp/synth/load_race(mob/living/carbon/human/new_human) new_human.set_species(SYNTH_GEN_THREE) +/datum/equipment_preset/upp/synth/load_skills(mob/living/carbon/human/new_human) + new_human.allow_gun_usage = FALSE + /datum/equipment_preset/upp/synth/load_gear(mob/living/carbon/human/new_human) - load_name(new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) //1 @@ -2658,22 +2660,18 @@ new_human.equip_to_slot_or_del(new hat, WEAR_HEAD) //body var/obj/item/clothing/under/marine/veteran/UPP/medic/UPP = new() - var/obj/item/clothing/accessory/storage/tool_webbing/equipped/W = new() - UPP.attach_accessory(new_human, W) + var/obj/item/clothing/accessory/storage/tool_webbing/equipped/webbing = new() + UPP.attach_accessory(new_human, webbing) new_human.equip_to_slot_or_del(UPP, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/support, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/bottle/tricordrazine, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/bizon/upp, WEAR_J_STORE) //waist new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST) //limbs new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/upp, WEAR_HANDS) - //póckets - var/obj/item/storage/pouch/magazine/large/ppouch = new() - new_human.equip_to_slot_or_del(ppouch, WEAR_R_STORE) - for(var/i = 1 to ppouch.storage_slots) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/bizon, WEAR_IN_R_STORE) + //pockets + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/full/pills, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_L_STORE) diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 578df21b67df..3651b83cc209 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -26,6 +26,7 @@ /datum/equipment_preset/uscm_ship/liaison name = "USCM Corporate Liaison (CL)" + faction_group = FACTION_LIST_MARINE_WY flags = EQUIPMENT_PRESET_START_OF_ROUND idtype = /obj/item/card/id/silver/cl @@ -128,18 +129,17 @@ minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN /datum/equipment_preset/uscm_ship/reporter/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/satchel - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/reporter(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/reporter(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/reporter(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/camera(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/device/camera_film(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/notepad(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/camera(new_human), WEAR_WAIST) + +/datum/equipment_preset/uscm_ship/reporter/load_preset(mob/living/carbon/human/new_human, randomise, count_participant, client/mob_client, show_job_gear) + . = ..() + new_human.marine_buyable_categories[CIVILIAN_CAN_BUY_BACKPACK] = 1 + new_human.marine_buyable_categories[CIVILIAN_CAN_BUY_UTILITY] = 1 /datum/equipment_preset/uscm_ship/reporter_uscm name = "Combat Correspondent" @@ -178,10 +178,6 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/device/camera(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/device/camera_film(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/notepad(new_human), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -252,17 +248,9 @@ if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/tech - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/welding(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/device/demo_scanner(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/bag/trash(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, (new_human), WEAR_R_HAND) /datum/equipment_preset/uscm_ship/maint/load_rank(mob/living/carbon/human/new_human) if(new_human.client) diff --git a/code/modules/lighting/lighting_static/static_lighting_turf.dm b/code/modules/lighting/lighting_static/static_lighting_turf.dm index 2fe918fa88bb..ec91e17e4fca 100644 --- a/code/modules/lighting/lighting_static/static_lighting_turf.dm +++ b/code/modules/lighting/lighting_static/static_lighting_turf.dm @@ -31,7 +31,8 @@ return !(luminosity || dynamic_lumcount) -/turf/proc/change_area(area/old_area, area/new_area) +///Transfer the lighting of one area to another +/turf/proc/transfer_area_lighting(area/old_area, area/new_area) if(SSlighting.initialized) if (new_area.static_lighting != old_area.static_lighting) if (new_area.static_lighting) @@ -44,6 +45,8 @@ if(new_area.lighting_effect) overlays += new_area.lighting_effect + + /turf/proc/static_generate_missing_corners() if (!lighting_corner_NE) lighting_corner_NE = new/datum/static_lighting_corner(src, NORTH|EAST) diff --git a/code/modules/logging/global_logs.dm b/code/modules/logging/global_logs.dm index e0055907d67a..3fbcb70a1a8d 100644 --- a/code/modules/logging/global_logs.dm +++ b/code/modules/logging/global_logs.dm @@ -28,6 +28,9 @@ GLOBAL_PROTECT(scheduler_stats) GLOBAL_VAR(strain_logs) GLOBAL_PROTECT(strain_logs) +GLOBAL_VAR(mapping_log) +GLOBAL_PROTECT(mapping_log) + GLOBAL_VAR(round_stats) GLOBAL_PROTECT(round_stats) diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm index 35f7d30a9732..50a343635de9 100644 --- a/code/modules/mapping/map_template.dm +++ b/code/modules/mapping/map_template.dm @@ -7,6 +7,20 @@ var/datum/parsed_map/cached_map var/keep_cached_map = FALSE + ///Default area associated with the map template + var/default_area + + ///if true, turfs loaded from this template are placed on top of the turfs already there, defaults to TRUE + var/should_place_on_top = TRUE + + ///if true, creates a list of all atoms created by this template loading, defaults to FALSE + var/returns_created_atoms = FALSE + + ///the list of atoms created by this template being loaded, only populated if returns_created_atoms is TRUE + var/list/created_atoms = list() + //make sure this list is accounted for/cleared if you request it from ssatoms! + + /datum/map_template/New(path = null, rename = null, cache = FALSE) if(path) mappath = path @@ -25,71 +39,129 @@ cached_map = parsed return bounds -/datum/parsed_map/proc/initTemplateBounds() - var/list/obj/structure/cable/cables = list() - var/list/atom/atoms = list() - var/list/area/areas = list() +/datum/map_template/proc/initTemplateBounds(list/bounds) + if (!bounds) //something went wrong + stack_trace("[name] template failed to initialize correctly!") + return - var/list/turfs = block( locate(bounds[MAP_MINX], bounds[MAP_MINY], bounds[MAP_MINZ]), - locate(bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ])) - for(var/L in turfs) - var/turf/B = L - atoms += B - areas |= B.loc - for(var/A in B) - atoms += A - if(istype(A, /obj/structure/cable)) - cables += A - continue + var/list/atom/movable/movables = list() + var/list/obj/docking_port/stationary/ports = list() + var/list/area/areas = list() + var/list/turfs = block( + locate( + bounds[MAP_MINX], + bounds[MAP_MINY], + bounds[MAP_MINZ] + ), + locate( + bounds[MAP_MAXX], + bounds[MAP_MAXY], + bounds[MAP_MAXZ] + ) + ) + for(var/turf/current_turf as anything in turfs) + var/area/current_turfs_area = current_turf.loc + areas |= current_turfs_area + if(!SSatoms.initialized) + continue + + for(var/movable_in_turf in current_turf) + if(istype(movable_in_turf, /obj/docking_port/mobile)) + continue // mobile docking ports need to be initialized after their template has finished loading, to ensure that their bounds are setup + movables += movable_in_turf + if(istype(movable_in_turf, /obj/docking_port/stationary)) + ports += movable_in_turf + + // Not sure if there is some importance here to make sure the area is in z + // first or not. Its defined In Initialize yet its run first in templates + // BEFORE so... hummm SSmapping.reg_in_areas_in_z(areas) - SSatoms.InitializeAtoms(atoms) - //SSmachines.setup_template_powernets(cables) // mapping TODO: - -/datum/map_template/proc/load_new_z() - var/x = round((world.maxx - width)/2) - var/y = round((world.maxy - height)/2) + if(!SSatoms.initialized) + return - var/datum/space_level/level = SSmapping.add_new_zlevel(name, list(ZTRAIT_AWAY = TRUE)) - var/datum/parsed_map/parsed = load_map(file(mappath), x, y, level.z_value, no_changeturf=(SSatoms.initialized == INITIALIZATION_INSSATOMS), placeOnTop=TRUE) + SSatoms.InitializeAtoms(areas + turfs + movables, returns_created_atoms ? created_atoms : null) + + for(var/turf/unlit as anything in turfs) + var/area/loc_area = unlit.loc + if(!loc_area.static_lighting) + continue + unlit.static_lighting_build_overlay() + +/datum/map_template/proc/load_new_z(secret = FALSE) + var/x = round((world.maxx - width) * 0.5) + 1 + var/y = round((world.maxy - height) * 0.5) + 1 + + var/datum/space_level/level = SSmapping.add_new_zlevel(name, list(), contain_turfs = FALSE) + var/datum/parsed_map/parsed = load_map( + file(mappath), + x, + y, + level.z_value, + no_changeturf = (SSatoms.initialized == INITIALIZATION_INSSATOMS), + place_on_top = should_place_on_top, + new_z = TRUE, + ) var/list/bounds = parsed.bounds if(!bounds) return FALSE repopulate_sorted_areas() - //initialize things that are normally initialized after map load - parsed.initTemplateBounds() - log_game("Z-level [name] loaded at at [x],[y],[world.maxz]") + initTemplateBounds(bounds) + log_game("Z-level [name] loaded at [x],[y],[world.maxz]") return level -/datum/map_template/proc/load(turf/T, centered, delete) +/datum/map_template/proc/load(turf/T, centered = FALSE, delete = FALSE) if(centered) T = locate(T.x - round(width/2) , T.y - round(height/2) , T.z) if(!T) return - if(T.x + width > world.maxx) + if((T.x+width) - 1 > world.maxx) return - if(T.y + height > world.maxy) + if((T.y+height) - 1 > world.maxy) return // Accept cached maps, but don't save them automatically - we don't want // ruins clogging up memory for the whole round. var/datum/parsed_map/parsed = cached_map || new(file(mappath)) cached_map = keep_cached_map ? parsed : null - if(!parsed.load(T.x, T.y, T.z, cropMap = TRUE, no_changeturf = (SSatoms.initialized == INITIALIZATION_INSSATOMS), placeOnTop = TRUE, delete = delete)) + + var/list/turf_blacklist = list() + update_blacklist(T, turf_blacklist) + + UNSETEMPTY(turf_blacklist) + parsed.turf_blacklist = turf_blacklist + if(!parsed.load( + T.x, + T.y, + T.z, + crop_map = TRUE, + no_changeturf = (SSatoms.initialized == INITIALIZATION_INSSATOMS), + place_on_top = should_place_on_top, + delete = delete + )) return + var/list/bounds = parsed.bounds if(!bounds) return + repopulate_sorted_areas() + //initialize things that are normally initialized after map load - parsed.initTemplateBounds() + initTemplateBounds(bounds) - log_game("[name] loaded at at [T.x],[T.y],[T.z]") + log_game("[name] loaded at [T.x],[T.y],[T.z]") return bounds +/datum/map_template/proc/post_load() + return + +/datum/map_template/proc/update_blacklist(turf/T, list/input_blacklist) + return + /datum/map_template/proc/get_affected_turfs(turf/T, centered = FALSE) var/turf/placement = T if(centered) diff --git a/code/modules/mapping/preloader.dm b/code/modules/mapping/preloader.dm index e8eee898a711..bd89d0e030a2 100644 --- a/code/modules/mapping/preloader.dm +++ b/code/modules/mapping/preloader.dm @@ -1,33 +1,42 @@ // global datum that will preload variables on atoms instanciation GLOBAL_VAR_INIT(use_preloader, FALSE) -GLOBAL_DATUM_INIT(_preloader, /datum/map_preloader, new) +GLOBAL_LIST_INIT(_preloader_attributes, null) +GLOBAL_LIST_INIT(_preloader_path, null) /// Preloader datum /datum/map_preloader - parent_type = /datum var/list/attributes var/target_path -/datum/map_preloader/proc/setup(list/the_attributes, path) +/world/proc/preloader_setup(list/the_attributes, path) if(the_attributes.len) GLOB.use_preloader = TRUE - attributes = the_attributes - target_path = path + GLOB._preloader_attributes = the_attributes + GLOB._preloader_path = path -/datum/map_preloader/proc/load(atom/what) +/world/proc/preloader_load(atom/what) GLOB.use_preloader = FALSE + var/list/attributes = GLOB._preloader_attributes for(var/attribute in attributes) var/value = attributes[attribute] if(islist(value)) - value = deepCopyList(value) + value = deep_copy_list(value) + #ifdef TESTING + if(what.vars[attribute] == value) + var/message = "[what.type] at [AREACOORD(what)] - VAR: [attribute] = [isnull(value) ? "null" : (isnum(value) ? value : "\"[value]\"")]" + log_mapping("DIRTY VAR: [message]") + GLOB.dirty_vars += message + #endif what.vars[attribute] = value -/// Area passthrough: do not instanciate a new area, reuse the current one +/// Template noop (no operation) is used to skip a turf or area when the template is loaded this allows for template transparency +/// ex. if a ship has gaps in it's design, you would use template_noop to fill these in so that when the ship moves z-level, any +/// tiles these gaps land on will not be deleted and replaced with the ships (empty) tiles /area/template_noop name = "Area Passthrough" icon_state = "noop" -/// Turf passthrough: do not instanciate a new turf, reuse the current one +/// See above explanation /turf/template_noop name = "Turf Passthrough" icon_state = "noop" diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm index 969dc6a795f8..424ab22ae4ac 100644 --- a/code/modules/mapping/reader.dm +++ b/code/modules/mapping/reader.dm @@ -1,7 +1,67 @@ /////////////////////////////////////////////////////////////// //SS13 Optimized Map loader ////////////////////////////////////////////////////////////// -#define SPACE_KEY "space" +// We support two different map formats +// It is kinda possible to process them together, but if we split them up +// I can make optimization decisions more easily +/** + * DMM SPEC: + * DMM is split into two parts. First we have strings of text linked to lists of paths and their modifications (I will call this the cache) + * We call these strings "keys" and the things they point to members. Keys have a static length + * + * The second part is a list of locations matched to a string of keys. (I'll be calling this the grid) + * These are used to lookup the cache we built earlier. + * We store location lists as grid_sets. the lines represent different things depending on the spec + * + * In standard DMM (which you can treat as the base case, since it also covers weird modifications) each line + * represents an x file, and there's typically only one grid set per z level. + * The meme is you can look at a DMM formatted map and literally see what it should roughly look like + * This differs in TGM, and we can pull some performance from this + * + * Any restrictions here also apply to TGM + * + * /tg/ Restrictions: + * Paths have a specified order. First atoms in the order in which they should be loaded, then a single turf, then the area of the cell + * DMM technically supports turf stacking, but this is deprecated for all formats + + */ +#define MAP_DMM "dmm" +/** + * TGM SPEC: + * TGM is a derevation of DMM, with restrictions placed on it + * to make it easier to parse and to reduce merge conflicts/ease their resolution + * + * Requirements: + * Each "statement" in a key's details ends with a new line, and wrapped in (...) + * All paths end with either a comma or occasionally a {, then a new line + * Excepting the area, who is listed last and ends with a ) to mark the end of the key + * + * {} denotes a list of variable edits applied to the path that came before the first { + * the final } is followed by a comma, and then a new line + * Variable edits have the form \tname = value;\n + * Except the last edit, which has no final ;, and just ends in a newline + * No extra padding is permitted + * Many values are supported. See parse_constant() + * Strings must be wrapped in "...", files in '...', and lists in list(...) + * Files are kinda susy, and may not actually work. buyer beware + * Lists support assoc values as expected + * These constants can be further embedded into lists + * + * There can be no padding in front of, or behind a path + * + * Therefore: + * "key" = ( + * /path, + * /other/path{ + * var = list("name" = 'filepath'); + * other_var = /path + * }, + * /turf, + * /area) + * + */ +#define MAP_TGM "tgm" +#define MAP_UNKNOWN "unknown" /datum/grid_set var/xcrd @@ -11,9 +71,20 @@ /datum/parsed_map var/original_path + var/map_format + /// The length of a key in this file. This is promised by the standard to be static var/key_len = 0 + /// The length of a line in this file. Not promised by dmm but standard dmm uses it, so we can trust it + var/line_len = 0 + /// If we've expanded world.maxx + var/expanded_y = FALSE + /// If we've expanded world.maxy + var/expanded_x = FALSE var/list/grid_models = list() var/list/gridSets = list() + /// List of area types we've loaded AS A PART OF THIS MAP + /// We do this to allow non unique areas, so we'll only load one per map + var/list/area/loaded_areas = list() var/list/modelCache @@ -22,33 +93,97 @@ /// Offset bounds. Same as parsed_bounds until load(). var/list/bounds + ///any turf in this list is skipped inside of build_coordinate. Lazy assoc list + var/list/turf_blacklist + // raw strings used to represent regexes more accurately // '' used to avoid confusing syntax highlighting - var/static/regex/dmmRegex = new(@'"([a-zA-Z]+)" = \(((?:.|\n)*?)\)\n(?!\t)|\((\d+),(\d+),(\d+)\) = \{"([a-zA-Z\n]*)"\}', "g") - var/static/regex/trimQuotesRegex = new(@'^[\s\n]+"?|"?[\s\n]+$|^"|"$', "g") - var/static/regex/trimRegex = new(@'^[\s\n]+|[\s\n]+$', "g") + var/static/regex/dmm_regex = new(@'"([a-zA-Z]+)" = (?:\(\n|\()((?:.|\n)*?)\)\n(?!\t)|\((\d+),(\d+),(\d+)\) = \{"([a-zA-Z\n]*)"\}', "g") + /// Matches key formats in TMG (IE: newline after the \() + var/static/regex/matches_tgm = new(@'^"[A-z]*"[\s]*=[\s]*\([\s]*\n', "m") + /// Pulls out key value pairs for TGM + var/static/regex/var_edits_tgm = new(@'^\t([A-z]*) = (.*?);?$') + /// Pulls out model paths for DMM + var/static/regex/model_path = new(@'(\/[^\{]*?(?:\{.*?\})?)(?:,|$)', "g") + + /// If we are currently loading this map + var/loading = FALSE #ifdef TESTING var/turfsSkipped = 0 #endif -/// Shortcut function to parse a map and apply it to the world. -/// -/// - `dmm_file`: A .dmm file to load (Required). -/// - `x_offset`, `y_offset`, `z_offset`: Positions representign where to load the map (Optional). -/// - `cropMap`: When true, the map will be cropped to fit the existing world dimensions (Optional). -/// - `measureOnly`: When true, no changes will be made to the world (Optional). -/// - `no_changeturf`: When true, [turf/AfterChange] won't be called on loaded turfs -/// - `x_lower`, `x_upper`, `y_lower`, `y_upper`: Coordinates (relative to the map) to crop to (Optional). -/// - `placeOnTop`: Whether to use [turf/PlaceOnTop] rather than [turf/ChangeTurf] (Optional). -/proc/load_map(dmm_file as file, x_offset as num, y_offset as num, z_offset as num, cropMap as num, measureOnly as num, no_changeturf as num, x_lower = -INFINITY as num, x_upper = INFINITY as num, y_lower = -INFINITY as num, y_upper = INFINITY as num, placeOnTop = FALSE as num) - var/datum/parsed_map/parsed = new(dmm_file, x_lower, x_upper, y_lower, y_upper, measureOnly) - if(parsed.bounds && !measureOnly) - parsed.load(x_offset, y_offset, z_offset, cropMap, no_changeturf, x_lower, x_upper, y_lower, y_upper, placeOnTop) - return parsed +/datum/parsed_map/proc/copy() + // Avoids duped work just in case + build_cache() + var/datum/parsed_map/newfriend = new() + newfriend.original_path = original_path + newfriend.map_format = map_format + newfriend.key_len = key_len + newfriend.line_len = line_len + newfriend.grid_models = grid_models.Copy() + newfriend.gridSets = gridSets.Copy() + newfriend.modelCache = modelCache.Copy() + newfriend.parsed_bounds = parsed_bounds.Copy() + // Copy parsed bounds to reset to initial values + newfriend.bounds = parsed_bounds.Copy() + newfriend.turf_blacklist = turf_blacklist?.Copy() + return newfriend + +//text trimming (both directions) helper macro +#define TRIM_TEXT(text) (trim_reduced(text)) + +/** + * Helper and recommened way to load a map file + * - dmm_file: The path to the map file + * - x_offset: The x offset to load the map at + * - y_offset: The y offset to load the map at + * - z_offset: The z offset to load the map at + * - crop_map: If true, the map will be cropped to the world bounds + * - measure_only: If true, the map will not be loaded, but the bounds will be calculated + * - no_changeturf: If true, the map will not call /turf/AfterChange + * - x_lower: The minimum x coordinate to load + * - x_upper: The maximum x coordinate to load + * - y_lower: The minimum y coordinate to load + * - y_upper: The maximum y coordinate to load + * - z_lower: The minimum z coordinate to load + * - z_upper: The maximum z coordinate to load + * - place_on_top: Whether to use /turf/proc/PlaceOnTop rather than /turf/proc/ChangeTurf + * - new_z: If true, a new z level will be created for the map + * - delete: CM/TGMC addition, if we need to manually clear turf contents before spawning stuff + */ +/proc/load_map( + dmm_file, + x_offset = 0, + y_offset = 0, + z_offset = 0, + crop_map = FALSE, + measure_only = FALSE, + no_changeturf = FALSE, + x_lower = -INFINITY, + x_upper = INFINITY, + y_lower = -INFINITY, + y_upper = INFINITY, + z_lower = -INFINITY, + z_upper = INFINITY, + place_on_top = FALSE, + new_z = FALSE, + delete = FALSE, +) + if(!(dmm_file in GLOB.cached_maps)) + GLOB.cached_maps[dmm_file] = new /datum/parsed_map(dmm_file) + + var/datum/parsed_map/parsed_map = GLOB.cached_maps[dmm_file] + parsed_map = parsed_map.copy() + if(!measure_only && !isnull(parsed_map.bounds)) + parsed_map.load(x_offset, y_offset, z_offset, crop_map, no_changeturf, x_lower, x_upper, y_lower, y_upper, z_lower, z_upper, place_on_top, new_z, delete) + return parsed_map /// Parse a map, possibly cropping it. -/datum/parsed_map/New(tfile, x_lower = -INFINITY, x_upper = INFINITY, y_lower = -INFINITY, y_upper=INFINITY, measureOnly=FALSE) +/datum/parsed_map/New(tfile, x_lower = -INFINITY, x_upper = INFINITY, y_lower = -INFINITY, y_upper=INFINITY, z_lower = -INFINITY, z_upper=INFINITY, measureOnly=FALSE) + // This proc sleeps for like 6 seconds. why? + // Is it file accesses? if so, can those be done ahead of time, async to save on time here? I wonder. + // Love ya :) if(isfile(tfile)) original_path = "[tfile]" tfile = file2text(tfile) @@ -56,16 +191,30 @@ // create a new datum without loading a map return - bounds = parsed_bounds = list(1.#INF, 1.#INF, 1.#INF, -1.#INF, -1.#INF, -1.#INF) - var/stored_index = 1 + src.bounds = parsed_bounds = list(1.#INF, 1.#INF, 1.#INF, -1.#INF, -1.#INF, -1.#INF) + + if(findtext(tfile, matches_tgm)) + map_format = MAP_TGM + else + map_format = MAP_DMM // Fallback + + // lists are structs don't you know :) + var/list/bounds = src.bounds + var/list/grid_models = src.grid_models + var/key_len = src.key_len + var/line_len = src.line_len + var/stored_index = 1 + var/list/regexOutput //multiz lool - while(dmmRegex.Find(tfile, stored_index)) - stored_index = dmmRegex.next + while(dmm_regex.Find(tfile, stored_index)) + stored_index = dmm_regex.next + // Datum var lookup is expensive, this isn't + regexOutput = dmm_regex.group // "aa" = (/type{vars=blah}) - if(dmmRegex.group[1]) // Model - var/key = dmmRegex.group[1] + if(regexOutput[1]) // Model + var/key = regexOutput[1] if(grid_models[key]) // Duplicate model keys are ignored in DMMs continue if(key_len != length(key)) @@ -74,328 +223,776 @@ else CRASH("Inconsistent key length in DMM") if(!measureOnly) - grid_models[key] = dmmRegex.group[2] + grid_models[key] = regexOutput[2] // (1,1,1) = {"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"} - else if(dmmRegex.group[3]) // Coords + else if(regexOutput[3]) // Coords if(!key_len) CRASH("Coords before model definition in DMM") - var/curr_x = text2num(dmmRegex.group[3]) - + var/curr_x = text2num(regexOutput[3]) if(curr_x < x_lower || curr_x > x_upper) continue + var/curr_y = text2num(regexOutput[4]) + if(curr_y < y_lower || curr_y > y_upper) + continue + + var/curr_z = text2num(regexOutput[5]) + if(curr_z < z_lower || curr_z > z_upper) + continue + var/datum/grid_set/gridSet = new gridSet.xcrd = curr_x - //position of the currently processed square - gridSet.ycrd = text2num(dmmRegex.group[4]) - gridSet.zcrd = text2num(dmmRegex.group[5]) + gridSet.ycrd = curr_y + gridSet.zcrd = curr_z - bounds[MAP_MINX] = min(bounds[MAP_MINX], clamp(gridSet.xcrd, x_lower, x_upper)) - bounds[MAP_MINZ] = min(bounds[MAP_MINZ], gridSet.zcrd) - bounds[MAP_MAXZ] = max(bounds[MAP_MAXZ], gridSet.zcrd) + bounds[MAP_MINX] = min(bounds[MAP_MINX], curr_x) + bounds[MAP_MINZ] = min(bounds[MAP_MINZ], curr_y) + bounds[MAP_MAXZ] = max(bounds[MAP_MAXZ], curr_z) - var/list/gridLines = splittext(dmmRegex.group[6], "\n") + var/list/gridLines = splittext(regexOutput[6], "\n") gridSet.gridLines = gridLines var/leadingBlanks = 0 - while(leadingBlanks < gridLines.len && gridLines[++leadingBlanks] == "") + while(leadingBlanks < length(gridLines) && gridLines[++leadingBlanks] == "") if(leadingBlanks > 1) gridLines.Cut(1, leadingBlanks) // Remove all leading blank lines. - if(!gridLines.len) // Skip it if only blank lines exist. + if(!length(gridLines)) // Skip it if only blank lines exist. continue gridSets += gridSet - if(gridLines.len && gridLines[gridLines.len] == "") - gridLines.Cut(gridLines.len) // Remove only one blank line at the end. + if(gridLines[length(gridLines)] == "") + gridLines.Cut(length(gridLines)) // Remove only one blank line at the end. + + bounds[MAP_MINY] = min(bounds[MAP_MINY], gridSet.ycrd) + gridSet.ycrd += length(gridLines) - 1 // Start at the top and work down + bounds[MAP_MAXY] = max(bounds[MAP_MAXY], gridSet.ycrd) - bounds[MAP_MINY] = min(bounds[MAP_MINY], clamp(gridSet.ycrd, y_lower, y_upper)) - gridSet.ycrd += gridLines.len - 1 // Start at the top and work down - bounds[MAP_MAXY] = max(bounds[MAP_MAXY], clamp(gridSet.ycrd, y_lower, y_upper)) + if(!line_len) + line_len = length(gridLines[1]) - var/maxx = gridSet.xcrd - if(gridLines.len) //Not an empty map - maxx = max(maxx, gridSet.xcrd + length(gridLines[1]) / key_len - 1) + var/maxx = curr_x + if(length(gridLines)) //Not an empty map + maxx = max(maxx, curr_x + line_len / key_len - 1) - bounds[MAP_MAXX] = clamp(max(bounds[MAP_MAXX], maxx), x_lower, x_upper) + bounds[MAP_MAXX] = max(bounds[MAP_MAXX], maxx) CHECK_TICK // Indicate failure to parse any coordinates by nulling bounds if(bounds[1] == 1.#INF) - bounds = null - parsed_bounds = bounds + src.bounds = null + else + // Clamp all our mins and maxes down to the proscribed limits + bounds[MAP_MINX] = clamp(bounds[MAP_MINX], x_lower, x_upper) + bounds[MAP_MAXX] = clamp(bounds[MAP_MAXX], x_lower, x_upper) + bounds[MAP_MINY] = clamp(bounds[MAP_MINY], y_lower, y_upper) + bounds[MAP_MAXY] = clamp(bounds[MAP_MAXY], y_lower, y_upper) + bounds[MAP_MINZ] = clamp(bounds[MAP_MINZ], z_lower, z_upper) + bounds[MAP_MAXZ] = clamp(bounds[MAP_MAXZ], z_lower, z_upper) + + parsed_bounds = src.bounds + src.key_len = key_len + src.line_len = line_len + +/// Iterates over all grid sets and returns ones with z values within the given bounds. Inclusive +/datum/parsed_map/proc/filter_grid_sets_based_on_z_bounds(lower_z, upper_z) + var/list/filtered_sets = list() + for(var/datum/grid_set/grid_set as anything in gridSets) + if(grid_set.zcrd < lower_z) + continue + if(grid_set.zcrd > upper_z) + continue + filtered_sets += grid_set + return filtered_sets -/// Load the parsed map into the world. See [/proc/load_map] for arguments. -/datum/parsed_map/proc/load(x_offset, y_offset, z_offset, cropMap, no_changeturf, x_lower, x_upper, y_lower, y_upper, placeOnTop, delete) +/// Load the parsed map into the world. You probably want [/proc/load_map]. Keep the signature the same. +/datum/parsed_map/proc/load(x_offset = 0, y_offset = 0, z_offset = 0, crop_map = FALSE, no_changeturf = FALSE, x_lower = -INFINITY, x_upper = INFINITY, y_lower = -INFINITY, y_upper = INFINITY, z_lower = -INFINITY, z_upper = INFINITY, place_on_top = FALSE, new_z = FALSE, delete = FALSE) //How I wish for RAII Master.StartLoadingMap() - . = _load_impl(x_offset, y_offset, z_offset, cropMap, no_changeturf, x_lower, x_upper, y_lower, y_upper, placeOnTop, delete) + . = _load_impl(x_offset, y_offset, z_offset, crop_map, no_changeturf, x_lower, x_upper, y_lower, y_upper, z_lower, z_upper, place_on_top, new_z, delete) Master.StopLoadingMap() +#define MAPLOADING_CHECK_TICK \ + if(TICK_CHECK) { \ + if(loading) { \ + SSatoms.map_loader_stop(REF(src)); \ + stoplag(); \ + SSatoms.map_loader_begin(REF(src)); \ + } else { \ + stoplag(); \ + } \ + } + // Do not call except via load() above. -/datum/parsed_map/proc/_load_impl(x_offset = 1, y_offset = 1, z_offset = world.maxz + 1, cropMap = FALSE, no_changeturf = FALSE, x_lower = -INFINITY, x_upper = INFINITY, y_lower = -INFINITY, y_upper = INFINITY, placeOnTop = FALSE, delete = FALSE) - var/list/areaCache = list() +/datum/parsed_map/proc/_load_impl(x_offset, y_offset, z_offset, crop_map, no_changeturf, x_lower, x_upper, y_lower, y_upper, z_lower, z_upper, place_on_top, new_z, delete) + PRIVATE_PROC(TRUE) + // Tell ss atoms that we're doing maploading + // We'll have to account for this in the following tick_checks so it doesn't overflow + loading = TRUE + SSatoms.map_loader_begin(REF(src)) + + // Loading used to be done in this proc + // We make the assumption that if the inner procs runtime, we WANT to do cleanup on them, but we should stil tell our parents we failed + // Since well, we did + var/sucessful = FALSE + switch(map_format) + if(MAP_TGM) + sucessful = _tgm_load(x_offset, y_offset, z_offset, crop_map, no_changeturf, x_lower, x_upper, y_lower, y_upper, z_lower, z_upper, place_on_top, new_z, delete) + else + sucessful = _dmm_load(x_offset, y_offset, z_offset, crop_map, no_changeturf, x_lower, x_upper, y_lower, y_upper, z_lower, z_upper, place_on_top, new_z, delete) + + // And we are done lads, call it off + SSatoms.map_loader_stop(REF(src)) + loading = FALSE + + // CM: Disabled due to not using contained_turfs and SSarea_contents +// if(new_z) +// for(var/z_index in bounds[MAP_MINZ] to bounds[MAP_MAXZ]) +// SSmapping.build_area_turfs(z_index) + + if(!no_changeturf) + var/list/turfs = block( + locate(bounds[MAP_MINX], bounds[MAP_MINY], bounds[MAP_MINZ]), + locate(bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ])) + for(var/turf/T as anything in turfs) + //we do this after we load everything in. if we don't, we'll have weird atmos bugs regarding atmos adjacent turfs + T.AfterChange(CHANGETURF_IGNORE_AIR) + + if(expanded_x || expanded_y) + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_EXPANDED_WORLD_BOUNDS, expanded_x, expanded_y) + + #ifdef TESTING + if(turfsSkipped) + testing("Skipped loading [turfsSkipped] default turfs") + #endif + + return sucessful + +// Wanna clear something up about maps, talking in 255x255 here +// In the tgm format, each gridset contains 255 lines, each line representing one tile, with 255 total gridsets +// In the dmm format, each gridset contains 255 lines, each line representing one row of tiles, containing 255 * line length characters, with one gridset per z +// You can think of dmm as storing maps in rows, whereas tgm stores them in columns +/datum/parsed_map/proc/_tgm_load(x_offset, y_offset, z_offset, crop_map, no_changeturf, x_lower, x_upper, y_lower, y_upper, z_lower, z_upper, place_on_top, new_z, delete) + // setup var/list/modelCache = build_cache(no_changeturf) var/space_key = modelCache[SPACE_KEY] var/list/bounds src.bounds = bounds = list(1.#INF, 1.#INF, 1.#INF, -1.#INF, -1.#INF, -1.#INF) - for(var/I in gridSets) - var/datum/grid_set/gset = I - var/ycrd = gset.ycrd + y_offset - 1 - var/zcrd = gset.zcrd + z_offset - 1 - if(!cropMap && ycrd > world.maxy) - world.maxy = ycrd // Expand Y here. X is expanded in the loop below + // Building y coordinate ranges + var/y_relative_to_absolute = y_offset - 1 + var/x_relative_to_absolute = x_offset - 1 + + // Ok so like. something important + // We talk in "relative" coords here, so the coordinate system of the map datum + // This is so we can do offsets, but it is NOT the same as positions in game + // That's why there's some uses of - y_relative_to_absolute here, to turn absolute positions into relative ones + // TGM maps process in columns, so the starting y will always be the max size + // We know y starts at 1 + var/datum/grid_set/first_column = gridSets[1] + var/relative_y = first_column.ycrd + var/highest_y = relative_y + y_relative_to_absolute + + if(!crop_map && highest_y > world.maxy) + if(new_z) + // Need to avoid improperly loaded area/turf_contents + world.increase_max_y(highest_y, map_load_z_cutoff = z_offset - 1) + else + world.increase_max_y(highest_y) + expanded_y = TRUE + + // Skip Y coords that are above the smallest of the three params + // So maxy and y_upper get to act as thresholds, and relative_y can play + var/y_skip_above = min(world.maxy - y_relative_to_absolute, y_upper, relative_y) + // How many lines to skip because they'd be above the y cuttoff line + var/y_starting_skip = relative_y - y_skip_above + highest_y -= y_starting_skip + + // Y is the LOWEST it will ever be here, so we can easily set a threshold for how low to go + var/line_count = length(first_column.gridLines) + var/lowest_y = relative_y - (line_count - 1) // -1 because we decrement at the end of the loop, not the start + var/y_ending_skip = max(max(y_lower, 1 - y_relative_to_absolute) - lowest_y, 0) + + // X setup + var/x_delta_with = x_upper + if(crop_map) + // Take our smaller crop threshold yes? + x_delta_with = min(x_delta_with, world.maxx) + + // We're gonna skip all the entries above the upper x, or maxx if cropMap is set + // The last column is guarenteed to have the highest x value we;ll encounter + // Even if z scales, this still works + var/datum/grid_set/last_column = gridSets[length(gridSets)] + var/final_x = last_column.xcrd + x_relative_to_absolute + + if(final_x > x_delta_with) + // If our relative x is greater then X upper, well then we've gotta limit our expansion + var/delta = max(final_x - x_delta_with, 0) + final_x -= delta + if(final_x > world.maxx && !crop_map) + if(new_z) + // Need to avoid improperly loaded area/turf_contents + world.increase_max_x(final_x, map_load_z_cutoff = z_offset - 1) + else + world.increase_max_x(final_x) + expanded_x = TRUE + + var/lowest_x = max(x_lower, 1 - x_relative_to_absolute) + + // Amount we offset the grid zcrd to get the true zcrd + var/grid_z_offset = z_offset - 1 + var/z_upper_set = z_upper < INFINITY + var/z_lower_set = z_lower > -INFINITY + + // We make the assumption that the last block of turfs will have the highest embedded z in it + // true max zcrd + var/map_bounds_z_max = last_column.zcrd + var/z_upper_parsed = map_bounds_z_max + z_offset - 1 + if(z_upper_set) + z_upper_parsed -= map_bounds_z_max - z_upper + if(z_lower_set) + var/offset_amount = z_lower - 1 + z_upper_parsed -= offset_amount + grid_z_offset -= offset_amount + + var/list/target_grid_sets = gridSets + if(z_lower_set || z_upper_set) // bounds are set, filter out gridsets for z levels we don't want + target_grid_sets = filter_grid_sets_based_on_z_bounds(z_lower, z_upper) + + var/z_threshold = world.maxz + if(z_upper_parsed > z_threshold && crop_map) + for(var/i in z_threshold + 1 to z_upper_parsed) //create a new z_level if needed + world.incrementMaxZ() + if(!no_changeturf) + WARNING("Z-level expansion occurred without no_changeturf set, this may cause problems when /turf/AfterChange is called") + + for(var/datum/grid_set/gset as anything in target_grid_sets) + var/true_xcrd = gset.xcrd + x_relative_to_absolute + + // any cutoff of x means we just shouldn't iterate this gridset + if(final_x < true_xcrd || lowest_x > gset.xcrd) + continue + + var/zcrd = gset.zcrd + grid_z_offset + // If we're using changeturf, we disable it if we load into a z level we JUST created + var/no_afterchange = no_changeturf || zcrd > z_threshold + + // We're gonna track the first and last pairs of coords we find + // Since x is always incremented in steps of 1, we only need to deal in y + // The first x is guarenteed to be the lowest, the first y the highest, and vis versa + // This is faster then doing mins and maxes inside the hot loop below + var/first_found = FALSE + var/first_y = 0 + var/last_y = 0 + + var/ycrd = highest_y + // Everything following this line is VERY hot. + for(var/i in 1 + y_starting_skip to line_count - y_ending_skip) + if(gset.gridLines[i] == space_key && no_afterchange) + #ifdef TESTING + ++turfsSkipped + #endif + ycrd-- + MAPLOADING_CHECK_TICK + continue + + var/list/cache = modelCache[gset.gridLines[i]] + if(!cache) + SSatoms.map_loader_stop(REF(src)) + CRASH("Undefined model key in DMM: [gset.gridLines[i]]") + build_coordinate(cache, locate(true_xcrd, ycrd, zcrd), no_afterchange, place_on_top, new_z, delete) + + // only bother with bounds that actually exist + if(!first_found) + first_found = TRUE + first_y = ycrd + last_y = ycrd + ycrd-- + MAPLOADING_CHECK_TICK + + // The x coord never changes, so not tracking first x is safe + // If no ycrd is found, we assume this row is totally empty and just continue on + if(first_found) + bounds[MAP_MINX] = min(bounds[MAP_MINX], true_xcrd) + bounds[MAP_MINY] = min(bounds[MAP_MINY], last_y) + bounds[MAP_MINZ] = min(bounds[MAP_MINZ], zcrd) + bounds[MAP_MAXX] = max(bounds[MAP_MAXX], true_xcrd) + bounds[MAP_MAXY] = max(bounds[MAP_MAXY], first_y) + bounds[MAP_MAXZ] = max(bounds[MAP_MAXZ], zcrd) + return TRUE + +/// Stanrdard loading, not used in production +/// Doesn't take advantage of any tgm optimizations, which makes it slower but also more general +/// Use this if for some reason your map format is messy +/datum/parsed_map/proc/_dmm_load(x_offset, y_offset, z_offset, crop_map, no_changeturf, x_lower, x_upper, y_lower, y_upper, z_lower, z_upper, place_on_top, new_z, delete) + // setup + var/list/modelCache = build_cache(no_changeturf) + var/space_key = modelCache[SPACE_KEY] + var/list/bounds + var/key_len = src.key_len + src.bounds = bounds = list(1.#INF, 1.#INF, 1.#INF, -1.#INF, -1.#INF, -1.#INF) + + var/y_relative_to_absolute = y_offset - 1 + var/x_relative_to_absolute = x_offset - 1 + var/line_len = src.line_len + + // Amount we offset the grid zcrd to get the true zcrd + var/grid_z_offset = z_offset - 1 + var/z_upper_set = z_upper < INFINITY + var/z_lower_set = z_lower > -INFINITY + + // we now need to find the maximum z, fun! + var/map_bounds_z_max = 1 + for(var/datum/grid_set/grid_set as anything in gridSets) + map_bounds_z_max = max(map_bounds_z_max, grid_set.zcrd) + + var/z_upper_parsed = map_bounds_z_max + z_offset - 1 + if(z_upper_set) + z_upper_parsed -= map_bounds_z_max - z_upper + if(z_lower_set) + var/offset_amount = z_lower - 1 + z_upper_parsed -= offset_amount + grid_z_offset -= offset_amount + + var/list/target_grid_sets = gridSets + if(z_lower_set || z_upper_set) // bounds are set, filter out gridsets for z levels we don't want + target_grid_sets = filter_grid_sets_based_on_z_bounds(z_lower, z_upper) + + for(var/datum/grid_set/gset as anything in target_grid_sets) + var/relative_x = gset.xcrd + var/relative_y = gset.ycrd + var/true_xcrd = relative_x + x_relative_to_absolute + var/ycrd = relative_y + y_relative_to_absolute + var/zcrd = gset.zcrd + grid_z_offset + if(!crop_map && ycrd > world.maxy) + if(new_z) + // Need to avoid improperly loaded area/turf_contents + world.increase_max_y(ycrd, map_load_z_cutoff = z_offset - 1) + else + world.increase_max_y(ycrd) + expanded_y = TRUE var/zexpansion = zcrd > world.maxz + var/no_afterchange = no_changeturf if(zexpansion) - if(cropMap) + if(crop_map) continue else while (zcrd > world.maxz) //create a new z_level if needed world.incrementMaxZ() if(!no_changeturf) WARNING("Z-level expansion occurred without no_changeturf set, this may cause problems when /turf/AfterChange is called") - - for(var/line in gset.gridLines) - if((ycrd - y_offset + 1) < y_lower || (ycrd - y_offset + 1) > y_upper) //Reverse operation and check if it is out of bounds of cropping. - --ycrd - continue - if(ycrd <= world.maxy && ycrd >= 1) - var/xcrd = gset.xcrd + x_offset - 1 - for(var/tpos = 1 to length(line) - key_len + 1 step key_len) - if((xcrd - x_offset + 1) < x_lower || (xcrd - x_offset + 1) > x_upper) //Same as above. - ++xcrd - continue //X cropping. - if(xcrd > world.maxx) - if(cropMap) - break - else - world.maxx = xcrd - - if(xcrd >= 1) - var/model_key = copytext(line, tpos, tpos + key_len) - var/no_afterchange = no_changeturf || zexpansion - if(!no_afterchange || (model_key != space_key)) - var/list/cache = modelCache[model_key] - if(!cache) - CRASH("Undefined model key in DMM: [model_key]") - build_coordinate(areaCache, cache, locate(xcrd, ycrd, zcrd), no_afterchange, placeOnTop, delete) - - // only bother with bounds that actually exist - bounds[MAP_MINX] = min(bounds[MAP_MINX], xcrd) - bounds[MAP_MINY] = min(bounds[MAP_MINY], ycrd) - bounds[MAP_MINZ] = min(bounds[MAP_MINZ], zcrd) - bounds[MAP_MAXX] = max(bounds[MAP_MAXX], xcrd) - bounds[MAP_MAXY] = max(bounds[MAP_MAXY], ycrd) - bounds[MAP_MAXZ] = max(bounds[MAP_MAXZ], zcrd) - #ifdef TESTING - else - ++turfsSkipped - #endif - CHECK_TICK + no_afterchange = TRUE + // Ok so like. something important + // We talk in "relative" coords here, so the coordinate system of the map datum + // This is so we can do offsets, but it is NOT the same as positions in game + // That's why there's some uses of - y_relative_to_absolute here, to turn absolute positions into relative ones + + // Skip Y coords that are above the smallest of the three params + // So maxy and y_upper get to act as thresholds, and relative_y can play + var/y_skip_above = min(world.maxy - y_relative_to_absolute, y_upper, relative_y) + // How many lines to skip because they'd be above the y cuttoff line + var/y_starting_skip = relative_y - y_skip_above + ycrd += y_starting_skip + + // Y is the LOWEST it will ever be here, so we can easily set a threshold for how low to go + var/line_count = length(gset.gridLines) + var/lowest_y = relative_y - (line_count - 1) // -1 because we decrement at the end of the loop, not the start + var/y_ending_skip = max(max(y_lower, 1 - y_relative_to_absolute) - lowest_y, 0) + + // Now we're gonna precompute the x thresholds + // We skip all the entries below the lower x, or 1 + var/starting_x_delta = max(max(x_lower, 1 - x_relative_to_absolute) - relative_x, 0) + // The x loop counts by key length, so we gotta multiply here + var/x_starting_skip = starting_x_delta * key_len + true_xcrd += starting_x_delta + + // We're gonna skip all the entries above the upper x, or maxx if cropMap is set + var/x_target = line_len - key_len + 1 + var/x_step_count = ROUND_UP(x_target / key_len) + var/final_x = relative_x + (x_step_count - 1) + var/x_delta_with = x_upper + if(crop_map) + // Take our smaller crop threshold yes? + x_delta_with = min(x_delta_with, world.maxx) + if(final_x > x_delta_with) + // If our relative x is greater then X upper, well then we've gotta limit our expansion + var/delta = max(final_x - x_delta_with, 0) + x_step_count -= delta + final_x -= delta + x_target = x_step_count * key_len + if(final_x > world.maxx && !crop_map) + if(new_z) + // Need to avoid improperly loaded area/turf_contents + world.increase_max_x(final_x, map_load_z_cutoff = z_offset - 1) + else + world.increase_max_x(final_x) + expanded_x = TRUE + + // We're gonna track the first and last pairs of coords we find + // The first x is guarenteed to be the lowest, the first y the highest, and vis versa + // This is faster then doing mins and maxes inside the hot loop below + var/first_found = FALSE + var/first_x = 0 + var/first_y = 0 + var/last_x = 0 + var/last_y = 0 + + // Everything following this line is VERY hot. How hot depends on the map format + // (Yes this does mean dmm is technically faster to parse. shut up) + for(var/i in 1 + y_starting_skip to line_count - y_ending_skip) + var/line = gset.gridLines[i] + + var/xcrd = true_xcrd + for(var/tpos in 1 + x_starting_skip to x_target step key_len) + var/model_key = copytext(line, tpos, tpos + key_len) + if(model_key == space_key && no_afterchange) + #ifdef TESTING + ++turfsSkipped + #endif + MAPLOADING_CHECK_TICK ++xcrd - --ycrd - - CHECK_TICK + continue + var/list/cache = modelCache[model_key] + if(!cache) + SSatoms.map_loader_stop(REF(src)) + CRASH("Undefined model key in DMM: [model_key]") + build_coordinate(cache, locate(xcrd, ycrd, zcrd), no_afterchange, place_on_top, new_z, delete) + + // only bother with bounds that actually exist + if(!first_found) + first_found = TRUE + first_x = xcrd + first_y = ycrd + last_x = xcrd + last_y = ycrd + MAPLOADING_CHECK_TICK + ++xcrd + ycrd-- + MAPLOADING_CHECK_TICK + bounds[MAP_MINX] = min(bounds[MAP_MINX], first_x) + bounds[MAP_MINY] = min(bounds[MAP_MINY], last_y) + bounds[MAP_MINZ] = min(bounds[MAP_MINZ], zcrd) + bounds[MAP_MAXX] = max(bounds[MAP_MAXX], last_x) + bounds[MAP_MAXY] = max(bounds[MAP_MAXY], first_y) + bounds[MAP_MAXZ] = max(bounds[MAP_MAXZ], zcrd) - //if(!no_changeturf)// mapping TODO: - // for(var/t in block(locate(bounds[MAP_MINX], bounds[MAP_MINY], bounds[MAP_MINZ]), locate(bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ]))) - // var/turf/T = t - // //we do this after we load everything in. if we don't; we'll have weird atmos bugs regarding atmos adjacent turfs - // T.AfterChange(CHANGETURF_IGNORE_AIR) + return TRUE - #ifdef TESTING - if(turfsSkipped) - testing("Skipped loading [turfsSkipped] default turfs") - #endif +GLOBAL_LIST_EMPTY(map_model_default) - return TRUE +/datum/parsed_map/proc/build_cache(no_changeturf, bad_paths) + if(map_format == MAP_TGM) + return tgm_build_cache(no_changeturf, bad_paths) + return dmm_build_cache(no_changeturf, bad_paths) -/datum/parsed_map/proc/build_cache(no_changeturf, bad_paths=null) +/datum/parsed_map/proc/tgm_build_cache(no_changeturf, bad_paths=null) if(modelCache && !bad_paths) return modelCache . = modelCache = list() var/list/grid_models = src.grid_models + var/set_space = FALSE + // Use where a list is needed, but where it will not be modified + // Used here to remove the cost of needing to make a new list for each fields entry when it's set manually later + var/static/list/default_list = GLOB.map_model_default // It's stupid, but it saves += list(list) + var/static/list/wrapped_default_list = list(default_list) // It's stupid, but it saves += list(list) + var/static/regex/var_edits = var_edits_tgm + + var/path_to_init = "" + // Reference to the attributes list we're currently filling, if any + var/list/current_attributes + // If we are currently editing a path or not + var/editing = FALSE for(var/model_key in grid_models) - var/model = grid_models[model_key] - var/list/members = list() //will contain all members (paths) in model (in our example : /turf/unsimulated/wall and /area/mine/explored) - var/list/members_attributes = list() //will contain lists filled with corresponding variables, if any (in our example : list(icon_state = "rock") and list()) + // We're going to split models by newline + // This guarentees that each entry will be of interest to us + // Then we'll process them step by step + // Hopefully this reduces the cost from read_list that we'd otherwise have + var/list/lines = splittext(grid_models[model_key], "\n") + // Builds list of path/edits for later + // Of note: we cannot preallocate them to save time in list expansion later + // But fortunately lists allocate at least 8 entries normally anyway, and + // We are unlikely to have more then that many members + //will contain all members (paths) in model (in our example : /turf/unsimulated/wall) + var/list/members = list() + //will contain lists filled with corresponding variables, if any (in our example : list(icon_state = "rock") and list()) + var/list/members_attributes = list() ///////////////////////////////////////////////////////// //Constructing members and corresponding variables lists //////////////////////////////////////////////////////// + // string representation of the path to init + for(var/line in lines) + // We do this here to avoid needing to check at each return statement + // No harm in it anyway + MAPLOADING_CHECK_TICK + + switch(line[length(line)]) + if(";") // Var edit, we'll apply it + // Var edits look like \tname = value; + // I'm gonna try capturing them with regex, since it ought to be the fastest here + // Should hand back key = value + var_edits.Find(line) + var/value = parse_constant(var_edits.group[2]) + if(istext(value)) + value = apply_text_macros(value) + current_attributes[var_edits.group[1]] = value + continue // Keep on keeping on brother + if("{") // Start of an edit, and so also the start of a path + editing = TRUE + current_attributes = list() // Init the list we'll be filling + members_attributes += list(current_attributes) + path_to_init = copytext(line, 1, -1) + if(",") // Either the end of a path, or the end of an edit + if(editing) // it was the end of a path + editing = FALSE + continue + members_attributes += wrapped_default_list // We know this is a path, and we also know it has no vv's. so we'll just set this to the default list + // Drop the last char mind + path_to_init = copytext(line, 1, -1) + if("}") // Gotta be the end of an area edit, let's check to be sure + if(editing) // it was the end of an area edit (shouldn't do those anyhow) + editing = FALSE + continue + stack_trace("ended a line on JUST a }, with no ongoing edit. What? Area shit?") + else // If we're editing, this is a var edit entry. the last one in a stack, cause god hates me. Otherwise, it's an area + if(editing) // I want inline I want inline I want inline + // Var edits look like \tname = value; + // I'm gonna try capturing them with regex, since it ought to be the fastest here + // Should hand back key = value + var_edits.Find(line) + var/value = parse_constant(var_edits.group[2]) + if(istext(value)) + value = apply_text_macros(value) + current_attributes[var_edits.group[1]] = value + continue // Keep on keeping on brother - var/index = 1 - var/old_position = 1 - var/dpos + members_attributes += wrapped_default_list // We know this is a path, and we also know it has no vv's. so we'll just set this to the default list + path_to_init = line - while(dpos != 0) - //finding next member (e.g /turf/unsimulated/wall{icon_state = "rock"} or /area/mine/explored) - dpos = find_next_delimiter_position(model, old_position, ",", "{", "}") //find next delimiter (comma here) that's not within {...} - var/full_def = trim_text(copytext(model, old_position, dpos)) //full definition, e.g : /obj/foo/bar{variables=derp} - var/variables_start = findtext(full_def, "{") - var/path_text = trim_text(copytext(full_def, 1, variables_start)) + // Alright, if we've gotten to this point, our string is a path + // Oh and we don't trim it, because we require no padding for these + // Saves like 1.5 deciseconds + var/atom_def = text2path(path_to_init) //path definition, e.g /obj/foo/bar + + if(!ispath(atom_def, /atom)) // Skip the item if the path does not exist. Fix your crap, mappers! + if(bad_paths) + // Rare case, avoid the var to save time most of the time + LAZYOR(bad_paths[copytext(line, 1, -1)], model_key) + continue + // Index is already incremented either way, just gotta set the path and all + members += atom_def + + //check and see if we can just skip this turf + //So you don't have to understand this horrid statement, we can do this if + // 1. the space_key isn't set yet + // 2. no_changeturf is set + // 3. there are exactly 2 members + // 4. with no attributes + // 5. and the members are world.turf and world.area + // Basically, if we find an entry like this: "XXX" = (/turf/default, /area/default) + // We can skip calling this proc every time we see XXX + if(!set_space \ + && no_changeturf \ + && members_attributes.len == 2 \ + && members.len == 2 \ + && members_attributes[1] == default_list \ + && members_attributes[2] == default_list \ + && members[2] == world.area \ + && members[1] == world.turf + ) + set_space = TRUE + .[SPACE_KEY] = model_key + continue + + .[model_key] = list(members, members_attributes) + return . + +/// Builds key caches for general formats +/// Slower then the proc above, tho it could still be optimized slightly. it's just not a priority +/// Since we don't run DMM maps, ever. +/datum/parsed_map/proc/dmm_build_cache(no_changeturf, bad_paths=null) + if(modelCache && !bad_paths) + return modelCache + . = modelCache = list() + var/list/grid_models = src.grid_models + var/set_space = FALSE + // Use where a list is needed, but where it will not be modified + // Used here to remove the cost of needing to make a new list for each fields entry when it's set manually later + var/static/list/default_list = list(GLOB.map_model_default) + for(var/model_key in grid_models) + //will contain all members (paths) in model (in our example : /turf/unsimulated/wall) + var/list/members = list() + //will contain lists filled with corresponding variables, if any (in our example : list(icon_state = "rock") and list()) + var/list/members_attributes = list() + + var/model = grid_models[model_key] + ///////////////////////////////////////////////////////// + //Constructing members and corresponding variables lists + //////////////////////////////////////////////////////// + + var/model_index = 1 + while(model_path.Find(model, model_index)) + var/variables_start = 0 + var/member_string = model_path.group[1] + model_index = model_path.next + //findtext is a bit expensive, lets only do this if the last char of our string is a } (IE: we know we have vars) + //this saves about 25 miliseconds on my machine. Not a major optimization + if(member_string[length(member_string)] == "}") + variables_start = findtext(member_string, "{") + + var/path_text = TRIM_TEXT(copytext(member_string, 1, variables_start)) var/atom_def = text2path(path_text) //path definition, e.g /obj/foo/bar - if(dpos) - old_position = dpos + length(model[dpos]) if(!ispath(atom_def, /atom)) // Skip the item if the path does not exist. Fix your crap, mappers! if(bad_paths) LAZYOR(bad_paths[path_text], model_key) continue - members.Add(atom_def) + members += atom_def //transform the variables in text format into a list (e.g {var1="derp"; var2; var3=7} => list(var1="derp", var2, var3=7)) - var/list/fields = list() - + // OF NOTE: this could be made faster by replacing readlist with a progressive regex + // I'm just too much of a bum to do it rn, especially since we mandate tgm format for any maps in repo + var/list/fields = default_list if(variables_start)//if there's any variable - full_def = copytext(full_def, variables_start + length(full_def[variables_start]), -length(copytext_char(full_def, -1))) //removing the last '}' - fields = readlist(full_def, ";") - if(fields.len) - if(!trim(fields[fields.len])) - --fields.len - for(var/I in fields) - var/value = fields[I] - if(istext(value)) - fields[I] = apply_text_macros(value) + member_string = copytext(member_string, variables_start + length(member_string[variables_start]), -length(copytext_char(member_string, -1))) //removing the last '}' + fields = list(readlist(member_string, ";")) + for(var/I in fields) + var/value = fields[I] + if(istext(value)) + fields[I] = apply_text_macros(value) //then fill the members_attributes list with the corresponding variables - members_attributes.len++ - members_attributes[index++] = fields - - CHECK_TICK + members_attributes += fields + MAPLOADING_CHECK_TICK //check and see if we can just skip this turf //So you don't have to understand this horrid statement, we can do this if - // 1. no_changeturf is set - // 2. the space_key isn't set yet + // 1. the space_key isn't set yet + // 2. no_changeturf is set // 3. there are exactly 2 members // 4. with no attributes // 5. and the members are world.turf and world.area // Basically, if we find an entry like this: "XXX" = (/turf/default, /area/default) // We can skip calling this proc every time we see XXX - if(no_changeturf \ - && !(.[SPACE_KEY]) \ + if(!set_space \ + && no_changeturf \ && members.len == 2 \ && members_attributes.len == 2 \ && length(members_attributes[1]) == 0 \ && length(members_attributes[2]) == 0 \ && (world.area in members) \ && (world.turf in members)) - + set_space = TRUE .[SPACE_KEY] = model_key continue - .[model_key] = list(members, members_attributes) + return . -/datum/parsed_map/proc/build_coordinate(list/areaCache, list/model, turf/crds, no_changeturf as num, placeOnTop as num, delete) +/datum/parsed_map/proc/build_coordinate(list/model, turf/crds, no_changeturf as num, placeOnTop as num, new_z, delete) + // If we don't have a turf, nothing we will do next will actually acomplish anything, so just go back + // Note, this would actually drop area vvs in the tile, but like, why tho + if(!crds) + return var/index var/list/members = model[1] var/list/members_attributes = model[2] + // We use static lists here because it's cheaper then passing them around + var/static/list/default_list = GLOB.map_model_default //////////////// //Instanciation //////////////// + if(turf_blacklist?[crds]) + return + //The next part of the code assumes there's ALWAYS an /area AND a /turf on a given tile //first instance the /area and remove it from the members list index = members.len + var/area/old_area if(members[index] != /area/template_noop) - var/atype = members[index] - GLOB._preloader.setup(members_attributes[index], atype)//preloader for assigning set variables on atom creation - var/atom/instance = areaCache[atype] - if(!instance) - instance = GLOB.areas_by_type[atype] - if(!instance) - instance = new atype(null) - areaCache[atype] = instance - if(crds) - instance.contents.Add(crds) - - if(GLOB.use_preloader && instance) - GLOB._preloader.load(instance) - - //then instance the /turf and, if multiple tiles are presents, simulates the DMM underlays piling effect - - var/first_turf_index = 1 - while(!ispath(members[first_turf_index], /turf)) //find first /turf object in members - first_turf_index++ - - //turn off base new Initialization until the whole thing is loaded - SSatoms.map_loader_begin() - //instanciate the first /turf - var/turf/T - if(members[first_turf_index] != /turf/template_noop) - T = instance_atom(members[first_turf_index], members_attributes[first_turf_index], crds,no_changeturf, placeOnTop, delete) - - if(T) - //if others /turf are presents, simulates the underlays piling effect - index = first_turf_index + 1 - while(index <= members.len - 1) // Last item is an /area - var/underlay = T.appearance - T = instance_atom(members[index], members_attributes[index], crds,no_changeturf, placeOnTop, delete)//instance new turf - T.underlays += underlay - index++ + if(members_attributes[index] != default_list) + world.preloader_setup(members_attributes[index], members[index])//preloader for assigning set variables on atom creation + var/area/area_instance = loaded_areas[members[index]] + if(!area_instance) + var/area_type = members[index] + // If this parsed map doesn't have that area already, we check the global cache + area_instance = GLOB.areas_by_type[area_type] + // If the global list DOESN'T have this area it's either not a unique area, or it just hasn't been created yet + if (!area_instance) + area_instance = new area_type(null) + if(!area_instance) + CRASH("[area_type] failed to be new'd, what'd you do?") + loaded_areas[area_type] = area_instance + + if(!new_z) + old_area = crds.loc +// old_area.turfs_to_uncontain += crds +// area_instance.contained_turfs.Add(crds) + area_instance.contents.Add(crds) + + if(GLOB.use_preloader) + world.preloader_load(area_instance) + + // Index right before /area is /turf + index-- + var/atom/instance + //then instance the /turf + //NOTE: this used to place any turfs before the last "underneath" it using .appearance and underlays + //We don't actually use this, and all it did was cost cpu, so we don't do this anymore + if(members[index] != /turf/template_noop) + if(members_attributes[index] != default_list) + world.preloader_setup(members_attributes[index], members[index]) + + // CM/TGMC addition: delete map contents before inserting if delete truthy + if(delete) + for(var/atom/turf_atom as anything in crds.GetAllTurfStrictContents()) + if(isobserver(turf_atom)) + continue + qdel(turf_atom, force = TRUE) + + // Note: we make the assertion that the last path WILL be a turf. if it isn't, this will fail. + if(placeOnTop) + instance = crds.load_on_top(members[index], CHANGETURF_DEFER_CHANGE | (no_changeturf ? CHANGETURF_SKIP : NONE)) + else if(no_changeturf) + instance = create_atom(members[index], crds)//first preloader pass + else + instance = crds.ChangeTurf(members[index], null, CHANGETURF_DEFER_CHANGE) + + if(GLOB.use_preloader && instance)//second preloader pass, for those atoms that don't ..() in New() + world.preloader_load(instance) + // If this isn't template work, we didn't change our turf and we changed area, then we've gotta handle area lighting transfer + else if(!no_changeturf && old_area) + // Don't do contain/uncontain stuff, this happens a few lines up when the area actally changes + crds.on_change_area(old_area, crds.loc) + MAPLOADING_CHECK_TICK //finally instance all remainings objects/mobs - for(index in 1 to first_turf_index-1) - instance_atom(members[index], members_attributes[index], crds, no_changeturf, placeOnTop, delete) - //Restore initialization to the previous value - SSatoms.map_loader_stop() + for(var/atom_index in 1 to index-1) + if(members_attributes[atom_index] != default_list) + world.preloader_setup(members_attributes[atom_index], members[atom_index]) + + // We make the assertion that only /atom s will be in this portion of the code. if that isn't true, this will fail + instance = create_atom(members[atom_index], crds)//first preloader pass + + if(GLOB.use_preloader && instance)//second preloader pass, for those atoms that don't ..() in New() + world.preloader_load(instance) + MAPLOADING_CHECK_TICK //////////////// //Helpers procs //////////////// -//Instance an atom at (x,y,z) and gives it the variables in attributes -/datum/parsed_map/proc/instance_atom(path,list/attributes, turf/crds, no_changeturf, placeOnTop, delete) - GLOB._preloader.setup(attributes, path) - - if(crds) - if(ispath(path, /turf)) - if(delete) - for(var/atom/A as anything in crds.GetAllTurfStrictContents()) - if(isobserver(A)) - continue - qdel(A, force=TRUE) - - if(placeOnTop) - . = crds.PlaceOnTop(null, path, CHANGETURF_DEFER_CHANGE | (no_changeturf ? CHANGETURF_SKIP : NONE)) - else if(!no_changeturf) - . = crds.ChangeTurf(path, null, CHANGETURF_DEFER_CHANGE) - else - . = create_atom(path, crds)//first preloader pass - else - . = create_atom(path, crds)//first preloader pass - - if(GLOB.use_preloader && .)//second preloader pass, for those atoms that don't ..() in New() - GLOB._preloader.load(.) - - //custom CHECK_TICK here because we don't want things created while we're sleeping to not initialize - if(TICK_CHECK) - SSatoms.map_loader_stop() - stoplag() - SSatoms.map_loader_begin() - /datum/parsed_map/proc/create_atom(path, crds) set waitfor = FALSE . = new path (crds) -//text trimming (both directions) helper proc -//optionally removes quotes before and after the text (for variable name) -/datum/parsed_map/proc/trim_text(what as text,trim_quotes=0) - if(trim_quotes) - return trimQuotesRegex.Replace(what, "") - else - return trimRegex.Replace(what, "") - - //find the position of the next delimiter,skipping whatever is comprised between opening_escape and closing_escape //returns 0 if reached the last delimiter /datum/parsed_map/proc/find_next_delimiter_position(text as text,initial_position as num, delimiter=",",opening_escape="\"",closing_escape="\"") @@ -410,7 +1007,6 @@ return next_delimiter - //build a list from variables in text form (e.g {var1="derp"; var2; var3=7} => list(var1="derp", var2, var3=7)) //return the filled list /datum/parsed_map/proc/readlist(text as text, delimiter=",") @@ -418,28 +1014,29 @@ if (!text) return + // If we're using a semi colon, we can do this as splittext rather then constant calls to find_next_delimiter_position + // This does make the code a bit harder to read, but saves a good bit of time so suck it up var/position var/old_position = 1 - while(position != 0) // find next delimiter that is not within "..." position = find_next_delimiter_position(text,old_position,delimiter) // check if this is a simple variable (as in list(var1, var2)) or an associative one (as in list(var1="foo",var2=7)) var/equal_position = findtext(text,"=",old_position, position) - - var/trim_left = trim_text(copytext(text,old_position,(equal_position ? equal_position : position))) - var/left_constant = delimiter == ";" ? trim_left : parse_constant(trim_left) + var/trim_left = TRIM_TEXT(copytext(text,old_position,(equal_position ? equal_position : position))) + var/left_constant = parse_constant(trim_left) if(position) old_position = position + length(text[position]) + if(!left_constant) // damn newlines man. Exists to provide behavior consistency with the above loop. not a major cost becuase this path is cold + continue if(equal_position && !isnum(left_constant)) // Associative var, so do the association. // Note that numbers cannot be keys - the RHS is dropped if so. - var/trim_right = trim_text(copytext(text, equal_position + length(text[equal_position]), position)) + var/trim_right = TRIM_TEXT(copytext(text, equal_position + length(text[equal_position]), position)) var/right_constant = parse_constant(trim_right) .[left_constant] = right_constant - else // simple var . += list(left_constant) @@ -451,7 +1048,10 @@ // string if(text[1] == "\"") - return copytext(text, length(text[1]) + 1, findtext(text, "\"", length(text[1]) + 1)) + // insert implied locate \" and length("\"") here + // It's a minimal timesave but it is a timesave + // Safe becuase we're guarenteed trimmed constants + return copytext(text, 2, -1) // list if(copytext(text, 1, 6) == "list(")//6 == length("list(") + 1 @@ -479,4 +1079,17 @@ /datum/parsed_map/Destroy() ..() + SSatoms.map_loader_stop(REF(src)) // Just in case, I don't want to double up here + if(turf_blacklist) + turf_blacklist.Cut() + parsed_bounds.Cut() + bounds.Cut() + grid_models.Cut() + gridSets.Cut() return QDEL_HINT_HARDDEL_NOW + +#undef MAP_DMM +#undef MAP_TGM +#undef MAP_UNKNOWN +#undef TRIM_TEXT +#undef MAPLOADING_CHECK_TICK diff --git a/code/modules/mapping/space_management/space_level.dm b/code/modules/mapping/space_management/space_level.dm index 861258aa20a2..48303b5e39ae 100644 --- a/code/modules/mapping/space_management/space_level.dm +++ b/code/modules/mapping/space_management/space_level.dm @@ -4,13 +4,20 @@ var/list/traits var/z_value = 1 //actual z placement var/linkage = SELFLOOPING - var/x_bounds - var/y_bounds + /// Bounds at time of loading the map + var/bounds /datum/space_level/New(new_z, new_name, list/new_traits = list()) z_value = new_z name = new_name traits = new_traits + + if (islist(new_traits)) + for (var/trait in new_traits) + SSmapping.z_trait_levels[trait] += list(new_z) + else // in case a single trait is passed in + SSmapping.z_trait_levels[new_traits] += list(new_z) //set_linkage(new_traits[ZTRAIT_LINKAGE]) - x_bounds = world.maxx - y_bounds = world.maxy + + //Lazy Init value, will be hopefully changed by SSmapping + bounds = list(1, 1, z_value, world.maxx, world.maxy, z_value) diff --git a/code/modules/mapping/space_management/space_reservation.dm b/code/modules/mapping/space_management/space_reservation.dm index adaff04000ff..3c47ac3b5c2a 100644 --- a/code/modules/mapping/space_management/space_reservation.dm +++ b/code/modules/mapping/space_management/space_reservation.dm @@ -1,81 +1,240 @@ +/// Cordon area surrounding turf reservations +/area/misc/cordon + name = "CORDON" + icon_state = "cordon" + static_lighting = FALSE + base_lighting_alpha = 255 + requires_power = FALSE + +#define CORDON_TURF_TYPE /turf/closed/cordon //Yes, they can only be rectangular. //Yes, I'm sorry. /datum/turf_reservation + /// All turfs that we've reserved var/list/reserved_turfs = list() + + /// Turfs around the reservation for cordoning + var/list/cordon_turfs = list() + + /// Area of turfs next to the cordon to fill with pre_cordon_area's + var/list/pre_cordon_turfs = list() + + /// The width of the reservation var/width = 0 + + /// The height of the reservation var/height = 0 - var/bottom_left_coords[3] - var/top_right_coords[3] - var/wipe_reservation_on_release = TRUE + + /// The z stack size of the reservation. Note that reservations are ALWAYS reserved from the bottom up + var/z_size = 0 + + /// List of the bottom left turfs. Indexed by what their z index for this reservation is + var/list/bottom_left_turfs = list() + + /// List of the top right turfs. Indexed by what their z index for this reservation is + var/list/top_right_turfs = list() + + /// The turf type the reservation is initially made with var/turf_type = /turf/open/space + ///Distance away from the cordon where we can put a "sort-cordon" and run some extra code (see make_repel). 0 makes nothing happen + var/pre_cordon_distance = 0 + /datum/turf_reservation/transit turf_type = /turf/open/space/transit + pre_cordon_distance = 7 /datum/turf_reservation/interior turf_type = /turf/open/void/vehicle /datum/turf_reservation/proc/Release() - var/v = reserved_turfs.Copy() - for(var/i in reserved_turfs) - var/turf/T = i - T.flags_atom |= UNUSED_RESERVATION_TURF - reserved_turfs -= i - SSmapping.used_turfs -= i - SSmapping.reserve_turfs(v) + bottom_left_turfs.Cut() + top_right_turfs.Cut() + + var/list/reserved_copy = reserved_turfs.Copy() + SSmapping.used_turfs -= reserved_turfs + reserved_turfs = list() + + var/list/cordon_copy = cordon_turfs.Copy() + SSmapping.used_turfs -= cordon_turfs + cordon_turfs = list() -/datum/turf_reservation/proc/Reserve(width, height, zlevel) + var/release_turfs = reserved_copy + cordon_copy + + for(var/turf/reserved_turf as anything in release_turfs) + SEND_SIGNAL(reserved_turf, COMSIG_TURF_RESERVATION_RELEASED, src) + + // Makes the linter happy, even tho we don't await this + INVOKE_ASYNC(SSmapping, TYPE_PROC_REF(/datum/controller/subsystem/mapping, reserve_turfs), release_turfs) + +/// Attempts to calaculate and store a list of turfs around the reservation for cordoning. Returns whether a valid cordon was calculated +/datum/turf_reservation/proc/calculate_cordon_turfs(turf/bottom_left, turf/top_right) + if(bottom_left.x < 2 || bottom_left.y < 2 || top_right.x > (world.maxx - 2) || top_right.y > (world.maxy - 2)) + return FALSE // no space for a cordon here + + var/list/possible_turfs = CORNER_OUTLINE(bottom_left, width, height) + // if they're our cordon turfs, accept them + possible_turfs -= cordon_turfs + for(var/turf/cordon_turf as anything in possible_turfs) + if(!(cordon_turf.turf_flags & UNUSED_RESERVATION_TURF)) + return FALSE + cordon_turfs |= possible_turfs + + if(pre_cordon_distance) + var/turf/offset_turf = locate(bottom_left.x + pre_cordon_distance, bottom_left.y + pre_cordon_distance, bottom_left.z) + var/list/to_add = CORNER_OUTLINE(offset_turf, width - pre_cordon_distance * 2, height - pre_cordon_distance * 2) //we step-by-stop move inwards from the outer cordon + for(var/turf/turf_being_added as anything in to_add) + pre_cordon_turfs |= turf_being_added //add one by one so we can filter out duplicates + + return TRUE + +/// Actually generates the cordon around the reservation, and marking the cordon turfs as reserved +/datum/turf_reservation/proc/generate_cordon() + for(var/turf/cordon_turf as anything in cordon_turfs) + var/area/misc/cordon/cordon_area = GLOB.areas_by_type[/area/misc/cordon] || new + //var/area/old_area = cordon_turf.loc + //old_area.turfs_to_uncontain += cordon_turf + //cordon_area.contained_turfs += cordon_turf + cordon_area.contents += cordon_turf + // Its no longer unused, but its also not "used" + cordon_turf.turf_flags &= ~UNUSED_RESERVATION_TURF + cordon_turf.ChangeTurf(CORDON_TURF_TYPE, CORDON_TURF_TYPE) + SSmapping.unused_turfs["[cordon_turf.z]"] -= cordon_turf + // still gets linked to us though + SSmapping.used_turfs[cordon_turf] = src + + //swap the area with the pre-cordoning area + +/// Internal proc which handles reserving the area for the reservation. +/datum/turf_reservation/proc/_reserve_area(width, height, zlevel) + src.width = width + src.height = height if(width > world.maxx || height > world.maxy || width < 1 || height < 1) - log_debug("turf reservation had invalid dimensions") return FALSE var/list/avail = SSmapping.unused_turfs["[zlevel]"] - var/turf/bottom_left - var/turf/top_right + var/turf/BL + var/turf/TR var/list/turf/final = list() var/passing = FALSE for(var/i in avail) CHECK_TICK - bottom_left = i - if(!(bottom_left.flags_atom & UNUSED_RESERVATION_TURF)) + BL = i + if(!(BL.turf_flags & UNUSED_RESERVATION_TURF)) continue - if(bottom_left.x + width > world.maxx || bottom_left.y + height > world.maxy) + if(BL.x + width > world.maxx || BL.y + height > world.maxy) continue - top_right = locate(bottom_left.x + width - 1, bottom_left.y + height - 1, bottom_left.z) - if(!(top_right.flags_atom & UNUSED_RESERVATION_TURF)) + TR = locate(BL.x + width - 1, BL.y + height - 1, BL.z) + if(!(TR.turf_flags & UNUSED_RESERVATION_TURF)) continue - final = block(bottom_left, top_right) + final = block(BL, TR) if(!final) continue passing = TRUE - for(var/turf/checking as anything in final) - if(!(checking.flags_atom & UNUSED_RESERVATION_TURF)) + for(var/I in final) + var/turf/checking = I + if(!(checking.turf_flags & UNUSED_RESERVATION_TURF)) passing = FALSE break + if(passing) // found a potentially valid area, now try to calculate its cordon + passing = calculate_cordon_turfs(BL, TR) if(!passing) continue break - if(!passing || !istype(bottom_left) || !istype(top_right)) - log_debug("failed to pass reservation tests, [passing], [istype(bottom_left)], [istype(top_right)]") + if(!passing || !istype(BL) || !istype(TR)) return FALSE - bottom_left_coords = list(bottom_left.x, bottom_left.y, bottom_left.z) - top_right_coords = list(top_right.x, top_right.y, top_right.z) - var/weakref = WEAKREF(src) for(var/i in final) var/turf/T = i reserved_turfs |= T SSmapping.unused_turfs["[T.z]"] -= T - SSmapping.used_turfs[T] = weakref - T = T.ChangeTurf(turf_type, turf_type) - T.flags_atom &= ~UNUSED_RESERVATION_TURF - src.width = width - src.height = height + SSmapping.used_turfs[T] = src + T.turf_flags = (T.turf_flags | RESERVATION_TURF) & ~UNUSED_RESERVATION_TURF + T.ChangeTurf(turf_type, turf_type) + + bottom_left_turfs += BL + top_right_turfs += TR + return TRUE + +/datum/turf_reservation/proc/reserve(width, height, z_size, z_reservation) + src.z_size = z_size + var/failed_reservation = FALSE + for(var/_ in 1 to z_size) + if(!_reserve_area(width, height, z_reservation)) + failed_reservation = TRUE + break + + if(failed_reservation) + Release() + return FALSE + + generate_cordon() return TRUE +/// Calculates the effective bounds information for the given turf. Returns a list of the information, or null if not applicable. +/datum/turf_reservation/proc/calculate_turf_bounds_information(turf/target) + for(var/z_idx in 1 to z_size) + var/turf/bottom_left = bottom_left_turfs[z_idx] + var/turf/top_right = top_right_turfs[z_idx] + var/bl_x = bottom_left.x + var/bl_y = bottom_left.y + var/tr_x = top_right.x + var/tr_y = top_right.y + + if(target.x < bl_x) + continue + + if(target.y < bl_y) + continue + + if(target.x > tr_x) + continue + + if(target.y > tr_y) + continue + + var/list/return_information = list() + return_information["z_idx"] = z_idx + return_information["offset_x"] = target.x - bl_x + return_information["offset_y"] = target.y - bl_y + return return_information + return null + +/// Gets the turf below the given target. Returns null if there is no turf below the target +/datum/turf_reservation/proc/get_turf_below(turf/target) + var/list/bounds_info = calculate_turf_bounds_information(target) + if(isnull(bounds_info)) + return null + + var/z_idx = bounds_info["z_idx"] + // check what z level, if its the max, then there is no turf below + if(z_idx == z_size) + return null + + var/offset_x = bounds_info["offset_x"] + var/offset_y = bounds_info["offset_y"] + var/turf/bottom_left = bottom_left_turfs[z_idx + 1] + return locate(bottom_left.x + offset_x, bottom_left.y + offset_y, bottom_left.z) + +/// Gets the turf above the given target. Returns null if there is no turf above the target +/datum/turf_reservation/proc/get_turf_above(turf/target) + var/list/bounds_info = calculate_turf_bounds_information(target) + if(isnull(bounds_info)) + return null + + var/z_idx = bounds_info["z_idx"] + // check what z level, if its the min, then there is no turf above + if(z_idx == 1) + return null + + var/offset_x = bounds_info["offset_x"] + var/offset_y = bounds_info["offset_y"] + var/turf/bottom_left = bottom_left_turfs[z_idx - 1] + return locate(bottom_left.x + offset_x, bottom_left.y + offset_y, bottom_left.z) + /datum/turf_reservation/New() LAZYADD(SSmapping.turf_reservations, src) /datum/turf_reservation/Destroy() - INVOKE_ASYNC(src, PROC_REF(Release)) + Release() LAZYREMOVE(SSmapping.turf_reservations, src) return ..() diff --git a/code/modules/mapping/space_management/zlevel_manager.dm b/code/modules/mapping/space_management/zlevel_manager.dm index 9311719ea7d8..2b96065929f8 100644 --- a/code/modules/mapping/space_management/zlevel_manager.dm +++ b/code/modules/mapping/space_management/zlevel_manager.dm @@ -14,16 +14,22 @@ for (var/I in 1 to default_map_traits.len) var/list/features = default_map_traits[I] var/datum/space_level/S = new(I, features[DL_NAME], features[DL_TRAITS]) - z_list += S + manage_z_level(S, filled_with_space = FALSE) + //generate_z_level_linkages() // Default Zs don't use add_new_zlevel() so they don't automatically generate z-linkages. -/datum/controller/subsystem/mapping/proc/add_new_zlevel(name, traits = list(), z_type = /datum/space_level) +/datum/controller/subsystem/mapping/proc/add_new_zlevel(name, traits = list(), z_type = /datum/space_level, contain_turfs = TRUE) + UNTIL(!adding_new_zlevel) + adding_new_zlevel = TRUE var/new_z = z_list.len + 1 if (world.maxz < new_z) world.incrementMaxZ() CHECK_TICK // TODO: sleep here if the Z level needs to be cleared var/datum/space_level/S = new z_type(new_z, name, traits) - z_list += S + manage_z_level(S, filled_with_space = TRUE, contain_turfs = contain_turfs) + //generate_linkages_for_z_level(new_z) + //calculate_z_level_gravity(new_z) + adding_new_zlevel = FALSE SEND_GLOBAL_SIGNAL(COMSIG_GLOB_NEW_Z, S) return S diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index ae86518a640f..3a27af37f669 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -188,37 +188,38 @@ clean_observe_target() /// When the observer target gets a screen, our observer gets a screen minus some game screens we don't want the observer to touch -/mob/dead/observer/proc/observe_target_screen_add(observe_target_mob_client, add_to_screen) +/mob/dead/observer/proc/observe_target_screen_add(observe_target_mob_client, screen_add) SIGNAL_HANDLER - if(!client) - return - - if(istype(add_to_screen, /atom/movable/screen/action_button)) - return - - if(istype(add_to_screen, /atom/movable/screen/fullscreen)) - return + var/static/list/excluded_types = typecacheof(list( + /atom/movable/screen/fullscreen, + /atom/movable/screen/click_catcher, + /atom/movable/screen/escape_menu, + /atom/movable/screen/buildmode, + /obj/effect/detector_blip, + )) - if(istype(add_to_screen, /atom/movable/screen/click_catcher)) + if(!client) return - if(istype(add_to_screen, /atom/movable/screen/escape_menu)) - return + // `screen_add` can sometimes be a list, so it's safest to just handle everything as one. + var/list/stuff_to_add = (islist(screen_add) ? screen_add : list(screen_add)) - if(istype(add_to_screen, /obj/effect/detector_blip)) - return + for(var/item in stuff_to_add) + // Ignore anything that's in `excluded_types`. + if(is_type_in_typecache(item, excluded_types)) + continue - client.add_to_screen(add_to_screen) + client.add_to_screen(screen_add) /// When the observer target loses a screen, our observer loses it as well -/mob/dead/observer/proc/observe_target_screen_remove(observe_target_mob_client, remove_from_screen) +/mob/dead/observer/proc/observe_target_screen_remove(observe_target_mob_client, screen_remove) SIGNAL_HANDLER if(!client) return - client.remove_from_screen(remove_from_screen) + client.remove_from_screen(screen_remove) /// When the observe target ghosts our observer disconnect from their screen updates /mob/dead/observer/proc/observe_target_ghosting(mob/observer_target_mob) @@ -235,8 +236,9 @@ if(observe_target_client != new_client) observe_target_client = new_client - RegisterSignal(observe_target_client, COMSIG_CLIENT_SCREEN_ADD, PROC_REF(observe_target_screen_add)) - RegisterSignal(observe_target_client, COMSIG_CLIENT_SCREEN_REMOVE, PROC_REF(observe_target_screen_remove)) + // Override the signal from any previous targets. + RegisterSignal(observe_target_client, COMSIG_CLIENT_SCREEN_ADD, PROC_REF(observe_target_screen_add), TRUE) + RegisterSignal(observe_target_client, COMSIG_CLIENT_SCREEN_REMOVE, PROC_REF(observe_target_screen_remove), TRUE) /// When the observe target logs in our observer connect to the new client /mob/dead/observer/proc/observe_target_login(mob/living/new_character) @@ -245,8 +247,9 @@ if(observe_target_client != new_character.client) observe_target_client = new_character.client - RegisterSignal(observe_target_client, COMSIG_CLIENT_SCREEN_ADD, PROC_REF(observe_target_screen_add)) - RegisterSignal(observe_target_client, COMSIG_CLIENT_SCREEN_REMOVE, PROC_REF(observe_target_screen_remove)) + // Override the signal from any previous targets. + RegisterSignal(observe_target_client, COMSIG_CLIENT_SCREEN_ADD, PROC_REF(observe_target_screen_add), TRUE) + RegisterSignal(observe_target_client, COMSIG_CLIENT_SCREEN_REMOVE, PROC_REF(observe_target_screen_remove), TRUE) ///makes the ghost see the target hud and sets the eye at the target. /mob/dead/observer/proc/do_observe(atom/movable/target) @@ -256,48 +259,26 @@ ManualFollow(target) reset_perspective() - if(!ishuman(target) || !client.prefs?.auto_observe) + if(!iscarbon(target) || !client.prefs?.auto_observe) return - var/mob/living/carbon/human/human_target = target - - client.eye = human_target - observe_target_mob = human_target - RegisterSignal(observe_target_mob, COMSIG_PARENT_QDELETING, PROC_REF(clean_observe_target)) - RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(observer_move_react)) - - if(!human_target.hud_used) + var/mob/living/carbon/carbon_target = target + if(!carbon_target.hud_used) return client.clear_screen() - LAZYINITLIST(human_target.observers) - human_target.observers |= src - human_target.hud_used.show_hud(human_target.hud_used.hud_version, src) - - var/list/target_contents = human_target.get_contents() - - //Handles any currently open storage containers the target is looking in when we observe - for(var/obj/item/storage/checked_storage in target_contents) - if(!(human_target in checked_storage.content_watchers)) - continue + client.eye = carbon_target + observe_target_mob = carbon_target - client.add_to_screen(checked_storage.closer) - client.add_to_screen(checked_storage.contents) - - if(checked_storage.storage_slots) - client.add_to_screen(checked_storage.boxes) - else - client.add_to_screen(checked_storage.storage_start) - client.add_to_screen(checked_storage.storage_continue) - client.add_to_screen(checked_storage.storage_end) - - break + carbon_target.auto_observed(src) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(observer_move_react)) + RegisterSignal(observe_target_mob, COMSIG_PARENT_QDELETING, PROC_REF(clean_observe_target)) RegisterSignal(observe_target_mob, COMSIG_MOB_GHOSTIZE, PROC_REF(observe_target_ghosting)) RegisterSignal(observe_target_mob, COMSIG_MOB_NEW_MIND, PROC_REF(observe_target_new_mind)) RegisterSignal(observe_target_mob, COMSIG_MOB_LOGIN, PROC_REF(observe_target_login)) - if(human_target.client) - observe_target_client = human_target.client + if(observe_target_mob.client) + observe_target_client = observe_target_mob.client RegisterSignal(observe_target_client, COMSIG_CLIENT_SCREEN_ADD, PROC_REF(observe_target_screen_add)) RegisterSignal(observe_target_client, COMSIG_CLIENT_SCREEN_REMOVE, PROC_REF(observe_target_screen_remove)) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index a5ef1231a140..08daa5348022 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -416,6 +416,29 @@
"} show_browser(user, dat, name, "mob[name]") +/** + * Called by [/mob/dead/observer/proc/do_observe] when a carbon mob is observed by a ghost with [/datum/preferences/var/auto_observe] enabled. + * + * Any HUD changes past this point are handled by [/mob/dead/observer/proc/observe_target_screen_add] + * and [/mob/dead/observer/proc/observe_target_screen_remove]. + * + * Override on subtype mobs if they have any extra HUD elements/behaviour. + */ +/mob/living/carbon/proc/auto_observed(mob/dead/observer/observer) + SHOULD_CALL_PARENT(TRUE) + + LAZYINITLIST(observers) + observers |= observer + hud_used.show_hud(hud_used.hud_version, observer) + + // Add the player's action buttons (not the actions themselves) to the observer's screen. + for(var/datum/action/action as anything in actions) + // Skip any hidden ones (of course). + if(action.hidden || action.player_hidden) + continue + + observer.client.add_to_screen(action.button) + //generates realistic-ish pulse output based on preset levels /mob/living/carbon/proc/get_pulse(method) //method 0 is for hands, 1 is for machines, more accurate var/temp = 0 //see setup.dm:694 diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index da17bf8a15f0..563d0f4107e9 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -541,7 +541,7 @@ if(med_hud.hudusers[passed_human]) return TRUE if("squadleader") - var/datum/mob_hud/faction_hud = GLOB.huds[MOB_HUD_FACTION_USCM] + var/datum/mob_hud/faction_hud = GLOB.huds[MOB_HUD_FACTION_MARINE] if(passed_human.mind && passed_human.assigned_squad && passed_human.assigned_squad.squad_leader == passed_human && faction_hud.hudusers[passed_mob]) return TRUE else diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 4c62361ec52e..3ebd199b08d9 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -311,6 +311,29 @@
"} show_browser(user, dat, name, "mob[name]") +/** + * Handles any storage containers that the human is looking inside when auto-observed. + */ +/mob/living/carbon/human/auto_observed(mob/dead/observer/observer) + . = ..() + + // If `src` doesn't have an inventory open. + if(!s_active) + return + + // Add the storage interface to `observer`'s screen. + observer.client.add_to_screen(s_active.closer) + observer.client.add_to_screen(s_active.contents) + + // If the storage has a set number of item slots. + if(s_active.storage_slots) + observer.client.add_to_screen(s_active.boxes) + // If the storage instead has a maximum combined item 'weight'. + else + observer.client.add_to_screen(s_active.storage_start) + observer.client.add_to_screen(s_active.storage_continue) + observer.client.add_to_screen(s_active.storage_end) + // called when something steps onto a human // this handles mulebots and vehicles /mob/living/carbon/human/Crossed(atom/movable/AM) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 5cb439721ce6..1d56b7db2728 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -88,7 +88,7 @@ attack = attacking_mob.species.secondary_unarmed return - last_damage_data = create_cause_data("fisticuffs", src) + last_damage_data = create_cause_data("fisticuffs", attacking_mob) attacking_mob.attack_log += text("\[[time_stamp()]\] [pick(attack.attack_verb)]ed [key_name(src)]") attack_log += text("\[[time_stamp()]\] Has been [pick(attack.attack_verb)]ed by [key_name(attacking_mob)]") msg_admin_attack("[key_name(attacking_mob)] [pick(attack.attack_verb)]ed [key_name(src)] in [get_area(src)] ([src.loc.x],[src.loc.y],[src.loc.z]).", src.loc.x, src.loc.y, src.loc.z) diff --git a/code/modules/mob/living/carbon/human/species/zombie.dm b/code/modules/mob/living/carbon/human/species/zombie.dm index f5db0c1b8728..4e8a0b5e98e2 100644 --- a/code/modules/mob/living/carbon/human/species/zombie.dm +++ b/code/modules/mob/living/carbon/human/species/zombie.dm @@ -62,7 +62,7 @@ var/datum/disease/black_goo/zombie_infection = locate() in zombie.viruses if(!zombie_infection) zombie_infection = zombie.AddDisease(new /datum/disease/black_goo()) - zombie_infection.stage = 3 + zombie_infection.stage = 4 var/datum/mob_hud/Hu = GLOB.huds[MOB_HUD_MEDICAL_OBSERVER] Hu.add_hud_to(zombie, zombie) diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm index c8d3df91c975..69ab18431237 100644 --- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm @@ -766,6 +766,11 @@ var/datum/mob_hud/MH = GLOB.huds[MOB_HUD_XENO_INFECTION] MH.add_hud_to(src, src) +// Transfer any observing players over to the xeno's new body (`target`) on evolve/de-evolve. +/mob/living/carbon/xenomorph/transfer_observers_to(atom/target) + for(var/mob/dead/observer/observer as anything in observers) + observer.clean_observe_target() + observer.do_observe(target) /mob/living/carbon/xenomorph/check_improved_pointing() //xeno leaders get a big arrow and less cooldown @@ -839,6 +844,8 @@ tackle_min = caste.tackle_min tackle_max = caste.tackle_max tackle_chance = caste.tackle_chance + tackle_chance_modifier + tacklestrength_min = caste.tacklestrength_min + tacklestrength_max = caste.tacklestrength_max /mob/living/carbon/xenomorph/proc/recalculate_health() var/new_max_health = nocrit ? health_modifier + maxHealth : health_modifier + caste.max_health diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm index 152115cd7c8b..f854272365d0 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm @@ -156,7 +156,7 @@ addtimer(CALLBACK(src, PROC_REF(process_tunnel), T), 1 SECONDS) /mob/living/carbon/xenomorph/proc/do_tunnel(turf/T) - to_chat(src, SPAN_NOTICE("We tunnel to your destination.")) + to_chat(src, SPAN_NOTICE("We tunnel to the destination.")) anchored = FALSE forceMove(T) burrow_off() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lesser_drone/lesser_drone_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lesser_drone/lesser_drone_powers.dm index 3c6b39f146be..0f72bf4d81c7 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/lesser_drone/lesser_drone_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/lesser_drone/lesser_drone_powers.dm @@ -1,6 +1,6 @@ /datum/action/xeno_action/onclick/plant_weeds/lesser/use_ability(atom/A) if(!(locate(/obj/effect/alien/weeds/node) in orange(4, owner))) - to_chat(owner, SPAN_XENONOTICE("We can only plant resin nodes near other resin nodes!")) + to_chat(owner, SPAN_XENONOTICE("We can only plant weed nodes near other weed nodes!")) return . = ..() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm index c2fbd6b9d8c4..199df345fb62 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm @@ -129,7 +129,7 @@ // Config var/max_distance = 7 - var/windup = 7 DECISECONDS + var/windup = 8 DECISECONDS /datum/action/xeno_action/activable/oppressor_punch name = "Dislocate" diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_abilities.dm index aa98f063b8d5..b1358e30c26b 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_abilities.dm @@ -1,14 +1,22 @@ -/datum/action/xeno_action/activable/pounce/predalien - name = "Leap" + +/datum/action/xeno_action/onclick/feralrush + name = "Feral Rush" + action_icon_state = "charge_spit" + ability_name = "toughen up" + macro_path = /datum/action/xeno_action/verb/verb_feralrush ability_primacy = XENO_PRIMARY_ACTION_1 + action_type = XENO_ACTION_ACTIVATE + xeno_cooldown = 12 SECONDS + + // Config + var/speed_duration = 3 SECONDS + var/armor_duration = 6 SECONDS + var/speed_buff_amount = 0.8 // Go from shit slow to kindafast + var/armor_buff_amount = 10 // hopefully-minor buff so they can close the distance - knockdown = FALSE + var/speed_buff = FALSE + var/armor_buff = FALSE - distance = 5 - knockdown = FALSE // Should we knock down the target? - slash = FALSE // Do we slash upon reception? - freeze_self = FALSE // Should we freeze ourselves after the lunge? - should_destroy_objects = TRUE // Only used for ravager charge /datum/action/xeno_action/onclick/predalien_roar name = "Roar" @@ -16,37 +24,53 @@ ability_name = "roar" action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_2 + macro_path = /datum/action/xeno_action/verb/verb_predalien_roar xeno_cooldown = 25 SECONDS - plasma_cost = 50 - var/predalien_roar = list("sound/voice/predalien_roar.ogg") var/bonus_damage_scale = 2.5 var/bonus_speed_scale = 0.05 -/datum/action/xeno_action/onclick/smash - name = "Smash" - action_icon_state = "stomp" - ability_name = "smash" +/datum/action/xeno_action/activable/feral_smash + name = "Feral Smash" + ability_name = "Feral Smash" + action_icon_state = "lunge" action_type = XENO_ACTION_CLICK + macro_path = /datum/action/xeno_action/verb/feral_smash ability_primacy = XENO_PRIMARY_ACTION_3 xeno_cooldown = 20 SECONDS - plasma_cost = 80 - - var/freeze_duration = 1.5 SECONDS - var/activation_delay = 1 SECONDS - var/smash_sounds = list('sound/effects/alien_footstep_charge1.ogg', 'sound/effects/alien_footstep_charge2.ogg', 'sound/effects/alien_footstep_charge3.ogg') + // Configurables + var/grab_range = 4 + var/click_miss_cooldown = 15 + var/twitch_message_cooldown = 0 //apparently this is necessary for a tiny code that makes the lunge message on cooldown not be spammable, doesn't need to be big so 5 will do. + var/smash_damage = 20 + var/smash_scale = 10 + var/stun_duration = 2 SECONDS -/datum/action/xeno_action/activable/devastate - name = "Devastate" - action_icon_state = "gut" - ability_name = "devastate" +/datum/action/xeno_action/activable/feralfrenzy + name = "Feral Frenzy" + action_icon_state = "rav_eviscerate" + ability_name = "Feral Frenzy" action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_4 - xeno_cooldown = 20 SECONDS - plasma_cost = 110 - - var/activation_delay = 1 SECONDS + macro_path = /datum/action/xeno_action/verb/verb_feralfrenzy + xeno_cooldown = 15 SECONDS + //AOE + var/activation_delay_aoe = 1 SECONDS + var/base_damage_aoe = 15 + var/damage_scale_aoe = 10 + //SINGLE TARGET + var/activation_delay = 0.5 SECONDS var/base_damage = 25 - var/damage_scale = 10 // How much it scales by every kill + var/damage_scale = 10 + var/targeting = SINGLETARGETGUT + /// The orange used for a AOETARGETGUT + var/range = 2 + +/datum/action/xeno_action/onclick/toggle_gut_targeting + name = "Toggle Gutting Type" + action_icon_state = "gut" // starting targetting is SINGLETARGETGUT + macro_path = /datum/action/xeno_action/verb/verb_toggle_gut_targeting + action_type = XENO_ACTION_ACTIVATE + ability_primacy = XENO_PRIMARY_ACTION_5 diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_macros.dm b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_macros.dm new file mode 100644 index 000000000000..450a0ac67745 --- /dev/null +++ b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_macros.dm @@ -0,0 +1,35 @@ +/datum/action/xeno_action/verb/verb_feralfrenzy() + set category = "Alien" + set name = "Feral Frenzy" + set hidden = TRUE + var/action_name = "Feral Frenzy" + handle_xeno_macro(src, action_name) + +/datum/action/xeno_action/verb/verb_toggle_gut_targeting() + set category = "Alien" + set name = "Toggle Gutting Type" + set hidden = TRUE + var/action_name = "Toggle Gutting Type" + handle_xeno_macro(src, action_name) + + +/datum/action/xeno_action/verb/verb_feralrush() + set category = "Alien" + set name = "Feral Rush" + set hidden = TRUE + var/action_name = "Feral Rush" + handle_xeno_macro(src, action_name) + +/datum/action/xeno_action/verb/verb_predalien_roar() + set category = "Alien" + set name = "Predalien Roar" + set hidden = TRUE + var/action_name = "Roar" + handle_xeno_macro(src, action_name) + +/datum/action/xeno_action/verb/feral_smash() + set category = "Alien" + set name = "Feral Smash" + set hidden = TRUE + var/action_name = "Feral Smash" + handle_xeno_macro(src, action_name) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm index cdf0d3840084..6e6fef86a2f4 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm @@ -1,13 +1,10 @@ -/datum/action/xeno_action/activable/pounce/predalien/pre_pounce_effects() - playsound(owner, 'sound/voice/predalien_pounce.ogg', 75, 0, status = 0) - /datum/action/xeno_action/onclick/predalien_roar/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner - if (!action_cooldown_check()) + if(!action_cooldown_check()) return - if (!xeno.check_state()) + if(!xeno.check_state()) return if(!check_and_use_plasma_owner()) @@ -34,124 +31,258 @@ continue new /datum/effects/xeno_buff(carbon, xeno, ttl = (0.25 SECONDS * behavior.kills + 3 SECONDS), bonus_damage = bonus_damage_scale * behavior.kills, bonus_speed = (bonus_speed_scale * behavior.kills)) - - for(var/mob/M in view(xeno)) - if(M && M.client) - shake_camera(M, 10, 1) - apply_cooldown() return ..() -/datum/action/xeno_action/onclick/smash/use_ability(atom/target) +/datum/action/xeno_action/activable/feralfrenzy/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner - - if (!action_cooldown_check()) + if(!action_cooldown_check() || xeno.action_busy) + return + if(!xeno.check_state()) return - if (!xeno.check_state()) + var/datum/behavior_delegate/predalien_base/predalienbehavior = xeno.behavior_delegate + if(!istype(predalienbehavior)) return + if(targeting == AOETARGETGUT) + xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] begins digging in for a massive strike!"), SPAN_XENOHIGHDANGER("We begin digging in for a massive strike!")) + ADD_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Eviscerate")) + xeno.anchored = TRUE + if (do_after(xeno, (activation_delay_aoe), INTERRUPT_ALL | BEHAVIOR_IMMOBILE, BUSY_ICON_HOSTILE)) + xeno.emote("roar") + xeno.spin_circle() + + for (var/mob/living/carbon/carbon in orange(xeno, range)) + if(!isliving(carbon) || xeno.can_not_harm(carbon)) + continue + + if (carbon.stat == DEAD) + continue + + if(!check_clear_path_to_target(xeno, carbon)) + continue + + xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] rips open the guts of [carbon]!"), SPAN_XENOHIGHDANGER("We rip open the guts of [carbon]!")) + carbon.spawn_gibs() + xeno.animation_attack_on(carbon) + xeno.spin_circle() + xeno.flick_attack_overlay(carbon, "tail") + playsound(get_turf(carbon), 'sound/effects/gibbed.ogg', 30, 1) + carbon.apply_effect(get_xeno_stun_duration(carbon, 0.5), WEAKEN) + playsound(get_turf(carbon), "alien_claw_flesh", 30, 1) + carbon.apply_armoured_damage(get_xeno_damage_slash(carbon, base_damage_aoe + damage_scale_aoe * predalienbehavior.kills), ARMOR_MELEE, BRUTE, "chest", 20) + playsound(owner, 'sound/voice/predalien_death.ogg', 75, 0, status = 0) + REMOVE_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Eviscerate")) + xeno.anchored = FALSE + apply_cooldown() + return ..() - var/datum/behavior_delegate/predalien_base/behavior = xeno.behavior_delegate - if(!istype(behavior)) + //single target checks + if(xeno.can_not_harm(target)) + to_chat(xeno, SPAN_XENOWARNING("We must target a hostile!")) return - if(!check_plasma_owner()) + if(!isliving(target)) return - if(!do_after(xeno, activation_delay, INTERRUPT_ALL, BUSY_ICON_GENERIC)) - to_chat(xeno, "Keep still whilst trying to smash into the ground") + if(get_dist_sqrd(target, xeno) > 2) + to_chat(xeno, SPAN_XENOWARNING("[target] is too far away!")) + return - var/real_cooldown = xeno_cooldown + var/mob/living/carbon/carbon = target - xeno_cooldown = 3 SECONDS + if(carbon.stat == DEAD) + to_chat(xeno, SPAN_XENOWARNING("[carbon] is dead, why would we want to touch them?")) + return + if(targeting == SINGLETARGETGUT) // single target + ADD_TRAIT(carbon, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Devastate")) apply_cooldown() - xeno_cooldown = real_cooldown + + ADD_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Devastate")) + xeno.anchored = TRUE + + if(do_after(xeno, activation_delay, INTERRUPT_ALL | BEHAVIOR_IMMOBILE, BUSY_ICON_HOSTILE)) + xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] rips open the guts of [carbon]!"), SPAN_XENOHIGHDANGER("We rapidly slice into [carbon]!")) + carbon.spawn_gibs() + playsound(get_turf(carbon), 'sound/effects/gibbed.ogg', 50, 1) + carbon.apply_effect(get_xeno_stun_duration(carbon, 0.5), WEAKEN) + carbon.apply_armoured_damage(get_xeno_damage_slash(carbon, base_damage + damage_scale * predalienbehavior.kills), ARMOR_MELEE, BRUTE, "chest", 20) + + xeno.animation_attack_on(carbon) + xeno.spin_circle() + xeno.flick_attack_overlay(carbon, "tail") + + playsound(owner, 'sound/voice/predalien_growl.ogg', 50, 0, status = 0) + + REMOVE_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Devastate")) + xeno.anchored = FALSE + unroot_human(carbon, TRAIT_SOURCE_ABILITY("Devastate")) + + return ..() + + +/datum/action/xeno_action/onclick/feralrush/use_ability(atom/A) + var/mob/living/carbon/xenomorph/predatoralien = owner + + if(!action_cooldown_check()) + return + + if(!istype(predatoralien) || !predatoralien.check_state()) + return + + if(armor_buff && speed_buff) + to_chat(predatoralien, SPAN_XENOHIGHDANGER("We cannot stack this!")) return if(!check_and_use_plasma_owner()) return - playsound(xeno.loc, pick(smash_sounds), 50, 0, status = 0) - xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] smashes into the ground!")) - xeno.create_stomp() + addtimer(CALLBACK(src, PROC_REF(remove_rush_effects)), speed_duration) + addtimer(CALLBACK(src, PROC_REF(remove_armor_effects)), armor_duration) // calculate armor and speed differently, so it's a bit more armored while trying to get out + predatoralien.add_filter("predalien_toughen", 1, list("type" = "outline", "color" = "#421313", "size" = 1)) + to_chat(predatoralien, SPAN_XENOWARNING("We feel our muscles tense as our speed and armor increase!")) + speed_buff = TRUE + armor_buff = TRUE + predatoralien.speed_modifier -= speed_buff_amount + predatoralien.armor_modifier += armor_buff_amount + predatoralien.recalculate_speed() + predatoralien.recalculate_armor() + playsound(predatoralien, 'sound/voice/predalien_growl.ogg', 75, 0, status = 0) + apply_cooldown() - for(var/mob/living/carbon/carbon in oview(round(behavior.kills * 0.5 + 2), xeno)) - if(!xeno.can_not_harm(carbon) && carbon.stat != DEAD) - ADD_TRAIT(carbon, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Smash")) - if (ishuman(carbon)) - var/mob/living/carbon/human/human = carbon - human.update_xeno_hostile_hud() +/datum/action/xeno_action/onclick/feralrush/proc/remove_rush_effects() + SIGNAL_HANDLER + var/mob/living/carbon/xenomorph/predatoralien = owner + if(speed_buff == TRUE) + to_chat(predatoralien, SPAN_XENOWARNING("Our muscles relax as we feel our speed wane.")) + predatoralien.remove_filter("predalien_toughen") + predatoralien.speed_modifier += speed_buff_amount + predatoralien.recalculate_speed() + speed_buff = FALSE - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(unroot_human), carbon, TRAIT_SOURCE_ABILITY("Smash")), get_xeno_stun_duration(carbon, freeze_duration)) +/datum/action/xeno_action/onclick/feralrush/proc/remove_armor_effects() + SIGNAL_HANDLER + var/mob/living/carbon/xenomorph/predatoralien = owner + if(armor_buff) + to_chat(predatoralien, SPAN_XENOWARNING("We are no longer armored.")) + predatoralien.armor_modifier -= armor_buff_amount + predatoralien.recalculate_armor() + armor_buff = FALSE - for(var/mob/M in view(xeno)) - if(M && M.client) - shake_camera(M, 0.2 SECONDS, 1) - apply_cooldown() - return ..() +/datum/action/xeno_action/onclick/toggle_gut_targeting/use_ability(atom/A) -/datum/action/xeno_action/activable/devastate/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner + var/action_icon_result - if (!action_cooldown_check()) + if(!xeno.check_state()) return - if (!xeno.check_state()) + var/datum/action/xeno_action/activable/feralfrenzy/guttype = get_xeno_action_by_type(xeno, /datum/action/xeno_action/activable/feralfrenzy) + if(!guttype) return - if (!isxeno_human(target) || xeno.can_not_harm(target)) - to_chat(xeno, SPAN_XENOWARNING("We must target a hostile!")) - return + if(guttype.targeting == SINGLETARGETGUT) + action_icon_result = "rav_scissor_cut" + guttype.targeting = AOETARGETGUT + to_chat(xeno, SPAN_XENOWARNING("We will now attack everyone around us during a Feral Frenzy.")) + else + action_icon_result = "gut" + guttype.targeting = SINGLETARGETGUT + to_chat(xeno, SPAN_XENOWARNING("We will now focus our Feral Frenzy on one person!")) + + button.overlays.Cut() + button.overlays += image('icons/mob/hud/actions_xeno.dmi', button, action_icon_result) + return ..() - if (get_dist_sqrd(target, xeno) > 2) - to_chat(xeno, SPAN_XENOWARNING("[target] is too far away!")) - return +/datum/action/xeno_action/activable/feral_smash/use_ability(atom/affected_atom) + var/mob/living/carbon/xenomorph/predalien_smash = owner + var/datum/behavior_delegate/predalien_base/predalienbehavior = predalien_smash.behavior_delegate - var/mob/living/carbon/carbon = target + if(!action_cooldown_check()) + if(twitch_message_cooldown < world.time ) + predalien_smash.visible_message(SPAN_XENOWARNING("[predalien_smash]'s muscles twitch."), SPAN_XENOWARNING("Our claws twitch as we try to grab onto the target but lack the strength. Wait a moment to try again.")) + twitch_message_cooldown = world.time + 5 SECONDS + return //this gives a little feedback on why your lunge didn't hit other than the lunge button going grey. Plus, it might spook marines that almost got lunged if they know why the message appeared, and extra spookiness is always good. - if (carbon.stat == DEAD) - to_chat(xeno, SPAN_XENOWARNING("[carbon] is dead, why would we want to touch them?")) + if(!affected_atom) return - var/datum/behavior_delegate/predalien_base/behavior = xeno.behavior_delegate - if(!istype(behavior)) + if(!isturf(predalien_smash.loc)) + to_chat(predalien_smash, SPAN_XENOWARNING("We can't lunge from here!")) return - if (!check_and_use_plasma_owner()) + if(!predalien_smash.check_state() || predalien_smash.agility) return - ADD_TRAIT(carbon, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Devastate")) - - if (ishuman(carbon)) - var/mob/living/carbon/human/human = carbon - human.update_xeno_hostile_hud() - - apply_cooldown() - - ADD_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Devastate")) - xeno.anchored = TRUE + if(predalien_smash.can_not_harm(affected_atom) || !ismob(affected_atom)) + apply_cooldown_override(click_miss_cooldown) + return - if (do_after(xeno, activation_delay, INTERRUPT_ALL | BEHAVIOR_IMMOBILE, BUSY_ICON_HOSTILE)) - xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] rips open the guts of [carbon]!"), SPAN_XENOHIGHDANGER("We rip open the guts of [carbon]!")) - carbon.spawn_gibs() - playsound(get_turf(carbon), 'sound/effects/gibbed.ogg', 75, 1) - carbon.apply_effect(get_xeno_stun_duration(carbon, 0.5), WEAKEN) - carbon.apply_armoured_damage(get_xeno_damage_slash(carbon, base_damage + damage_scale * behavior.kills), ARMOR_MELEE, BRUTE, "chest", 20) - xeno.animation_attack_on(carbon) - xeno.spin_circle() - xeno.flick_attack_overlay(carbon, "tail") + var/mob/living/carbon/carbon = affected_atom + if(carbon.stat == DEAD) + return - playsound(owner, 'sound/voice/predalien_growl.ogg', 75, 0, status = 0) + if(!isliving(affected_atom)) + return - REMOVE_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Devastate")) - xeno.anchored = FALSE - unroot_human(carbon, TRAIT_SOURCE_ABILITY("Devastate")) + if(!check_and_use_plasma_owner()) + return - xeno.visible_message(SPAN_XENODANGER("[xeno] rapidly slices into [carbon]!")) + apply_cooldown() + predalien_smash.throw_atom(get_step_towards(affected_atom, predalien_smash), grab_range, SPEED_FAST, predalien_smash) + + if(predalien_smash.Adjacent(carbon) && predalien_smash.start_pulling(carbon, TRUE)) + playsound(carbon.pulledby, 'sound/voice/predalien_growl.ogg', 75, 0, status = 0) // bang and roar for dramatic effect + playsound(carbon, 'sound/effects/bang.ogg', 25, 0) + animate(carbon, pixel_y = carbon.pixel_y + 32, time = 4, easing = SINE_EASING) + sleep(4) + playsound(carbon, 'sound/effects/bang.ogg', 25, 0) + playsound(carbon,"slam", 50, 1) + animate(carbon, pixel_y = 0, time = 4, easing = BOUNCE_EASING) //animates the smash + carbon.apply_armoured_damage(get_xeno_damage_slash(carbon, smash_damage + smash_scale * predalienbehavior.kills), ARMOR_MELEE, BRUTE, "chest", 20) + else + predalien_smash.visible_message(SPAN_XENOWARNING("[predalien_smash]'s claws twitch."), SPAN_XENOWARNING("We couldn't grab our target. Wait a moment to try again.")) + + return TRUE + +/mob/living/carbon/xenomorph/predalien/stop_pulling() + if(isliving(pulling) && smashing) + smashing = FALSE // To avoid extreme cases of stopping a lunge then quickly pulling and stopping to pull someone else + var/mob/living/smashed = pulling + smashed.set_effect(0, STUN) + smashed.set_effect(0, WEAKEN) return ..() + +/mob/living/carbon/xenomorph/predalien/start_pulling(atom/movable/movable_atom, feral_smash) + if(!check_state()) + return FALSE + + if(!isliving(movable_atom)) + return FALSE + var/mob/living/living_mob = movable_atom + var/should_neckgrab = !(src.can_not_harm(living_mob)) && feral_smash + + + . = ..(living_mob, feral_smash, should_neckgrab) + + if(.) //successful pull + if(isxeno(living_mob)) + var/mob/living/carbon/xenomorph/xeno = living_mob + if(xeno.tier >= 2) // Tier 2 castes or higher immune to warrior grab stuns + return + + if(should_neckgrab && living_mob.mob_size < MOB_SIZE_BIG) + visible_message(SPAN_XENOWARNING("[src] grabs [living_mob] by the back of their leg and slams them onto the ground!"), \ + SPAN_XENOWARNING("We grab [living_mob] by the back of their leg and slam them onto the ground!")) // more flair + smashing = TRUE + living_mob.drop_held_items() + var/duration = get_xeno_stun_duration(living_mob, 1) + living_mob.KnockDown(duration) + living_mob.Stun(duration) + addtimer(VARSET_CALLBACK(src, smashing, FALSE), duration) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm index 9ec61b4c95ca..ebcd29ded29d 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm @@ -38,7 +38,7 @@ var/node_plant_cooldown = 7 SECONDS var/node_plant_plasma_cost = 300 - var/turf_build_cooldown = 7 SECONDS + var/turf_build_cooldown = 10 SECONDS /datum/action/xeno_action/onclick/manage_hive name = "Manage The Hive" diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm index 2aefff19c684..9f42f8ae8928 100644 --- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm +++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm @@ -911,7 +911,7 @@ return XENO_ATTACK_ACTION /obj/structure/girder/attack_alien(mob/living/carbon/xenomorph/M) - if((M.caste && M.caste.tier < 2 && !isqueen(M)) || unacidable) + if((M.caste && M.caste.tier < 2 && M.claw_type < CLAW_TYPE_VERY_SHARP) || unacidable) to_chat(M, SPAN_WARNING("Our claws aren't sharp enough to damage [src].")) return XENO_NO_DELAY_ACTION M.animation_attack_on(src) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm index d7702b9d8ee1..d98e60fe2177 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm @@ -76,7 +76,7 @@ /datum/component/temporary_mute,\ "We aren't old enough to vocalize anything yet.",\ "We aren't old enough to communicate like this yet.",\ - "We feel old enough to be able to vocalize and speak to the hivemind.",\ + "We feel old enough to be able to vocalize now.",\ 3 MINUTES,\ ) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm b/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm index ebae6f56830f..841675234e63 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm @@ -6,8 +6,7 @@ melee_damage_upper = XENO_DAMAGE_TIER_5 melee_vehicle_damage = XENO_DAMAGE_TIER_5 max_health = XENO_HEALTH_TIER_9 - plasma_gain = XENO_PLASMA_GAIN_TIER_9 - plasma_max = XENO_PLASMA_TIER_3 + plasma_max = XENO_NO_PLASMA xeno_explosion_resistance = XENO_EXPLOSIVE_ARMOR_TIER_10 armor_deflection = XENO_ARMOR_TIER_3 evasion = XENO_EVASION_NONE @@ -41,6 +40,7 @@ speaking_noise = 'sound/voice/predalien_click.ogg' plasma_types = list(PLASMA_CATECHOLAMINE) faction = FACTION_PREDALIEN + claw_type = CLAW_TYPE_VERY_SHARP wall_smash = TRUE hardcore = FALSE pixel_x = -16 @@ -56,18 +56,19 @@ /datum/action/xeno_action/onclick/regurgitate, /datum/action/xeno_action/watch_xeno, /datum/action/xeno_action/activable/tail_stab, - /datum/action/xeno_action/activable/pounce/predalien, + /datum/action/xeno_action/onclick/feralrush, /datum/action/xeno_action/onclick/predalien_roar, - /datum/action/xeno_action/onclick/smash, - /datum/action/xeno_action/activable/devastate, + /datum/action/xeno_action/activable/feral_smash, + /datum/action/xeno_action/activable/feralfrenzy, + /datum/action/xeno_action/onclick/toggle_gut_targeting, /datum/action/xeno_action/onclick/tacmap, ) weed_food_icon = 'icons/mob/xenos/weeds_64x64.dmi' weed_food_states = list("Predalien_1","Predalien_2","Predalien_3") weed_food_states_flipped = list("Predalien_1","Predalien_2","Predalien_3") + var/smashing = FALSE - var/butcher_time = 6 SECONDS /mob/living/carbon/xenomorph/predalien/Initialize(mapload, mob/living/carbon/xenomorph/oldxeno, h_number) @@ -86,15 +87,20 @@ to_chat(src, {" |______________________| -You are a predator-alien hybrid! -You are a very powerful xenomorph creature that was born of a Yautja warrior body. -You are stronger, faster, and smarter than a regular xenomorph, but you must still listen to the queen. -You have a degree of freedom to where you can hunt and claim the heads of the hive's enemies, so check your verbs. -Your health meter will not regenerate normally, so kill and die for the hive! +You are a yautja-alien hybrid! +You are a xenomorph born from the body of your natural enemy, you are considered an abomination to all of the yautja race and they will do WHATEVER it takes to kill you. +However, being born from one you also harbor their intelligence and strength. You are built to be able to take them on but that does not mean you are invincible. Stay with your hive and overwhelm them with your numbers. Your sisters have sacrificed a lot for you; Do not just wander off and die. +You must still listen to the queen. + |______________________| "}) emote("roar") + +/mob/living/carbon/xenomorph/predalien/resist_fire() + ..() + SetKnockDown(0.1 SECONDS) + /datum/behavior_delegate/predalien_base name = "Base Predalien Behavior Delegate" @@ -118,53 +124,11 @@ Your health meter will not regenerate normally, so kill and die for the hive! 0) - return 1 - return 0 + return TRUE + update_wounds() + return FALSE /obj/limb/process() diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index f42030cce69d..69ce9ec4ce13 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -90,7 +90,7 @@ icon_state = "album" item_state = "briefcase" can_hold = list(/obj/item/photo,) - storage_slots = 20 + storage_slots = 28 /obj/item/storage/photo_album/MouseDrop(obj/over_object as obj) @@ -122,9 +122,14 @@ /obj/item/device/camera name = "camera" icon = 'icons/obj/items/items.dmi' - desc = "A polaroid camera. 10 photos left." + desc = "A polaroid camera." icon_state = "camera" - item_state = "electropack" + item_state = "camera" + item_icons = list( + WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_0.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_0.dmi' + ) + flags_item = TWOHANDED w_class = SIZE_SMALL flags_atom = FPRINT|CONDUCT flags_equip_slot = SLOT_WAIST @@ -132,10 +137,22 @@ black_market_value = 20 var/pictures_max = 10 var/pictures_left = 10 - var/on = 1 - var/icon_on = "camera" - var/icon_off = "camera_off" - var/size = 3 + var/size = 7 + +/obj/item/device/camera/get_examine_text(mob/user) + . = ..() + . += "It has [pictures_left] photos left." + +/obj/item/device/camera/attack_self(mob/user) //wielding capabilities + . = ..() + if(flags_item & WIELDED) + unwield(user) + else + wield(user) + +/obj/item/device/camera/dropped(mob/user) + ..() + unwield(user) /obj/item/device/camera/verb/change_size() set name = "Set Photo Focus" @@ -149,24 +166,15 @@ /obj/item/device/camera/attack(mob/living/carbon/human/M, mob/user) return -/obj/item/device/camera/attack_self(mob/user) - ..() - on = !on - if(on) - src.icon_state = icon_on - else - src.icon_state = icon_off - to_chat(user, "You switch the camera [on ? "on" : "off"].") - /obj/item/device/camera/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/device/camera_film)) - if(pictures_left) - to_chat(user, SPAN_NOTICE("[src] still has some film in it!")) + if(pictures_left > (pictures_max - 10)) + to_chat(user, SPAN_NOTICE("[src] cannot fit more film in it!")) return to_chat(user, SPAN_NOTICE("You insert [I] into [src].")) if(user.temp_drop_inv_item(I)) qdel(I) - pictures_left = pictures_max + pictures_left += 10 return ..() @@ -270,24 +278,19 @@ return mob_detail /obj/item/device/camera/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) - if(!on || !pictures_left || ismob(target.loc) || isstorage(target.loc)) + if(pictures_left <= 0) + to_chat(user, SPAN_WARNING("There isn't enough film in the [src] to take a photo.")) return - if(user.contains(target) || istype(target, /atom/movable/screen)) + if(ismob(target.loc) || isstorage(target.loc) || user.contains(target) || istype(target, /atom/movable/screen)) + return + if(!(flags_item & WIELDED)) + to_chat(user, SPAN_WARNING("You need to wield the [src] with both hands to take a photo!")) return - playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 15, 1) - pictures_left-- - desc = "A polaroid camera. It has [pictures_left] photos left." to_chat(user, SPAN_NOTICE("[pictures_left] photos left.")) - captureimage(target, user, flag) - - icon_state = icon_off - on = 0 - spawn(64) - icon_state = icon_on - on = 1 + addtimer(CALLBACK(src, PROC_REF(captureimage), target, user, flag), 1 SECONDS) /obj/item/device/camera/proc/captureimage(atom/target, mob/user, flag) var/mob_descriptions = "" @@ -343,10 +346,17 @@ name = "Old Camera" desc = "An old, slightly beat-up digital camera, with a cheap photo printer taped on. It's a nice shade of blue." icon_state = "oldcamera" - icon_on = "oldcamera" - icon_off = "oldcamera_off" pictures_left = 30 +/obj/item/device/camera/broadcasting + name = "Broadcasting Camera" + desc = "Actively document everything you see, from the mundanity of shipside to the brutal battlefields below. Has a built-in printer for action shots." + icon_state = "broadcastingcamera" + item_state = "broadcastingcamera" + pictures_left = 20 + pictures_max = 20 + w_class = SIZE_HUGE + flags_equip_slot = NO_FLAGS //cannot be equiped /obj/item/photo/proc/construct(datum/picture/P) icon = P.fields["icon"] diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 37094bb12775..f875af99bb43 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -1271,6 +1271,19 @@ Defined in conflicts.dm of the #defines folder. QDEL_NULL(scope_element) return ..() +/obj/item/attachable/vulture_scope/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection) + . = ..() + var/new_attach_icon + switch(SSmapping.configs[GROUND_MAP].camouflage_type) + if("snow") + attach_icon = new_attach_icon ? new_attach_icon : "s_" + attach_icon + if("desert") + attach_icon = new_attach_icon ? new_attach_icon : "d_" + attach_icon + if("classic") + attach_icon = new_attach_icon ? new_attach_icon : "c_" + attach_icon + if("urban") + attach_icon = new_attach_icon ? new_attach_icon : "u_" + attach_icon + /obj/item/attachable/vulture_scope/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) @@ -1814,6 +1827,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/stock/vulture name = "\improper M707 heavy stock" icon_state = "vulture_stock" + attach_icon = "vulture_stock" hud_offset_mod = 3 /obj/item/attachable/stock/vulture/Initialize(mapload, ...) @@ -1821,6 +1835,19 @@ Defined in conflicts.dm of the #defines folder. 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/vulture/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection) + . = ..() + var/new_attach_icon + switch(SSmapping.configs[GROUND_MAP].camouflage_type) + if("snow") + attach_icon = new_attach_icon ? new_attach_icon : "s_" + attach_icon + if("desert") + attach_icon = new_attach_icon ? new_attach_icon : "d_" + attach_icon + if("classic") + attach_icon = new_attach_icon ? new_attach_icon : "c_" + attach_icon + if("urban") + attach_icon = new_attach_icon ? new_attach_icon : "u_" + attach_icon + /obj/item/attachable/stock/tactical name = "\improper MK221 tactical stock" desc = "A metal stock made for the MK221 tactical shotgun." @@ -3199,7 +3226,7 @@ Defined in conflicts.dm of the #defines folder. var/obj/projectile/P = new(src, create_cause_data(initial(name), user, src)) var/datum/ammo/flamethrower/ammo_datum = new projectile_type - ammo_datum.flamer_reagent_type = flamer_reagent.type + ammo_datum.flamer_reagent_id = flamer_reagent.id P.generate_bullet(ammo_datum) P.icon_state = "naptha_ball" P.color = flamer_reagent.color @@ -3513,6 +3540,23 @@ Defined in conflicts.dm of the #defines folder. attach_icon = "vulture_bipod" heavy_bipod = TRUE +/obj/item/attachable/bipod/vulture/Initialize(mapload, ...) + . = ..() + select_gamemode_skin(type) + +/obj/item/attachable/bipod/vulture/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection) + . = ..() + var/new_attach_icon + switch(SSmapping.configs[GROUND_MAP].camouflage_type) + if("snow") + attach_icon = new_attach_icon ? new_attach_icon : "s_" + attach_icon + if("desert") + attach_icon = new_attach_icon ? new_attach_icon : "d_" + attach_icon + if("classic") + attach_icon = new_attach_icon ? new_attach_icon : "c_" + attach_icon + if("urban") + attach_icon = new_attach_icon ? new_attach_icon : "u_" + attach_icon + /obj/item/attachable/burstfire_assembly name = "burst fire assembly" desc = "A small angled piece of fine machinery that increases the burst count on some weapons, and grants the ability to others. \nIncreases weapon scatter." diff --git a/code/modules/projectiles/guns/boltaction.dm b/code/modules/projectiles/guns/boltaction.dm index a06131f98ce0..16ccb3438e23 100644 --- a/code/modules/projectiles/guns/boltaction.dm +++ b/code/modules/projectiles/guns/boltaction.dm @@ -279,3 +279,9 @@ /obj/item/weapon/gun/boltaction/vulture/skillless bypass_trait = TRUE + +/obj/item/weapon/gun/boltaction/vulture/holo_target + current_mag = /obj/item/ammo_magazine/rifle/boltaction/vulture/holo_target + +/obj/item/weapon/gun/boltaction/vulture/holo_target/skillless + bypass_trait = TRUE diff --git a/code/modules/projectiles/guns/pistols.dm b/code/modules/projectiles/guns/pistols.dm index 5794e861a63c..362841651b2d 100644 --- a/code/modules/projectiles/guns/pistols.dm +++ b/code/modules/projectiles/guns/pistols.dm @@ -587,7 +587,7 @@ desc = "Standard issue USCM firearm. Also found in the hands of Weyland-Yutani PMC teams. Fires 9mm armor shredding rounds and is capable of 3-round burst." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "_88m4" // to comply with css standards - item_state = "88m4" + item_state = "_88m4" fire_sound = "88m4" firesound_volume = 20 reload_sound = 'sound/weapons/gun_88m4_reload.ogg' diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm index bfc411a2ea63..d12f390ccd95 100644 --- a/code/modules/projectiles/magazines/rifles.dm +++ b/code/modules/projectiles/magazines/rifles.dm @@ -457,6 +457,14 @@ 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 + ammo_band_icon = "+vulture_band" + ammo_band_icon_empty = "+vulture_band_e" + +/obj/item/ammo_magazine/rifle/boltaction/vulture/holo_target + name = "\improper M707 \"Vulture\" holo-target magazine (20x102mm)" + desc = "A magazine for the M707 \"Vulture\" anti-matieriel rifle. Contains up to 4 massively oversized IFF-CAPABLE holo-targeting rounds, which excel at marking heavy targets to be attacked by allied ground forces. The logistical requirements for such capabilities heavily hinder the performance and stopping power of this round." + default_ammo = /datum/ammo/bullet/sniper/anti_materiel/vulture/holo_target + ammo_band_color = AMMO_BAND_COLOR_HOLOTARGETING //=ROYAL MARINES=\\ diff --git a/code/modules/reagents/chemistry_machinery/chem_simulator.dm b/code/modules/reagents/chemistry_machinery/chem_simulator.dm index 8a95e3f3b07e..dd7f008e47d2 100644 --- a/code/modules/reagents/chemistry_machinery/chem_simulator.dm +++ b/code/modules/reagents/chemistry_machinery/chem_simulator.dm @@ -380,8 +380,7 @@ relate(C) if(!C.original_id) C.original_id = target.data.id - C.id = encode_reagent(C) - C.name = C.id + encode_reagent(C) if(C.id in simulations) //We've already simulated this before, so we don't need to continue C = GLOB.chemical_reagents_list[C.id] @@ -577,8 +576,8 @@ var/obj/item/paper/research_report/report = new /obj/item/paper/research_report/(loc) var/datum/reagent/D = GLOB.chemical_reagents_list[id] var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper) - report.name = "Simulation result for [D.name]" - report.info += "
Official Company Document
Simulated Synthesis Report

Result for [D.name]

" + report.name = "Simulation result for [D.id]" + report.info += "
Official Company Document
Simulated Synthesis Report

Result for [D.id]

" report.generate(D) report.info += "
This report was automatically printed by the Synthesis Simulator.
The [MAIN_SHIP_NAME], [time2text(world.timeofday, "MM/DD")]/[GLOB.game_year], [worldtime2text()]
\n" playsound(loc, 'sound/machines/twobeep.ogg', 15, 1) @@ -590,7 +589,9 @@ var/suffix = " " for(var/datum/chem_property/P in C.properties) suffix += P.code+"[P.level]" - return O.name + suffix + C.id = O.name + " " + copytext(md5(suffix),1,3) + suffix //Show random suffix AND real properties on research paper + C.name = O.name + " " + copytext(md5(suffix),1,3) //Show ONLY random suffix on health analyzers + return /obj/structure/machinery/chem_simulator/proc/complexity_to_string_list() var/list/L = list() diff --git a/code/modules/reagents/chemistry_properties/prop_special.dm b/code/modules/reagents/chemistry_properties/prop_special.dm index 52354f0d6b01..cee75ca58c06 100644 --- a/code/modules/reagents/chemistry_properties/prop_special.dm +++ b/code/modules/reagents/chemistry_properties/prop_special.dm @@ -96,7 +96,7 @@ H.contract_disease(new /datum/disease/xeno_transformation(0),1) //This is the real reason PMCs are being sent to retrieve it. /datum/chem_property/special/DNA_Disintegrating/trigger() - SSticker.mode.get_specific_call("Weyland-Yutani Goon (Chemical Investigation Squad)", TRUE, FALSE, holder.name) + SSticker.mode.get_specific_call(/datum/emergency_call/goon/chem_retrieval, TRUE, FALSE, holder.name) // "Weyland-Yutani Goon (Chemical Investigation Squad)" GLOB.chemical_data.update_credits(10) message_admins("The research department has discovered DNA_Disintegrating in [holder.name] adding 10 bonus tech points.") var/datum/techtree/tree = GET_TREE(TREE_MARINE) diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index 79377d9c0849..b803a8f66b55 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -81,8 +81,8 @@ to_chat(usr, SPAN_NOTICE("Unable to comply.")) return TRUE -/obj/structure/machinery/computer/shuttle/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE) - if(port && (shuttleId == initial(shuttleId) || override)) +/obj/structure/machinery/computer/shuttle/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock) + if(port && (shuttleId == initial(shuttleId))) shuttleId = port.id /obj/structure/machinery/computer/shuttle/ert diff --git a/code/modules/shuttle/computers/escape_pod_computer.dm b/code/modules/shuttle/computers/escape_pod_computer.dm index c45ac7d56102..dd621c83eaec 100644 --- a/code/modules/shuttle/computers/escape_pod_computer.dm +++ b/code/modules/shuttle/computers/escape_pod_computer.dm @@ -55,7 +55,7 @@ .["docking_status"] = STATE_LAUNCHED var/obj/structure/machinery/door/door = shuttle.door_handler.doors[1] .["door_state"] = door.density - .["door_lock"] = shuttle.door_handler.is_locked + .["door_lock"] = shuttle.door_handler.status == SHUTTLE_DOOR_LOCKED .["can_delay"] = TRUE//launch_status[2] .["launch_without_evac"] = launch_without_evac diff --git a/code/modules/shuttle/docking.dm b/code/modules/shuttle/docking.dm index a21ec330d4c9..63e220deadc6 100644 --- a/code/modules/shuttle/docking.dm +++ b/code/modules/shuttle/docking.dm @@ -1,7 +1,5 @@ /// This is the main proc. It instantly moves our mobile port to stationary port `new_dock`. /obj/docking_port/mobile/proc/initiate_docking(obj/docking_port/stationary/new_dock, movement_direction, force=FALSE) - // Crashing this ship with NO SURVIVORS - if(new_dock.get_docked() == src) remove_ripples() return DOCKING_SUCCESS diff --git a/code/modules/shuttle/dropship_hijack.dm b/code/modules/shuttle/dropship_hijack.dm index c01445be5b5b..73150f5bfc08 100644 --- a/code/modules/shuttle/dropship_hijack.dm +++ b/code/modules/shuttle/dropship_hijack.dm @@ -176,13 +176,14 @@ turfs += get_area_turfs(/area/almayer/shipboard/brig/cic_hallway) turfs += get_area_turfs(/area/almayer/shipboard/brig/cryo) turfs += get_area_turfs(/area/almayer/shipboard/brig/evidence_storage) - turfs += get_area_turfs(/area/almayer/shipboard/brig/execution) turfs += get_area_turfs(/area/almayer/shipboard/brig/general_equipment) turfs += get_area_turfs(/area/almayer/shipboard/brig/lobby) - turfs += get_area_turfs(/area/almayer/shipboard/brig/main_office) + turfs += get_area_turfs(/area/almayer/shipboard/brig/starboard_hallway) turfs += get_area_turfs(/area/almayer/shipboard/brig/perma) turfs += get_area_turfs(/area/almayer/shipboard/brig/processing) - turfs += get_area_turfs(/area/almayer/shipboard/brig/surgery) + turfs += get_area_turfs(/area/almayer/shipboard/brig/medical) + turfs += get_area_turfs(/area/almayer/shipboard/brig/mp_bunks) + turfs += get_area_turfs(/area/almayer/shipboard/brig/chief_mp_office) turfs += get_area_turfs(/area/almayer/command/cichallway) turfs += get_area_turfs(/area/almayer/command/cic) if("Upper deck Midship") @@ -191,14 +192,13 @@ turfs += get_area_turfs(/area/almayer/medical/containment) turfs += get_area_turfs(/area/almayer/medical/containment/cell) turfs += get_area_turfs(/area/almayer/medical/medical_science) - turfs += get_area_turfs(/area/almayer/medical/testlab) turfs += get_area_turfs(/area/almayer/medical/hydroponics) if("Upper deck Aftship") turfs += get_area_turfs(/area/almayer/engineering/upper_engineering) turfs += get_area_turfs(/area/almayer/engineering/laundry) if("Lower deck Foreship") turfs += get_area_turfs(/area/almayer/hallways/hangar) - turfs += get_area_turfs(/area/almayer/hallways/vehiclehangar) + turfs += get_area_turfs(/area/almayer/hallways/lower/vehiclehangar) if("Lower deck Midship") turfs += get_area_turfs(/area/almayer/medical/chemistry) turfs += get_area_turfs(/area/almayer/medical/lower_medical_lobby) diff --git a/code/modules/shuttle/helpers.dm b/code/modules/shuttle/helpers.dm index 6b29f155582e..9c8d817ec237 100644 --- a/code/modules/shuttle/helpers.dm +++ b/code/modules/shuttle/helpers.dm @@ -19,7 +19,7 @@ if(!door_controllers[direction]) var/datum/door_controller/single/new_controller = new() new_controller.label = label - new_controller.is_locked = FALSE + new_controller.status = SHUTTLE_DOOR_UNLOCKED door_controllers[direction] = new_controller var/datum/door_controller/single/controller = door_controllers[direction] @@ -29,12 +29,12 @@ if(direction == "all") for(var/i in door_controllers) var/datum/door_controller/single/control = door_controllers[i] - if(!control.is_locked) + if(control.status != SHUTTLE_DOOR_LOCKED) return FALSE return TRUE if(door_controllers[direction]) var/datum/door_controller/single/single_controller = door_controllers[direction] - return single_controller.is_locked + return single_controller.status == SHUTTLE_DOOR_LOCKED else WARNING("Direction [direction] does not exist.") return FALSE @@ -60,9 +60,9 @@ for(var/direction in door_controllers) var/datum/door_controller/single/controller = door_controllers[direction] - var/list/door_data = list("id" = direction, "value" = controller.is_locked) + var/list/door_data = list("id" = direction, "value" = controller.status) . += list(door_data) - if(!controller.is_locked) + if(controller.status == SHUTTLE_DOOR_UNLOCKED) all_locked = FALSE var/list/door_data = list("id" = "all", "value" = all_locked) @@ -74,7 +74,7 @@ /datum/door_controller/single var/label = "dropship" var/list/doors = list() - var/is_locked = FALSE + var/status = SHUTTLE_DOOR_UNLOCKED /datum/door_controller/single/Destroy(force, ...) . = ..() @@ -93,23 +93,29 @@ if("close") INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/structure/machinery/door/airlock, close)) if("force-lock") + if (status == SHUTTLE_DOOR_BROKEN) + continue INVOKE_ASYNC(src, PROC_REF(lockdown_door), door) - is_locked = TRUE + status = SHUTTLE_DOOR_LOCKED if("lock") INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/structure/machinery/door/airlock, lock)) - is_locked = TRUE + if (status != SHUTTLE_DOOR_BROKEN) + status = SHUTTLE_DOOR_LOCKED if("unlock") INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/structure/machinery/door/airlock, unlock)) - is_locked = FALSE + if (status != SHUTTLE_DOOR_BROKEN) + status = SHUTTLE_DOOR_UNLOCKED if("force-lock-launch") if(asynchronous) INVOKE_ASYNC(src, PROC_REF(lockdown_door_launch), door) else lockdown_door_launch(door) - is_locked = TRUE + if (status != SHUTTLE_DOOR_BROKEN) + status = SHUTTLE_DOOR_LOCKED if("force-unlock") INVOKE_ASYNC(src, PROC_REF(force_lock_open_door), door) - is_locked = FALSE + if (status != SHUTTLE_DOOR_BROKEN) + status = SHUTTLE_DOOR_UNLOCKED else CRASH("Unknown door command [action]") diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 6f02bf00e89d..d72dcdda5bfe 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -380,10 +380,82 @@ var/shuttle_flags = NONE +#define WORLDMAXX_CUTOFF (world.maxx + 1) +#define WORLDMAXY_CUTOFF (world.maxx + 1) +/** + * Calculated and populates the information used for docking and some internal vars. + * This can also be used to calculate from shuttle_areas so that you can expand/shrink shuttles! + * + * Arguments: + * * loading_from - The template that the shuttle was loaded from, if not given we iterate shuttle_areas to calculate information instead + */ +/obj/docking_port/mobile/proc/calculate_docking_port_information(datum/map_template/shuttle/loading_from) + var/port_x_offset = loading_from?.port_x_offset + var/port_y_offset = loading_from?.port_y_offset + var/width = loading_from?.width + var/height = loading_from?.height + if(!loading_from) + if(!length(shuttle_areas)) + CRASH("Attempted to calculate a docking port's information without a template before it was assigned any areas!") + // no template given, use shuttle_areas to calculate width and height + var/min_x = -1 + var/min_y = -1 + var/max_x = WORLDMAXX_CUTOFF + var/max_y = WORLDMAXY_CUTOFF + for(var/area/area as anything in shuttle_areas) + for(var/turf/turf in area) + min_x = max(turf.x, min_x) + max_x = min(turf.x, max_x) + min_y = max(turf.y, min_y) + max_y = min(turf.y, max_y) + CHECK_TICK + + if(min_x == -1 || max_x == WORLDMAXX_CUTOFF) + CRASH("Failed to locate shuttle boundaries when iterating through shuttle areas, somehow.") + if(min_y == -1 || max_y == WORLDMAXY_CUTOFF) + CRASH("Failed to locate shuttle boundaries when iterating through shuttle areas, somehow.") + + width = (max_x - min_x) + 1 + height = (max_y - min_y) + 1 + port_x_offset = min_x - x + port_y_offset = min_y - y + + if(dir in list(EAST, WEST)) + src.width = height + src.height = width + else + src.width = width + src.height = height + + switch(dir) + if(NORTH) + dwidth = port_x_offset - 1 + dheight = port_y_offset - 1 + if(EAST) + dwidth = height - port_y_offset + dheight = port_x_offset - 1 + if(SOUTH) + dwidth = width - port_x_offset + dheight = height - port_y_offset + if(WEST) + dwidth = port_y_offset - 1 + dheight = width - port_x_offset +#undef WORLDMAXX_CUTOFF +#undef WORLDMAXY_CUTOFF + /obj/docking_port/mobile/register() . = ..() SSshuttle.mobile += src +/** + * Actions to be taken after shuttle is loaded and has been moved to its final location + * + * Arguments: + * * replace - TRUE if this shuttle is replacing an existing one. FALSE by default. + */ +/obj/docking_port/mobile/proc/postregister(replace = FALSE) + return + /obj/docking_port/mobile/Destroy(force) if(force) QDEL_NULL(alarm_sound_loop) @@ -442,6 +514,10 @@ // Called after the shuttle is loaded from template /obj/docking_port/mobile/proc/linkup(datum/map_template/shuttle/template, obj/docking_port/stationary/dock) + + // ================== CM Change ================== + // This is gone in /tg/ backend but kept for historical reasons + // Suspect this is supposed to be handled in register var/list/static/shuttle_id = list() var/idnum = ++shuttle_id[id] if(idnum > 1) @@ -449,12 +525,12 @@ id = "[id][idnum]" if(name == initial(name)) name = "[name] [idnum]" - for(var/place in shuttle_areas) - var/area/area = place - area.connect_to_shuttle(src, dock, idnum, FALSE) - for(var/each in place) - var/atom/atom = each - atom.connect_to_shuttle(src, dock, idnum, FALSE) + // ================ END CM Change ================ + + for(var/area/place as anything in shuttle_areas) + place.connect_to_shuttle(TRUE, src, dock) + for(var/atom/individual_atoms in place) + individual_atoms.connect_to_shuttle(TRUE, src, dock) //this is a hook for custom behaviour. Maybe at some point we could add checks to see if engines are intact diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm index ce9ba7c623bb..d0f27d869741 100644 --- a/code/modules/shuttle/shuttles/dropship.dm +++ b/code/modules/shuttle/shuttles/dropship.dm @@ -43,6 +43,9 @@ door_control.add_door(air, "port") if("aft_door") door_control.add_door(air, "aft") + var/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/hatch = air + if(istype(hatch)) + hatch.linked_dropship = src RegisterSignal(src, COMSIG_DROPSHIP_ADD_EQUIPMENT, PROC_REF(add_equipment)) RegisterSignal(src, COMSIG_DROPSHIP_REMOVE_EQUIPMENT, PROC_REF(remove_equipment)) @@ -81,10 +84,12 @@ door_control.add_door(air, "port") if("aft_door") door_control.add_door(air, "aft") + RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_change)) /obj/docking_port/mobile/marine_dropship/Destroy(force) . = ..() qdel(door_control) + UnregisterSignal(src, COMSIG_ATOM_DIR_CHANGE) /obj/docking_port/mobile/marine_dropship/proc/control_doors(action, direction, force, asynchronous = TRUE) // its been locked down by the queen @@ -118,6 +123,12 @@ set_security_level(SEC_LEVEL_RED) return +/obj/docking_port/mobile/marine_dropship/proc/on_dir_change(datum/source, old_dir, new_dir) + SIGNAL_HANDLER + for(var/place in shuttle_areas) + for(var/obj/structure/machinery/door/air in place) + air.handle_multidoor(old_dir, new_dir) + /obj/docking_port/mobile/marine_dropship/alamo name = "Alamo" id = DROPSHIP_ALAMO diff --git a/code/modules/shuttle/shuttles/ert.dm b/code/modules/shuttle/shuttles/ert.dm index b619645c501c..cc6e61f7a26a 100644 --- a/code/modules/shuttle/shuttles/ert.dm +++ b/code/modules/shuttle/shuttles/ert.dm @@ -31,9 +31,11 @@ air.breakable = FALSE air.indestructible = TRUE air.unacidable = TRUE + RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_change)) /obj/docking_port/mobile/emergency_response/enterTransit() control_doors("force-lock-launch", force = TRUE, external_only = TRUE) + UnregisterSignal(src, COMSIG_ATOM_DIR_CHANGE) ..() /obj/docking_port/mobile/emergency_response/proc/control_doors(action, force = FALSE, external_only = FALSE) @@ -77,10 +79,10 @@ air.lock() air.safe = 1 -/obj/docking_port/mobile/emergency_response/setDir(newdir) - . = ..() +/obj/docking_port/mobile/emergency_response/proc/on_dir_change(datum/source, old_dir, new_dir) + SIGNAL_HANDLER for(var/obj/structure/machinery/door/shuttle_door in doors) - shuttle_door.handle_multidoor() + shuttle_door.handle_multidoor(old_dir, new_dir) // ERT Shuttle 1 /obj/docking_port/mobile/emergency_response/ert1 @@ -254,7 +256,7 @@ width = 17 height = 29 airlock_id = "s_umbilical" - airlock_area = /area/almayer/hallways/port_umbilical + airlock_area = /area/almayer/hallways/lower/port_umbilical /obj/docking_port/stationary/emergency_response/external/hangar_starboard name = "Almayer hanger starboard external airlock" @@ -263,7 +265,7 @@ width = 17 height = 29 airlock_id = "n_umbilical" - airlock_area = /area/almayer/hallways/starboard_umbilical + airlock_area = /area/almayer/hallways/lower/starboard_umbilical // These are docking ports not on the almayer /obj/docking_port/stationary/emergency_response/idle_port1 diff --git a/code/modules/shuttle/shuttles/trijent_elevator.dm b/code/modules/shuttle/shuttles/trijent_elevator.dm index 457c150212c0..ff10485e8d5a 100644 --- a/code/modules/shuttle/shuttles/trijent_elevator.dm +++ b/code/modules/shuttle/shuttles/trijent_elevator.dm @@ -37,12 +37,6 @@ . = ..() door_control.control_doors("force-lock-launch", "all", force=TRUE) -/obj/docking_port/mobile/trijent_elevator/linkup(datum/map_template/shuttle/template, obj/docking_port/stationary/dock) - ..() - var/datum/map_template/shuttle/trijent_elevator/elev = template - elevator_network = elev.elevator_network - log_debug("Adding network [elev.elevator_network] to [id]") - /obj/docking_port/stationary/trijent_elevator dir=NORTH width=7 diff --git a/code/modules/tgs/core/core.dm b/code/modules/tgs/core/core.dm index 8be96f27404a..15622228e91f 100644 --- a/code/modules/tgs/core/core.dm +++ b/code/modules/tgs/core/core.dm @@ -166,3 +166,11 @@ var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) if(api) return api.Visibility() + +/world/TgsTriggerEvent(event_name, list/parameters, wait_for_completion = FALSE) + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + if(!istype(parameters, /list)) + parameters = list() + + return api.TriggerEvent(event_name, parameters, wait_for_completion) diff --git a/code/modules/tgs/core/datum.dm b/code/modules/tgs/core/datum.dm index 07ce3b684584..898516f12486 100644 --- a/code/modules/tgs/core/datum.dm +++ b/code/modules/tgs/core/datum.dm @@ -17,7 +17,7 @@ TGS_DEFINE_AND_SET_GLOBAL(tgs, null) world.sleep_offline = FALSE // https://www.byond.com/forum/post/2894866 del(world) world.sleep_offline = FALSE // just in case, this is BYOND after all... - sleep(1) + sleep(world.tick_lag) TGS_DEBUG_LOG("BYOND DIDN'T TERMINATE THE WORLD!!! TICK IS: [world.time], sleep_offline: [world.sleep_offline]") /datum/tgs_api/latest @@ -69,3 +69,6 @@ TGS_PROTECT_DATUM(/datum/tgs_api) /datum/tgs_api/proc/Visibility() return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/TriggerEvent(event_name, list/parameters, wait_for_completion) + return FALSE diff --git a/code/modules/tgs/v4/api.dm b/code/modules/tgs/v4/api.dm index 945e2e411767..7c87922750b9 100644 --- a/code/modules/tgs/v4/api.dm +++ b/code/modules/tgs/v4/api.dm @@ -181,7 +181,7 @@ var/json = json_encode(data) while(requesting_new_port && !override_requesting_new_port) - sleep(1) + sleep(world.tick_lag) //we need some port open at this point to facilitate return communication if(!world.port) @@ -209,7 +209,7 @@ requesting_new_port = FALSE while(export_lock) - sleep(1) + sleep(world.tick_lag) export_lock = TRUE last_interop_response = null @@ -217,7 +217,7 @@ text2file(json, server_commands_json_path) for(var/I = 0; I < EXPORT_TIMEOUT_DS && !last_interop_response; ++I) - sleep(1) + sleep(world.tick_lag) if(!last_interop_response) TGS_ERROR_LOG("Failed to get export result for: [json]") diff --git a/code/modules/tgs/v5/__interop_version.dm b/code/modules/tgs/v5/__interop_version.dm index 616263098fd3..f4806f7adb97 100644 --- a/code/modules/tgs/v5/__interop_version.dm +++ b/code/modules/tgs/v5/__interop_version.dm @@ -1 +1 @@ -"5.8.0" +"5.9.0" diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm index 1c7d67d20cdf..92c7a8388a71 100644 --- a/code/modules/tgs/v5/_defines.dm +++ b/code/modules/tgs/v5/_defines.dm @@ -14,6 +14,7 @@ #define DMAPI5_BRIDGE_COMMAND_KILL 4 #define DMAPI5_BRIDGE_COMMAND_CHAT_SEND 5 #define DMAPI5_BRIDGE_COMMAND_CHUNK 6 +#define DMAPI5_BRIDGE_COMMAND_EVENT 7 #define DMAPI5_PARAMETER_ACCESS_IDENTIFIER "accessIdentifier" #define DMAPI5_PARAMETER_CUSTOM_COMMANDS "customCommands" @@ -34,6 +35,7 @@ #define DMAPI5_BRIDGE_PARAMETER_VERSION "version" #define DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE "chatMessage" #define DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL "minimumSecurityLevel" +#define DMAPI5_BRIDGE_PARAMETER_EVENT_INVOCATION "eventInvocation" #define DMAPI5_BRIDGE_RESPONSE_NEW_PORT "newPort" #define DMAPI5_BRIDGE_RESPONSE_RUNTIME_INFORMATION "runtimeInformation" @@ -81,6 +83,7 @@ #define DMAPI5_TOPIC_COMMAND_SEND_CHUNK 9 #define DMAPI5_TOPIC_COMMAND_RECEIVE_CHUNK 10 #define DMAPI5_TOPIC_COMMAND_RECEIVE_BROADCAST 11 +#define DMAPI5_TOPIC_COMMAND_COMPLETE_EVENT 12 #define DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE "commandType" #define DMAPI5_TOPIC_PARAMETER_CHAT_COMMAND "chatCommand" @@ -116,3 +119,9 @@ #define DMAPI5_CUSTOM_CHAT_COMMAND_NAME "name" #define DMAPI5_CUSTOM_CHAT_COMMAND_HELP_TEXT "helpText" #define DMAPI5_CUSTOM_CHAT_COMMAND_ADMIN_ONLY "adminOnly" + +#define DMAPI5_EVENT_ID "eventId" + +#define DMAPI5_EVENT_INVOCATION_NAME "eventName" +#define DMAPI5_EVENT_INVOCATION_PARAMETERS "parameters" +#define DMAPI5_EVENT_INVOCATION_NOTIFY_COMPLETION "notifyCompletion" diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm index a5c064a8eaf1..95b8edd3ee5c 100644 --- a/code/modules/tgs/v5/api.dm +++ b/code/modules/tgs/v5/api.dm @@ -27,6 +27,8 @@ var/chunked_requests = 0 var/list/chunked_topics = list() + var/list/pending_events = list() + var/detached = FALSE /datum/tgs_api/v5/New() @@ -46,6 +48,10 @@ var/datum/tgs_version/api_version = ApiVersion() version = null // we want this to be the TGS version, not the interop version + + // sleep once to prevent an issue where world.Export on the first tick can hang indefinitely + sleep(world.tick_lag) + var/list/bridge_response = Bridge(DMAPI5_BRIDGE_COMMAND_STARTUP, list(DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL = minimum_required_security_level, DMAPI5_BRIDGE_PARAMETER_VERSION = api_version.raw_parameter, DMAPI5_PARAMETER_CUSTOM_COMMANDS = ListCustomCommands(), DMAPI5_PARAMETER_TOPIC_PORT = GetTopicPort())) if(!istype(bridge_response)) TGS_ERROR_LOG("Failed initial bridge request!") @@ -125,7 +131,7 @@ TGS_DEBUG_LOG("RequireInitialBridgeResponse: Starting sleep") logged = TRUE - sleep(1) + sleep(world.tick_lag) TGS_DEBUG_LOG("RequireInitialBridgeResponse: Passed") @@ -249,6 +255,40 @@ WaitForReattach(TRUE) return chat_channels.Copy() +/datum/tgs_api/v5/TriggerEvent(event_name, list/parameters, wait_for_completion) + RequireInitialBridgeResponse() + WaitForReattach(TRUE) + + if(interop_version.minor < 9) + TGS_WARNING_LOG("Interop version too low for custom events!") + return FALSE + + var/str_parameters = list() + for(var/i in parameters) + str_parameters += "[i]" + + var/list/response = Bridge(DMAPI5_BRIDGE_COMMAND_EVENT, list(DMAPI5_BRIDGE_PARAMETER_EVENT_INVOCATION = list(DMAPI5_EVENT_INVOCATION_NAME = event_name, DMAPI5_EVENT_INVOCATION_PARAMETERS = str_parameters, DMAPI5_EVENT_INVOCATION_NOTIFY_COMPLETION = wait_for_completion))) + if(!response) + return FALSE + + var/event_id = response[DMAPI5_EVENT_ID] + if(!event_id) + return FALSE + + TGS_DEBUG_LOG("Created event ID: [event_id]") + if(!wait_for_completion) + return TRUE + + TGS_DEBUG_LOG("Waiting for completion of event ID: [event_id]") + + while(!pending_events[event_id]) + sleep(world.tick_lag) + + TGS_DEBUG_LOG("Completed wait on event ID: [event_id]") + pending_events -= event_id + + return TRUE + /datum/tgs_api/v5/proc/DecodeChannels(chat_update_json) TGS_DEBUG_LOG("DecodeChannels()") var/list/chat_channels_json = chat_update_json[DMAPI5_CHAT_UPDATE_CHANNELS] diff --git a/code/modules/tgs/v5/bridge.dm b/code/modules/tgs/v5/bridge.dm index a0ab35987670..0c5e701a32b6 100644 --- a/code/modules/tgs/v5/bridge.dm +++ b/code/modules/tgs/v5/bridge.dm @@ -65,7 +65,7 @@ if(detached) // Wait up to one minute for(var/i in 1 to 600) - sleep(1) + sleep(world.tick_lag) if(!detached && (!require_channels || length(chat_channels))) break @@ -77,8 +77,11 @@ /datum/tgs_api/v5/proc/PerformBridgeRequest(bridge_request) WaitForReattach(FALSE) + TGS_DEBUG_LOG("Bridge request start") // This is an infinite sleep until we get a response var/export_response = world.Export(bridge_request) + TGS_DEBUG_LOG("Bridge request complete") + if(!export_response) TGS_ERROR_LOG("Failed bridge request: [bridge_request]") return @@ -88,7 +91,7 @@ TGS_ERROR_LOG("Failed bridge request, missing content!") return - var/response_json = file2text(content) + var/response_json = TGS_FILE2TEXT_NATIVE(content) if(!response_json) TGS_ERROR_LOG("Failed bridge request, failed to load content!") return diff --git a/code/modules/tgs/v5/topic.dm b/code/modules/tgs/v5/topic.dm index 05e6c4e1b214..e1f2cb638578 100644 --- a/code/modules/tgs/v5/topic.dm +++ b/code/modules/tgs/v5/topic.dm @@ -176,6 +176,10 @@ var/list/reattach_response = TopicResponse(error_message) reattach_response[DMAPI5_PARAMETER_CUSTOM_COMMANDS] = ListCustomCommands() reattach_response[DMAPI5_PARAMETER_TOPIC_PORT] = GetTopicPort() + + for(var/eventId in pending_events) + pending_events[eventId] = TRUE + return reattach_response if(DMAPI5_TOPIC_COMMAND_SEND_CHUNK) @@ -276,6 +280,15 @@ TGS_WORLD_ANNOUNCE(message) return TopicResponse() + if(DMAPI5_TOPIC_COMMAND_COMPLETE_EVENT) + var/event_id = topic_parameters[DMAPI5_EVENT_ID] + if (!istext(event_id)) + return TopicResponse("Invalid or missing [DMAPI5_EVENT_ID]") + + TGS_DEBUG_LOG("Completing event ID [event_id]...") + pending_events[event_id] = TRUE + return TopicResponse() + return TopicResponse("Unknown command: [command]") /datum/tgs_api/v5/proc/WorldBroadcast(message) diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm index d531d4b7b9dd..237207fdfd05 100644 --- a/code/modules/tgs/v5/undefs.dm +++ b/code/modules/tgs/v5/undefs.dm @@ -14,6 +14,7 @@ #undef DMAPI5_BRIDGE_COMMAND_KILL #undef DMAPI5_BRIDGE_COMMAND_CHAT_SEND #undef DMAPI5_BRIDGE_COMMAND_CHUNK +#undef DMAPI5_BRIDGE_COMMAND_EVENT #undef DMAPI5_PARAMETER_ACCESS_IDENTIFIER #undef DMAPI5_PARAMETER_CUSTOM_COMMANDS @@ -34,6 +35,7 @@ #undef DMAPI5_BRIDGE_PARAMETER_VERSION #undef DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE #undef DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL +#undef DMAPI5_BRIDGE_PARAMETER_EVENT_INVOCATION #undef DMAPI5_BRIDGE_RESPONSE_NEW_PORT #undef DMAPI5_BRIDGE_RESPONSE_RUNTIME_INFORMATION @@ -81,6 +83,7 @@ #undef DMAPI5_TOPIC_COMMAND_SEND_CHUNK #undef DMAPI5_TOPIC_COMMAND_RECEIVE_CHUNK #undef DMAPI5_TOPIC_COMMAND_RECEIVE_BROADCAST +#undef DMAPI5_TOPIC_COMMAND_COMPLETE_EVENT #undef DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE #undef DMAPI5_TOPIC_PARAMETER_CHAT_COMMAND @@ -116,3 +119,9 @@ #undef DMAPI5_CUSTOM_CHAT_COMMAND_NAME #undef DMAPI5_CUSTOM_CHAT_COMMAND_HELP_TEXT #undef DMAPI5_CUSTOM_CHAT_COMMAND_ADMIN_ONLY + +#undef DMAPI5_EVENT_ID + +#undef DMAPI5_EVENT_INVOCATION_NAME +#undef DMAPI5_EVENT_INVOCATION_PARAMETERS +#undef DMAPI5_EVENT_INVOCATION_NOTIFY_COMPLETION diff --git a/code/modules/tgui_panel/ping_relay.dm b/code/modules/tgui_panel/ping_relay.dm new file mode 100644 index 000000000000..36929a2e33b0 --- /dev/null +++ b/code/modules/tgui_panel/ping_relay.dm @@ -0,0 +1,52 @@ +GLOBAL_DATUM_INIT(relays_panel, /datum/ping_relay_tgui, new) + +/datum/tgui_panel/proc/ping_relays() + GLOB.relays_panel.tgui_interact(client.mob) + +/datum/ping_relay_tgui/tgui_interact(mob/user, datum/tgui/ui) + var/list/relay_ping_conf = CONFIG_GET(keyed_list/connection_relay_ping) + if(!length(relay_ping_conf)) + to_chat(user, "There are no relays configured to test.") + return + + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "PingRelaysPanel", "Relay Pings") + ui.open() + ui.set_autoupdate(FALSE) + +/datum/ping_relay_tgui/ui_state(mob/user) + return GLOB.always_state + +/datum/ping_relay_tgui/ui_static_data(mob/user) + var/list/data = list() + var/list/relay_names = list() + var/list/relay_pings = list() + var/list/relay_cons = list() + + var/list/relay_ping_conf = CONFIG_GET(keyed_list/connection_relay_ping) + var/list/relay_con_conf = CONFIG_GET(keyed_list/connection_relay_con) + for(var/key in relay_ping_conf) + // assumption: keys are the same in both configs + relay_names += key + relay_pings += relay_ping_conf[key] + relay_cons += relay_con_conf[key] + + data["relay_names"] = relay_names + data["relay_pings"] = relay_pings + data["relay_cons"] = relay_cons + return data + +/datum/ping_relay_tgui/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + var/mob/user = ui.user + + switch(action) + if("connect") + to_chat(user, "Now connecting via [params["desc"]]. Please wait..."); + user << link(params["url"]) + ui.close() + return diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm index f33f190d80e0..25338a4a3b5d 100644 --- a/code/modules/tgui_panel/tgui_panel.dm +++ b/code/modules/tgui_panel/tgui_panel.dm @@ -92,6 +92,9 @@ if(type == "telemetry") analyze_telemetry(payload) return TRUE + if(type == "act/ping_relays") + ping_relays() + return TRUE /** * public diff --git a/code/modules/vehicles/interior/interior.dm b/code/modules/vehicles/interior/interior.dm index f2afcd5ae5f7..8fb65602c9b3 100644 --- a/code/modules/vehicles/interior/interior.dm +++ b/code/modules/vehicles/interior/interior.dm @@ -304,21 +304,13 @@ // Returns min and max turfs for the interior /datum/interior/proc/get_bound_turfs() - var/turf/min = TURF_FROM_COORDS_LIST(reservation.bottom_left_coords) - if(!min) - return null - - var/turf/max = TURF_FROM_COORDS_LIST(reservation.top_right_coords) - if(!max) - return null - - return list(min, max) + return list(reservation.bottom_left_turfs[1], reservation.top_right_turfs[1]) /datum/interior/proc/get_middle_coords() - var/turf/min = reservation.bottom_left_coords - var/turf/max = reservation.top_right_coords + var/turf/min = reservation.bottom_left_turfs[1] + var/turf/max = reservation.top_right_turfs[1] + return list(Floor(min.x + (max.x - min.x)/2), Floor(min.y + (max.y - min.y)/2), min.z) - return list(Floor(min[1] + (max[1] - min[1])/2), Floor(min[2] + (max[2] - min[2])/2), min[3]) /datum/interior/proc/get_middle_turf() var/list/turf/bounds = get_bound_turfs() diff --git a/code/modules/vehicles/van/van.dm b/code/modules/vehicles/van/van.dm index c4aa64360ec0..8bf114d6b4a8 100644 --- a/code/modules/vehicles/van/van.dm +++ b/code/modules/vehicles/van/van.dm @@ -83,7 +83,7 @@ icon_state = null - RegisterSignal(SSdcs, COMSIG_GLOB_MOB_LOGIN, PROC_REF(add_default_image)) + RegisterSignal(SSdcs, COMSIG_GLOB_MOB_LOGGED_IN, PROC_REF(add_default_image)) for(var/I in GLOB.player_list) add_default_image(SSdcs, I) @@ -125,7 +125,7 @@ mobs_under += L RegisterSignal(L, COMSIG_PARENT_QDELETING, PROC_REF(remove_under_van)) - RegisterSignal(L, COMSIG_MOB_LOGIN, PROC_REF(add_client)) + RegisterSignal(L, COMSIG_MOB_LOGGED_IN, PROC_REF(add_client)) RegisterSignal(L, COMSIG_MOVABLE_MOVED, PROC_REF(check_under_van)) if(L.client) @@ -141,7 +141,7 @@ UnregisterSignal(L, list( COMSIG_PARENT_QDELETING, - COMSIG_MOB_LOGIN, + COMSIG_MOB_LOGGED_IN, COMSIG_MOVABLE_MOVED, )) diff --git a/colonialmarines.dme b/colonialmarines.dme index 602e4fa9de30..4c7eaf582e90 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -112,6 +112,7 @@ #include "code\__DEFINES\tgui.dm" #include "code\__DEFINES\traits.dm" #include "code\__DEFINES\turf_flags.dm" +#include "code\__DEFINES\turfs.dm" #include "code\__DEFINES\tutorial.dm" #include "code\__DEFINES\unit_tests.dm" #include "code\__DEFINES\urls.dm" @@ -184,6 +185,7 @@ #include "code\__HELPERS\sanitize_values.dm" #include "code\__HELPERS\shell.dm" #include "code\__HELPERS\status_effects.dm" +#include "code\__HELPERS\string_lists.dm" #include "code\__HELPERS\text.dm" #include "code\__HELPERS\traits.dm" #include "code\__HELPERS\type2type.dm" @@ -970,7 +972,9 @@ #include "code\game\machinery\vending\vendor_types\antag\antag_gear.dm" #include "code\game\machinery\vending\vendor_types\antag\antag_guns_snowflake.dm" #include "code\game\machinery\vending\vendor_types\antag\antag_guns_sorted.dm" +#include "code\game\machinery\vending\vendor_types\crew\combat_correspondent.dm" #include "code\game\machinery\vending\vendor_types\crew\commanding_officer.dm" +#include "code\game\machinery\vending\vendor_types\crew\engineering.dm" #include "code\game\machinery\vending\vendor_types\crew\medical.dm" #include "code\game\machinery\vending\vendor_types\crew\mp.dm" #include "code\game\machinery\vending\vendor_types\crew\pilot_officer.dm" @@ -1240,6 +1244,7 @@ #include "code\game\objects\items\toys\crayons.dm" #include "code\game\objects\items\toys\toy_weapons.dm" #include "code\game\objects\items\toys\toys.dm" +#include "code\game\objects\items\toys\trading_cards.dm" #include "code\game\objects\items\weapons\blades.dm" #include "code\game\objects\items\weapons\energy.dm" #include "code\game\objects\items\weapons\misc.dm" @@ -1566,11 +1571,16 @@ #include "code\modules\clothing\suits\bio.dm" #include "code\modules\clothing\suits\jobs.dm" #include "code\modules\clothing\suits\labcoat.dm" -#include "code\modules\clothing\suits\marine_armor.dm" #include "code\modules\clothing\suits\marine_coat.dm" #include "code\modules\clothing\suits\miscellaneous.dm" #include "code\modules\clothing\suits\storage.dm" #include "code\modules\clothing\suits\utility.dm" +#include "code\modules\clothing\suits\marine_armor\_marine_armor.dm" +#include "code\modules\clothing\suits\marine_armor\ert.dm" +#include "code\modules\clothing\suits\marine_armor\ghillie.dm" +#include "code\modules\clothing\suits\marine_armor\intel.dm" +#include "code\modules\clothing\suits\marine_armor\smartgunner.dm" +#include "code\modules\clothing\suits\marine_armor\spec_fire.dm" #include "code\modules\clothing\under\color.dm" #include "code\modules\clothing\under\gimmick.dm" #include "code\modules\clothing\under\marine_uniform.dm" @@ -1765,8 +1775,10 @@ #include "code\modules\gear_presets\survivors\kutjevo\preset_kutjevo.dm" #include "code\modules\gear_presets\survivors\lv_522\forcon_survivors.dm" #include "code\modules\gear_presets\survivors\lv_624\clfship_insert_lv624.dm" +#include "code\modules\gear_presets\survivors\lv_624\corporate_dome_insert_lv624.dm" #include "code\modules\gear_presets\survivors\lv_624\preset_lv.dm" #include "code\modules\gear_presets\survivors\new_varadero\preset_new_varadero.dm" +#include "code\modules\gear_presets\survivors\shivas_snowball\panic_room_insert_shivas.dm" #include "code\modules\gear_presets\survivors\shivas_snowball\preset_shivas_snowball.dm" #include "code\modules\gear_presets\survivors\solaris\crashlanding-offices_insert_bigred.dm" #include "code\modules\gear_presets\survivors\solaris\preset_solaris.dm" @@ -2006,6 +2018,7 @@ #include "code\modules\mob\living\carbon\xenomorph\abilities\praetorian\praetorian_macros.dm" #include "code\modules\mob\living\carbon\xenomorph\abilities\praetorian\praetorian_powers.dm" #include "code\modules\mob\living\carbon\xenomorph\abilities\predalien\predalien_abilities.dm" +#include "code\modules\mob\living\carbon\xenomorph\abilities\predalien\predalien_macros.dm" #include "code\modules\mob\living\carbon\xenomorph\abilities\predalien\predalien_powers.dm" #include "code\modules\mob\living\carbon\xenomorph\abilities\queen\queen_abilities.dm" #include "code\modules\mob\living\carbon\xenomorph\abilities\queen\queen_macros.dm" @@ -2356,6 +2369,7 @@ #include "code\modules\tgui_input\text.dm" #include "code\modules\tgui_panel\audio.dm" #include "code\modules\tgui_panel\external.dm" +#include "code\modules\tgui_panel\ping_relay.dm" #include "code\modules\tgui_panel\telemetry.dm" #include "code\modules\tgui_panel\tgui_panel.dm" #include "code\modules\tooltip\tooltip.dm" diff --git a/config/example/config.txt b/config/example/config.txt index f9e0956593a9..f055a5d65bff 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -4,6 +4,7 @@ # $include dbconfig.txt # $include resources.txt # $include icon_source.txt +# $include relays.txt ## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice # SERVERNAME spacestation13 diff --git a/config/example/relays.txt b/config/example/relays.txt new file mode 100644 index 000000000000..562e917fa484 --- /dev/null +++ b/config/example/relays.txt @@ -0,0 +1,22 @@ +## Settings controlling the relay ping browser accessed via PingIndicator in TGChat +## Pings are performed by timing how long it takes to download favicon.ico from the PingURL + +## Connection Relays: Name must match both ping and connect pairs +## CONNECTION_RELAY_PING Name|PingURL +## CONNECTION_RELAY_CON Name|ConnectURL +CONNECTION_RELAY_PING Direct|play.cm-ss13.com:8998 +CONNECTION_RELAY_CON Direct|play.cm-ss13.com:1400 +CONNECTION_RELAY_PING United Kingdom, London|uk.cm-ss13.com:8998 +CONNECTION_RELAY_CON United Kingdom, London|uk.cm-ss13.com:1400 +CONNECTION_RELAY_PING France, Gravelines|eu-w.cm-ss13.com:8998 +CONNECTION_RELAY_CON France, Gravelines|eu-w.cm-ss13.com:1400 +CONNECTION_RELAY_PING Poland, Warsaw|eu-e.cm-ss13.com:8998 +CONNECTION_RELAY_CON Poland, Warsaw|eu-e.cm-ss13.com:1400 +CONNECTION_RELAY_PING Oregon, Hillsboro|us-w.cm-ss13.com:8998 +CONNECTION_RELAY_CON Oregon, Hillsboro|us-w.cm-ss13.com:1400 +CONNECTION_RELAY_PING Virginia, Vint Hill|us-e.cm-ss13.com:8998 +CONNECTION_RELAY_CON Virginia, Vint Hill|us-e.cm-ss13.com:1400 +CONNECTION_RELAY_PING Singapore|asia-se.cm-ss13.com:8998 +CONNECTION_RELAY_CON Singapore|asia-se.cm-ss13.com:1400 +CONNECTION_RELAY_PING Australia, Sydney|aus.cm-ss13.com:8998 +CONNECTION_RELAY_CON Australia, Sydney|aus.cm-ss13.com:1400 diff --git a/html/changelogs/AutoChangeLog-pr-5584.yml b/html/changelogs/AutoChangeLog-pr-5584.yml deleted file mode 100644 index 7d2f7b8e156c..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5584.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Contrabang" -delete-after: True -changes: - - rscadd: "Falling out of a Dropship en route to an LZ, now lets your corpse plummet to the ground instead of being deleted." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5645.yml b/html/changelogs/AutoChangeLog-pr-5645.yml deleted file mode 100644 index b37554dbe5f0..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5645.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "hislittlecuzingames" -delete-after: True -changes: - - maptweak: "tweaked Trijent Dam to add a new choke point." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5687.yml b/html/changelogs/AutoChangeLog-pr-5687.yml new file mode 100644 index 000000000000..5e76c3882b6e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5687.yml @@ -0,0 +1,4 @@ +author: "iloveloopers" +delete-after: True +changes: + - bugfix: "custom flamer chemicals now work on the flamer nozzle" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5752.yml b/html/changelogs/AutoChangeLog-pr-5752.yml deleted file mode 100644 index 74f574d66b7c..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5752.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Drathek" -delete-after: True -changes: - - maptweak: "Fixed access for two doors on the Almayer" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5753.yml b/html/changelogs/AutoChangeLog-pr-5753.yml deleted file mode 100644 index 09fe604e5a9a..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5753.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Drathek" -delete-after: True -changes: - - balance: "Corrected vampire lurker damage values (Effectively reduction by 5 damage for most attacks)" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5784.yml b/html/changelogs/AutoChangeLog-pr-5784.yml new file mode 100644 index 000000000000..9d227ce7d2fb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5784.yml @@ -0,0 +1,9 @@ +author: "GrrrKitten" +delete-after: True +changes: + - rscadd: "New Deployable Fax Backpack for the Civilian Combat Correspondent" + - rscadd: "New Wieldable Broadcasting Camera for the Civilian Combat Correspondent" + - rscadd: "Cameras can no longer be turned off but have to be wielded to take photos" + - rscadd: "Add's new Combat Correspondent vendor with CC's basic outfits and standard gear" + - bugfix: "Fixes numerous camera/photo bugs" + - imageadd: "Adds new itemstates for the polaroid camera" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5820.yml b/html/changelogs/AutoChangeLog-pr-5820.yml new file mode 100644 index 000000000000..efb4d661d2a1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5820.yml @@ -0,0 +1,4 @@ +author: "Vicacrov" +delete-after: True +changes: + - bugfix: "Hugger and acid traps no longer activate when they get shuttlecrushed." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5850.yml b/html/changelogs/AutoChangeLog-pr-5850.yml new file mode 100644 index 000000000000..9d88e7df98a3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5850.yml @@ -0,0 +1,4 @@ +author: "TheGamerdk" +delete-after: True +changes: + - refactor: "Overwatch console will now save your filter settings" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5852.yml b/html/changelogs/AutoChangeLog-pr-5852.yml new file mode 100644 index 000000000000..514e3b105c91 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5852.yml @@ -0,0 +1,4 @@ +author: "Warfan1815" +delete-after: True +changes: + - bugfix: "Fixes the pulling of trading cards out of a pack message being visible to other people" \ No newline at end of file diff --git a/html/changelogs/archive/2024-02.yml b/html/changelogs/archive/2024-02.yml index 1feb5e858afc..f344da79decb 100644 --- a/html/changelogs/archive/2024-02.yml +++ b/html/changelogs/archive/2024-02.yml @@ -247,3 +247,231 @@ against your helmet. Zonespace27: - bugfix: You can no longer remove vehicle parts from a vehicle at a distance +2024-02-21: + Contrabang: + - rscadd: Falling out of a Dropship en route to an LZ, now lets your corpse plummet + to the ground instead of being deleted. + Drathek: + - maptweak: Fixed access for two doors on the Almayer + - balance: Corrected vampire lurker damage values (Effectively reduction by 5 damage + for most attacks) + Stakeyng: + - rscadd: mou is now compatible with the shotgun scabbard + VileBeggar: + - rscadd: The Vulture can now be loaded with holo-targetting rounds which have severely + hampered ballistic performance, but mark any target that is hit, increasing + their damage taken by 33% for a brief period of time. + hislittlecuzingames: + - maptweak: tweaked Trijent Dam to add a new choke point. + private-tristan: + - rscdel: VAIMS (vaipo med spec) no longer gets a redundant burn line + - balance: VAIMS now gets an extra MAR mag. + - bugfix: Forsaken and Feral xenos can now (correctly) use hive-status + - spellcheck: fixed a case where we/our wouldn't be used when attempting to access + hive status with no queen +2024-02-22: + BadAtThisGame302: + - rscadd: Implemented a probability of playing a static-filled transmission as the + distress received response. + Drathek: + - bugfix: Fixed automatic CMB ERT caused by black market heat + - code_imp: get_specific_call now only accepts a path or a string of a path + - ui: Fix broken admin Medals Panel + - spellcheck: Reworded message when a facehugger's temporary mute ends to not mention + hivemind + Huffie56: + - refactor: refactored files with the aim of making fixing barricade with a welder + more constant. + - bugfix: being unable to repair more than one metal barricade at the time. + Kaga: + - bugfix: Fixed a bug that broke ID-Lockable items in presets. Rejoice, PMC Snipers, + pre-equipped USCM Specs, UPP Commandos, and WY Deathsquads. + LaylaMcC: + - rscadd: Increased levels of acidic blood and carpotoxin in xenomeat and carp fillets. + - rscdel: Xenomeat and carp fillet-based recipes no longer add additional acidic + blood or carpotoxin. + - qol: Master level domestic skill allows the use of the food processor to remove + acidic blood and carpotoxin from xenomeat and carp fillets. + - bugfix: Turning named pieces of human meat into meatballs will retain the human's + name. + SabreML: + - rscadd: Added 'observe' functionality to Xenomorphs, allowing observers to view + the target's UI. + - rscadd: Made observing a player also show their action buttons. + - refactor: Refactored the 'gun action' buttons, making them show their names in + the status bar when hovered over. + TheGamerdk: + - rscadd: CIC can now view helmet cameras of Command Staff. Literally 1984 + iloveloopers: + - qol: Autolathes are now significantly faster. +2024-02-23: + AtticusRezzer: + - bugfix: Fixed the incorrect area flag in lifeboats allowing tunneling + Drathek: + - balance: Increased same tile weed expansion delay for queen from 7s to 10s + Huffie56: + - maptweak: split each Hallway area port and starboard into three areas.(fore midship + aft) + - maptweak: change the area around north and south west staircase to remove emergency + shutters. + - maptweak: change the area west of squad preparation room to remove emergency shutter. + - maptweak: change the area west of lower engi to make emergency shutter be at the + frontier of the area. + InsaneRed: + - rscadd: Added a new ability to the predalien "Feral Rush" that increases it's + armor and speed for a short duration. + - rscadd: Added two new abilities to the predalien "Feral Frenzy" and a toggle. + The predalien can now switch between a single target GUT and an AOE one, both + of which has damage that scale with your kills. + - rscdel: Removed the predaliens gib ability + - rscdel: Removed the predaliens "pounce" ability + - rscdel: Removed the predaliens "Ground Smash" ability + - balance: Predalien no longer has plasma costs, or plasma. + - balance: The Plasma Rifle, which is ONLY used to hunt abominations now has a higher + ROF and has incin bullets. + - spellcheck: Re-wrote the predalien text to be more up to date and remove missinformation + - qol: Everyone can see how many kills the predalien has by examining it. + - rscadd: Added a "Feral Smash" ability that lets you grab somebody and smash them + to the ground, this scales with kills and is a devastating attack. + - balance: Removed screenshake from predalien's screech + - balance: Predalien removes fire stacks faster. + - bugfix: Girders are now slashable by very_sharp_claws instead of just having a + queen chack + SabreML: + - bugfix: Fixed the search function of TGUI input lists. + - qol: Made the TGUI input list search bar automatically focus when toggled. + - bugfix: Fixed Xenomorphs not having their caste's tackle duration values applied + to them. + fira: + - code_imp: Updated mapping backend from /tg/ upstream. + iloveloopers: + - qol: Reagent tanks can now be dragged faster. +2024-02-24: + BadAtThisGame302: + - rscadd: Added a CL and Goon nightmare insert spawn. + - mapadd: added a new nightmare insert on LV which revamps the Corporate Dome into + a holdout. + SabreML: + - bugfix: Fixed the 88 Mod 4 pistol's holster sprite. + Segrain: + - admin: Check Ckey verb is now available on player panel. + - bugfix: Fully healed limbs should now properly remove the overlays for their wounds + and bandages. + TopHatPenguin: + - rscdel: Removes part of MOPP suit desc. + Warfan1815: + - rscadd: Added WeyYu Trading Cards (they come in packs of 5, single, or in special + packs of WeyYu Gold) buyable at rec vendor (and/or colony tobacco vendors in + the case of the special cigarette packs) + - imageadd: Added sprites of the WeyYu Trading Cards, trading card packs, and special + WeyYu Gold cigarette packs. +2024-02-25: + Drathek: + - ui: Added the relay ping browser accessed by the tgchat ping to test and use alternative + connections to the server + - ui: Added onConfirmChange prop to Button.Confirm component. + - config: Added CONNECTION_RELAY_PING and CONNECTION_RELAY_CON in the relays.txt + config that is optionally included in config.txt + - rscadd: Welding a barricade will now repeat automatically if it can still be repaired. + - balance: 'Reverted multi-welding change to barricades: All barricades must be + welded one at a time.' + - refactor: Refactored more barricade code. + Huffie56: + - refactor: refactor marine_armor.dm and split it into multiples files. + SabreML: + - bugfix: Fixed 'hidden' action buttons being shown to observing players. + - qol: Made any observers transfer over when a Xenomorph evolves/de-evolves. + SpartanBobby: + - maptweak: Edits to secure storage LV624s detailing + - maptweak: Make a few unabreakable walls on kutjevo breakable, touches the east + botony caves flanks ands removes some ledges from combat routes + - maptweak: Edits to southwest dorms LV522 + - maptweak: Redetails bigred Libary +2024-02-26: + Mister-moon1: + - balance: Reverted flare range buff 7->5 tiles + SpartanBobby: + - maptweak: Edits to southyard sci-annex + harryob: + - admin: marking a ticket now actually stops other people from messing with your + marked ticket + realforest2001: + - admin: Mods can now run votes where appropriate. + - admin: Moved a few event verbs from Admin level to Senior Mod. + - admin: Added a log to creating new bank accounts. +2024-02-27: + BadAtThisGame302: + - mapadd: added a new nightmare insert in the Operations Panic Room on Shivas + - rscadd: Added trucker hats to the Solaris and Trijent Trucker survs. + - rscadd: Added the CMB Marshal jacket to the CMB Marshal. + - imageadd: Differentiated the CMB Deputy and CMB Marshal jackets to accurately + know which is which. Courtesy of AmoryBlaine. + - imageadd: Added new insulated gloves, coveralls (Tan/Red), updated the blue coveralls, + Five Colonist Clothes (Grey/Khaki/Pink/Blue/Green), updated the Orange/Blue/Black + hazard vests and updated the CMB Uniform and Cap. Courtesy of AmoryBlaine. + Drathek: + - bugfix: Fixed a runtime when swapping tools during cade welding + Huffie56: + - rscadd: adding vendor for maintenance technician. + - code_imp: remove some item that maintenance technician spawned with and put them + in is vendor instead. + - maptweak: replaced secured closet by vendor for maintenance technician. + - balance: set base price for B12 to 30 and for the M4 to 20. + - balance: Medic comtech and SL have a discount of 20% for the B12 and M4. (B12=24 + & M4=16=) + - balance: removed the free M4 for FTL but added FTL the option to buy it for 20. + - balance: changed the price of Drop Pouch from 15 to 10. + InsaneRed: + - balance: Oppressor tailhook is now 8 deciseconds instead of 7. + Megaddd: + - balance: health analyzer no longer shows large custom research chem property text + rows. + SabreML: + - qol: Added a failure message when trying to remove a built-in helmet visor. + paulrpg,kugamo: + - imageadd: shuttle rotation sprites added + - maptweak: escape pods now use new floors +2024-02-28: + Birdtalon: + - bugfix: Admin verbs - Hide will now hide Control Mob verb + Drathek: + - bugfix: Fixed the Mass Screenshot Debug verb bounds + LTNTS: + - rscadd: 'brig areas: warden office, MP bunks, starboard hallway, interrogation + room, evidence storage' + - spellcheck: changes brig surgery to brig medical + - code_imp: removed some brig areas from hijack, added other brig areas + SabreML: + - bugfix: Fixed acid pillars shooting nested marines. + Segrain: + - bugfix: FORECON and RMC now can add their frequences to groundside radiotowers. + - bugfix: Fisticuffs attacks are no longer attributed to wrong mob. + - admin: TWE mobs are now properly counted on Who screen. + - spellcheck: Changed names of "resin node" and "resin hole" to "weed node" and + "resin trap" respectfully. + - bugfix: CLF survivors no longer incorrectly get told that they are not hostile + to marines. + Warfan1815: + - spellcheck: Fixed the order of trading cards (as they were accidentally inverted) + Zonespace27: + - bugfix: M707 spotting scope should no longer teleport its user. + - bugfix: M707's attachments should now correctly reflect the map's camouflage. + ihatethisengine: + - balance: Pried open dropship hatches cannot be remotely locked anymore + mullenpaul: + - bugfix: ammo consumption logic for cas tgui correctly counts +2024-02-29: + MobiusWon: + - balance: Readds M4 armor to FTL vendor as a default item + Nanu: + - balance: Removed the ability for Combat Synths in the UPP/CLF ERT to use guns, + as well as the CLF Survivor Synth. + - rscadd: Did a few minor tweaks to help fill in some of the space given by the + removal of guns/ammo from the Combat Synths loadout. + Segrain: + - bugfix: Removed an exploit involving crates. + cuberound: + - balance: omnisentrygun price down to 300, but it goes up 100 points after each + purchase + mullenpaul: + - code_imp: removed duplicated signal code from dropship equipment diff --git a/html/changelogs/archive/2024-03.yml b/html/changelogs/archive/2024-03.yml new file mode 100644 index 000000000000..922eaa9e8478 --- /dev/null +++ b/html/changelogs/archive/2024-03.yml @@ -0,0 +1,19 @@ +2024-03-01: + BadAtThisGame302: + - rscadd: Added a new uniform to the Flight Control Operator. + - rscadd: Added a new faction IFF grouping for WY Survs. + - rscadd: Added the ICC and the CL survs to the WY IFF System. + - rscadd: Added the USCM CL to the WY IFF System. + Drathek BadAtThisGame: + - maptweak: Fixed various nightmare inserts that were not spawning; removing or + disabling others that were not in use. + - maptweak: Updated containerroom_xenos insert for Solaris Ridge to include coms + tower (BadAtThisGame) + - code_imp: Nightmare errors are now a runtime. + Huffie56: + - refactor: refactored stage three of black goo and added stage four. + Lok1: + - rscadd: maintenance stations stun when exiting like closets + Vicacrov: + - rscadd: 'You can now order the following in Requisitions: M2C ammo, M56D ammo, + UA 45-F mini sentry ammo, UA 60-FP sentry ammo.' diff --git a/icons/mob/hud/actions_xeno.dmi b/icons/mob/hud/actions_xeno.dmi index 6a48235a4f3b..c829821730c2 100644 Binary files a/icons/mob/hud/actions_xeno.dmi and b/icons/mob/hud/actions_xeno.dmi differ diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi index 10c4f0765a12..eba8a2d0289c 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/belt.dmi b/icons/mob/humans/onmob/belt.dmi index 4cff5838fbbb..453f2e9e2b2d 100644 Binary files a/icons/mob/humans/onmob/belt.dmi and b/icons/mob/humans/onmob/belt.dmi differ diff --git a/icons/mob/humans/onmob/contained/war_correspondent.dmi b/icons/mob/humans/onmob/contained/war_correspondent.dmi deleted file mode 100644 index 38bef4845cb3..000000000000 Binary files a/icons/mob/humans/onmob/contained/war_correspondent.dmi and /dev/null differ diff --git a/icons/mob/humans/onmob/hands.dmi b/icons/mob/humans/onmob/hands.dmi index 83bf9960ad12..923a417f4f89 100644 Binary files a/icons/mob/humans/onmob/hands.dmi and b/icons/mob/humans/onmob/hands.dmi differ diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi index e69c0191042f..ab93b68640fc 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_0.dmi b/icons/mob/humans/onmob/items_lefthand_0.dmi index b3adba7e980e..bcf2773e8dd7 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_0.dmi and b/icons/mob/humans/onmob/items_lefthand_0.dmi differ diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index 357a94f60cf7..91dc908a8293 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_0.dmi b/icons/mob/humans/onmob/items_righthand_0.dmi index 485e270510d8..d53360ec86a7 100644 Binary files a/icons/mob/humans/onmob/items_righthand_0.dmi and b/icons/mob/humans/onmob/items_righthand_0.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi index 7bcc772c7375..c5b67e97c2e1 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_0.dmi b/icons/mob/humans/onmob/suit_0.dmi index de2595e261f0..737b59f6c4af 100644 Binary files a/icons/mob/humans/onmob/suit_0.dmi and b/icons/mob/humans/onmob/suit_0.dmi differ diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index 61297e9f98cb..c372b8a6d72c 100644 Binary files a/icons/mob/humans/onmob/suit_1.dmi and b/icons/mob/humans/onmob/suit_1.dmi differ diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi index 0613b6e66623..9126bfccb699 100644 Binary files a/icons/mob/humans/onmob/uniform_0.dmi and b/icons/mob/humans/onmob/uniform_0.dmi differ diff --git a/icons/mob/humans/onmob/uniform_1.dmi b/icons/mob/humans/onmob/uniform_1.dmi index 12f4d104c2f0..89500b39a596 100644 Binary files a/icons/mob/humans/onmob/uniform_1.dmi and b/icons/mob/humans/onmob/uniform_1.dmi differ diff --git a/icons/obj/items/cigarettes.dmi b/icons/obj/items/cigarettes.dmi index db313199afb2..89b3ca2195fa 100644 Binary files a/icons/obj/items/cigarettes.dmi and b/icons/obj/items/cigarettes.dmi differ diff --git a/icons/obj/items/clothing/backpacks.dmi b/icons/obj/items/clothing/backpacks.dmi index 678107edf7af..13acfa42cc40 100644 Binary files a/icons/obj/items/clothing/backpacks.dmi and b/icons/obj/items/clothing/backpacks.dmi differ diff --git a/icons/obj/items/clothing/belts.dmi b/icons/obj/items/clothing/belts.dmi index 946fbfd23cda..2506ee0eb48d 100644 Binary files a/icons/obj/items/clothing/belts.dmi and b/icons/obj/items/clothing/belts.dmi differ diff --git a/icons/obj/items/clothing/cm_hats.dmi b/icons/obj/items/clothing/cm_hats.dmi index ae311984e2c3..ff0aa3d08ec8 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 7f4de16bb174..c1910d21b599 100644 Binary files a/icons/obj/items/clothing/cm_suits.dmi and b/icons/obj/items/clothing/cm_suits.dmi differ diff --git a/icons/obj/items/clothing/gloves.dmi b/icons/obj/items/clothing/gloves.dmi index f1fe9b303046..b290778d2d28 100644 Binary files a/icons/obj/items/clothing/gloves.dmi and b/icons/obj/items/clothing/gloves.dmi differ diff --git a/icons/obj/items/clothing/suits.dmi b/icons/obj/items/clothing/suits.dmi index cf23d265181f..5057a89fe278 100644 Binary files a/icons/obj/items/clothing/suits.dmi and b/icons/obj/items/clothing/suits.dmi differ diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi index bf8e5831607c..788e24bf46e6 100644 Binary files a/icons/obj/items/clothing/uniforms.dmi and b/icons/obj/items/clothing/uniforms.dmi differ diff --git a/icons/obj/items/items.dmi b/icons/obj/items/items.dmi index 80daeefc21d5..58f267721345 100644 Binary files a/icons/obj/items/items.dmi and b/icons/obj/items/items.dmi differ diff --git a/icons/obj/items/playing_cards.dmi b/icons/obj/items/playing_cards.dmi index 4db5c94cf063..61b521edddd8 100644 Binary files a/icons/obj/items/playing_cards.dmi and b/icons/obj/items/playing_cards.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 e177d85dc726..8b3b5e0f1c80 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/structures/doors/dropship1_cargo.dmi b/icons/obj/structures/doors/dropship1_cargo.dmi index 699a3cc13b9f..be517592324f 100644 Binary files a/icons/obj/structures/doors/dropship1_cargo.dmi and b/icons/obj/structures/doors/dropship1_cargo.dmi differ diff --git a/icons/obj/structures/doors/dropship1_pilot.dmi b/icons/obj/structures/doors/dropship1_pilot.dmi index 776882a136e4..0ae55add9966 100644 Binary files a/icons/obj/structures/doors/dropship1_pilot.dmi and b/icons/obj/structures/doors/dropship1_pilot.dmi differ diff --git a/icons/obj/structures/doors/dropship1_side.dmi b/icons/obj/structures/doors/dropship1_side.dmi index 346811438914..7f3298d69975 100644 Binary files a/icons/obj/structures/doors/dropship1_side.dmi and b/icons/obj/structures/doors/dropship1_side.dmi differ diff --git a/icons/obj/structures/doors/dropship2_cargo.dmi b/icons/obj/structures/doors/dropship2_cargo.dmi index 4e2ebfe0e3d2..f6bd23184889 100644 Binary files a/icons/obj/structures/doors/dropship2_cargo.dmi and b/icons/obj/structures/doors/dropship2_cargo.dmi differ diff --git a/icons/obj/structures/doors/dropship2_pilot.dmi b/icons/obj/structures/doors/dropship2_pilot.dmi index 9a77adf39f70..226249be4d84 100644 Binary files a/icons/obj/structures/doors/dropship2_pilot.dmi and b/icons/obj/structures/doors/dropship2_pilot.dmi differ diff --git a/icons/obj/structures/doors/dropship2_side.dmi b/icons/obj/structures/doors/dropship2_side.dmi index 03c0492d7df9..8dfa437d6521 100644 Binary files a/icons/obj/structures/doors/dropship2_side.dmi and b/icons/obj/structures/doors/dropship2_side.dmi differ diff --git a/icons/obj/structures/machinery/library.dmi b/icons/obj/structures/machinery/library.dmi index 00e90fc7babf..3efeeef8b9f5 100644 Binary files a/icons/obj/structures/machinery/library.dmi and b/icons/obj/structures/machinery/library.dmi differ diff --git a/icons/obj/structures/props/almayer_props64.dmi b/icons/obj/structures/props/almayer_props64.dmi index c45b37d6ef15..f47f19be9081 100644 Binary files a/icons/obj/structures/props/almayer_props64.dmi and b/icons/obj/structures/props/almayer_props64.dmi differ diff --git a/icons/turf/dropship.dmi b/icons/turf/dropship.dmi index b3cf56eb4549..e4261344ebba 100644 Binary files a/icons/turf/dropship.dmi and b/icons/turf/dropship.dmi differ diff --git a/icons/turf/dropship2.dmi b/icons/turf/dropship2.dmi index 754c20d9ead4..53a44fe75b71 100644 Binary files a/icons/turf/dropship2.dmi and b/icons/turf/dropship2.dmi differ diff --git a/icons/turf/ert_shuttle.dmi b/icons/turf/ert_shuttle.dmi index befed9f547b7..39018d4f1611 100644 Binary files a/icons/turf/ert_shuttle.dmi and b/icons/turf/ert_shuttle.dmi differ diff --git a/icons/turf/escapepods.dmi b/icons/turf/escapepods.dmi index 089db3cd3e19..96aa67789bb1 100644 Binary files a/icons/turf/escapepods.dmi and b/icons/turf/escapepods.dmi differ diff --git a/maps/Nightmare/maps/Ice_Colony_v3/nightmare.json b/maps/Nightmare/maps/Ice_Colony_v3/nightmare.json index 9c3008696d3a..301ffa337115 100644 --- a/maps/Nightmare/maps/Ice_Colony_v3/nightmare.json +++ b/maps/Nightmare/maps/Ice_Colony_v3/nightmare.json @@ -96,5 +96,12 @@ "landmark": "lz2-north", "path": "lz2-variations/north/full-closed.dmm", "when": { "lz2-north": "full" } - } + }, + { + "type": "map_insert", + "landmark": "panic_room", + "chance": 0.5, + "path": "standalone/panic_room_hold.dmm", + "when": { "panic_room": "full" } + } ] diff --git a/maps/Nightmare/maps/Ice_Colony_v3/scenario.json b/maps/Nightmare/maps/Ice_Colony_v3/scenario.json index 414bbcb15abc..4b4eb7b6b92f 100644 --- a/maps/Nightmare/maps/Ice_Colony_v3/scenario.json +++ b/maps/Nightmare/maps/Ice_Colony_v3/scenario.json @@ -8,6 +8,13 @@ { "weight": 1, "type": "def", "values": { "lz2-southwest": "half", "lz2-south-gate": "none", "lz2-southeast": "half", "lz2-eastsouth": "full", "lz2-southeast-gate": "full", "lz2-east": "none", "lz2-east-gate": "half", "lz2-north": "none"} }, { "weight": 1, "type": "def", "values": { "lz2-southwest": "full", "lz2-south-gate": "none", "lz2-southeast": "half", "lz2-eastsouth": "none", "lz2-southeast-gate": "open", "lz2-east": "full", "lz2-east-gate": "none", "lz2-north": "open"} } ] +}, +{ + "type": "pick", "name": "Panic Room", + "choices": [ + { "weight": 10, "type": "def", "values": { "panic_room": "none"} }, + { "weight": 3, "type": "def", "values": { "panic_room": "full"} } + ] } ] diff --git a/maps/Nightmare/maps/LV624/nightmare.json b/maps/Nightmare/maps/LV624/nightmare.json index 8f81a61c16de..0fe51643177b 100644 --- a/maps/Nightmare/maps/LV624/nightmare.json +++ b/maps/Nightmare/maps/LV624/nightmare.json @@ -6,6 +6,13 @@ "path": "standalone/clfship.dmm", "when": { "lvevent": "fallen_ship" } }, + { + "type": "map_insert", + "landmark": "corporatedome", + "chance": 0.5, + "path": "standalone/corporatedome.dmm", + "when": { "lvevent": "asset_protection" } + }, { "type": "map_insert", "landmark": "lv-skylight", diff --git a/maps/Nightmare/maps/LV624/scenario.json b/maps/Nightmare/maps/LV624/scenario.json index 3c8051a4eb17..6880cb542f2a 100644 --- a/maps/Nightmare/maps/LV624/scenario.json +++ b/maps/Nightmare/maps/LV624/scenario.json @@ -13,7 +13,8 @@ { "weight": 2, "type": "def", "values": { "lvevent": "none" } }, { "weight": 4, "type": "def", "values": { "lvevent": "last_stand" } }, { "weight": 2, "type": "def", "values": { "lvevent": "fallen_ship", "mainpath": "bridge" } }, - { "weight": 2, "type": "def", "values": { "lvevent": "fallen_ship", "mainpath": "right" } } + { "weight": 2, "type": "def", "values": { "lvevent": "fallen_ship", "mainpath": "right" } }, + { "weight": 2, "type": "def", "values": { "lvevent": "asset_protection", "mainpath": "left" } } ] } ] diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index 8cbac69b23a0..dbcf22e2e586 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -5256,11 +5256,6 @@ icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) -"apI" = ( -/turf/open/floor{ - icon_state = "red" - }, -/area/bigredv2/outside/lambda_cave_cas) "apJ" = ( /obj/structure/window/framed/solaris/reinforced, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -6864,18 +6859,6 @@ icon_state = "darkish" }, /area/bigredv2/caves/lambda/breakroom) -"auw" = ( -/obj/structure/showcase{ - icon_state = "d_analyzer_la"; - icon = 'icons/obj/structures/machinery/research.dmi' - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/turf/open/floor{ - icon_state = "darkish" - }, -/area/bigredv2/caves/lambda/breakroom) "aux" = ( /obj/effect/landmark/xeno_spawn, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -9710,22 +9693,6 @@ }, /turf/open/floor, /area/bigredv2/outside/hydroponics) -"aDc" = ( -/obj/structure/bookcase{ - density = 0 - }, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/library) -"aDd" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/library) "aDe" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -9734,17 +9701,6 @@ icon_state = "wood" }, /area/bigredv2/outside/library) -"aDf" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Library Backroom" - }, -/turf/open/floor{ - icon_state = "delivery" - }, -/area/bigredv2/outside/library) "aDg" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -9753,20 +9709,6 @@ icon_state = "wood" }, /area/bigredv2/outside/library) -"aDh" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/machinery/power/apc{ - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 - }, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/library) "aDi" = ( /obj/structure/machinery/light/small, /turf/open/floor/engine, @@ -10123,24 +10065,6 @@ /obj/structure/window/framed/solaris/reinforced, /turf/open/floor/plating, /area/bigredv2/caves/eta/living) -"aEk" = ( -/obj/structure/surface/table/woodentable, -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/library) -"aEl" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 9 - }, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/library) "aEm" = ( /obj/structure/machinery/power/apc{ dir = 8; @@ -10768,16 +10692,6 @@ icon_state = "wood" }, /area/bigredv2/outside/library) -"aGf" = ( -/obj/structure/machinery/door_control{ - id = "Library"; - name = "Storm Shutters"; - pixel_x = 32 - }, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/library) "aGg" = ( /obj/structure/machinery/light/built{ dir = 4 @@ -11022,19 +10936,6 @@ /obj/structure/machinery/biogenerator, /turf/open/floor, /area/bigredv2/outside/hydroponics) -"aGN" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor{ - dir = 8; - icon_state = "carpet6-2" - }, -/area/bigredv2/outside/library) -"aGO" = ( -/turf/open/floor{ - dir = 8; - icon_state = "carpet10-8" - }, -/area/bigredv2/outside/library) "aGP" = ( /obj/structure/filingcabinet/medical, /obj/effect/landmark/objective_landmark/science, @@ -11042,14 +10943,6 @@ icon_state = "white" }, /area/bigredv2/outside/virology) -"aGQ" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/library) "aGT" = ( /obj/structure/surface/table, /turf/open/floor{ @@ -11350,20 +11243,6 @@ icon_state = "delivery" }, /area/bigredv2/outside/hydroponics) -"aHM" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor{ - dir = 8; - icon_state = "carpet7-3" - }, -/area/bigredv2/outside/library) -"aHN" = ( -/obj/effect/landmark/crap_item, -/turf/open/floor{ - dir = 8; - icon_state = "carpet11-12" - }, -/area/bigredv2/outside/library) "aHO" = ( /obj/structure/bed/chair/wood/normal, /turf/open/floor{ @@ -11502,6 +11381,14 @@ icon_state = "white" }, /area/bigredv2/outside/virology) +"aIe" = ( +/obj/structure/surface/table/reinforced, +/obj/item/pizzabox/vegetable, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, +/area/bigredv2/outside/lambda_cave_cas) "aIg" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -11679,20 +11566,6 @@ /obj/structure/machinery/vending/snack, /turf/open/floor, /area/bigredv2/outside/hydroponics) -"aIG" = ( -/turf/open/floor{ - dir = 8; - icon_state = "carpet11-12" - }, -/area/bigredv2/outside/library) -"aIH" = ( -/obj/structure/surface/table/woodentable, -/obj/item/paper, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/library) "aIJ" = ( /turf/open/floor{ dir = 9; @@ -12042,15 +11915,6 @@ }, /turf/open/floor, /area/bigredv2/outside/hydroponics) -"aJB" = ( -/obj/structure/machinery/vending/cola, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor{ - icon_state = "yellowfull" - }, -/area/bigredv2/outside/hydroponics) "aJC" = ( /obj/structure/machinery/alarm{ dir = 4; @@ -12466,39 +12330,6 @@ icon_state = "yellowfull" }, /area/bigredv2/outside/hydroponics) -"aKK" = ( -/obj/structure/machinery/vending/coffee, -/turf/open/floor, -/area/bigredv2/outside/hydroponics) -"aKL" = ( -/obj/structure/bookcase{ - density = 0 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/library) -"aKM" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 5 - }, -/turf/open/floor{ - dir = 8; - icon_state = "carpet7-3" - }, -/area/bigredv2/outside/library) -"aKN" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 - }, -/turf/open/floor{ - dir = 8; - icon_state = "carpet11-12" - }, -/area/bigredv2/outside/library) "aKO" = ( /obj/structure/bed/chair/wood/normal{ dir = 1 @@ -12652,12 +12483,6 @@ icon_state = "grimy" }, /area/bigredv2/outside/office_complex) -"aLh" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "lz1north" - }, -/turf/closed/wall/solaris/reinforced, -/area/bigredv2/outside/space_port) "aLi" = ( /obj/structure/closet/jcloset, /obj/structure/machinery/camera/autoname{ @@ -12807,19 +12632,6 @@ icon_state = "yellowfull" }, /area/bigredv2/outside/hydroponics) -"aLF" = ( -/turf/open/floor{ - dir = 8; - icon_state = "carpet7-3" - }, -/area/bigredv2/outside/library) -"aLG" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor{ - dir = 8; - icon_state = "carpet11-12" - }, -/area/bigredv2/outside/library) "aLH" = ( /turf/open/floor/bluegrid{ icon_state = "bcircuitoff" @@ -13271,15 +13083,6 @@ icon_state = "mars_dirt_13" }, /area/bigredv2/outside/e) -"aMS" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor{ - dir = 10; - icon_state = "asteroidwarning" - }, -/area/bigredv2/caves_lambda) "aMT" = ( /turf/open/floor{ icon_state = "asteroidwarning" @@ -13767,19 +13570,6 @@ icon_state = "yellowfull" }, /area/bigredv2/outside/hydroponics) -"aOi" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor{ - dir = 8; - icon_state = "carpet15-15" - }, -/area/bigredv2/outside/library) -"aOj" = ( -/turf/open/floor{ - dir = 8; - icon_state = "carpet14-10" - }, -/area/bigredv2/outside/library) "aOk" = ( /turf/open/mars{ icon_state = "mars_dirt_11" @@ -14179,49 +13969,6 @@ icon_state = "yellowfull" }, /area/bigredv2/outside/hydroponics) -"aPk" = ( -/turf/open/floor{ - dir = 8; - icon_state = "carpet5-1" - }, -/area/bigredv2/outside/library) -"aPl" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 5 - }, -/turf/open/floor{ - dir = 8; - icon_state = "carpet13-5" - }, -/area/bigredv2/outside/library) -"aPm" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 - }, -/turf/open/floor{ - dir = 8; - icon_state = "carpet13-5" - }, -/area/bigredv2/outside/library) -"aPn" = ( -/obj/effect/landmark/crap_item, -/turf/open/floor{ - dir = 8; - icon_state = "carpet13-5" - }, -/area/bigredv2/outside/library) -"aPo" = ( -/turf/open/floor{ - dir = 8; - icon_state = "carpet13-5" - }, -/area/bigredv2/outside/library) -"aPp" = ( -/turf/open/floor{ - dir = 8; - icon_state = "carpet9-4" - }, -/area/bigredv2/outside/library) "aPq" = ( /obj/structure/machinery/door/airlock/almayer/research/glass/colony{ dir = 1; @@ -14646,20 +14393,6 @@ }, /turf/open/floor, /area/bigredv2/outside/hydroponics) -"aQr" = ( -/obj/structure/machinery/camera/autoname{ - dir = 4 - }, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/library) -"aQs" = ( -/obj/structure/machinery/light, -/turf/open/floor{ - icon_state = "wood" - }, -/area/bigredv2/outside/library) "aQt" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ @@ -15056,13 +14789,6 @@ icon_state = "delivery" }, /area/bigredv2/outside/library) -"aRw" = ( -/obj/effect/landmark/crap_item, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/mars_cave{ - icon_state = "mars_cave_6" - }, -/area/bigredv2/caves_lambda) "aRx" = ( /obj/structure/machinery/teleport/station, /turf/open/floor{ @@ -15334,21 +15060,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/e) -"aSj" = ( -/obj/effect/decal/remains/human, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lambda_cave_cas) -"aSk" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor{ - dir = 5; - icon_state = "asteroidwarning" - }, -/area/bigredv2/caves_lambda) "aSl" = ( /obj/structure/machinery/light{ dir = 8 @@ -15846,29 +15557,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/caves_lambda) -"aTy" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigredv2/caves_lambda) -"aTz" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/caves_lambda) "aTC" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -16121,39 +15809,15 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/outside/e) -"aUp" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/e) -"aUw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "lambda-exterior"; - name = "Lambda Checkpoint Exterior" - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor{ - icon_state = "delivery" +"aUv" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/area/bigredv2/outside/lambda_cave_cas) -"aUx" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor{ dir = 1; icon_state = "asteroidfloor" }, /area/bigredv2/outside/lambda_cave_cas) -"aUA" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/caves_lambda) "aUD" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -16450,16 +16114,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/e) -"aVw" = ( -/obj/effect/decal/cleanable/blood{ - dir = 4; - icon_state = "gib6" - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/outside/lambda_cave_cas) "aVx" = ( /obj/structure/curtain/medical, /obj/structure/machinery/alarm{ @@ -17113,14 +16767,6 @@ "aXr" = ( /turf/open/floor, /area/bigredv2/outside/office_complex) -"aXt" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor, -/area/bigredv2/outside/lambda_cave_cas) "aXu" = ( /obj/structure/machinery/computer/med_data, /turf/open/floor{ @@ -17432,9 +17078,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/e) -"aYy" = ( -/turf/open/floor, -/area/bigredv2/outside/lambda_cave_cas) "aYA" = ( /obj/structure/closet/l3closet/virology, /turf/open/floor{ @@ -23332,14 +22975,6 @@ icon_state = "mars_cave_5" }, /area/bigredv2/caves/mining) -"bum" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor{ - dir = 4; - icon_state = "asteroidwarning" - }, -/area/bigredv2/caves_lambda) "bun" = ( /turf/open/floor{ dir = 10; @@ -26530,22 +26165,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/bigredv2/caves/mining) -"bKH" = ( -/obj/structure/machinery/light, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/outside/lambda_cave_cas) -"bKU" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/recharger, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor{ - dir = 9; - icon_state = "redfull" - }, -/area/bigredv2/outside/lambda_cave_cas) "bKY" = ( /obj/structure/fence, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -26647,6 +26266,12 @@ icon_state = "mars_cave_7" }, /area/bigredv2/outside/lz1_telecomm_cas) +"bRC" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "reactor_meltdown" + }, +/turf/closed/wall/solaris/rock, +/area/bigredv2/caves) "bRK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, @@ -26820,6 +26445,14 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves/mining) +"ceA" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/mars_cave{ + icon_state = "mars_dirt_4" + }, +/area/bigredv2/outside/e) "cfr" = ( /obj/item/explosive/grenade/baton{ dir = 8 @@ -26961,6 +26594,16 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves/mining) +"crd" = ( +/obj/structure/bed/chair/wood/normal{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + dir = 4; + icon_state = "chapel" + }, +/area/bigredv2/outside/chapel) "crl" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -26981,6 +26624,14 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"cry" = ( +/obj/structure/surface/table/reinforced, +/obj/item/handcuffs, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, +/area/bigredv2/outside/lambda_cave_cas) "crQ" = ( /turf/open/mars_cave{ icon_state = "mars_cave_18" @@ -27023,6 +26674,12 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/engineering) +"cuG" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/chapel) "cvi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/tunnel{ @@ -27076,17 +26733,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating, /area/bigredv2/caves/mining) -"cBg" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/security/glass/colony{ - name = "\improper Lambda Checkpoint" - }, -/turf/open/floor{ - icon_state = "delivery" - }, -/area/bigredv2/outside/lambda_cave_cas) "cBq" = ( /obj/structure/machinery/camera/autoname{ dir = 1 @@ -27157,17 +26803,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/lz2_south_cas) -"cHv" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor{ - dir = 4; - icon_state = "asteroidwarning" - }, -/area/bigredv2/caves_lambda) "cHy" = ( /obj/item/device/flashlight, /obj/effect/decal/cleanable/dirt, @@ -27199,15 +26834,6 @@ icon_state = "wood" }, /area/bigredv2/outside/dorms) -"cIq" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lambda_cave_cas) "cIP" = ( /obj/item/paper/bigred/smuggling, /turf/open/floor, @@ -27229,6 +26855,9 @@ icon_state = "delivery" }, /area/bigredv2/outside/admin_building) +"cJd" = ( +/turf/open/space/basic, +/area/space) "cJh" = ( /obj/structure/bed/chair{ dir = 8; @@ -27306,6 +26935,12 @@ /obj/structure/sign/poster/clf, /turf/closed/wall/solaris/reinforced, /area/bigredv2/caves/mining) +"cOu" = ( +/obj/structure/machinery/vending/coffee, +/turf/open/floor{ + icon_state = "yellowfull" + }, +/area/bigredv2/outside/hydroponics) "cOJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -27508,6 +27143,15 @@ icon_state = "podhatchfloor" }, /area/bigredv2/outside/admin_building) +"djo" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/recharger, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, +/area/bigredv2/outside/lambda_cave_cas) "dka" = ( /obj/effect/landmark/crap_item, /turf/open/mars_cave{ @@ -27564,6 +27208,21 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"drx" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 16 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "drT" = ( /obj/structure/disposalpipe/broken{ dir = 4 @@ -27627,6 +27286,10 @@ }, /turf/open/gm/river, /area/bigredv2/outside/engineering) +"dvz" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/lambda_cave_cas) "dvB" = ( /obj/item/ore/coal{ pixel_x = 9; @@ -27698,6 +27361,14 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) +"dAd" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/recharger, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, +/area/bigredv2/outside/lambda_cave_cas) "dAi" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating, @@ -27807,6 +27478,13 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"dFL" = ( +/obj/effect/landmark/corpsespawner/security, +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "dFR" = ( /obj/item/stack/sheet/wood{ pixel_y = -8 @@ -27815,12 +27493,6 @@ icon_state = "mars_cave_16" }, /area/bigredv2/caves/mining) -"dFW" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor, -/area/bigredv2/outside/lambda_cave_cas) "dHr" = ( /obj/effect/decal/cleanable/blood{ icon_state = "gib6"; @@ -27871,6 +27543,14 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor, /area/bigredv2/outside/dorms) +"dJr" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor{ + dir = 5; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_lambda) "dJM" = ( /obj/structure/surface/rack, /obj/item/storage/pouch/shotgun, @@ -27880,6 +27560,12 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"dKk" = ( +/turf/open/floor{ + dir = 8; + icon_state = "redcorner" + }, +/area/bigredv2/outside/lambda_cave_cas) "dKo" = ( /obj/item/ore/iron{ pixel_x = 6; @@ -27899,14 +27585,20 @@ icon_state = "mars_cave_5" }, /area/bigredv2/caves_lambda) -"dLo" = ( -/obj/structure/machinery/light{ - dir = 4 +"dLS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_17"; + pixel_x = 7; + pixel_y = 14 }, -/turf/open/mars_cave{ - icon_state = "mars_dirt_4" +/obj/structure/window{ + dir = 8 }, -/area/bigredv2/outside/e) +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "dNd" = ( /obj/item/stack/cable_coil/cut, /turf/open/mars_cave{ @@ -27931,6 +27623,10 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"dNX" = ( +/obj/effect/landmark/crap_item, +/turf/open/floor/carpet, +/area/bigredv2/outside/library) "dOu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -28000,6 +27696,14 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/filtration_plant) +"dRc" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/colony{ + name = "\improper Lambda Checkpoint" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/lambda_cave_cas) "dSg" = ( /obj/effect/landmark/crap_item, /obj/effect/decal/cleanable/dirt, @@ -28014,6 +27718,9 @@ icon_state = "mars_cave_9" }, /area/bigredv2/caves_north) +"dTB" = ( +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/lambda_cave_cas) "dUj" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = -8; @@ -28113,6 +27820,14 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"eaZ" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "yellowfull" + }, +/area/bigredv2/outside/hydroponics) "ebr" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ @@ -28160,6 +27875,20 @@ icon_state = "asteroidfloor" }, /area/bigred/ground/garage_workshop) +"eeI" = ( +/obj/structure/machinery/light, +/obj/structure/window{ + dir = 4 + }, +/obj/structure/surface/table/woodentable, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_10"; + pixel_y = 11 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "efK" = ( /obj/structure/machinery/computer/crew{ density = 0; @@ -28191,6 +27920,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"ejp" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "filtration_restored" + }, +/turf/open/mars_cave{ + icon_state = "mars_cave_2" + }, +/area/bigredv2/outside/s) "eju" = ( /obj/item/ore{ pixel_x = 9; @@ -28289,16 +28026,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/eta) -"epu" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/computer/cameras/wooden_tv{ - dir = 4 - }, -/turf/open/floor{ - dir = 9; - icon_state = "redfull" - }, -/area/bigredv2/outside/lambda_cave_cas) "eql" = ( /turf/open/mars_cave{ icon_state = "mars_cave_9" @@ -28313,12 +28040,6 @@ icon_state = "delivery" }, /area/bigredv2/outside/dorms) -"ers" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "etatunnel" - }, -/turf/closed/wall/solaris/rock, -/area/bigredv2/caves) "erA" = ( /obj/item/ore, /turf/open/mars_cave{ @@ -28345,6 +28066,15 @@ icon_state = "mars_cave_20" }, /area/bigredv2/caves/mining) +"esS" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/window, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "eup" = ( /obj/structure/bed/chair, /obj/item/trash/cigbutt, @@ -28383,12 +28113,6 @@ icon_state = "bcircuitoff" }, /area/bigredv2/caves/lambda/research) -"evN" = ( -/turf/open/floor{ - dir = 8; - icon_state = "redcorner" - }, -/area/bigredv2/outside/lambda_cave_cas) "evX" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave{ @@ -28431,6 +28155,14 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"eBL" = ( +/obj/structure/bookcase{ + icon_state = "book-5" + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "eDQ" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/landmark/objective_landmark/medium, @@ -28553,6 +28285,16 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/filtration_plant) +"eKZ" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/computer/cameras/wooden_tv{ + dir = 4 + }, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, +/area/bigredv2/outside/lambda_cave_cas) "eLp" = ( /obj/structure/closet/secure_closet/brig, /obj/effect/landmark/objective_landmark/medium, @@ -28664,12 +28406,6 @@ }, /turf/open/floor/plating, /area/bigredv2/caves/mining) -"eUT" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "viro-rock" - }, -/turf/closed/wall/solaris/reinforced, -/area/bigredv2/outside/virology) "eVo" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/gun/pistol/m4a3, @@ -28760,6 +28496,15 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/engineering) +"eYA" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/e) "eYH" = ( /obj/structure/machinery/camera/autoname{ dir = 4 @@ -28950,19 +28695,6 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/outside/space_port_lz2) -"ftX" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "lambda-interior"; - name = "Lambda Checkpoint Interior" - }, -/turf/open/floor{ - icon_state = "delivery" - }, -/area/bigredv2/outside/lambda_cave_cas) "ftY" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_7" @@ -29072,6 +28804,16 @@ icon_state = "whitepurplecorner" }, /area/bigredv2/outside/medical) +"fyZ" = ( +/obj/structure/surface/table/reinforced, +/obj/item/device/camera, +/obj/structure/machinery/light/small, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, +/area/bigredv2/outside/lambda_cave_cas) "fBc" = ( /obj/structure/pipes/standard/tank/phoron, /turf/open/floor/plating, @@ -29153,18 +28895,20 @@ icon_state = "mars_cave_3" }, /area/bigredv2/caves/mining) -"fJs" = ( -/turf/open/floor{ - dir = 4; - icon_state = "asteroidwarning" - }, -/area/bigredv2/caves_east) "fJH" = ( /turf/open/floor{ dir = 10; icon_state = "asteroidwarning" }, /area/bigredv2/outside/eta) +"fJW" = ( +/obj/structure/window, +/obj/structure/surface/table/woodentable, +/obj/item/newspaper, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "fKO" = ( /obj/structure/barricade/wooden{ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; @@ -29397,6 +29141,18 @@ icon_state = "grass_impenetrable" }, /area/bigredv2/caves/eta/xenobiology) +"fWY" = ( +/obj/structure/window, +/obj/structure/window{ + dir = 8 + }, +/obj/structure/surface/table/woodentable, +/obj/effect/landmark/objective_landmark/close, +/obj/item/prop/magazine/book/starshiptroopers, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "fXm" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -29500,10 +29256,6 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/outside/lz1_north_cas) -"gfv" = ( -/obj/structure/window/framed/solaris/reinforced, -/turf/open/floor/plating, -/area/bigredv2/outside/lambda_cave_cas) "gfX" = ( /obj/structure/sign/safety/hazard{ pixel_y = -32 @@ -29641,6 +29393,12 @@ /obj/structure/machinery/light, /turf/open/floor, /area/bigred/ground/garage_workshop) +"gri" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "containerroom_xenos" + }, +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/nw/ceiling) "grU" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ dir = 4; @@ -29760,6 +29518,12 @@ }, /turf/open/floor, /area/bigredv2/outside/hydroponics) +"gAK" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "chapel_cult" + }, +/turf/closed/wall/solaris, +/area/bigredv2/outside/chapel) "gAX" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 @@ -29802,6 +29566,13 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves_east) +"gEM" = ( +/obj/structure/machinery/vending/security, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor{ + icon_state = "red" + }, +/area/bigredv2/outside/lambda_cave_cas) "gFR" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor{ @@ -29829,6 +29600,16 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/engineering) +"gIT" = ( +/obj/structure/machinery/door/poddoor/almayer/closed{ + dir = 4; + id = "lambda-interior"; + name = "Lambda Checkpoint Interior" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/caves_north) "gJw" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave, @@ -29906,15 +29687,6 @@ /obj/structure/cargo_container/horizontal/blue/top, /turf/open/mars, /area/bigredv2/outside/space_port_lz2) -"gQk" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor{ - dir = 1; - icon_state = "red" - }, -/area/bigredv2/outside/lambda_cave_cas) "gSg" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -29978,6 +29750,12 @@ icon_state = "darkblue2" }, /area/bigredv2/caves/eta/research) +"gWv" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "eta_carp" + }, +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/caves/eta/xenobiology) "gWD" = ( /turf/closed/wall/solaris, /area/bigredv2/outside/space_port_lz2) @@ -30079,6 +29857,15 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/engineering) +"heD" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "heG" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -30118,6 +29905,15 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/outside/lz1_north_cas) +"hho" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/wood/normal{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "hhK" = ( /turf/open/floor{ dir = 1; @@ -30130,12 +29926,6 @@ }, /turf/open/floor/plating, /area/bigredv2/outside/bar) -"hiH" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor{ - icon_state = "red" - }, -/area/bigredv2/outside/lambda_cave_cas) "hiP" = ( /obj/structure/sign/safety/one{ pixel_x = 16 @@ -30272,15 +30062,6 @@ icon_state = "dark" }, /area/bigredv2/caves/lambda/research) -"hwG" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/caves_lambda) "hxs" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/effect/landmark/objective_landmark/far, @@ -30381,6 +30162,13 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"hFg" = ( +/obj/effect/landmark/crap_item, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/mars_cave{ + icon_state = "mars_cave_6" + }, +/area/bigredv2/caves_lambda) "hFv" = ( /obj/structure/platform{ dir = 4 @@ -30459,17 +30247,23 @@ icon_state = "mars_cave_17" }, /area/bigredv2/caves_north) +"hKO" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + dir = 10; + icon_state = "red" + }, +/area/bigredv2/outside/lambda_cave_cas) "hLp" = ( /obj/effect/landmark/corpsespawner/ua_riot, /turf/open/mars_cave, /area/bigredv2/caves/mining) "hLs" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, /turf/open/floor{ dir = 1; - icon_state = "asteroidfloor" + icon_state = "asteroidwarning" }, /area/bigredv2/outside/lambda_cave_cas) "hLS" = ( @@ -30484,6 +30278,13 @@ icon_state = "dark" }, /area/bigredv2/caves/eta/research) +"hNW" = ( +/obj/structure/machinery/light, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/lambda_cave_cas) "hOx" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber/huge/stationary, /turf/open/floor{ @@ -30565,11 +30366,6 @@ icon_state = "mars_cave_15" }, /area/bigredv2/caves/mining) -"hXM" = ( -/turf/open/floor{ - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/e) "hYB" = ( /obj/structure/platform{ dir = 1 @@ -30626,6 +30422,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"iaS" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "iaX" = ( /obj/item/weapon/twohanded/folded_metal_chair, /obj/effect/landmark/corpsespawner/colonist/random/burst, @@ -30810,14 +30614,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_plant) -"inP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/outside/e) "ioA" = ( /obj/item/tool/pickaxe{ pixel_y = -7 @@ -30884,6 +30680,15 @@ /obj/effect/spawner/random/technology_scanner, /turf/open/floor/plating, /area/bigredv2/outside/filtration_plant) +"irZ" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + dir = 6; + icon_state = "red" + }, +/area/bigredv2/outside/lambda_cave_cas) "itL" = ( /obj/structure/closet/l3closet/virology, /obj/effect/landmark/objective_landmark/science, @@ -30913,16 +30718,6 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) -"ixR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/outside/lambda_cave_cas) "iyY" = ( /turf/open/mars_cave{ icon_state = "mars_cave_13" @@ -30970,11 +30765,6 @@ }, /turf/open/gm/river, /area/bigredv2/outside/engineering) -"iBs" = ( -/turf/open/floor{ - icon_state = "redcorner" - }, -/area/bigredv2/outside/lambda_cave_cas) "iCu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -31037,6 +30827,10 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"iEm" = ( +/obj/structure/bed/chair/wood/normal, +/turf/open/floor/carpet, +/area/bigredv2/outside/library) "iFa" = ( /obj/effect/decal/cleanable/dirt, /obj/item/bananapeel, @@ -31045,6 +30839,16 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/engineering) +"iFz" = ( +/obj/structure/machinery/door/poddoor/almayer/closed{ + dir = 4; + id = "lambda-interior"; + name = "Lambda Checkpoint Interior" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/lambda_cave_cas) "iGK" = ( /turf/open/mars_cave, /area/bigredv2/caves_sw) @@ -31061,15 +30865,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/space_port_lz2) -"iHG" = ( -/turf/closed/wall/solaris/reinforced, -/area/bigredv2/outside/lambda_cave_cas) -"iIp" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "chapel" - }, -/turf/closed/wall/solaris, -/area/bigredv2/outside/chapel) "iJF" = ( /obj/effect/decal/cleanable/blood{ icon_state = "gib6"; @@ -31080,6 +30875,12 @@ icon_state = "mars_cave_13" }, /area/bigredv2/caves/mining) +"iKn" = ( +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/lambda_cave_cas) "iLs" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -31277,12 +31078,6 @@ icon_state = "mars_cave_13" }, /area/bigredv2/caves/mining) -"jcn" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "tcomms" - }, -/turf/closed/wall/solaris/rock, -/area/bigredv2/caves) "jcR" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave{ @@ -31309,14 +31104,6 @@ icon_state = "mars_dirt_3" }, /area/bigredv2/outside/s) -"jeH" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/recharger, -/turf/open/floor{ - dir = 9; - icon_state = "redfull" - }, -/area/bigredv2/outside/lambda_cave_cas) "jeO" = ( /turf/open/mars{ icon_state = "mars_dirt_13" @@ -31434,18 +31221,6 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) -"joa" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 5 - }, -/obj/effect/landmark/nightmare{ - insert_tag = "dorms" - }, -/turf/open/floor, -/area/bigredv2/outside/dorms) -"jov" = ( -/turf/open/space/basic, -/area/space) "jph" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -31508,6 +31283,24 @@ icon_state = "podhatch" }, /area/bigredv2/caves/lambda/research) +"juZ" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/lambda_cave_cas) +"jvW" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor{ + dir = 6; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_lambda) "jwj" = ( /obj/structure/platform/shiva{ dir = 8 @@ -31713,11 +31506,14 @@ icon_state = "mars_cave_13" }, /area/bigredv2/caves_north) -"jKu" = ( -/obj/limb/arm/l_arm, -/obj/effect/decal/cleanable/blood/drip, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor, +"jKp" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor{ + dir = 1; + icon_state = "red" + }, /area/bigredv2/outside/lambda_cave_cas) "jKI" = ( /obj/structure/platform_decoration/shiva{ @@ -31731,15 +31527,6 @@ icon_state = "bcircuitoff" }, /area/bigredv2/caves/lambda/research) -"jKV" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor{ - dir = 6; - icon_state = "asteroidwarning" - }, -/area/bigredv2/caves_east) "jMm" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -31767,6 +31554,13 @@ icon_state = "freezerfloor" }, /area/bigredv2/outside/general_offices) +"jNN" = ( +/obj/structure/bed/chair/wood/normal, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "jOc" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ dir = 4; @@ -31917,6 +31711,20 @@ icon_state = "delivery" }, /area/bigredv2/outside/cargo) +"jUJ" = ( +/obj/structure/machinery/light, +/obj/structure/surface/table/woodentable, +/obj/structure/window{ + dir = 8 + }, +/obj/structure/machinery/door_control{ + id = "Library"; + name = "Storm Shutters" + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "jUM" = ( /obj/structure/surface/table/woodentable, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -32241,15 +32049,6 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) -"kja" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 1 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/outside/e) "kjr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, @@ -32348,6 +32147,14 @@ icon_state = "mars_cave_14" }, /area/bigredv2/outside/ne) +"kqO" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/caves_lambda) "kqS" = ( /turf/open/floor{ icon_state = "wood" @@ -32451,6 +32258,15 @@ icon_state = "darkredcorners2" }, /area/bigredv2/caves/eta/xenobiology) +"kxr" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/obj/effect/landmark/nightmare{ + insert_tag = "dorms_party" + }, +/turf/open/floor, +/area/bigredv2/outside/dorms) "kyz" = ( /obj/structure/transmitter/colony_net{ dir = 4; @@ -32467,6 +32283,13 @@ icon_state = "mars_cave_2" }, /area/bigredv2/outside/ne) +"kAj" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet, +/area/bigredv2/outside/library) "kAs" = ( /obj/structure/platform_decoration{ dir = 8 @@ -32576,12 +32399,6 @@ icon_state = "darkred2" }, /area/bigredv2/caves/eta/research) -"kKH" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "lambda-cave-extratunnel" - }, -/turf/closed/wall/solaris/rock, -/area/bigredv2/caves) "kMk" = ( /obj/effect/landmark/hunter_primary, /turf/open/floor{ @@ -32714,6 +32531,17 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor, /area/bigredv2/outside/filtration_cave_cas) +"kUW" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + dir = 4; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_lambda) "kVR" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -32771,6 +32599,15 @@ /obj/item/storage/bible/hefa, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"kZI" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor{ + dir = 10; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_lambda) "laj" = ( /obj/structure/tunnel{ id = "hole5" @@ -32884,6 +32721,21 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/eta) +"lmO" = ( +/obj/structure/surface/table/woodentable, +/obj/item/newspaper{ + pixel_x = -7 + }, +/obj/item/prop/magazine/book/theartofwar{ + pixel_x = 11 + }, +/obj/item/tool/pen{ + pixel_x = -7 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "lom" = ( /obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood{ @@ -33056,6 +32908,18 @@ /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/wood, /area/bigredv2/caves/lambda/breakroom) +"lAR" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/door_control{ + id = "lambda-interior"; + name = "Lambda Checkpoint Interior"; + pixel_x = null + }, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, +/area/bigredv2/outside/lambda_cave_cas) "lBc" = ( /turf/closed/wall/solaris/reinforced, /area/bigredv2/outside/c) @@ -33129,6 +32993,12 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"lFR" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "viro_open" + }, +/turf/closed/wall/solaris/rock, +/area/bigredv2/caves) "lGt" = ( /turf/open/floor{ icon_state = "delivery" @@ -33142,15 +33012,6 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) -"lIB" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/e) "lID" = ( /obj/structure/barricade/handrail{ dir = 4 @@ -33179,6 +33040,11 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"lLe" = ( +/turf/open/mars_cave{ + icon_state = "mars_cave_18" + }, +/area/bigredv2/outside/lambda_cave_cas) "lLf" = ( /obj/structure/largecrate/random/case, /turf/open/floor/plating{ @@ -33186,12 +33052,6 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) -"lMt" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "cargo" - }, -/turf/closed/wall/solaris, -/area/bigredv2/outside/cargo) "lMw" = ( /obj/structure/machinery/sensortower{ pixel_x = -9 @@ -33201,12 +33061,6 @@ icon_state = "asteroidfloor" }, /area/bigredv2/caves_lambda) -"lMB" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "lz1cave" - }, -/turf/closed/wall/solaris/reinforced, -/area/bigredv2/outside/space_port) "lMC" = ( /obj/structure/machinery/light{ dir = 4 @@ -33233,6 +33087,12 @@ icon_state = "mars_cave_20" }, /area/bigredv2/outside/n) +"lOY" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "etatunnel_open" + }, +/turf/closed/wall/solaris/rock, +/area/bigredv2/caves) "lPg" = ( /turf/closed/wall/solaris, /area/bigredv2/outside/n) @@ -33321,6 +33181,17 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/filtration_plant) +"lTC" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/machinery/power/apc{ + dir = 1 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "lTM" = ( /obj/item/folder/yellow, /turf/open/floor{ @@ -33407,6 +33278,12 @@ icon_state = "mars_cave_23" }, /area/bigredv2/caves/mining) +"maB" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "viro-rock_open" + }, +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/virology) "maD" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -33562,6 +33439,13 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/ne) +"moe" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet, +/area/bigredv2/outside/library) "moE" = ( /turf/open/mars_cave{ icon_state = "mars_cave_9" @@ -33661,12 +33545,6 @@ "muP" = ( /turf/closed/wall/wood, /area/bigredv2/caves_research) -"muT" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/chapel) "mxf" = ( /turf/open/floor{ dir = 9; @@ -33783,14 +33661,6 @@ icon_state = "mars_cave_17" }, /area/bigredv2/outside/lz1_north_cas) -"mGW" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigredv2/caves_lambda) "mHp" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -33810,6 +33680,13 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/outside/filtration_plant) +"mIs" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "mIu" = ( /obj/structure/machinery/light{ dir = 4 @@ -33827,18 +33704,14 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_plant) -"mKL" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/door_control{ - id = "lambda-exterior"; - name = "Lambda Checkpoint Exterior"; - pixel_x = null +"mKi" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_10" }, /turf/open/floor{ - dir = 9; - icon_state = "redfull" + icon_state = "wood" }, -/area/bigredv2/outside/lambda_cave_cas) +/area/bigredv2/outside/library) "mKM" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_y = 6 @@ -33850,6 +33723,14 @@ icon_state = "mars_dirt_11" }, /area/bigredv2/outside/space_port_lz2) +"mNT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/manifold/hidden/green, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/e) "mOc" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ dir = 1; @@ -33907,10 +33788,6 @@ /obj/structure/machinery/computer/atmos_alert, /turf/open/floor, /area/bigredv2/caves) -"mRJ" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/closed/wall/solaris/reinforced, -/area/bigredv2/outside/lambda_cave_cas) "mSn" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor{ @@ -33936,14 +33813,17 @@ icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) -"mTJ" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/colony{ - name = "\improper Lambda Checkpoint" +"mUb" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/obj/structure/bed/chair/comfy{ + dir = 4 }, /turf/open/floor{ - icon_state = "delivery" + icon_state = "wood" }, -/area/bigredv2/outside/lambda_cave_cas) +/area/bigredv2/outside/library) "mUy" = ( /turf/open/mars_cave{ icon_state = "mars_cave_7" @@ -33974,6 +33854,16 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) +"mYV" = ( +/obj/structure/machinery/power/apc{ + dir = 1; + start_charge = 0 + }, +/turf/open/floor{ + dir = 1; + icon_state = "red" + }, +/area/bigredv2/outside/lambda_cave_cas) "mYW" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "A heavy duty power cable for high voltage applications"; @@ -34054,12 +33944,27 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_cave_cas) +"nfY" = ( +/turf/open/floor{ + dir = 4; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_east) "ngJ" = ( /obj/item/stack/cable_coil/cut, /turf/open/mars_cave{ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) +"nhF" = ( +/obj/structure/machinery/camera/autoname{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "niQ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -34079,6 +33984,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor, /area/bigredv2/outside/admin_building) +"nkE" = ( +/obj/structure/surface/table/woodentable, +/obj/item/paper_bin/wy{ + pixel_x = 7; + pixel_y = 8 + }, +/obj/item/paper_bin/wy{ + pixel_x = -4; + pixel_y = 8 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "nkQ" = ( /turf/open/mars_cave{ icon_state = "mars_cave_23" @@ -34140,6 +34059,18 @@ icon_state = "mars_dirt_5" }, /area/bigredv2/outside/n) +"nnA" = ( +/obj/structure/surface/table/woodentable, +/obj/structure/window{ + dir = 8 + }, +/obj/structure/machinery/computer/emails{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "nnK" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ @@ -34201,12 +34132,13 @@ icon_state = "mars_cave_6" }, /area/bigredv2/outside/filtration_cave_cas) -"nse" = ( +"nrA" = ( +/obj/effect/landmark/objective_landmark/close, /turf/open/floor{ dir = 1; - icon_state = "asteroidwarning" + icon_state = "asteroidfloor" }, -/area/bigredv2/outside/lambda_cave_cas) +/area/bigredv2/outside/ne) "ntX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -34261,6 +34193,13 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/engineering) +"nuQ" = ( +/obj/structure/surface/table/woodentable, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "nvn" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ density = 0; @@ -34373,6 +34312,15 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"nFp" = ( +/obj/structure/window, +/obj/structure/window{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "nFB" = ( /obj/item/weapon/gun/rifle/m16, /obj/item/ammo_magazine/rifle/m16, @@ -34395,12 +34343,6 @@ icon_state = "mars_cave_17" }, /area/bigredv2/outside/filtration_cave_cas) -"nGt" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "admin" - }, -/turf/closed/wall/solaris/reinforced, -/area/bigredv2/outside/admin_building) "nHQ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/machinery/door/poddoor/almayer/closed{ @@ -34421,6 +34363,14 @@ icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) +"nIS" = ( +/obj/structure/surface/table/reinforced, +/obj/item/storage/donut_box, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, +/area/bigredv2/outside/lambda_cave_cas) "nKL" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "An exchange valve"; @@ -34596,6 +34546,12 @@ /obj/item/tool/warning_cone, /turf/open/mars, /area/bigredv2/outside/s) +"nZd" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "lz1cave_flank" + }, +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/space_port) "nZB" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -34674,6 +34630,13 @@ icon_state = "dark" }, /area/bigredv2/caves/lambda/breakroom) +"oes" = ( +/obj/structure/surface/table/woodentable, +/obj/item/newspaper, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "ofn" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/solaris, @@ -34969,16 +34932,6 @@ icon_state = "mars_cave_5" }, /area/bigredv2/outside/filtration_cave_cas) -"oyM" = ( -/obj/structure/bed/chair/wood/normal{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor{ - dir = 4; - icon_state = "chapel" - }, -/area/bigredv2/outside/chapel) "ozf" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "A heavy duty power cable for high voltage applications"; @@ -35059,6 +35012,12 @@ icon_state = "darkred2" }, /area/bigredv2/outside/admin_building) +"oHn" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "oIc" = ( /obj/effect/decal/cleanable/blood{ base_icon = 'icons/obj/items/weapons/grenade.dmi'; @@ -35095,14 +35054,14 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) -"oJh" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 +"oJv" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/computer/cameras/wooden_tv{ + dir = 8 }, /turf/open/floor{ - dir = 1; - icon_state = "red" + dir = 9; + icon_state = "redfull" }, /area/bigredv2/outside/lambda_cave_cas) "oJO" = ( @@ -35171,6 +35130,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/gm/river, /area/bigredv2/outside/c) +"oPM" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/door_control{ + id = "lambda-exterior"; + name = "Lambda Checkpoint Exterior"; + pixel_x = null + }, +/turf/open/floor{ + dir = 9; + icon_state = "redfull" + }, +/area/bigredv2/outside/lambda_cave_cas) "oQz" = ( /obj/structure/machinery/light/double{ dir = 1 @@ -35258,6 +35229,12 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/telecomm/n_cave) +"oVq" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "lz1entrance_v2" + }, +/turf/open/mars, +/area/bigredv2/outside/nw) "oWc" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -35425,12 +35402,6 @@ icon_state = "wood" }, /area/bigredv2/outside/admin_building) -"pdN" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "lz1entrance" - }, -/turf/open/mars, -/area/bigredv2/outside/nw) "pdW" = ( /turf/open/mars_cave{ icon_state = "mars_cave_13" @@ -35473,21 +35444,29 @@ icon_state = "freezerfloor" }, /area/bigredv2/outside/general_offices) +"pgV" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + dir = 6; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_east) "phi" = ( /turf/open/mars_cave{ icon_state = "mars_cave_6" }, /area/bigredv2/caves_research) -"pjK" = ( -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "lambda-interior"; - name = "Lambda Checkpoint Interior" +"phx" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 }, /turf/open/floor{ - icon_state = "delivery" + dir = 1; + icon_state = "asteroidfloor" }, -/area/bigredv2/caves_north) +/area/bigredv2/outside/e) "plx" = ( /obj/structure/machinery/power/apc{ dir = 4 @@ -35519,6 +35498,15 @@ "pmS" = ( /turf/open/mars, /area/bigredv2/caves_north) +"pmV" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/caves_lambda) "pnL" = ( /turf/open/mars{ icon_state = "mars_dirt_11" @@ -35562,15 +35550,19 @@ icon_state = "mars_cave_15" }, /area/bigredv2/caves_north) -"prC" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/colony{ - dir = 1; - name = "\improper Lambda Checkpoint" +"prU" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/woodentable, +/obj/item/prop/magazine/book/bladerunner{ + pixel_y = 3 }, /turf/open/floor{ - icon_state = "delivery" + icon_state = "wood" }, -/area/bigredv2/outside/lambda_cave_cas) +/area/bigredv2/outside/library) "psE" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor{ @@ -35646,6 +35638,16 @@ icon_state = "dark" }, /area/bigredv2/outside/admin_building) +"pyq" = ( +/obj/structure/surface/table, +/obj/structure/machinery/computer/emails{ + dir = 8; + pixel_y = 4 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "pyU" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -35668,6 +35670,9 @@ /obj/structure/curtain, /turf/open/floor/plating, /area/bigredv2/outside/medical) +"pAX" = ( +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "pBv" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -35737,21 +35742,23 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves_lambda) +"pJd" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/security/glass/colony{ + name = "\improper Lambda Checkpoint" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/lambda_cave_cas) "pJn" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave{ icon_state = "mars_cave_2" }, /area/bigredv2/outside/ne) -"pJq" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigredv2/caves_lambda) "pJt" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -35905,6 +35912,9 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"pSf" = ( +/turf/open/floor/carpet, +/area/bigredv2/outside/library) "pTo" = ( /obj/structure/machinery/power/apc{ dir = 1; @@ -36066,6 +36076,25 @@ icon_state = "bcircuit" }, /area/bigredv2/outside/telecomm/lz2_cave) +"qbG" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/almayer/closed{ + dir = 4; + id = "lambda-interior"; + name = "Lambda Checkpoint Interior" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/lambda_cave_cas) +"qcE" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor/carpet, +/area/bigredv2/outside/library) "qcQ" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_7" @@ -36221,6 +36250,15 @@ icon_state = "whiteblue" }, /area/bigredv2/outside/medical) +"qoS" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + dir = 8; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/e) "qpn" = ( /obj/item/tool/warning_cone{ pixel_x = -6 @@ -36256,6 +36294,15 @@ "qsE" = ( /turf/closed/wall/solaris/reinforced, /area/bigred/ground/garage_workshop) +"qsV" = ( +/obj/structure/bookcase{ + icon_state = "book-5" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "qus" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ @@ -36443,6 +36490,20 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor, /area/bigredv2/outside/cargo) +"qJB" = ( +/obj/effect/decal/cleanable/blood{ + dir = 4; + icon_state = "gib6" + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/lambda_cave_cas) +"qJM" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet, +/area/bigredv2/outside/library) "qJV" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = -5; @@ -36453,12 +36514,29 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"qKH" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_lambda) "qLk" = ( /obj/item/device/flashlight/lantern, /turf/open/mars_cave{ icon_state = "mars_dirt_5" }, /area/bigredv2/caves/mining) +"qLD" = ( +/turf/open/floor{ + icon_state = "red" + }, +/area/bigredv2/outside/lambda_cave_cas) "qLV" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ @@ -36546,12 +36624,6 @@ /obj/structure/cargo_container/hd/mid/alt, /turf/open/floor/plating, /area/bigredv2/caves/mining) -"qTu" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "viro" - }, -/turf/closed/wall/solaris/rock, -/area/bigredv2/caves) "qTC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -36601,6 +36673,27 @@ icon_state = "mars_cave_17" }, /area/bigredv2/caves/mining) +"qWA" = ( +/obj/structure/surface/table/woodentable, +/obj/item/paper, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) +"qWT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door/poddoor/almayer/closed{ + dir = 4; + id = "lambda-exterior"; + name = "Lambda Checkpoint Exterior" + }, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/lambda_cave_cas) "qXi" = ( /obj/structure/surface/table/woodentable, /obj/item/device/pinpointer, @@ -36684,6 +36777,10 @@ icon_state = "red" }, /area/bigredv2/outside/marshal_office) +"rbs" = ( +/obj/structure/window/framed/solaris/reinforced, +/turf/open/floor/plating, +/area/bigredv2/outside/lambda_cave_cas) "rbD" = ( /obj/structure/largecrate/random, /turf/open/floor/plating{ @@ -36751,15 +36848,6 @@ }, /turf/closed/wall/solaris/rock, /area/bigredv2/caves) -"reU" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor{ - dir = 8; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/e) "rfe" = ( /obj/structure/platform/kutjevo/rock{ dir = 8 @@ -36784,6 +36872,15 @@ icon_state = "whitegreen" }, /area/bigredv2/outside/medical) +"rgm" = ( +/obj/structure/bed/chair/wood/normal{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + icon_state = "chapel" + }, +/area/bigredv2/outside/chapel) "rgp" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave{ @@ -36823,6 +36920,12 @@ }, /turf/closed/wall/solaris/reinforced, /area/bigredv2/caves/mining) +"rkh" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor{ + icon_state = "red" + }, +/area/bigredv2/outside/lambda_cave_cas) "rkS" = ( /obj/structure/cable{ icon_state = "5-6" @@ -36832,16 +36935,6 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) -"rma" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/computer/cameras/wooden_tv{ - dir = 8 - }, -/turf/open/floor{ - dir = 9; - icon_state = "redfull" - }, -/area/bigredv2/outside/lambda_cave_cas) "rml" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor, @@ -36849,6 +36942,17 @@ "rnc" = ( /turf/open/mars_cave, /area/bigredv2/caves_research) +"rnK" = ( +/obj/structure/machinery/door/poddoor/almayer/closed{ + dir = 4; + id = "lambda-exterior"; + name = "Lambda Checkpoint Exterior" + }, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/lambda_cave_cas) "rnV" = ( /obj/item/stack/sheet/glass, /turf/open/floor{ @@ -36902,14 +37006,6 @@ icon_state = "mars_cave_19" }, /area/bigredv2/caves/mining) -"rrl" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "filtration" - }, -/turf/open/mars_cave{ - icon_state = "mars_cave_2" - }, -/area/bigredv2/outside/s) "rrF" = ( /turf/open/mars_cave{ icon_state = "mars_cave_13" @@ -37010,6 +37106,12 @@ icon_state = "mars_cave_6" }, /area/bigredv2/caves_east) +"rBn" = ( +/obj/structure/window, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "rBK" = ( /obj/structure/fence, /turf/open/mars{ @@ -37027,6 +37129,11 @@ icon_state = "mars_cave_7" }, /area/bigredv2/outside/lz1_telecomm_cas) +"rDa" = ( +/turf/open/floor{ + icon_state = "redcorner" + }, +/area/bigredv2/outside/lambda_cave_cas) "rDl" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = -3; @@ -37101,6 +37208,12 @@ icon_state = "mars_cave_15" }, /area/bigredv2/caves/mining) +"rKe" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor/carpet, +/area/bigredv2/outside/library) "rKs" = ( /obj/item/stack/medical/splint{ pixel_x = 4; @@ -37188,6 +37301,12 @@ /obj/effect/landmark/crap_item, /turf/open/floor, /area/bigredv2/outside/hydroponics) +"rNs" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "tcomms_open" + }, +/turf/closed/wall/solaris/rock, +/area/bigredv2/caves) "rOK" = ( /obj/effect/landmark/corpsespawner/ua_riot, /obj/item/weapon/baton/loaded, @@ -37466,6 +37585,15 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/telecomm/n_cave) +"sdl" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/obj/structure/window, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "sdP" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating, @@ -37503,6 +37631,20 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"shn" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/almayer/closed{ + dir = 4; + id = "lambda-exterior"; + name = "Lambda Checkpoint Exterior" + }, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/lambda_cave_cas) "shK" = ( /obj/structure/cargo_container/arious/right, /turf/open/mars_cave{ @@ -37514,16 +37656,6 @@ icon_state = "asteroidwarning" }, /area/bigred/ground/garage_workshop) -"sit" = ( -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "lambda-interior"; - name = "Lambda Checkpoint Interior" - }, -/turf/open/floor{ - icon_state = "delivery" - }, -/area/bigredv2/outside/lambda_cave_cas) "siu" = ( /turf/open/floor{ icon_state = "asteroidwarning" @@ -37878,6 +38010,21 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/engineering) +"sEb" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 3 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) +"sEh" = ( +/turf/open/floor{ + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/e) "sEi" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -37911,14 +38058,6 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) -"sHk" = ( -/obj/structure/surface/table/reinforced, -/obj/item/handcuffs, -/turf/open/floor{ - dir = 9; - icon_state = "redfull" - }, -/area/bigredv2/outside/lambda_cave_cas) "sHz" = ( /obj/item/ore{ pixel_x = 9; @@ -37928,6 +38067,19 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) +"sHO" = ( +/obj/effect/landmark/crap_item, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) +"sIh" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "lambda-cave-extratunnel" + }, +/turf/closed/wall/solaris/rock, +/area/bigredv2/caves) "sIP" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -38016,29 +38168,55 @@ icon_state = "delivery" }, /area/bigredv2/outside/admin_building) +"sRV" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_lambda) "sSU" = ( /turf/open/mars_cave{ icon_state = "mars_cave_19" }, /area/bigredv2/outside/lz2_south_cas) -"sTv" = ( -/obj/structure/surface/table/reinforced, -/obj/item/device/camera, -/obj/structure/machinery/light/small, -/obj/structure/blocker/forcefield/multitile_vehicles, +"sSY" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/bed/chair/comfy{ + dir = 4 + }, /turf/open/floor{ - dir = 9; - icon_state = "redfull" + icon_state = "wood" }, -/area/bigredv2/outside/lambda_cave_cas) +/area/bigredv2/outside/library) "sUQ" = ( /obj/structure/machinery/photocopier, /turf/open/floor/wood, /area/bigredv2/caves/lambda/breakroom) +"sVk" = ( +/obj/effect/decal/remains/human, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/lambda_cave_cas) "sVB" = ( /obj/structure/window_frame/solaris, /turf/open/floor/plating, /area/bigredv2/outside/marshal_office) +"sVM" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/caves_lambda) "sWa" = ( /obj/item/ore{ pixel_x = 12; @@ -38066,6 +38244,12 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"sXd" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "prison_breakout" + }, +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/marshal_office) "sXv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/drip{ @@ -38129,18 +38313,6 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/n) -"taW" = ( -/obj/structure/surface/table/reinforced, -/obj/structure/machinery/door_control{ - id = "lambda-interior"; - name = "Lambda Checkpoint Interior"; - pixel_x = null - }, -/turf/open/floor{ - dir = 9; - icon_state = "redfull" - }, -/area/bigredv2/outside/lambda_cave_cas) "tbS" = ( /obj/structure/morgue{ dir = 1 @@ -38329,6 +38501,17 @@ }, /turf/open/floor, /area/bigred/ground/garage_workshop) +"tlU" = ( +/obj/structure/surface/table, +/obj/structure/window, +/obj/structure/machinery/computer/emails{ + dir = 8; + pixel_y = 4 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "tmH" = ( /obj/structure/closet/crate, /obj/structure/machinery/light{ @@ -38613,15 +38796,6 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves_research) -"tFp" = ( -/obj/structure/bed/chair/wood/normal{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor{ - icon_state = "chapel" - }, -/area/bigredv2/outside/chapel) "tFt" = ( /obj/structure/surface/table, /obj/structure/machinery/light, @@ -38886,12 +39060,6 @@ icon_state = "mars_cave_13" }, /area/bigredv2/caves/mining) -"tYM" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "prison" - }, -/turf/closed/wall/solaris/reinforced, -/area/bigredv2/outside/marshal_office) "tZU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -38950,14 +39118,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/space_port_lz2) -"ufg" = ( -/obj/structure/surface/table/reinforced, -/obj/item/pizzabox/vegetable, -/turf/open/floor{ - dir = 9; - icon_state = "redfull" - }, -/area/bigredv2/outside/lambda_cave_cas) "ufu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil, @@ -39094,6 +39254,10 @@ icon_state = "delivery" }, /area/bigredv2/outside/telecomm/lz2_cave) +"unS" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/carpet, +/area/bigredv2/outside/library) "uoj" = ( /obj/effect/decal/remains/human, /turf/open/floor{ @@ -39138,11 +39302,6 @@ icon_state = "mars_cave_18" }, /area/bigredv2/caves_east) -"uuo" = ( -/turf/open/mars_cave{ - icon_state = "mars_cave_18" - }, -/area/bigredv2/outside/lambda_cave_cas) "uuO" = ( /obj/item/shard{ icon_state = "small" @@ -39227,12 +39386,6 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) -"uCD" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "reactor" - }, -/turf/closed/wall/solaris/rock, -/area/bigredv2/caves) "uDn" = ( /obj/structure/sign/safety/west, /obj/structure/sign/safety/hazard{ @@ -39559,14 +39712,6 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/engineering) -"vdy" = ( -/obj/structure/surface/table/reinforced, -/obj/item/storage/donut_box, -/turf/open/floor{ - dir = 9; - icon_state = "redfull" - }, -/area/bigredv2/outside/lambda_cave_cas) "vdS" = ( /obj/item/explosive/grenade/incendiary/molotov{ pixel_x = -10; @@ -39821,15 +39966,6 @@ icon_state = "delivery" }, /area/bigredv2/caves/eta/xenobiology) -"vtR" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor{ - dir = 6; - icon_state = "asteroidwarning" - }, -/area/bigredv2/caves_lambda) "vuz" = ( /obj/structure/machinery/door_control{ id = "eta"; @@ -39842,15 +39978,6 @@ icon_state = "darkblue2" }, /area/bigredv2/caves/eta/research) -"vvi" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "lz1containers" - }, -/turf/open/floor{ - dir = 4; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/space_port) "vvj" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -39917,15 +40044,6 @@ icon_state = "mars_cave_9" }, /area/bigredv2/outside/n) -"vBK" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor{ - dir = 10; - icon_state = "red" - }, -/area/bigredv2/outside/lambda_cave_cas) "vBT" = ( /obj/structure/surface/table/reinforced, /obj/structure/transmitter/colony_net/rotary{ @@ -39977,6 +40095,20 @@ icon_state = "mars_dirt_10" }, /area/bigredv2/outside/s) +"vFA" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) +"vFH" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_lambda) "vFS" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -40123,12 +40255,28 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/engineering) +"vUw" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/lambda_cave_cas) "vUy" = ( /obj/structure/cargo_container/kelland/left, /turf/open/mars_cave{ icon_state = "mars_dirt_4" }, /area/bigredv2/outside/space_port_lz2) +"vUN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "vVl" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Dormitories Toilet" @@ -40324,6 +40472,13 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_cave_cas) +"whw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/woodentable, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "whE" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/objective_landmark/close, @@ -40352,15 +40507,6 @@ icon_state = "podhatchfloor" }, /area/bigredv2/outside/engineering) -"wiX" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor{ - dir = 6; - icon_state = "red" - }, -/area/bigredv2/outside/lambda_cave_cas) "wjW" = ( /obj/structure/platform/shiva{ dir = 1 @@ -40377,13 +40523,6 @@ icon_state = "darkpurple2" }, /area/bigredv2/caves/lambda/research) -"wku" = ( -/obj/effect/landmark/corpsespawner/security, -/obj/effect/decal/cleanable/blood{ - layer = 3 - }, -/turf/open/floor, -/area/bigredv2/outside/lambda_cave_cas) "wlE" = ( /obj/item/stack/cable_coil/cut, /turf/open/mars_cave{ @@ -40595,6 +40734,14 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) +"wBK" = ( +/obj/structure/bed/chair/wood/normal{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "wCo" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_4" @@ -40616,6 +40763,14 @@ icon_state = "mars_cave_17" }, /area/bigredv2/caves/mining) +"wET" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "wFL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/safety/hazard{ @@ -40673,6 +40828,12 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) +"wHg" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "lz1north_mining" + }, +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/space_port) "wHx" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -40683,6 +40844,27 @@ icon_state = "darkredcorners2" }, /area/bigredv2/outside/admin_building) +"wHM" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) +"wIj" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/e) "wIw" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -40708,6 +40890,15 @@ icon_state = "mars_cave_17" }, /area/bigredv2/outside/lz1_north_cas) +"wKA" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "wood" + }, +/area/bigredv2/outside/library) "wLD" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/plating{ @@ -40755,22 +40946,19 @@ /obj/structure/largecrate/random/secure, /turf/open/floor, /area/bigred/ground/garage_workshop) -"wNw" = ( -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "lambda-exterior"; - name = "Lambda Checkpoint Exterior" - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor{ - icon_state = "delivery" - }, -/area/bigredv2/outside/lambda_cave_cas) "wNA" = ( /obj/effect/decal/cleanable/dirt, /obj/item/ammo_magazine/pistol/m1911, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"wOK" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor{ + dir = 4; + icon_state = "asteroidwarning" + }, +/area/bigredv2/caves_lambda) "wPk" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -40796,6 +40984,12 @@ icon_state = "mars_cave_7" }, /area/bigredv2/caves_lambda) +"wRl" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "admin_pmc" + }, +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/admin_building) "wRH" = ( /obj/effect/decal/cleanable/dirt, /obj/item/device/flashlight, @@ -40919,6 +41113,15 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/outside/space_port_lz2) +"xaE" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/colony{ + dir = 1; + name = "\improper Lambda Checkpoint" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/lambda_cave_cas) "xaH" = ( /turf/closed/wall/wood, /area/bigredv2/caves_sw) @@ -40959,20 +41162,6 @@ icon_state = "warnplate" }, /area/bigredv2/outside/telecomm/warehouse) -"xdh" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "lambda-exterior"; - name = "Lambda Checkpoint Exterior" - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor{ - icon_state = "delivery" - }, -/area/bigredv2/outside/lambda_cave_cas) "xej" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -40988,13 +41177,6 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/outside/filtration_plant) -"xfb" = ( -/obj/structure/machinery/vending/security, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor{ - icon_state = "red" - }, -/area/bigredv2/outside/lambda_cave_cas) "xfx" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "A heavy duty power cable for high voltage applications"; @@ -41149,12 +41331,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) -"xpQ" = ( -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/outside/lambda_cave_cas) "xqf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/objective_landmark/medium, @@ -41181,6 +41357,14 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"xsX" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "xte" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light, @@ -41409,6 +41593,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor, /area/bigredv2/outside/admin_building) +"xLz" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "lz1containers_scramble" + }, +/turf/open/floor{ + dir = 4; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/space_port) "xLM" = ( /obj/structure/machinery/light{ dir = 1 @@ -41456,6 +41649,12 @@ icon_state = "dark" }, /area/bigredv2/caves/lambda/research) +"xOk" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "cargo_containers" + }, +/turf/closed/wall/solaris, +/area/bigredv2/outside/cargo) "xPg" = ( /obj/structure/barricade/handrail/wire, /turf/open/mars_cave{ @@ -41496,10 +41695,26 @@ icon_state = "mars_cave_13" }, /area/bigredv2/caves/mining) +"xTk" = ( +/obj/limb/arm/l_arm, +/obj/effect/decal/cleanable/blood/drip, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor, +/area/bigredv2/outside/lambda_cave_cas) "xTM" = ( /obj/structure/closet/medical_wall, /turf/closed/wall/solaris/reinforced, /area/bigredv2/caves/mining) +"xTV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/lambda_cave_cas) "xUo" = ( /obj/effect/landmark/monkey_spawn, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -41544,6 +41759,14 @@ }, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"xWv" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/caves_lambda) "xWz" = ( /obj/effect/decal/cleanable/dirt{ pixel_x = 17 @@ -41602,9 +41825,6 @@ icon_state = "darkyellow2" }, /area/bigredv2/outside/engineering) -"xXN" = ( -/turf/closed/wall/solaris/rock, -/area/bigredv2/outside/lambda_cave_cas) "xXP" = ( /obj/structure/prop/invuln/minecart_tracks/bumper, /turf/open/mars_cave{ @@ -41646,6 +41866,9 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/caves/mining) +"xZL" = ( +/turf/closed/wall/solaris/rock, +/area/bigredv2/outside/lambda_cave_cas) "yar" = ( /turf/open/floor{ dir = 4; @@ -41706,14 +41929,6 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/outside/eta) -"ydM" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/caves_lambda) "yej" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -41723,12 +41938,6 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/n) -"yfe" = ( -/obj/effect/landmark/nightmare{ - insert_tag = "eta" - }, -/turf/closed/wall/solaris/reinforced, -/area/bigredv2/caves/eta/xenobiology) "yfs" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -41797,6 +42006,18 @@ icon_state = "mars_dirt_5" }, /area/bigredv2/caves/mining) +"yhG" = ( +/obj/structure/showcase{ + icon = 'icons/obj/structures/machinery/research.dmi'; + icon_state = "d_analyzer_la" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/turf/open/floor{ + icon_state = "darkish" + }, +/area/bigredv2/caves/lambda/breakroom) "yhN" = ( /obj/effect/decal/cleanable/blood{ layer = 3 @@ -43871,7 +44092,7 @@ aao aao aao aao -jcn +rNs aao aao xmy @@ -45202,7 +45423,7 @@ aao aao aao aao -qTu +lFR aao aao aao @@ -49078,7 +49299,7 @@ ajx aoN ajx vXp -pdN +oVq aeI aeI aeI @@ -49116,7 +49337,7 @@ aoD aoD aoD aoD -eUT +maB aoD aoD aoD @@ -49276,7 +49497,7 @@ acw acw aam aam -vvi +xLz aam aam aam @@ -49964,7 +50185,7 @@ axv anp anp anp -anp +gri ajx ajY akK @@ -50342,7 +50563,7 @@ wcs aae aae aae -aLh +wHg aah aah aaU @@ -52022,7 +52243,7 @@ aao aao aao aao -ers +lOY aao uHQ oRK @@ -52403,7 +52624,7 @@ asK asK bkz asK -lMt +xOk aFc ftY kcH @@ -53179,7 +53400,7 @@ aae aae aae aae -lMB +nZd aae aae aaq @@ -55041,7 +55262,7 @@ wog wog wog aao -uCD +bRC aao aao aao @@ -56891,7 +57112,7 @@ ana acp acp acp -tYM +sXd ume aqv bOZ @@ -58244,7 +58465,7 @@ apC apC apC apC -nGt +wRl aHF aHD aBR @@ -61594,7 +61815,7 @@ aCe aCe aCe aCe -yfe +gWv aao jrD jrD @@ -63198,7 +63419,7 @@ ayY axG ayY ayY -joa +kxr asJ asJ aua @@ -65882,7 +66103,7 @@ buc buc buc buu -rrl +ejp azO meT meT @@ -73624,7 +73845,7 @@ aCo aQa aCZ anT -aIE +cOu aJA aKJ aEd @@ -73636,7 +73857,7 @@ aQp aQm aqU qhl -hXM +sEh aUk aKP aKP @@ -73799,7 +74020,7 @@ aao tqS xWl xWl -pjK +gIT xWl xWl tqS @@ -73842,8 +74063,8 @@ aQa aCZ anT aIF -aJB -aKK +eaZ +aCZ aLE aMp aLE @@ -73853,7 +74074,7 @@ aQq aRs anT qhl -aUp +wIj aUk aKP aKP @@ -74070,7 +74291,7 @@ anW anW anW aDy -aUp +wIj aUk aKP aKP @@ -74269,25 +74490,25 @@ pLH bMz apo anW -aDc -aEi -aDc -aDg -aDc -aEi -aDc -aJC -aKL -aEi -aDc -aEi -aDc -aEi -aQr +qsV +vFA +heD +wKA +nhF +anW +eBL +qsV +qsV +anW +qsV +anW +eBL +eBL +eBL anW aTq aDy -hXM +sEh aUk aKP aWL @@ -74302,7 +74523,7 @@ atP atP atP atb -iIp +gAK bja bes bes @@ -74486,25 +74707,25 @@ aCc aCc aMk anW -aDc +qsV aEi -aDc -aDg -aDc aEi -aDc +wKA aEi -aDc +aJC aEi -aDc aEi -aDc +vFA +vUN +vFA +wET +aEi aEi aEi aqx aTq aDy -aUp +wIj aUk aKP aKP @@ -74703,25 +74924,25 @@ aCc pLH aMk anW -aDc -aEi +qsV +vFA aDe aGe -aGN -aHM -aHM -aHM -aKM -aLF -aLF -aLF -aLF -aPk +unS +unS +unS +mIs +kAj +qJM +pSf aEi +pSf +iEm +lmO aqx aTq aDy -aUp +wIj aQu aVr aKP @@ -74920,25 +75141,25 @@ aCc aCc aMk anW -aDc -aEi +anW +dLS aDg +nFp +pSf +dNX +pSf aEi -aGO -aHN -aIG -aIG -aKN -aLG -aLG -aLG -aOi -aPl -aQs +moe +unS +unS +aQt +unS +rKe +eeI anW aTq qhl -aUp +wIj aQu aUk aKP @@ -75137,25 +75358,25 @@ aCc aCc aMk anW -aDd -aEi -aDg -aEi +wHM +sSY +mUb +sdl +vFA +vFA +vFA aEi aEi aEi -aEi -aEi -aEi -aDc -aEi -aOj -aPm -aQt +aHO +fWY +pSf +qcE +mIs aRu nnK -inP -aUp +mNT +wIj aQu aUk aKP @@ -75354,25 +75575,25 @@ aCc aCc aMk anW -aDe -aQt -aEl -aGf +pyq +tlU +pyq +tlU aEi -aHO -aIH +jNN +qWA aJD aKO aEi +aHO +fJW aEi -aEi -aOj -aPn -aEi +sHO +vFA ocA aTq qhl -aUp +wIj aQu aQu aOk @@ -75571,24 +75792,24 @@ aCc aCc aMk anW -aDf anW anW anW -aEi +anW +drx aHO lDa lDa aKO aEi -aDc aEi -aOj -aPo -aQs +rBn +oes +nnA +jUJ anW aTq -kja +phx aTt aSf aSf @@ -75787,22 +76008,22 @@ aCc aCc aCc aMk -anW -aDg -aEk -aui +apo +apo +nrA +apo anW voz +wBK +wBK +vFA +hho +wBK aEi aEi aEi -aEi -aEi -aDc -aEi -aGO -aPp -aEi +iaS +aui aqx aTq aDy @@ -76004,26 +76225,26 @@ pLH pLH aCc aMk +apo +apo +apo +apo anW -aDh -aEl -aEi -anW -aGQ -aEi -aEi -aEi -aGQ -aEi -aEi -aGQ -aEi -aEi -aEi +lTC +nuQ +whw +vFA +prU +whw +mKi +esS +sEb +sEb +nkE aqx aTq aDy -aUp +wIj aQu aVq aVq @@ -76221,10 +76442,10 @@ aao aao rLM aMk -anW -anW -anW -anW +apo +apo +apo +apo anW anW anW @@ -76240,7 +76461,7 @@ anW anW aTq qhl -aUp +wIj aUk aKP aKP @@ -76457,7 +76678,7 @@ aSg aSg aTq qhl -aUp +wIj aUk aKP aKP @@ -76674,17 +76895,17 @@ aKP aMR aTr aDy -aUp +wIj aQu aVr aKP aKP aSh -lIB +eYA aZh -muT -oyM -tFp +cuG +crd +rgm bbG bap baT @@ -76893,7 +77114,7 @@ aTr aDy aTp aTu -reU +qoS aTu aTu aTu @@ -77110,12 +77331,12 @@ aTr aDy aTq aTq -iHG -gfv -gfv -mTJ -iHG -iHG +dTB +rbs +rbs +dRc +dTB +dTB nRT bap baT @@ -77322,17 +77543,17 @@ aao aQu aQu aQu -dLo +ceA aTr aDy aTq aTq -gfv -mKL -epu -aYy -vBK -iHG +rbs +oPM +eKZ +pAX +hKO +dTB nRT bao baS @@ -77539,17 +77760,17 @@ aao aao aao aao -mRJ -wNw -xdh -aUw -wNw -mRJ -bKU -aXt -jKu -hiH -mRJ +dvz +rnK +shn +qWT +rnK +dvz +djo +xsX +xTk +rkh +dvz nRT bat baW @@ -77756,18 +77977,18 @@ aao aao aao aao -uuo -aSj -ixR -aUx -xpQ -gfv -ufg -aYy -aYy -apI -mRJ -iHG +lLe +sVk +xTV +vUw +iKn +rbs +aIe +pAX +pAX +qLD +dvz +dTB aJy aJy nRT @@ -77974,17 +78195,17 @@ aao aao aao aao -nse -ixR -xpQ -bKH -iHG -gQk -wku -aYy -evN -sTv -iHG +hLs +xTV +iKn +hNW +dTB +jKp +dFL +pAX +dKk +fyZ +dTB atb atb atb @@ -78190,17 +78411,17 @@ aao aao aao aao -iHG -cIq -ixR -xpQ -xpQ -prC -aYy -aYy -aYy -aYy -xfb +dTB +juZ +xTV +iKn +iKn +xaE +pAX +pAX +pAX +pAX +gEM aao aao aao @@ -78408,16 +78629,16 @@ aao aao aao aao -nse -ixR -xpQ -aVw -iHG -oJh -aYy -aYy -iBs -sHk +hLs +xTV +iKn +qJB +dTB +mYV +pAX +pAX +rDa +cry aao aao aao @@ -78625,16 +78846,16 @@ aao aao aao sYL -nse hLs -xpQ -xpQ -gfv -vdy -aYy -aYy -apI -iHG +aUv +iKn +iKn +rbs +nIS +pAX +pAX +qLD +dTB aao aao aao @@ -78841,17 +79062,17 @@ eFh aao aao aao -iHG -sit -ftX -sit -sit -iHG -jeH -dFW -aYy -apI -xXN +dTB +iFz +qbG +iFz +iFz +dTB +dAd +oHn +pAX +qLD +xZL aao aao gCE @@ -79060,15 +79281,15 @@ aao aao aao aTw -hwG +pmV aTv aTv -gfv -taW -rma -aYy -wiX -iHG +rbs +lAR +oJv +pAX +irZ +dTB aao gCE rAs @@ -79276,16 +79497,16 @@ tQw aao aao aao -mGW -hwG +vFH +pmV aTv -ydM -iHG -gfv -gfv -cBg -iHG -iHG +kqO +dTB +rbs +rbs +pJd +dTB +dTB gCE gCE gCE @@ -79493,15 +79714,15 @@ tQw tQw aao aao -aSk -aTz -aUA -bum -cHv +dJr +sVM +xWv +wOK +kUW aOn -fJs -fJs -jKV +nfY +nfY +pgV gCE gCE gCE @@ -79709,9 +79930,9 @@ tQw gXp gXp gXp -aRw +hFg eFh -pJq +sRV aMT tQw ujC @@ -79928,7 +80149,7 @@ tQw tQw tQw eFh -pJq +sRV aMT tQw tQw @@ -80145,7 +80366,7 @@ tQw tQw tQw eFh -pJq +sRV aMT tQw tQw @@ -80356,13 +80577,13 @@ anI anI anI anI -aMS +kZI gmN tQw tQw tQw arK -aTy +qKH aMT tQw tQw @@ -80579,7 +80800,7 @@ aOm aOm aOm aSl -hwG +pmV aMT tQw ujC @@ -80796,7 +81017,7 @@ aOn aOn aOn aTv -hwG +pmV aMT tQw tQw @@ -81007,7 +81228,7 @@ aJF anI anI anI -vtR +jvW gXp gXp gXp @@ -81669,7 +81890,7 @@ aMV tQw aao aao -kKH +sIh aao aao aao @@ -82286,7 +82507,7 @@ tFO axs ati atN -auw +yhG avj avR awI @@ -89067,7 +89288,7 @@ aab aaa aaa aaa -jov +cJd aaa aaa aaa @@ -89284,7 +89505,7 @@ aab aaa aaa aaa -jov +cJd aaa aaa aaa @@ -89503,7 +89724,7 @@ aaa aaa aaa aaa -jov +cJd aaa aaa aaa @@ -89720,15 +89941,15 @@ aaa aaa aaa aaa -jov +cJd aaa aaa aaa aaa aaa -jov -jov -jov +cJd +cJd +cJd aaa aaa aaa @@ -89943,9 +90164,9 @@ aaa aaa aaa aaa -jov -jov -jov +cJd +cJd +cJd aaa aaa aaa diff --git a/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm b/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm index 6aa3dfd2cfc2..bfce848e5656 100644 --- a/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm +++ b/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm @@ -36,12 +36,8 @@ /turf/open/floor/plating, /area/bigredv2/outside/nw) "i" = ( -/obj/structure/machinery/light{ - dir = 1; - icon_state = "tube1" - }, -/turf/open/floor/plating, -/area/bigredv2/outside/nw) +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/telecomm/warehouse) "j" = ( /turf/open/floor/plating, /area/bigredv2/outside/nw) @@ -130,6 +126,84 @@ /obj/structure/machinery/light, /turf/open/floor/plating, /area/bigredv2/outside/nw) +"D" = ( +/obj/effect/landmark/static_comms/net_one, +/turf/open/floor{ + icon_state = "bcircuit" + }, +/area/bigredv2/outside/telecomm/warehouse) +"H" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/plating{ + dir = 10; + icon_state = "warnplate" + }, +/area/bigredv2/outside/telecomm/warehouse) +"K" = ( +/turf/open/floor{ + icon_state = "bcircuit" + }, +/area/bigredv2/outside/telecomm/warehouse) +"O" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/plating{ + dir = 8; + icon_state = "warnplate" + }, +/area/bigredv2/outside/telecomm/warehouse) +"S" = ( +/obj/structure/machinery/power/apc{ + dir = 1; + start_charge = 0 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5; + pixel_x = -1 + }, +/turf/open/floor/plating{ + dir = 4; + icon_state = "warnplate" + }, +/area/bigredv2/outside/telecomm/warehouse) +"T" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/plating{ + dir = 6; + icon_state = "warnplate" + }, +/area/bigredv2/outside/telecomm/warehouse) +"V" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/plating{ + icon_state = "warnplate" + }, +/area/bigredv2/outside/telecomm/warehouse) +"Z" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5; + pixel_x = -1 + }, +/turf/open/floor/plating{ + dir = 4; + icon_state = "warnplate" + }, +/area/bigredv2/outside/telecomm/warehouse) (1,1,1) = {" b @@ -144,10 +218,10 @@ b b "} (2,1,1) = {" -b -e -j -j +i +O +O +H q j u @@ -156,10 +230,10 @@ j b "} (3,1,1) = {" -b -f -j -j +i +K +D +V q j v @@ -168,10 +242,10 @@ y b "} (4,1,1) = {" -b -g -m -j +i +K +K +V q j j @@ -180,10 +254,10 @@ j b "} (5,1,1) = {" -b -h -m -j +i +S +Z +T q j j @@ -194,7 +268,7 @@ b (6,1,1) = {" b g -j +m j r j @@ -205,8 +279,8 @@ b "} (7,1,1) = {" b -g -j +h +m j q j @@ -217,7 +291,7 @@ b "} (8,1,1) = {" b -i +f j j q @@ -301,7 +375,7 @@ b "} (15,1,1) = {" b -j +e j j q diff --git a/maps/map_files/BigRed/sprinkles/30.cave-north_lambdapath.dmm b/maps/map_files/BigRed/sprinkles/30.cave-north_lambdapath.dmm deleted file mode 100644 index 69d091b39d02..000000000000 --- a/maps/map_files/BigRed/sprinkles/30.cave-north_lambdapath.dmm +++ /dev/null @@ -1,214 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/open/mars_cave{ - icon_state = "mars_cave_18" - }, -/area/bigredv2/caves_north) -"b" = ( -/turf/closed/wall/solaris/rock, -/area/bigredv2/caves) -"c" = ( -/turf/open/mars_cave{ - icon_state = "mars_cave_2" - }, -/area/bigredv2/caves_lambda) -"d" = ( -/turf/open/mars_cave, -/area/bigredv2/caves_north) -"e" = ( -/turf/open/mars_cave{ - icon_state = "mars_cave_2" - }, -/area/bigredv2/caves_north) -"f" = ( -/turf/open/mars_cave{ - icon_state = "mars_cave_7" - }, -/area/bigredv2/caves_north) -"g" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, -/turf/open/mars_cave{ - icon_state = "mars_cave_2" - }, -/area/bigredv2/caves_lambda) -"h" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/mars_cave{ - icon_state = "mars_cave_2" - }, -/area/bigredv2/caves_lambda) -"j" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/mars_cave{ - icon_state = "mars_dirt_4" - }, -/area/bigredv2/caves_north) -"m" = ( -/turf/open/mars_cave{ - icon_state = "mars_cave_14" - }, -/area/bigredv2/caves_north) -"n" = ( -/turf/open/mars_cave{ - icon_state = "mars_dirt_4" - }, -/area/bigredv2/caves_north) -"o" = ( -/turf/open/mars_cave{ - icon_state = "mars_cave_17" - }, -/area/bigredv2/caves_north) -"s" = ( -/turf/open/mars_cave{ - icon_state = "mars_cave_15" - }, -/area/bigredv2/caves_north) -"C" = ( -/turf/open/mars_cave{ - icon_state = "mars_dirt_6" - }, -/area/bigredv2/caves_north) -"H" = ( -/turf/open/mars_cave{ - icon_state = "mars_cave_19" - }, -/area/bigredv2/caves_north) -"M" = ( -/turf/open/mars_cave{ - icon_state = "mars_dirt_5" - }, -/area/bigredv2/caves_north) -"S" = ( -/turf/open/mars_cave{ - icon_state = "mars_cave_7" - }, -/area/bigredv2/caves_lambda) -"Z" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, -/turf/open/mars_cave{ - icon_state = "mars_cave_16" - }, -/area/bigredv2/caves_lambda) - -(1,1,1) = {" -a -d -e -m -C -n -H -e -e -s -"} -(2,1,1) = {" -b -f -s -n -j -n -o -e -e -m -"} -(3,1,1) = {" -b -b -s -M -n -H -d -b -b -b -"} -(4,1,1) = {" -b -b -g -Z -Z -b -b -b -b -b -"} -(5,1,1) = {" -b -c -c -c -c -c -b -b -b -b -"} -(6,1,1) = {" -b -c -c -c -h -c -c -b -b -b -"} -(7,1,1) = {" -S -c -c -c -c -c -c -b -c -c -"} -(8,1,1) = {" -c -c -c -c -c -c -c -g -c -c -"} -(9,1,1) = {" -c -h -c -c -c -h -c -g -c -c -"} -(10,1,1) = {" -c -c -c -c -c -c -c -g -c -h -"} diff --git a/maps/map_files/BigRed/sprinkles/5+gruesome_medicaleast.dmm b/maps/map_files/BigRed/sprinkles/5+gruesome_medicaleast.dmm deleted file mode 100644 index 96ed195a9bee..000000000000 --- a/maps/map_files/BigRed/sprinkles/5+gruesome_medicaleast.dmm +++ /dev/null @@ -1,53 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/obj/item/prop/helmetgarb/rosary{ - pixel_y = 6 - }, -/turf/template_noop, -/area/template_noop) -"d" = ( -/obj/item/clothing/head/soft/blue{ - pixel_x = 5 - }, -/turf/template_noop, -/area/template_noop) -"g" = ( -/obj/item/weapon/gun/pistol/holdout{ - pixel_x = -4 - }, -/turf/template_noop, -/area/template_noop) -"A" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/template_noop, -/area/template_noop) -"K" = ( -/obj/item/limb/arm/l_arm{ - dir = 8 - }, -/obj/item/limb/arm/r_arm, -/obj/item/limb/foot/l_foot{ - dir = 1; - pixel_y = 21 - }, -/obj/item/limb/head{ - dir = 4; - pixel_x = 6 - }, -/obj/effect/decal/cleanable/blood, -/turf/template_noop, -/area/template_noop) -"M" = ( -/turf/template_noop, -/area/template_noop) - -(1,1,1) = {" -d -A -a -"} -(2,1,1) = {" -K -g -M -"} diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index 4e06de75bc43..a86fb326152d 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -62185,7 +62185,7 @@ /area/desert_dam/exterior/valley/valley_telecoms) "lrn" = ( /obj/effect/landmark/nightmare{ - insert_tag = "damtemple" + insert_tag = "damtemple_intact" }, /turf/open/desert/dirt{ icon_state = "desert_transition_edge1" @@ -65097,7 +65097,7 @@ icon_state = "S" }, /obj/effect/landmark/nightmare{ - insert_tag = "shipgone" + insert_tag = "shipgone_northlz" }, /turf/open/floor/prison{ dir = 10; @@ -65450,7 +65450,7 @@ /area/desert_dam/interior/dam_interior/garage) "wrl" = ( /obj/effect/landmark/nightmare{ - insert_tag = "cavein" + insert_tag = "cavein_engineering" }, /turf/closed/wall/rock/orange, /area/desert_dam/exterior/rock) @@ -66042,7 +66042,7 @@ icon_state = "road_edge_decal3" }, /obj/effect/landmark/nightmare{ - insert_tag = "minievac" + insert_tag = "minievac_westresearch" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_wilderness) diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index d7d206c01c50..a344e32c6e56 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -883,14 +883,10 @@ }, /area/fiorina/station/flight_deck) "ayW" = ( -/obj/structure/bed{ - icon_state = "abed" - }, /obj/item/explosive/grenade/incendiary/molotov, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - dir = 10; - icon_state = "yellow" + icon_state = "floor_plate" }, /area/fiorina/station/lowsec) "ayX" = ( @@ -1973,13 +1969,9 @@ /turf/open/floor/prison, /area/fiorina/station/security) "bjt" = ( -/obj/structure/bed{ - icon_state = "abed" - }, -/obj/item/bedsheet/green, +/obj/structure/girder, /turf/open/floor/prison{ - dir = 6; - icon_state = "yellow" + icon_state = "yellowfull" }, /area/fiorina/station/lowsec) "bjR" = ( @@ -1999,14 +1991,9 @@ /turf/open/floor/prison, /area/fiorina/station/power_ring) "bki" = ( -/obj/structure/closet{ - density = 0; - pixel_y = 18 - }, -/obj/item/clothing/gloves/boxing/yellow, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" + icon_state = "floor_plate" }, /area/fiorina/station/lowsec) "bkQ" = ( @@ -4688,12 +4675,14 @@ }, /area/fiorina/station/transit_hub) "cQf" = ( -/obj/structure/machinery/power/apc{ - dir = 1 +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/explosive/grenade/incendiary/molotov, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + icon_state = "floor_plate" }, /area/fiorina/station/lowsec) "cQv" = ( @@ -5700,20 +5689,11 @@ }, /area/fiorina/lz/near_lzI) "dxl" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/obj/structure/barricade/metal/wired, +/turf/open/floor/prison{ + icon_state = "yellowfull" }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/space, -/area/fiorina/oob) +/area/fiorina/station/lowsec) "dxv" = ( /turf/open/floor/prison{ dir = 10; @@ -7946,10 +7926,6 @@ }, /area/fiorina/station/telecomm/lz1_cargo) "eQb" = ( -/obj/structure/closet{ - density = 0; - pixel_y = 18 - }, /obj/item/clothing/gloves/boxing/green, /turf/open/floor/prison{ dir = 1; @@ -9155,20 +9131,12 @@ }, /area/fiorina/tumor/civres) "fCJ" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ +/obj/structure/girder, +/turf/open/floor/prison{ dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 + icon_state = "yellow" }, -/turf/open/space, -/area/fiorina/oob) +/area/fiorina/station/lowsec) "fCW" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/communications, @@ -9412,7 +9380,7 @@ "fLb" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/prison{ - dir = 9; + dir = 1; icon_state = "yellow" }, /area/fiorina/station/lowsec) @@ -9527,11 +9495,12 @@ }, /area/fiorina/station/power_ring) "fPl" = ( -/obj/structure/barricade/metal/wired{ - dir = 8 +/obj/structure/machinery/power/apc{ + dir = 1 }, /turf/open/floor/prison{ - icon_state = "yellowfull" + dir = 1; + icon_state = "yellow" }, /area/fiorina/station/lowsec) "fPB" = ( @@ -13081,17 +13050,11 @@ /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) "hTN" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" +/obj/structure/girder, +/turf/open/floor/prison{ + icon_state = "yellow" }, -/turf/open/space, -/area/fiorina/oob) +/area/fiorina/station/lowsec) "hUi" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, @@ -14176,18 +14139,11 @@ }, /area/fiorina/oob) "iCf" = ( -/obj/structure/closet{ - density = 0; - pixel_y = 18 - }, -/obj/item/clothing/gloves/boxing, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, +/obj/structure/closet/wardrobe/orange, +/obj/item/clothing/gloves/boxing/blue, +/obj/item/clothing/gloves/boxing/blue, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + icon_state = "yellowfull" }, /area/fiorina/station/lowsec) "iCE" = ( @@ -17474,10 +17430,6 @@ }, /area/fiorina/tumor/servers) "kCT" = ( -/obj/structure/toilet{ - dir = 8; - pixel_y = 8 - }, /obj/effect/spawner/random/gun/smg, /turf/open/floor/prison{ dir = 5; @@ -23856,13 +23808,9 @@ }, /area/fiorina/station/chapel) "opj" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/prison{ - dir = 6; + dir = 4; icon_state = "yellow" }, /area/fiorina/station/lowsec) @@ -25963,13 +25911,8 @@ dir = 4 }, /obj/item/device/flashlight/lamp/tripod, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + icon_state = "floor_plate" }, /area/fiorina/station/lowsec) "pIs" = ( @@ -27957,10 +27900,10 @@ /turf/open/floor/prison, /area/fiorina/station/medbay) "qSz" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/closet/wardrobe/orange, +/obj/item/clothing/gloves/boxing/yellow, /turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" + icon_state = "yellowfull" }, /area/fiorina/station/lowsec) "qSA" = ( @@ -29120,9 +29063,12 @@ }, /area/fiorina/station/research_cells) "rLJ" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/chapel) +/obj/item/clothing/gloves/boxing, +/turf/open/floor/prison{ + dir = 10; + icon_state = "yellow" + }, +/area/fiorina/station/lowsec) "rMo" = ( /obj/effect/landmark/objective_landmark/far, /obj/structure/closet/secure_closet/engineering_personal, @@ -29445,13 +29391,6 @@ icon_state = "darkbrown2" }, /area/fiorina/maintenance) -"rVL" = ( -/obj/structure/largecrate/supply, -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) "rVM" = ( /obj/structure/closet/crate/miningcar, /obj/structure/barricade/wooden{ @@ -33656,17 +33595,6 @@ icon_state = "darkredfull2" }, /area/fiorina/station/research_cells) -"utG" = ( -/obj/structure/closet{ - density = 0; - pixel_y = 18 - }, -/obj/item/clothing/gloves/boxing/blue, -/turf/open/floor/prison{ - dir = 1; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) "utL" = ( /obj/structure/bed/chair, /turf/open/floor/prison{ @@ -34739,12 +34667,6 @@ icon_state = "darkbrownfull2" }, /area/fiorina/tumor/aux_engi) -"vbG" = ( -/obj/structure/prop/structure_lattice{ - dir = 4 - }, -/turf/open/floor/plating/prison, -/area/fiorina/maintenance) "vbV" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/prison, @@ -36931,13 +36853,6 @@ icon_state = "whitegreenfull" }, /area/fiorina/tumor/ice_lab) -"wsX" = ( -/obj/item/trash/snack_bowl, -/turf/open/floor/prison{ - dir = 5; - icon_state = "yellow" - }, -/area/fiorina/station/lowsec) "wtm" = ( /obj/structure/monorail{ name = "launch track" @@ -66439,9 +66354,9 @@ iKs nTv dtS fQA -bFr -bFr -bFr +bis +bis +bis oLV nxq dBy @@ -66650,10 +66565,10 @@ iKs nTv dtS fQA -bFr -bFr -bQM -bFr +bis +bis +cME +bis bis gXd dBy @@ -66861,12 +66776,12 @@ tyj tyj dtS fQA -bFr -bFr -bQM -bQM -bFr -rLJ +bis +bis +cME +cME +wpD +iKs oeY dBy nxq @@ -67072,12 +66987,12 @@ rJF fmb dBy dBy +dBy +bis +cME +cME +cME bis -bFr -bQM -bQM -bQM -bFr bis gXd qIT @@ -67284,12 +67199,12 @@ bFr twb eLu tLC +tLC +eLu +cME +cME +cME eLu -twb -twb -twb -twb -twb tIn dwP dBy @@ -67721,7 +67636,7 @@ twb eBO eBO eBO -twb +eLu eLu eLu eLu @@ -67925,7 +67840,7 @@ tIU gZc tIU cME -liA +cME cME qIq eLu @@ -67933,7 +67848,7 @@ uvF rzp vds elO -uvF +cME wQT eLu cME @@ -68133,11 +68048,11 @@ twb twb twb cME -eLu -eLu -eLu +cME +cME +cME bgy -eLu +cME cME cME cME @@ -68349,7 +68264,7 @@ cME cME cME cME -liA +cME cME cME cME @@ -68561,7 +68476,7 @@ twb twb cME cME -eLu +cME cME rJh eLu @@ -68569,7 +68484,7 @@ eLu dHD xbM fHo -vbG +cME vZD cME cME @@ -68777,8 +68692,8 @@ eLu mrk cME jkg -uvF -rVL +cME +dHD xbM fHo xno @@ -68985,15 +68900,15 @@ bQM twb nSU cME -eLu +cME cME cME eLu -uvF +jkg dHD xbM fHo -uvF +cME wQT eLu cYP @@ -69197,7 +69112,7 @@ bQM twb uts cME -liA +cME cME cME cME @@ -69409,17 +69324,17 @@ iYw twb eLu eLu -eLu +cME srI dTf +cME eLu -twb dHD xbM fHo -wzE -sfu -jyF +ioc +bjt +bjt kqC sfu jyF @@ -69624,13 +69539,13 @@ tmo gfo cME wQT -eLu +cME kqC dHD xbM fHo -kqC -wsX +ioc +ioc bjt kqC qNF @@ -69829,21 +69744,21 @@ ssc aeI nQu suX -bLJ -twb -twb -tPN -tPN -tPN -twb +neY +liA +yfK +tmo +gfo +cME +cME eLu kqC -dHD +fCJ xbM fHo -kqC -ryJ -end +ioc +ioc +kgN kqC ryJ end @@ -70041,16 +69956,16 @@ aeI aeI aeI nQu -hCh -sKY -bQM -bQM -bQM -bQM -bQM +bLJ +iYw +wzE +hZR +hZR +hZR +wzE wzE kqC -dHD +fCJ bPn fHo ioc @@ -70688,7 +70603,7 @@ srp bqD cAJ xbM -fHo +hTN kqC rzp tKk @@ -70900,7 +70815,7 @@ mGr upY dHD xbM -fHo +hTN kqC qLi dpe @@ -71112,7 +71027,7 @@ mGr upY dHD xbM -fHo +voO kqC kqC kqC @@ -71325,9 +71240,9 @@ upY dHD xbM fHo -kqC -sfu -jyF +ioc +ioc +ioc kqC sfu iEG @@ -71537,9 +71452,9 @@ iox dHD xbM fHo -kqC -qNF -bjt +ioc +ioc +ioc kqC qNF mDO @@ -71748,10 +71663,10 @@ iYw izh dHD xbM -voO -kqC -ryJ -end +fHo +ioc +ioc +kgN kqC ryJ end @@ -71951,14 +71866,14 @@ aeI nQu hCh sKY -hTN -fyC -qOk -mKS -erT -wzE +cAW +cAW +cAW +cAW +cAW wzE -dHD +kqC +fPl xbM fHo ioc @@ -72163,14 +72078,14 @@ aeI nQu hCh sKY -dxl -afk -afk -afk -ghg +cAW +cAW +cAW wzE wzE -dHD +wzE +kqC +nBb xbM fHo ioc @@ -72375,19 +72290,19 @@ nQu bVE iYw iYw -urJ -afk -hkh -afk -tCZ -pcu +cAW +cAW +wzE wzE +cQf +xbM +dxl dHD xbM -voO -kqC -ryJ -end +fHo +ioc +ioc +kgN kqC ryJ end @@ -72586,20 +72501,20 @@ eMI nQu bVE iYw -jKI -mdJ -afk -afk -afk -xMW -jlH +cAW +cAW +cAW wzE +bki +xbM +xbM +dxl cPh xbM fHo -kqC -rzp -mwP +ioc +ioc +ioc kqC rzp ldz @@ -72800,18 +72715,18 @@ aPv iYw iYw iYw -fCJ -llQ -jKI -bUB -bQM +cAW wzE -nBb +xbM +xbM +xbM +ioc +dHD xbM fHo -kqC -qLi -dpe +ioc +ioc +ioc kqC qLi dpe @@ -73014,16 +72929,16 @@ vOZ iYw sKY wzE -wzE -wzE -wzE -wzE -cQf +xbM +xbM +xbM +ioc +dHD jpx fHo -kqC -kqC -kqC +ioc +ioc +ioc kqC kqC kqC @@ -73229,13 +73144,13 @@ oFI mCe xbM sJP -kqC +ioc dHD xbM fHo -kqC -sfu -jyF +ioc +ioc +ioc kqC sfu jyF @@ -73445,9 +73360,9 @@ ioc dHD xbM fHo -kqC -qNF -mDO +ioc +ioc +ioc kqC qNF eub @@ -73656,10 +73571,10 @@ xbM ioc nbP xbM -voO -kqC -cRB -end +fHo +ioc +ioc +kgN kqC ryJ end @@ -73864,7 +73779,7 @@ bce wzE kqC ioc -fPl +ioc kqC oFp xbM @@ -74300,7 +74215,7 @@ kqC ryJ end kqC -iCf +nBb xbM voO kqC @@ -75143,12 +75058,12 @@ xbM bkQ xbM qNF -qSz +dHD kqC rkp iKy kqC -utG +dHD xbM jbm xbM @@ -75360,7 +75275,7 @@ kqC qNF efW kqC -bki +qNF xRI iXq xRI @@ -75771,11 +75686,11 @@ ioc ioc ioc qNF -xRI -xRI -xRI nAK xbM +xbM +xbM +xbM jET xbM xbM @@ -75786,12 +75701,12 @@ elO hZR bQM hZR -jvi +iCf rzp vds vds vds -elO +rLJ jvi duF jTN @@ -75983,9 +75898,9 @@ kqC ecd kqC kqC -cRB -end -kqC +dHD +xbM +xbM pHx xbM eNa @@ -76197,8 +76112,8 @@ vRA kqC fLb ayW -kqC -dHD +xbM +xbM xbM rYK kqC @@ -76210,7 +76125,7 @@ end wzE bQM hZR -jvi +qSz dHD eNa rwK @@ -76409,8 +76324,8 @@ arl oFI kCT opj -kqC -dHD +xRI +nAK xbM fHo kqC diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index e5c8e3e13c69..7ff89252a916 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -7035,6 +7035,17 @@ }, /turf/open/floor/plating, /area/shiva/interior/aerodrome) +"bws" = ( +/obj/structure/surface/rack, +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/turf/open/floor/shiva{ + dir = 10; + icon_state = "yellow" + }, +/area/shiva/interior/garage) "bwJ" = ( /turf/open/floor/shiva{ dir = 4; @@ -7260,12 +7271,6 @@ /obj/item/device/motiondetector/hacked, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) -"bIP" = ( -/obj/structure/machinery/power/reactor/colony, -/turf/open/floor/shiva{ - dir = 1 - }, -/area/shiva/interior/garage) "bIV" = ( /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard/cp_bar) @@ -10094,6 +10099,12 @@ icon_state = "yellow" }, /area/shiva/interior/colony/medseceng) +"ffg" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "panic_room" + }, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/junkyard) "ffj" = ( /turf/closed/shuttle/elevator{ dir = 10 @@ -10105,6 +10116,14 @@ icon_state = "yellow" }, /area/shiva/interior/lz2_habs) +"ffo" = ( +/obj/structure/surface/rack, +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/turf/open/floor/shiva{ + icon_state = "yellow" + }, +/area/shiva/interior/garage) "ffw" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/shiva{ @@ -10768,14 +10787,6 @@ /obj/structure/window/framed/shiva, /turf/open/floor/plating, /area/shiva/interior/colony/research_hab) -"fNR" = ( -/obj/structure/surface/rack, -/obj/item/fuel_cell, -/obj/item/fuel_cell, -/turf/open/floor/shiva{ - icon_state = "yellow" - }, -/area/shiva/interior/garage) "fOa" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -11 @@ -10911,13 +10922,6 @@ icon_state = "floor3" }, /area/shiva/interior/aerodrome) -"fWJ" = ( -/obj/structure/machinery/power/reactor/colony, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "yellowfull" - }, -/area/shiva/interior/lz2_habs) "fXp" = ( /obj/structure/prop/invuln{ desc = "The mounting points are ground down from heavy use. They'll need some maintenance work before they can be used again."; @@ -11956,17 +11960,6 @@ dir = 1 }, /area/shiva/interior/colony/central) -"hat" = ( -/obj/structure/surface/rack, -/obj/item/fuel_cell, -/obj/item/fuel_cell, -/obj/item/fuel_cell, -/obj/item/fuel_cell, -/turf/open/floor/shiva{ - dir = 10; - icon_state = "yellow" - }, -/area/shiva/interior/garage) "hbo" = ( /obj/structure/platform/strata, /turf/open/auto_turf/ice/layer1, @@ -12028,13 +12021,6 @@ icon_state = "wred" }, /area/shiva/interior/colony/medseceng) -"hgk" = ( -/obj/structure/machinery/fuelcell_recycler/full, -/turf/open/floor/shiva{ - dir = 6; - icon_state = "yellow" - }, -/area/shiva/interior/garage) "hgI" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/auto_turf/snow/layer2, @@ -14767,10 +14753,6 @@ icon_state = "floor3" }, /area/shiva/exterior/lz2_fortress) -"jTR" = ( -/obj/structure/machinery/power/reactor/colony, -/turf/open/floor/plating, -/area/shiva/interior/colony/medseceng) "jTT" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 6 @@ -18191,6 +18173,10 @@ }, /turf/open/auto_turf/snow/layer3, /area/shiva/interior/colony/medseceng) +"npM" = ( +/obj/structure/machinery/power/reactor/colony, +/turf/open/floor/plating, +/area/shiva/interior/colony/medseceng) "npY" = ( /obj/structure/inflatable, /turf/open/auto_turf/snow/layer3, @@ -18446,6 +18432,13 @@ /obj/structure/machinery/space_heater, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/warehouse/caves) +"nED" = ( +/obj/structure/machinery/power/reactor/colony, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellowfull" + }, +/area/shiva/interior/lz2_habs) "nEH" = ( /obj/effect/landmark/monkey_spawn, /obj/effect/decal/warning_stripes{ @@ -18544,6 +18537,12 @@ }, /turf/open/floor/wood, /area/shiva/interior/bar) +"nJu" = ( +/obj/structure/machinery/fuelcell_recycler/full, +/turf/open/floor/shiva{ + icon_state = "yellow" + }, +/area/shiva/interior/garage) "nKc" = ( /obj/structure/machinery/door/airlock/almayer/medical/colony{ dir = 1; @@ -19331,6 +19330,13 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) +"oDJ" = ( +/obj/structure/machinery/fuelcell_recycler/full, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "yellow" + }, +/area/shiva/interior/garage) "oDM" = ( /turf/open/floor/shiva{ dir = 10; @@ -27212,12 +27218,6 @@ }, /turf/open/floor/plating, /area/shiva/interior/colony/research_hab) -"wZO" = ( -/obj/structure/machinery/fuelcell_recycler/full, -/turf/open/floor/shiva{ - icon_state = "yellow" - }, -/area/shiva/interior/garage) "wZW" = ( /obj/structure/bed, /turf/open/floor/wood, @@ -27285,6 +27285,12 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/shiva/interior/colony/botany) +"xdk" = ( +/obj/structure/machinery/power/reactor/colony, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/garage) "xdT" = ( /obj/structure/surface/table, /obj/effect/spawner/random/toolbox, @@ -37097,7 +37103,7 @@ puZ puZ puZ anc -fWJ +nED mCn uRi xQJ @@ -37421,7 +37427,7 @@ puZ puZ puZ anc -fWJ +nED mCn cce xQJ @@ -37745,7 +37751,7 @@ puZ puZ puZ anc -fWJ +nED mCn cce xQJ @@ -43668,7 +43674,7 @@ tHd tHd jMf tHd -jMf +ffg tHd jMf ofw @@ -53212,7 +53218,7 @@ ver ver ver fEO -hat +bws ktd bFg bIV @@ -53374,7 +53380,7 @@ ver ver ver ver -fNR +ffo ktd cZk bIV @@ -54184,7 +54190,7 @@ aAh ver ver ver -wZO +nJu ktd cZk bFg @@ -54346,7 +54352,7 @@ ver ver ver pNf -hgk +oDJ ktd gJo lTc @@ -54987,11 +54993,11 @@ oQl oQl oQl ktd -bIP +xdk tXd aAh pSD -bIP +xdk ktd oQl oQl @@ -55149,11 +55155,11 @@ oQl oQl oQl ktd -bIP +xdk ush vUL aCA -bIP +xdk ktd oQl oQl @@ -55312,9 +55318,9 @@ oQl oQl ktd ktd -bIP -bIP -bIP +xdk +xdk +xdk ktd ktd oQl @@ -58331,16 +58337,16 @@ acT qDT eAZ acT -jTR +npM cso agh -jTR -jTR -jTR -jTR +npM +npM +npM +npM agh cso -jTR +npM acT aii agh @@ -58493,7 +58499,7 @@ aDn eAZ eAZ aDn -jTR +npM cso agh cso @@ -58502,7 +58508,7 @@ cso cso agh cso -jTR +npM acT acT aii @@ -58658,10 +58664,10 @@ aek eXL cso agh -jTR -jTR -jTR -jTR +npM +npM +npM +npM agh cso qdd diff --git a/maps/map_files/Ice_Colony_v3/sprinkles/30.labs-elevator_alternate.dmm b/maps/map_files/Ice_Colony_v3/sprinkles/unused/30.labs-elevator_alternate.dmm similarity index 100% rename from maps/map_files/Ice_Colony_v3/sprinkles/30.labs-elevator_alternate.dmm rename to maps/map_files/Ice_Colony_v3/sprinkles/unused/30.labs-elevator_alternate.dmm diff --git a/maps/map_files/Ice_Colony_v3/sprinkles/35.south-spidercave_cleared.dmm b/maps/map_files/Ice_Colony_v3/sprinkles/unused/35.south-spidercave_cleared.dmm similarity index 100% rename from maps/map_files/Ice_Colony_v3/sprinkles/35.south-spidercave_cleared.dmm rename to maps/map_files/Ice_Colony_v3/sprinkles/unused/35.south-spidercave_cleared.dmm diff --git a/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm b/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm new file mode 100644 index 000000000000..15ec0c4e099d --- /dev/null +++ b/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm @@ -0,0 +1,2547 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ai" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/junkyard/cp_bar) +"aq" = ( +/obj/structure/window_frame/colony/reinforced, +/obj/item/stack/rods, +/turf/open/floor/plating, +/area/shiva/interior/colony/s_admin) +"aH" = ( +/obj/item/tool/pen/blue{ + pixel_x = 5 + }, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib6" + }, +/turf/open/floor/wood, +/area/shiva/interior/colony/s_admin) +"ba" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, +/obj/effect/landmark/crap_item, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"bi" = ( +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_x = -5; + pixel_y = 12 + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"bI" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"ce" = ( +/turf/closed/wall/shiva/prefabricated/reinforced, +/area/shiva/interior/colony/s_admin) +"ch" = ( +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 11; + pixel_y = 20 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/bar) +"cv" = ( +/obj/structure/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"cL" = ( +/obj/item/prop/colony/folded_bedroll, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"cO" = ( +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/s_admin) +"cS" = ( +/turf/closed/wall/shiva/prefabricated/reinforced, +/area/shiva/interior/bar) +"cY" = ( +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/item/shard{ + icon_state = "large" + }, +/obj/item/frame/table/reinforced, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"dg" = ( +/obj/structure/barricade/metal{ + dir = 1; + health = 210 + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"do" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"dv" = ( +/obj/item/ammo_magazine/rifle/m16, +/obj/structure/closet/secure_closet/guncabinet/wy, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "redfull" + }, +/area/shiva/interior/colony/s_admin) +"dF" = ( +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"eO" = ( +/obj/structure/barricade/wooden{ + dir = 1 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/s_admin) +"eZ" = ( +/turf/open/floor/shiva{ + dir = 8; + icon_state = "redfull" + }, +/area/shiva/interior/colony/s_admin) +"ff" = ( +/obj/structure/barricade/wooden{ + dir = 4; + pixel_y = 4 + }, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor/wood, +/area/shiva/interior/colony/s_admin) +"fj" = ( +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"fx" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/obj/effect/landmark/corpsespawner/doctor, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/shiva/interior/bar) +"fM" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + name = "\improper Panic Room Shutters"; + id = "south_panicroom" + }, +/turf/open/floor/shiva, +/area/shiva/interior/colony/s_admin) +"fR" = ( +/turf/open/floor/wood, +/area/shiva/interior/colony/s_admin) +"fT" = ( +/obj/effect/decal/cleanable/vomit, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "green" + }, +/area/shiva/interior/colony/botany) +"gf" = ( +/obj/structure/closet/crate/freezer, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"gh" = ( +/obj/structure/noticeboard{ + pixel_y = 32 + }, +/obj/item/ammo_magazine/rifle/extended{ + current_rounds = 0 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"gk" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/shiva/interior/colony/s_admin) +"gn" = ( +/obj/structure/machinery/computer/cameras/wooden_tv{ + pixel_y = 7 + }, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"gB" = ( +/obj/structure/surface/table, +/obj/item/weapon/gun/rifle/m16, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"gL" = ( +/obj/structure/bed/bedroll, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"gO" = ( +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/machinery/computer/communications{ + dir = 4 + }, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"gR" = ( +/obj/item/stack/rods, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"hN" = ( +/obj/item/ammo_casing, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/s_admin) +"iF" = ( +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"iS" = ( +/obj/structure/filingcabinet, +/obj/item/paper/research_notes, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"iZ" = ( +/obj/item/weapon/gun/rifle/m16, +/obj/structure/closet/secure_closet/guncabinet/wy, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "redfull" + }, +/area/shiva/interior/colony/s_admin) +"js" = ( +/obj/item/stack/rods, +/turf/open/floor/shiva{ + dir = 10; + icon_state = "green" + }, +/area/shiva/interior/colony/botany) +"jE" = ( +/obj/effect/acid_hole{ + dir = 4 + }, +/turf/closed/wall/shiva/prefabricated, +/area/shiva/interior/colony/s_admin) +"jK" = ( +/obj/structure/flora/bush/snow{ + icon_state = "snowgrassall_1" + }, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/junkyard) +"jL" = ( +/obj/structure/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, +/turf/open/floor/wood, +/area/shiva/interior/colony/s_admin) +"jP" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/head/soft/sec/corp{ + pixel_y = 10 + }, +/obj/item/tool/stamp/hos, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"ky" = ( +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_x = 10; + pixel_y = 16 + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"kB" = ( +/obj/structure/bed/bedroll, +/obj/effect/landmark/survivor_spawner/shivas_panic_room_doc, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"kP" = ( +/obj/structure/surface/table/woodentable{ + dir = 1; + flipped = 1 + }, +/obj/structure/machinery/computer/objective, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"kT" = ( +/obj/item/stack/folding_barricade, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"lb" = ( +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"lq" = ( +/obj/item/ammo_magazine/rifle{ + current_rounds = 0 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"lP" = ( +/obj/effect/landmark/corpsespawner/wygoon, +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"lQ" = ( +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/window/reinforced/tinted{ + dir = 1 + }, +/obj/item/paper_bin, +/obj/item/tool/pen/blue, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"mC" = ( +/obj/structure/machinery/power/apc{ + dir = 8; + start_charge = 0 + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"mI" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"ne" = ( +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/junkyard/cp_bar) +"ng" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno/limb, +/turf/open/floor/plating, +/area/shiva/interior/colony/s_admin) +"nh" = ( +/obj/structure/window/framed/shiva, +/turf/open/floor/plating, +/area/shiva/interior/colony/s_admin) +"ns" = ( +/obj/structure/surface/table, +/obj/item/weapon/gun/rifle/ar10, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"ob" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/cans/ale{ + pixel_x = -7; + pixel_y = 3 + }, +/obj/item/reagent_container/food/drinks/cans/ale{ + pixel_y = 10 + }, +/obj/item/reagent_container/food/drinks/cans/ale{ + pixel_x = 7; + pixel_y = 4 + }, +/obj/item/reagent_container/food/drinks/cans/ale, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"of" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + name = "\improper Panic Room Shutters"; + id = "north_panicroom" + }, +/turf/open/floor/plating, +/area/shiva/interior/colony/s_admin) +"ov" = ( +/obj/item/trash/buritto, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"oH" = ( +/obj/structure/machinery/light/double, +/turf/open/floor/shiva{ + icon_state = "green" + }, +/area/shiva/interior/colony/botany) +"oT" = ( +/obj/item/shard{ + icon_state = "large" + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"oY" = ( +/obj/structure/closet/crate/secure/weyland, +/obj/effect/landmark/objective_landmark/science, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"pz" = ( +/obj/item/weapon/gun/boltaction, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "redfull" + }, +/area/shiva/interior/colony/s_admin) +"pC" = ( +/obj/structure/machinery/disposal, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"pG" = ( +/obj/structure/filingcabinet, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"pQ" = ( +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/junkyard) +"pS" = ( +/obj/structure/filingcabinet, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"pV" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/shiva/interior/colony/s_admin) +"qT" = ( +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"qU" = ( +/obj/effect/landmark/corpsespawner/scientist, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"rB" = ( +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/structure/window/reinforced/tinted, +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin, +/obj/item/tool/pen/blue, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"rM" = ( +/obj/structure/barricade/wooden{ + dir = 1 + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"rQ" = ( +/obj/item/ammo_magazine/rifle/boltaction, +/obj/effect/landmark/survivor_spawner/shivas_panic_room_civ, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"sq" = ( +/obj/structure/machinery/faxmachine, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"sy" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xgibdown1" + }, +/obj/structure/machinery/light/double, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"sZ" = ( +/obj/structure/machinery/vending/coffee, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/s_admin) +"ti" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/shiva/interior/colony/s_admin) +"tk" = ( +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/structure/window/reinforced/tinted{ + dir = 1 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/clipboard, +/obj/item/tool/stamp, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"tl" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/obj/effect/landmark/survivor_spawner/shivas_panic_room_doc, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"tu" = ( +/obj/structure/machinery/light/double{ + dir = 8; + pixel_y = -5 + }, +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"tD" = ( +/obj/effect/decal/cleanable/vomit{ + icon_state = "vomit_2" + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = 9; + pixel_y = 17 + }, +/obj/effect/landmark/corpsespawner/chef, +/obj/structure/bed/bedroll, +/obj/item/bedsheet/ce, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"tG" = ( +/obj/structure/janitorialcart, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "green" + }, +/area/shiva/interior/colony/botany) +"tW" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, +/turf/open/floor/plating, +/area/shiva/interior/colony/s_admin) +"tY" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"ug" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "3" + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/s_admin) +"uh" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/item/ammo_casing, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"ul" = ( +/obj/item/ammo_magazine/rifle/boltaction, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"uA" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/item/ammo_magazine/pistol/holdout{ + pixel_x = 3; + pixel_y = 2 + }, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/shiva/interior/bar) +"uE" = ( +/obj/structure/machinery/door_control{ + id = "north_panicroom"; + pixel_y = 30 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"uJ" = ( +/obj/item/stack/rods, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"uM" = ( +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/window/reinforced/tinted, +/obj/structure/surface/table/reinforced/prison, +/obj/item/clipboard, +/obj/item/tool/stamp, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"uP" = ( +/obj/structure/machinery/light/double{ + dir = 4; + pixel_y = -5 + }, +/obj/structure/machinery/vending/coffee, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"uR" = ( +/obj/structure/machinery/light/double{ + dir = 8; + pixel_y = -5 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"vn" = ( +/obj/effect/decal/remains/xeno, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"vq" = ( +/obj/structure/filingcabinet, +/obj/item/paper/research_notes, +/obj/structure/machinery/light/double{ + dir = 8; + pixel_y = -5 + }, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"vs" = ( +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/s_admin) +"vL" = ( +/obj/item/reagent_container/glass/bucket/mopbucket{ + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "green" + }, +/area/shiva/interior/colony/botany) +"wH" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/shiva/interior/colony/s_admin) +"wM" = ( +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_y = 5 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"wO" = ( +/obj/item/clipboard, +/obj/item/tool/pen/blue, +/obj/item/stack/sheet/metal, +/obj/item/shard{ + icon_state = "large" + }, +/obj/item/shard{ + icon_state = "large" + }, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"wW" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/s_admin) +"wX" = ( +/turf/open/floor/shiva{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/s_admin) +"wY" = ( +/obj/structure/machinery/power/apc{ + dir = 1; + start_charge = 0 + }, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/junkyard/cp_bar) +"xa" = ( +/obj/item/shard{ + icon_state = "large" + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"xg" = ( +/obj/structure/bed/chair/office/light{ + dir = 4 + }, +/turf/open/floor/wood, +/area/shiva/interior/colony/s_admin) +"xD" = ( +/obj/structure/bed/chair/comfy/orange{ + dir = 1 + }, +/obj/item/paper_bin, +/obj/structure/machinery/light/double, +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"xZ" = ( +/obj/item/storage/belt/marine, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"yd" = ( +/obj/item/weapon/gun/rifle/ar10, +/obj/item/ammo_magazine/rifle/ar10, +/obj/structure/closet/secure_closet/guncabinet/wy, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "redfull" + }, +/area/shiva/interior/colony/s_admin) +"ye" = ( +/obj/structure/bed/chair/office/light{ + dir = 1 + }, +/obj/effect/landmark/survivor_spawner/shivas_panic_room_cl, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"yi" = ( +/obj/item/trash/wy_chips_pepper, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"yo" = ( +/obj/structure/machinery/disposal, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"yq" = ( +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/obj/effect/decal/remains/human, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"yz" = ( +/obj/structure/flora/bush/snow{ + icon_state = "snowgrassall_3" + }, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/junkyard) +"yQ" = ( +/obj/effect/landmark/survivor_spawner/shivas_panic_room_sci, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"yS" = ( +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/item/weapon/gun/boltaction, +/obj/structure/closet/secure_closet/guncabinet/wy, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "redfull" + }, +/area/shiva/interior/colony/s_admin) +"zc" = ( +/obj/structure/machinery/vending/snack, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"zi" = ( +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin, +/obj/item/tool/pen/blue, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"zp" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"zu" = ( +/obj/structure/machinery/light/double, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "green" + }, +/area/shiva/interior/colony/botany) +"zw" = ( +/obj/item/ammo_casing, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"zA" = ( +/obj/structure/window_frame/colony/reinforced, +/turf/open/floor/plating, +/area/shiva/interior/colony/s_admin) +"Ad" = ( +/obj/structure/bed/chair/office/light{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"Av" = ( +/obj/structure/machinery/light/double{ + dir = 8; + pixel_y = -5 + }, +/obj/structure/closet/secure_closet/guncabinet/wy, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "redfull" + }, +/area/shiva/interior/colony/s_admin) +"AC" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"AY" = ( +/obj/structure/flora/pottedplant, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"AZ" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/shiva/interior/colony/s_admin) +"Bg" = ( +/obj/structure/machinery/light_construct{ + dir = 1 + }, +/obj/item/light_bulb/tube/prison, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Bq" = ( +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/structure/machinery/computer/cameras{ + dir = 8 + }, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"Bv" = ( +/obj/structure/machinery/door_control{ + id = "south_panicroom"; + pixel_x = 30 + }, +/obj/structure/surface/table, +/obj/item/ammo_magazine/shotgun/slugs, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"BD" = ( +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -11; + pixel_y = 20 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/bar) +"BQ" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib6" + }, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/shiva/interior/bar) +"BU" = ( +/obj/effect/landmark/survivor_spawner/shivas_panic_room_civ, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Cc" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/shiva/interior/colony/s_admin) +"Cd" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/good_item, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Cu" = ( +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/window/reinforced/tinted, +/obj/structure/surface/table/reinforced/prison, +/obj/item/clipboard, +/obj/item/tool/stamp, +/obj/effect/landmark/crap_item, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"Cx" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"CZ" = ( +/obj/item/ammo_casing, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Dg" = ( +/obj/effect/decal/cleanable/vomit, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = -3; + pixel_y = 6 + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Dl" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Dx" = ( +/obj/structure/machinery/light/double, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"DB" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/s_admin) +"DU" = ( +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"DW" = ( +/obj/structure/machinery/vending/cigarette/colony, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"DY" = ( +/obj/item/trash/burger, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"EX" = ( +/obj/structure/machinery/light/double{ + dir = 1; + pixel_y = 9 + }, +/obj/item/shard{ + icon_state = "large" + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"Fa" = ( +/obj/effect/spawner/gibspawner/human, +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/shiva/interior/colony/s_admin) +"Fc" = ( +/obj/structure/surface/table, +/obj/item/ammo_magazine/rifle/ar10, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"Ff" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/shiva/interior/colony/s_admin) +"Fg" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/junkyard/cp_bar) +"Fn" = ( +/turf/open/floor/shiva{ + icon_state = "radiator_tile" + }, +/area/shiva/interior/bar) +"Fp" = ( +/obj/structure/bed/chair/office/dark, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Fx" = ( +/obj/structure/surface/table, +/obj/structure/prop/ice_colony/hula_girl, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"FH" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/item/stack/rods, +/turf/open/floor/wood, +/area/shiva/interior/colony/s_admin) +"FK" = ( +/obj/structure/machinery/photocopier, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"FY" = ( +/turf/template_noop, +/area/template_noop) +"GC" = ( +/turf/closed/wall/shiva/prefabricated, +/area/shiva/interior/colony/s_admin) +"GJ" = ( +/obj/structure/surface/table, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"GQ" = ( +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgibhead" + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"He" = ( +/obj/item/stool, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Hf" = ( +/obj/structure/closet/secure_closet/security, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"Hp" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/s_admin) +"Hx" = ( +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"HA" = ( +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/machinery/computer/station_alert{ + dir = 4 + }, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"Ik" = ( +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/junkyard) +"Iy" = ( +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/obj/effect/landmark/corpsespawner/wysec, +/turf/open/floor/wood, +/area/shiva/interior/colony/s_admin) +"IB" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib6" + }, +/turf/open/floor/wood, +/area/shiva/interior/colony/s_admin) +"IQ" = ( +/obj/structure/machinery/vending/cigarette/colony, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"Jp" = ( +/obj/item/ammo_magazine/rifle/extended{ + current_rounds = 0 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"Jv" = ( +/obj/structure/machinery/light/double{ + dir = 4; + pixel_y = -5 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"Jx" = ( +/turf/open/floor/shiva{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/botany) +"JF" = ( +/obj/structure/machinery/blackbox_recorder, +/obj/item/prop/almayer/flight_recorder/colony{ + pixel_x = -6; + pixel_y = 10 + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"JQ" = ( +/obj/item/ammo_magazine/rifle/boltaction, +/obj/structure/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, +/obj/structure/closet/secure_closet/guncabinet/wy, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "redfull" + }, +/area/shiva/interior/colony/s_admin) +"Kb" = ( +/obj/structure/machinery/light/double, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/botany) +"Ko" = ( +/obj/structure/bed/chair, +/obj/item/ammo_casing, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Kp" = ( +/obj/structure/machinery/computer/cameras{ + dir = 8 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/shard{ + icon_state = "large" + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"KO" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/junkyard/cp_bar) +"KR" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"Ld" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/shiva{ + icon_state = "green" + }, +/area/shiva/interior/colony/botany) +"Lh" = ( +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Lk" = ( +/obj/structure/largecrate/random/case, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/junkyard/cp_bar) +"Lr" = ( +/obj/structure/prop/ice_colony/tiger_rug{ + icon_state = "White" + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Lu" = ( +/obj/structure/machinery/vending/cigarette/colony, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/s_admin) +"LE" = ( +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/shiva/interior/bar) +"LF" = ( +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"LU" = ( +/turf/open/floor/shiva{ + icon_state = "snow_mat" + }, +/area/shiva/interior/colony/botany) +"Mi" = ( +/obj/structure/surface/table, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"MG" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + name = "\improper Panic Room Shutters"; + id = "south_panicroom" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"ML" = ( +/obj/item/stack/sheet/wood, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/shiva/interior/colony/s_admin) +"MR" = ( +/obj/structure/safe, +/obj/item/spacecash/c1000{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c500, +/obj/effect/landmark/good_item, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "redfull" + }, +/area/shiva/interior/colony/s_admin) +"Nq" = ( +/turf/open/floor/shiva{ + icon_state = "green" + }, +/area/shiva/interior/colony/botany) +"Nt" = ( +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib6" + }, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/s_admin) +"Nu" = ( +/obj/effect/landmark/survivor_spawner/shivas_panic_room_doc, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"NC" = ( +/obj/item/lightstick/variant/planted, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/junkyard) +"On" = ( +/obj/item/stack/rods, +/obj/structure/window_frame/colony/reinforced, +/turf/open/floor/plating, +/area/shiva/interior/colony/s_admin) +"ON" = ( +/obj/item/lightstick/red/variant/planted, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/junkyard/cp_bar) +"OV" = ( +/obj/structure/machinery/light/double{ + dir = 4; + pixel_y = -5 + }, +/turf/open/floor/wood, +/area/shiva/interior/colony/s_admin) +"Pb" = ( +/obj/structure/filingcabinet, +/obj/item/paper/research_notes, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"Py" = ( +/obj/item/trash/kepler, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"PG" = ( +/turf/open/floor/shiva{ + dir = 4; + icon_state = "snow_mat" + }, +/area/shiva/interior/colony/botany) +"PI" = ( +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/clipboard, +/obj/item/tool/stamp, +/obj/effect/landmark/crap_item, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"PV" = ( +/obj/structure/bed/bedroll, +/obj/effect/landmark/survivor_spawner/shivas_panic_room_sci, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Qh" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/shiva/interior/bar) +"QS" = ( +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/junkyard) +"Rs" = ( +/obj/structure/surface/table, +/obj/item/tool/pen/blue{ + pixel_x = -6 + }, +/obj/item/paper_bin{ + pixel_y = 7 + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Ru" = ( +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"Ry" = ( +/obj/item/tool/mop{ + pixel_x = -10 + }, +/turf/open/floor/shiva{ + icon_state = "green" + }, +/area/shiva/interior/colony/botany) +"RD" = ( +/obj/structure/bed/chair/wood/normal, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"RH" = ( +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/obj/structure/window/reinforced/tinted{ + dir = 1 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin, +/obj/item/tool/pen/blue, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"RP" = ( +/turf/open/floor/shiva{ + dir = 10; + icon_state = "green" + }, +/area/shiva/interior/colony/botany) +"RQ" = ( +/obj/structure/machinery/vending/snack, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"RS" = ( +/obj/structure/bed/chair/office/light{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"Se" = ( +/obj/effect/decal/cleanable/vomit{ + icon_state = "vomit_4" + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = 5; + pixel_y = 10 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"Sl" = ( +/obj/structure/machinery/disposal/broken, +/turf/open/floor/plating, +/area/shiva/interior/colony/s_admin) +"Sq" = ( +/obj/item/tool/wet_sign, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "green" + }, +/area/shiva/interior/colony/botany) +"SB" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating, +/area/shiva/interior/colony/s_admin) +"SU" = ( +/obj/item/device/flashlight/lamp{ + pixel_y = 7 + }, +/obj/item/frame/table/wood, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib6" + }, +/turf/open/floor/wood, +/area/shiva/interior/colony/s_admin) +"Tc" = ( +/obj/item/frame/table/reinforced, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Td" = ( +/obj/item/reagent_container/food/drinks/cans/waterbottle, +/obj/item/ammo_casing, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"Tj" = ( +/obj/structure/machinery/disposal/broken, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Tr" = ( +/obj/structure/machinery/computer/station_alert{ + dir = 4 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"TG" = ( +/obj/item/prop/colony/folded_bedroll, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "redfull" + }, +/area/shiva/interior/colony/s_admin) +"TI" = ( +/obj/item/ammo_casing, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/s_admin) +"TL" = ( +/obj/item/weapon/gun/energy/taser, +/obj/structure/machinery/light/double{ + dir = 8; + pixel_y = -5 + }, +/turf/open/floor/wood, +/area/shiva/interior/colony/s_admin) +"Ub" = ( +/obj/item/trash/kepler/flamehot, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"Ue" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/item/ammo_casing, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/shiva/interior/bar) +"UD" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ + name = "\improper Colony Administration"; + locked = 1 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"UW" = ( +/obj/structure/machinery/light/double, +/turf/open/floor/shiva{ + dir = 10; + icon_state = "green" + }, +/area/shiva/interior/colony/botany) +"Vb" = ( +/obj/item/bodybag, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Vi" = ( +/obj/structure/window_frame/colony/reinforced, +/obj/item/shard, +/turf/open/floor/plating, +/area/shiva/interior/colony/s_admin) +"Vl" = ( +/obj/effect/acid_hole, +/turf/closed/wall/shiva/prefabricated, +/area/shiva/interior/colony/s_admin) +"Vy" = ( +/obj/structure/surface/table, +/obj/item/storage/toolbox/emergency, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"VC" = ( +/obj/structure/machinery/light/double{ + dir = 4; + pixel_y = -5 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/crap_item, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"VE" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/colony{ + name = "\improper Colony Security Checkpoint" + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"VX" = ( +/obj/structure/closet/secure_closet/personal, +/obj/effect/landmark/objective_landmark/medium, +/obj/effect/landmark/good_item, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"Wj" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Wm" = ( +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/junkyard/cp_bar) +"WA" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/shiva/interior/bar) +"WT" = ( +/obj/item/frame/table/wood, +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/shiva/interior/colony/s_admin) +"Xt" = ( +/obj/structure/flora/pottedplant, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) +"Xu" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/shiva/interior/colony/s_admin) +"XP" = ( +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/structure/window/reinforced/tinted, +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin, +/obj/item/tool/pen/blue, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"YD" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras{ + dir = 1 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"YS" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/colony/s_admin) +"YT" = ( +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/structure/machinery/computer/atmos_alert{ + dir = 8 + }, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/colony/s_admin) +"Zi" = ( +/obj/item/weapon/gun/pistol/holdout, +/obj/item/ammo_magazine/pistol/holdout, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/shiva/interior/bar) +"Zl" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/shiva/interior/colony/s_admin) +"ZD" = ( +/obj/item/ammo_magazine/rifle/m16, +/turf/open/floor/shiva{ + icon_state = "bluefull" + }, +/area/shiva/interior/colony/s_admin) + +(1,1,1) = {" +PG +ce +FY +FY +FY +FY +FY +FY +FY +FY +FY +FY +ce +ce +ce +ce +ce +ce +pQ +pQ +Ik +FY +FY +"} +(2,1,1) = {" +PG +ce +FY +FY +FY +FY +FY +FY +FY +FY +FY +ce +ce +JQ +yS +Av +yd +ce +QS +NC +QS +FY +FY +"} +(3,1,1) = {" +Kb +ce +FY +FY +FY +FY +FY +FY +FY +FY +FY +ce +MR +wM +fj +rQ +iZ +ce +Ik +jK +pQ +FY +FY +"} +(4,1,1) = {" +RP +ce +ce +ce +ce +ce +ce +ce +ce +ce +ce +ce +ce +fj +xZ +fj +dv +ce +yz +Ik +Ik +FY +FY +"} +(5,1,1) = {" +RP +GC +iS +pG +tu +ba +Cd +mC +dF +dF +qT +JF +ce +pz +TG +eZ +ce +ce +ce +ce +Ik +FY +FY +"} +(6,1,1) = {" +RP +Vl +dF +Hx +Ad +Hx +dF +CZ +Hx +Ad +zw +dF +ce +Nu +Ub +xZ +Pb +vq +pS +ce +QS +FY +FY +"} +(7,1,1) = {" +Ld +nh +rM +tk +YT +zi +xa +dF +tk +Kp +rB +qU +ce +ul +dF +dF +ov +yQ +kB +ce +Ik +FY +FY +"} +(8,1,1) = {" +RP +Vi +CZ +lQ +gO +uM +dF +dF +RH +Tr +PI +Dx +ce +uE +CZ +tl +Dl +dF +iF +ce +NC +FY +FY +"} +(9,1,1) = {" +UW +GC +mI +Hx +RS +Hx +CZ +dF +Hx +RS +Jp +dF +of +Td +RD +Rs +sq +ye +fj +ce +QS +FY +FY +"} +(10,1,1) = {" +js +zA +do +Hx +Hx +lP +dF +Lr +Hx +Hx +Hx +yq +of +Vy +Fp +Tj +Fx +tY +oY +ce +QS +FY +FY +"} +(11,1,1) = {" +Nq +tW +dg +uh +lq +Hx +dF +dF +Hx +Hx +Hx +CZ +of +ns +PV +He +Wj +dF +gf +ce +QS +FY +FY +"} +(12,1,1) = {" +oH +GC +Bg +oT +Cx +Hx +dF +CZ +LF +Ad +Hx +dF +of +Fc +CZ +DY +dF +BU +ce +ce +cS +ch +Fn +"} +(13,1,1) = {" +Nq +aq +rM +tk +Bq +XP +dF +dF +tk +Bq +XP +sy +ce +YS +dF +dF +cL +bi +Mi +MG +Qh +LE +LE +"} +(14,1,1) = {" +Nq +SB +FK +RH +HA +Cu +dF +dF +cY +HA +Cu +dF +ce +yi +BU +dF +dF +Ko +gB +fM +Ue +Zi +LE +"} +(15,1,1) = {" +Sq +GC +dF +Hx +RS +Hx +CZ +dF +zw +RS +Hx +dF +ce +fj +Vb +ky +CZ +ZD +GJ +fM +fx +BQ +BQ +"} +(16,1,1) = {" +vL +GC +dF +Tc +VC +dF +Lh +dF +gR +dF +vn +Xt +ce +Se +Dg +dF +yQ +CZ +Py +fM +uA +LE +LE +"} +(17,1,1) = {" +fT +ce +GC +GC +GC +jE +GC +ce +oT +cO +cO +uh +ce +tD +RQ +uP +IQ +gL +Bv +MG +WA +LE +LE +"} +(18,1,1) = {" +Ry +GC +DU +jL +TL +fR +ob +GC +AY +vs +vs +AY +ce +GC +GC +GC +GC +ce +ce +ce +cS +BD +Fn +"} +(19,1,1) = {" +tG +GC +gn +fR +fR +Iy +jP +GC +Ru +Hp +cO +Hx +GC +VX +cv +kP +lb +GC +ai +Wm +FY +FY +FY +"} +(20,1,1) = {" +Sq +GC +Hf +ff +OV +xg +YD +GC +gh +cO +cO +Hx +FH +IB +aH +SU +xD +GC +ne +Wm +FY +FY +FY +"} +(21,1,1) = {" +zu +ce +ce +VE +ce +wO +bI +ce +EX +cO +hN +Hx +GC +pC +fj +kT +fj +GC +KO +ON +FY +FY +FY +"} +(22,1,1) = {" +Jx +On +KR +GQ +uR +Hx +Hx +On +Cx +Nt +cO +AC +ce +GC +GC +AZ +GC +ce +Fg +Wm +FY +FY +FY +"} +(23,1,1) = {" +PG +UD +Lu +wX +TI +wX +ug +UD +eO +wW +vs +Hx +GC +Ff +wH +AZ +WT +GC +Lk +Wm +FY +FY +FY +"} +(24,1,1) = {" +LU +Hx +eO +wX +DB +wX +wX +Hx +sZ +vs +vs +zw +Zl +ML +AZ +ti +wH +pV +ne +Wm +FY +FY +FY +"} +(25,1,1) = {" +PG +nh +zc +zw +Hx +Hx +Hx +nh +DW +Hx +Hx +uJ +gk +ng +wH +Cc +Fa +GC +ne +ON +FY +FY +FY +"} +(26,1,1) = {" +PG +GC +Hx +Hx +Jv +Hx +AY +GC +yo +Hx +Jv +zp +GC +Sl +Xu +wH +AZ +GC +wY +Wm +FY +FY +FY +"} +(27,1,1) = {" +PG +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +ce +ce +ce +ce +GC +GC +ce +ne +Wm +FY +FY +FY +"} diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index 2fe5f7b45337..b63b0895a23b 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -417,20 +417,6 @@ dir = 4 }, /area/kutjevo/interior/complex/med) -"azI" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/barricade/handrail/kutjevo{ - layer = 3.1 - }, -/obj/structure/barricade/handrail/kutjevo{ - dir = 4 - }, -/turf/open/floor/kutjevo/multi_tiles{ - dir = 1 - }, -/area/kutjevo/interior/colony_South/power2) "azO" = ( /turf/open/desert/desert_shore/desert_shore1{ dir = 8 @@ -606,15 +592,6 @@ }, /turf/closed/wall/kutjevo/colony, /area/kutjevo/interior/construction) -"aNj" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/interior/colony_South/power2) "aNn" = ( /turf/open/auto_turf/sand/layer2, /area/kutjevo/interior/power/comms) @@ -1999,8 +1976,8 @@ "cKY" = ( /obj/structure/prop/brazier/frame/full/campfire, /obj/item/tool/match/paper{ - pixel_y = -2; - pixel_x = -11 + pixel_x = -11; + pixel_y = -2 }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/spring) @@ -3643,12 +3620,12 @@ /area/kutjevo/interior/construction) "eCE" = ( /obj/item/clipboard{ - pixel_y = 4; - pixel_x = -4 + pixel_x = -4; + pixel_y = 4 }, /obj/item/tool/pen{ - name = "stained pen"; desc = "It's a seemingly normal pen... aside from the faint red fingerprints on the side..."; + name = "stained pen"; pixel_x = 2; pixel_y = 10 }, @@ -4527,12 +4504,6 @@ /obj/effect/landmark/corpsespawner/security/marshal, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/construction) -"fMi" = ( -/obj/structure/stairs/perspective/kutjevo{ - icon_state = "p_stair_full" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/colony_South/power2) "fMB" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 5 @@ -4549,7 +4520,7 @@ /area/kutjevo/exterior/runoff_river) "fNe" = ( /obj/effect/landmark/nightmare{ - insert_tag = "cleaningprog" + insert_tag = "cleaningprog_botany" }, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany) @@ -4695,14 +4666,6 @@ /obj/structure/largecrate/random/secure, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/construction) -"fVA" = ( -/obj/structure/barricade/handrail/kutjevo{ - layer = 3.1 - }, -/turf/open/floor/kutjevo/multi_tiles{ - dir = 8 - }, -/area/kutjevo/interior/colony_South/power2) "fWl" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/kutjevo/grey/plate, @@ -5624,6 +5587,9 @@ /obj/structure/machinery/bioprinter{ stored_metal = 1000 }, +/obj/item/clothing/glasses/thermal/syndi{ + icon_state = "kutjevo_goggles" + }, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/operating) "hnZ" = ( @@ -5920,9 +5886,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_South) -"hGM" = ( -/turf/closed/wall/kutjevo/colony/reinforced/hull, -/area/kutjevo/exterior/runoff_bridge) "hGP" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/kutjevo/plate, @@ -6165,9 +6128,6 @@ /area/kutjevo/exterior/lz_dunes) "idX" = ( /obj/structure/closet/firecloset/full, -/obj/item/clothing/glasses/thermal/syndi{ - icon_state = "kutjevo_goggles" - }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/complex/med/locks) @@ -6741,8 +6701,8 @@ /area/kutjevo/exterior/complex_border/med_rec) "jac" = ( /obj/item/device/radio{ - name = "damp shortwave radio"; - desc = "A regular shortwave radio, this one has experienced minor water damage but is still functional." + desc = "A regular shortwave radio, this one has experienced minor water damage but is still functional."; + name = "damp shortwave radio" }, /turf/open/desert/desert_shore/shore_corner2, /area/kutjevo/exterior/spring) @@ -8061,7 +8021,7 @@ /area/kutjevo/interior/colony_central/mine_elevator) "kPw" = ( /obj/effect/landmark/nightmare{ - insert_tag = "trappedmonke" + insert_tag = "trappedmonke_andclown" }, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/oob) @@ -9504,7 +9464,7 @@ /area/kutjevo/interior/complex/med) "mIg" = ( /obj/effect/landmark/nightmare{ - insert_tag = "plinkingspot" + insert_tag = "plinkingspot_northlz" }, /turf/closed/wall/kutjevo/rock/border, /area/kutjevo/exterior/scrubland) @@ -11148,14 +11108,6 @@ dir = 8 }, /area/kutjevo/interior/complex/med/auto_doc) -"oSx" = ( -/obj/structure/barricade/handrail/kutjevo{ - layer = 3.1 - }, -/turf/open/floor/kutjevo/multi_tiles{ - dir = 4 - }, -/area/kutjevo/interior/colony_South/power2) "oSK" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/kutjevo/tan/grey_edge, @@ -12768,15 +12720,6 @@ /obj/structure/platform/kutjevo/rock, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) -"rgh" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/interior/colony_South/power2) "rgv" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/auto_turf/sand/layer0, @@ -15262,20 +15205,6 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/oob) -"uxb" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/barricade/handrail/kutjevo{ - layer = 3.1 - }, -/obj/structure/barricade/handrail/kutjevo{ - dir = 8 - }, -/turf/open/floor/kutjevo/multi_tiles{ - dir = 10 - }, -/area/kutjevo/interior/colony_South/power2) "uxA" = ( /obj/structure/prop/dam/truck, /turf/open/asphalt/cement_sunbleached, @@ -15428,12 +15357,6 @@ /obj/structure/flora/grass/desert/lightgrass_3, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/construction) -"uHJ" = ( -/obj/structure/stairs/perspective/kutjevo{ - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/colony_South/power2) "uHP" = ( /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/auto_doc) @@ -16063,13 +15986,6 @@ /obj/structure/flora/grass/tallgrass/desert/corner, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/scrubland) -"vwB" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/colony_South/power2) "vxe" = ( /turf/open/floor/kutjevo/tan/alt_edge{ dir = 8 @@ -33461,9 +33377,9 @@ dxF dxF dxF dxF -mxB -mxB -mxB +dxF +dxF +dxF dxF dxF hkO @@ -33628,8 +33544,8 @@ jPt pKP dxF dxF -mxB -mxB +dxF +dxF mhj dxF dxF @@ -33795,7 +33711,7 @@ bjj fpO orL dxF -mxB +dxF mhj fjF gBl @@ -34001,7 +33917,7 @@ kDS wGD mNM xvn -hGM +mNM xms dRj dRj @@ -36506,8 +36422,8 @@ vDS mNM xvn dJT -hGM -hGM +mNM +mNM oeb fyD oeb @@ -36673,7 +36589,7 @@ gqQ vys dRj lok -hGM +mNM qrl nOH fyD @@ -37508,7 +37424,7 @@ kDS nOH xuY xyY -hGM +mNM juH dRj dRj @@ -37675,7 +37591,7 @@ vfd mNM xvn dJT -hGM +mNM wuy mSd dTM @@ -38507,10 +38423,10 @@ tIz tIz wtH wtH -nie -jhS -jhS -jhS +wtH +rzh +rzh +rzh jhS tGi tGi @@ -38674,10 +38590,10 @@ vHh tIz wtH wtH -nie -jhS -jhS -jhS +wtH +rzh +rzh +rzh jhS kVJ kVJ @@ -38841,9 +38757,9 @@ sAe hMu wCU wCU -btI -btI -btI +wCU +wCU +wCU btI jhS mjP @@ -39008,8 +38924,8 @@ hMu hMu wCU wCU -btI -btI +wCU +wCU btI btI sfz @@ -39996,15 +39912,15 @@ dip dip dip dip -mMf -mMf -gQr -gQr -gQr gQr gQr gQr rIL +rIL +rIL +rIL +rIL +rIL cyM rIL fWl @@ -40157,14 +40073,14 @@ szC lNG szC lNG -szC dip -gQr -gQr +dip rIL mMf -rIL -rIL +mMf +gQr +gQr +gQr rIL dnF rIL @@ -40325,11 +40241,11 @@ dip dip dip dip -dip rIL rIL -mMf rIL +mMf +mMf rIL rIL rIL @@ -40340,7 +40256,7 @@ gQr gQr iGz dnF -gQr +rIL rMp kGM nbu @@ -40490,8 +40406,14 @@ oNG rIL rIL rIL -mMf -mMf +rIL +rIL +rIL +rIL +rIL +rIL +rIL +rIL rIL rIL rIL @@ -40500,14 +40422,8 @@ gQr gQr gQr gQr -gQr -gQr -gQr -gQr -gQr -gQr -gQr -gQr +mMf +rIL hMu nbu kAW @@ -40656,11 +40572,11 @@ rIL mMf rIL mMf -jhS -kVJ -kVJ -kVJ -jhS +rIL +rIL +rIL +rIL +rIL jhS jhS jhS @@ -40819,15 +40735,15 @@ fyF sTU bDX qaI -oNG -oNG +rIL +rIL fAT dnF -jhS -gtL -rzb -vGx -jhS +rIL +rIL +rIL +rIL +mMf jhS gtL rzb @@ -40988,13 +40904,13 @@ fyF qaI oNG oNG -oNG -oNG -jhS -hws -qwg -vcY -jhS +mMf +rIL +mMf +rIL +rIL +rIL +mMf jhS hws qwg @@ -41156,12 +41072,12 @@ qaI oNG oNG oNG -oNG -jhS -cTG -fRZ -cQt -jhS +hMu +hMu +rIL +rIL +mMf +hMu jhS cTG fRZ @@ -41324,11 +41240,11 @@ rfE rdm rdm rdm -jhS -kVJ -kVJ -kVJ -jhS +hMu +rIL +rIL +mMf +hMu jhS kVJ kVJ @@ -41843,8 +41759,8 @@ vXK evr fTk fTk -oSx -eaB +fTk +qGx qGx qGx qGx @@ -42010,8 +41926,8 @@ klE klE ngK klE -azI -rgh +ngK +qGx qGx qGx qGx @@ -42177,8 +42093,8 @@ klE qGx qGx qGx -uHJ -uHJ +qGx +qGx qGx qGx eQW @@ -42344,8 +42260,8 @@ qGx duw mLw xVZ -fMi -fMi +xVZ +mLw mLw cpg fqm @@ -42511,8 +42427,8 @@ xVZ xVZ mLw qGx -vwB -vwB +qGx +qGx qGx qGx gNx @@ -42678,8 +42594,8 @@ qGx mEe slx qGx -uxb -aNj +klE +qGx qGx rHE qGx @@ -42845,8 +42761,8 @@ mBG qGx efr qGx -fVA -eaB +shX +qGx acD vSE acD diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index 954ad6e3693c..6bc30f573dd2 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -689,12 +689,13 @@ }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "arP" = ( -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -9; - pixel_y = 25 +/obj/structure/machinery/light{ + dir = 8 }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/central_streets) +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/lv522/indoors/lone_buildings/storage_blocks) "arV" = ( /obj/structure/surface/table/almayer, /obj/item/storage/belt/utility, @@ -3430,10 +3431,8 @@ }, /area/lv522/indoors/b_block/bar) "bOX" = ( -/turf/open/floor/plating{ - dir = 8; - icon_state = "platingdmg3" - }, +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/shiva/prefabricated/reinforced, /area/lv522/indoors/lone_buildings/storage_blocks) "bPH" = ( /obj/structure/prop/invuln/ice_prefab/trim{ @@ -6361,20 +6360,8 @@ }, /area/lv522/oob) "dbc" = ( -/obj/structure/fence{ - layer = 2.9 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/outdoors/colony_streets/central_streets) +/turf/closed/wall/solaris/reinforced/hull/lv522, +/area/lv522/indoors/lone_buildings/storage_blocks) "dbi" = ( /obj/item/clothing/suit/storage/marine/medium/leader, /obj/item/clothing/head/helmet/marine/leader{ @@ -9187,10 +9174,7 @@ /area/lv522/atmos/east_reactor) "egj" = ( /obj/structure/machinery/floodlight, -/turf/open/floor/plating{ - dir = 8; - icon_state = "platingdmg3" - }, +/turf/open/floor/prison, /area/lv522/indoors/lone_buildings/storage_blocks) "egt" = ( /obj/structure/powerloader_wreckage, @@ -9495,10 +9479,13 @@ }, /area/lv522/atmos/east_reactor) "emt" = ( -/obj/structure/cargo_container/grant/rightmid, +/obj/structure/barricade/handrail{ + dir = 8 + }, +/obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" + dir = 8; + icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) "emz" = ( @@ -11327,11 +11314,10 @@ /turf/closed/wall/strata_outpost/reinforced, /area/lv522/landing_zone_1/tunnel) "eYT" = ( -/obj/structure/prop/ice_colony/ground_wire{ - dir = 8 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/central_streets) +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/spiderling/nogrow, +/turf/open/floor/prison, +/area/lv522/indoors/lone_buildings/storage_blocks) "eZb" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -15434,7 +15420,16 @@ /area/lv522/indoors/c_block/casino) "gFy" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/obj/structure/machinery/camera/autoname{ + dir = 8 + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, /area/lv522/indoors/lone_buildings/storage_blocks) "gFD" = ( /obj/structure/surface/table/almayer, @@ -17131,7 +17126,7 @@ "hjE" = ( /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison, +/turf/closed/wall/shiva/prefabricated/reinforced, /area/lv522/indoors/lone_buildings/storage_blocks) "hjW" = ( /obj/structure/surface/table/almayer, @@ -20222,12 +20217,6 @@ icon_state = "plate" }, /area/lv522/atmos/cargo_intake) -"isG" = ( -/obj/structure/largecrate/random/barrel, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "isL" = ( /obj/structure/surface/table/almayer, /obj/item/spacecash/c1000, @@ -21509,10 +21498,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/shale/layer2, /area/lv522/outdoors/colony_streets/north_west_street) -"iSx" = ( -/obj/structure/girder, -/turf/open/floor/plating, -/area/lv522/indoors/lone_buildings/storage_blocks) "iSF" = ( /obj/structure/surface/table/almayer, /obj/structure/prop/server_equipment/laptop/on, @@ -27720,10 +27705,7 @@ }, /area/lv522/atmos/east_reactor/south) "kXc" = ( -/obj/structure/prop/ice_colony/ground_wire{ - dir = 8 - }, -/turf/open/auto_turf/shale/layer1, +/turf/closed/wall/solaris/reinforced/hull/lv522, /area/lv522/outdoors/colony_streets/central_streets) "kXe" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -30605,8 +30587,8 @@ "meM" = ( /obj/item/clothing/accessory/red, /obj/item/clothing/under/liaison_suit/field{ - pixel_y = 9; - pixel_x = -4 + pixel_x = -4; + pixel_y = 9 }, /turf/open/floor/carpet, /area/lv522/indoors/a_block/executive) @@ -31895,16 +31877,6 @@ icon_state = "floor_plate" }, /area/lv522/outdoors/n_rockies) -"mFe" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/cargo_container/grant/left, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "mFg" = ( /obj/structure/surface/table/almayer, /obj/item/co2_cartridge{ @@ -34310,9 +34282,6 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/admin) -"nxu" = ( -/turf/open/floor/plating, -/area/lv522/indoors/lone_buildings/storage_blocks) "nxF" = ( /obj/structure/machinery/light/small, /obj/effect/landmark/lv624/fog_blocker/short, @@ -34829,10 +34798,7 @@ "nKj" = ( /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - dir = 4; - icon_state = "cell_stripe" - }, +/turf/open/floor/prison, /area/lv522/indoors/lone_buildings/storage_blocks) "nKk" = ( /obj/structure/machinery/camera/autoname{ @@ -38452,13 +38418,6 @@ icon_state = "floor_marked" }, /area/lv522/landing_zone_2) -"pck" = ( -/obj/structure/largecrate/random/barrel/white, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "pco" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/green, /turf/open/floor/prison, @@ -42166,13 +42125,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) -"qvK" = ( -/obj/structure/cargo_container/grant/right, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "qvM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/chair/comfy{ @@ -42382,8 +42334,8 @@ /area/lv522/indoors/a_block/fitness/glass) "qzp" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{ - id = "sh_dropship2"; dir = 2; + id = "sh_dropship2"; name = "\improper Typhoon crew hatch" }, /turf/open/shuttle/dropship{ @@ -45546,11 +45498,6 @@ icon_state = "41" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) -"rBV" = ( -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "rBZ" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "97" @@ -47121,7 +47068,10 @@ "she" = ( /obj/structure/machinery/floodlight, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, /area/lv522/indoors/lone_buildings/storage_blocks) "shh" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{ @@ -47462,6 +47412,11 @@ }, /area/lv522/oob) "smR" = ( +/obj/structure/machinery/door/poddoor/almayer/closed{ + dir = 4; + id = "West LZ Storage"; + name = "Emergency Lockdown" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -51630,7 +51585,7 @@ /area/lv522/outdoors/colony_streets/north_east_street) "tNS" = ( /obj/item/stack/sheet/metal, -/turf/open/floor/plating, +/turf/open/floor/prison, /area/lv522/indoors/lone_buildings/storage_blocks) "tOe" = ( /obj/structure/platform{ @@ -56966,18 +56921,6 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/dorms) -"vIt" = ( -/obj/structure/machinery/camera/autoname{ - dir = 8 - }, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "vIy" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -57577,12 +57520,6 @@ icon_state = "cement3" }, /area/lv522/outdoors/colony_streets/north_east_street) -"vTH" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "vTK" = ( /obj/structure/prop/vehicles{ icon_state = "van_damaged" @@ -57926,12 +57863,6 @@ icon_state = "blue" }, /area/lv522/indoors/a_block/hallway) -"waj" = ( -/obj/structure/girder/displaced, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "wan" = ( /obj/structure/surface/table/almayer, /turf/open/floor/prison{ @@ -57982,6 +57913,11 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, +/obj/structure/machinery/door/poddoor/almayer/closed{ + dir = 4; + id = "West LZ Storage"; + name = "Emergency Lockdown" + }, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -61227,11 +61163,8 @@ }, /area/lv522/atmos/sewer) "xoj" = ( -/obj/structure/largecrate/random/barrel/red, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, +/turf/closed/wall/solaris/reinforced/hull/lv522, /area/lv522/indoors/lone_buildings/storage_blocks) "xoC" = ( /obj/structure/machinery/door/airlock/almayer/generic{ @@ -62557,11 +62490,6 @@ icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) -"xQR" = ( -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/lv522/indoors/lone_buildings/storage_blocks) "xRg" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -67594,7 +67522,7 @@ ien ien ien ien -ien +spo umf vXc vXc @@ -67813,15 +67741,15 @@ ylo ylo ylo ylo +dbc ylo ylo ylo ylo ylo ylo -ylo -ien -ien +rMF +spo vXc vXc vXc @@ -68038,18 +67966,18 @@ udK wHi nly miW -hYf -mFe -hYf -wHi +ylo +ylo +dbc +bOX jZe wky wPV tyl ylo -ien -ien -ien +rMF +spo +vXc vXc vXc vXc @@ -68265,17 +68193,17 @@ hYf wHi jUk ouI -hYf -emt -pck -hYf +arP +ylo +xoj +ylo erS abe ukT ofS ylo -ien -ien +rMF +spo vXc vXc vXc @@ -68493,16 +68421,16 @@ hYf xhW hYf hYf -qvK +ylo xoj -hYf +ylo lpt gJL wHi cAW ylo ylo -ien +spo vXc vXc vXc @@ -68720,17 +68648,17 @@ hYf hLl wHi hYf -vBM -hYf -isG -vBM +ylo +dbc +ylo +emt hYf wHi tIS -xQR -waj -ien -ien +yfu +ylo +spo +vXc vXc vXc umf @@ -68947,16 +68875,16 @@ yfu yfu bZd yfu -bZd -bZd +bOX +xoj +ylo yfu +bZd yfu bZd -xQR -vTH -gFy -nxu -ien +bZd +iPD +spo vXc vXc vXc @@ -69174,16 +69102,16 @@ qJK qJK cQB bZd +ylo +xoj +bOX yfu +tNS bZd bZd yfu -tNS -gFy -gFy -rBV -iSx -ien +iPD +spo vXc vXc cpy @@ -69401,17 +69329,17 @@ yfu yfu bDr bZd -yfu -yfu -bZd +ylo +dbc +bOX +eYT bZd +yfu bZd -bOX -gFy -tNS -xQR -ien -ien +yfu +iPD +spo +vXc vXc cpy vXc @@ -69629,15 +69557,15 @@ yfu bDr yfu hjE -yfu -qpc +dbc +ylo nKj dGK qpc she egj ylo -ien +spo vXc vXc vXc @@ -69855,16 +69783,16 @@ jUk hYf sIS yfu -bZd -gJL -vIt -cOA -xhW +bOX +xoj +ylo +ylo +gFy hsz jnr ylo ylo -ien +spo vXc vXc vXc @@ -70082,17 +70010,17 @@ ylo smR wbi smR -smR -smR ylo +dbc ylo ylo ylo ylo ylo -ien -ien -ien +ylo +rMF +sql +vXc vXc yiM yiM @@ -70310,15 +70238,15 @@ xyN cnN xyN xyN -xyN +kXc lwv xyN xyN -dbc +xyN xyN xyN sql -ien +vXc yiM yiM yiM @@ -70536,16 +70464,16 @@ rwE rwE hWI yiM +kXc +kXc +kXc vXc vXc vXc -vXc -vXc -dbc umf umf vXc -ien +yiM yiM yiM yiM @@ -70762,18 +70690,18 @@ yiM yiM yiM yiM -eYT -eYT +yiM +yiM kXc vXc vXc vXc -dbc vXc vXc -ien -ien -ien +vXc +vXc +yiM +yiM yiM yiM yiM @@ -70989,17 +70917,17 @@ yiM yiM yiM yiM -arP yiM yiM -puY +kXc +vXc +vXc vXc vXc -dbc vXc vXc yiM -ien +yiM yiM yiM yiM @@ -71217,16 +71145,16 @@ yiM yiM yiM yiM -yiM -yiM -yiM +kXc +kXc +kXc +vXc vXc vXc -dbc vXc yiM yiM -ien +yiM yiM yiM yiM @@ -71445,16 +71373,16 @@ yiM yiM yiM wdy +kXc iPR iPR iPR iPR -dbc jPv vXc -ien -ien -ien +vXc +yiM +yiM yiM yiM pWR @@ -71680,7 +71608,7 @@ nLm rMF jPv vXc -ien +vXc yiM yiM yiM @@ -71907,7 +71835,7 @@ nLm nLm rVa jPv -ien +vXc vXc vXc yiM @@ -72133,9 +72061,9 @@ wan wEQ nLm nLm -ien -ien -ien +rMF +jPv +vXc vXc umf xTV @@ -72361,7 +72289,7 @@ uDP kDH nLm nLm -ien +spo vXc vXc vXc @@ -72588,7 +72516,7 @@ fjP vJT pfV nLm -ien +spo vXc vXc vXc @@ -72814,9 +72742,9 @@ tUM uOs uOs vJT -nLm -ien -ien +pMd +spo +vXc vXc jue wYa @@ -73041,8 +72969,8 @@ uOs uOs lsD wyE -nLm -ien +pMd +spo vXc vXc upz @@ -73268,8 +73196,8 @@ lBj vJT whn tek -nLm -ien +pMd +spo vXc vXc vXc @@ -73496,8 +73424,8 @@ oDu nLm nLm nLm -ien -ien +spo +vXc umf vXc vaZ @@ -73723,7 +73651,7 @@ fVB cxC rzG nLm -ien +spo vXc umf vXc @@ -73950,7 +73878,7 @@ bGL koj aMI nLm -ien +spo vXc vXc vXc @@ -74177,8 +74105,8 @@ sKH weR nLm nLm -ien -ien +spo +vXc vXc vXc wYa diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index 11f57fc6680c..ffe928acf3ae 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -11174,6 +11174,7 @@ /obj/structure/computerframe{ anchored = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv624/lazarus/secure_storage) "aWd" = ( @@ -11464,13 +11465,13 @@ /turf/open/floor/greengrid, /area/lv624/lazarus/secure_storage) "aWV" = ( -/obj/structure/surface/rack, -/obj/item/weapon/gun/rifle/m41a, -/turf/open/floor/greengrid, +/obj/item/stack/rods/plasteel, +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, /area/lv624/lazarus/secure_storage) "aWW" = ( /obj/structure/surface/rack, -/obj/item/ammo_magazine/rifle/extended, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/greengrid, /area/lv624/lazarus/secure_storage) "aWX" = ( @@ -11686,11 +11687,13 @@ "aXF" = ( /obj/structure/surface/rack, /obj/item/ammo_magazine/shotgun/buckshot, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/greengrid, /area/lv624/lazarus/secure_storage) "aXG" = ( /obj/structure/surface/rack, /obj/item/ammo_magazine/shotgun/slugs, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/greengrid, /area/lv624/lazarus/secure_storage) "aXH" = ( @@ -12272,8 +12275,7 @@ }, /area/lv624/lazarus/comms) "aZL" = ( -/obj/structure/surface/rack, -/obj/structure/prop/mech/drill, +/obj/item/stack/sheet/metal, /turf/open/floor/greengrid, /area/lv624/lazarus/secure_storage) "aZM" = ( @@ -12929,7 +12931,7 @@ /area/lv624/ground/colony/west_tcomms_road) "bTw" = ( /obj/effect/landmark/nightmare{ - insert_tag = "cargospecial" + insert_tag = "cargospecial1" }, /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) @@ -13034,6 +13036,12 @@ icon_state = "whiteyellow" }, /area/lv624/lazarus/corporate_dome) +"cfA" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/lv624/lazarus/secure_storage) "cfD" = ( /turf/closed/wall/r_wall/unmeltable, /area/lv624/lazarus/quartstorage/outdoors) @@ -13094,6 +13102,10 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/south_west_caves) +"chy" = ( +/obj/structure/girder/reinforced, +/turf/open/floor/plating, +/area/lv624/lazarus/secure_storage) "cij" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, @@ -14600,6 +14612,10 @@ "eTQ" = ( /turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_east_jungle) +"eUI" = ( +/obj/item/storage/toolbox, +/turf/open/gm/dirt, +/area/lv624/ground/colony/west_tcomms_road) "eVH" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor{ @@ -15064,6 +15080,12 @@ icon_state = "white" }, /area/lv624/lazarus/corporate_dome) +"fMv" = ( +/obj/item/stack/sheet/metal, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/greengrid, +/area/lv624/lazarus/secure_storage) "fNA" = ( /obj/structure/barricade/wooden, /turf/open/shuttle{ @@ -15525,6 +15547,11 @@ "gRx" = ( /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) +"gSb" = ( +/obj/item/stack/sheet/metal, +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/lv624/lazarus/secure_storage) "gTj" = ( /obj/effect/decal/grass_overlay/grass1/inner{ dir = 8 @@ -15631,6 +15658,11 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/south_central_caves) +"haE" = ( +/obj/item/stack/rods, +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/south_west_jungle) "haN" = ( /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/gm/grass/grass1, @@ -15682,6 +15714,11 @@ icon_state = "asteroidwarning" }, /area/lv624/lazarus/landing_zones/lz2) +"hen" = ( +/obj/item/tool/weldingtool, +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/south_central_jungle) "hez" = ( /obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{ light_on = 1; @@ -16099,6 +16136,15 @@ "hSn" = ( /turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) +"hSp" = ( +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 9 + }, +/obj/effect/landmark/nightmare{ + insert_tag = "corporatedome" + }, +/turf/open/gm/grass/grass1, +/area/lv624/ground/colony/west_tcomms_road) "hSz" = ( /obj/effect/landmark/hunter_secondary, /turf/open/gm/grass/grass1, @@ -16107,6 +16153,12 @@ /obj/effect/landmark/monkey_spawn, /turf/open/gm/dirt, /area/lv624/ground/jungle/east_central_jungle) +"hTp" = ( +/obj/structure/girder/reinforced, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/lv624/lazarus/secure_storage) "hTR" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/auto_turf/strata_grass/layer1, @@ -16640,6 +16692,10 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/caves/sand_temple) +"jaw" = ( +/obj/item/stack/sheet/metal, +/turf/open/gm/dirt, +/area/lv624/ground/colony/west_tcomms_road) "jbd" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/grass/grass1, @@ -17613,6 +17669,12 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) +"kSN" = ( +/obj/structure/girder, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/lv624/lazarus/secure_storage) "kSR" = ( /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, @@ -17631,6 +17693,10 @@ /obj/structure/flora/jungle/plantbot1, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) +"kVS" = ( +/obj/item/weapon/gun/rifle/m41a, +/turf/open/gm/dirt, +/area/lv624/lazarus/secure_storage) "kWH" = ( /turf/open/floor{ icon_state = "dark" @@ -18265,6 +18331,10 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/south_central_caves) +"mdw" = ( +/obj/structure/prop/mech/drill, +/turf/open/floor/greengrid, +/area/lv624/lazarus/secure_storage) "mdQ" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/caves/west_caves) @@ -18344,6 +18414,7 @@ }, /area/lv624/ground/barrens/south_eastern_barrens) "mkn" = ( +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv624/lazarus/secure_storage) "mko" = ( @@ -18417,6 +18488,10 @@ icon_state = "whitebluefull" }, /area/lv624/lazarus/medbay) +"mqf" = ( +/obj/item/tool/wrench, +/turf/open/floor/plating, +/area/lv624/lazarus/secure_storage) "mqw" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor{ @@ -19584,6 +19659,10 @@ icon_state = "asteroidwarning" }, /area/lv624/ground/colony/telecomm/cargo) +"ose" = ( +/obj/structure/girder/displaced, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/south_central_jungle) "osf" = ( /obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{ light_on = 1; @@ -20012,7 +20091,7 @@ /area/lv624/ground/caves/sand_temple) "pca" = ( /obj/effect/landmark/nightmare{ - insert_tag = "nexuscenter" + insert_tag = "nexuscenter_barricaded" }, /turf/open/floor{ dir = 9; @@ -20075,6 +20154,11 @@ icon_state = "whiteblue" }, /area/lv624/lazarus/corporate_dome) +"phk" = ( +/obj/item/stack/rods, +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/lv624/lazarus/secure_storage) "phU" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, @@ -20108,6 +20192,9 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) +"plC" = ( +/turf/open/floor/plating, +/area/lv624/lazarus/secure_storage) "pmt" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/gm/dirt, @@ -20866,6 +20953,10 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) +"qEz" = ( +/obj/item/ammo_magazine/rifle/extended, +/turf/open/floor/greengrid, +/area/lv624/lazarus/secure_storage) "qGH" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/gm/grass/grass2, @@ -21314,6 +21405,11 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) +"rwK" = ( +/obj/effect/decal/remains/xeno, +/obj/item/stack/sheet/metal, +/turf/open/gm/dirt, +/area/lv624/ground/colony/west_tcomms_road) "rxV" = ( /turf/open/gm/dirtgrassborder{ icon_state = "desert_dug" @@ -21394,6 +21490,12 @@ "rCV" = ( /turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_central_jungle) +"rDK" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/lv624/lazarus/secure_storage) "rER" = ( /obj/effect/decal/grass_overlay/grass1/inner{ dir = 6 @@ -21915,6 +22017,11 @@ icon_state = "whiteyellowfull" }, /area/lv624/ground/barrens/south_eastern_barrens) +"sCx" = ( +/obj/item/clothing/head/welding, +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/lv624/ground/jungle/south_west_jungle) "sCJ" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/floor{ @@ -22225,7 +22332,7 @@ /area/lv624/lazarus/quartstorage) "tgi" = ( /obj/effect/landmark/nightmare{ - insert_tag = "lz-containers" + insert_tag = "lz-containers_swapped" }, /turf/open/floor{ icon_state = "warning" @@ -22918,7 +23025,8 @@ phone_id = "Secure Storage"; pixel_y = 24 }, -/turf/open/floor/greengrid, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/lv624/lazarus/secure_storage) "umb" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane, @@ -23773,6 +23881,10 @@ /obj/structure/flora/jungle/vines/light_1, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) +"vTT" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/greengrid, +/area/lv624/lazarus/secure_storage) "vUj" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/dirtgrassborder/south, @@ -23894,10 +24006,20 @@ }, /turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/caves/sand_temple) +"weB" = ( +/obj/item/stack/rods/plasteel, +/turf/open/floor/greengrid, +/area/lv624/lazarus/secure_storage) "weH" = ( /obj/structure/flora/bush/ausbushes/genericbush, /turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) +"weR" = ( +/obj/item/stack/rods, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/lv624/lazarus/secure_storage) "wgk" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /obj/structure/platform_decoration/mineral/sandstone/runed{ @@ -23990,6 +24112,10 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"wol" = ( +/obj/item/ammo_magazine/rifle/extended, +/turf/open/floor/plating, +/area/lv624/lazarus/secure_storage) "woF" = ( /obj/structure/flora/jungle/vines/light_3, /obj/structure/barricade/metal/wired{ @@ -24570,6 +24696,9 @@ /obj/effect/landmark/lv624/fog_blocker, /turf/open/gm/dirt, /area/lv624/ground/river/west_river) +"xvj" = ( +/turf/open/gm/dirt, +/area/lv624/lazarus/secure_storage) "xvz" = ( /obj/structure/platform_decoration, /obj/effect/decal/cleanable/dirt, @@ -24752,6 +24881,10 @@ /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/south_central_jungle) +"xOL" = ( +/obj/item/stack/rods, +/turf/open/gm/dirt, +/area/lv624/ground/colony/west_tcomms_road) "xPk" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/colony/south_medbay_road) @@ -24780,6 +24913,10 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) +"xRc" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/lv624/lazarus/secure_storage) "xRe" = ( /obj/effect/decal/grass_overlay/grass1/inner{ dir = 10 @@ -32743,7 +32880,7 @@ aWT aUQ aZL aUQ -aUQ +mdw aTf aTf aTf @@ -32965,7 +33102,7 @@ aTf aUj aUQ aUQ -ygp +aZL aUQ gte aUQ @@ -33422,11 +33559,11 @@ aUj aUQ aUQ aVZ -aUQ -aWV +qEz +ygp aUQ aXE -aUQ +vTT aUQ aYu aTf @@ -33648,13 +33785,13 @@ aTf aTf aTf ulp -aUQ +aZL aWa -aUQ +xRc aWW aUQ aXF -aUQ +weB aUQ aTf aTf @@ -33876,13 +34013,13 @@ vxU aTf aTf aUS -aUQ +xLT iml -aUQ -aWW -aUQ +vTT +fMv +plC aXG -aUQ +aZL aYf aTf aTf @@ -34104,13 +34241,13 @@ aXh aTf aTf aTf +aWV aUQ +plC +vTT +weR aUQ -aUQ -aUQ -sWk -aUQ -aUQ +cfA aTf aTf aTf @@ -34336,9 +34473,9 @@ aTf aTf mkn xLT -mkn -xLT -sWk +xvj +cfA +kSN aTf aTf aXh @@ -34562,12 +34699,12 @@ efp aTf aTf aWc -mkn -mkn +phk +wol sWk -mkn -mkn -xLT +mqf +gSb +hTp kBq aXh aXh @@ -34789,13 +34926,13 @@ bSm efp efp aTf -aTf -xLT -aWv +chy +rDK aWv +kVS xLT -xTT -xTT +sCx +haE vUj qGH aLj @@ -35018,12 +35155,12 @@ buw efp efp uSq +eUI qIO qIO -qIO -qIO +jaw uXV -qtj +hen dMc knp iIU @@ -35242,7 +35379,7 @@ aXh wTC kjp kjp -ply +hSp efp efp uSq @@ -35250,7 +35387,7 @@ njC qIO qIO qIO -qtj +ose qtj ksM rox @@ -35474,7 +35611,7 @@ efp efp gDu uSq -hDX +rwK qIO qIO aXH @@ -35702,9 +35839,9 @@ efp efp efp uSq +xOL qIO -qIO -qIO +jaw ntL kxI kxI diff --git a/maps/map_files/LV624/standalone/corporatedome.dmm b/maps/map_files/LV624/standalone/corporatedome.dmm new file mode 100644 index 000000000000..0778d0c61564 --- /dev/null +++ b/maps/map_files/LV624/standalone/corporatedome.dmm @@ -0,0 +1,1787 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aQ" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Corporation Dome"; + req_access_txt = "100" + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"bm" = ( +/obj/structure/surface/rack, +/obj/item/spacecash/c1000/counterfeit, +/obj/item/spacecash/c1000/counterfeit, +/obj/item/spacecash/c1000/counterfeit, +/turf/open/floor{ + dir = 8; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"bA" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"bD" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/gm/dirt, +/area/lv624/ground/colony/west_tcomms_road) +"bE" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/item/shard, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"cm" = ( +/obj/structure/largecrate/random/case/small, +/obj/structure/barricade/sandbags{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"cn" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/largecrate/random/case/double, +/turf/open/floor{ + dir = 10; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"cA" = ( +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"cB" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/corporate_dome) +"cR" = ( +/obj/structure/flora/jungle/vines/light_2, +/obj/structure/flora/jungle/vines/heavy, +/turf/closed/wall/r_wall, +/area/lv624/lazarus/corporate_dome) +"da" = ( +/obj/effect/decal/cleanable/blood/drip{ + pixel_y = 20 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/plating{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/lv624/lazarus/landing_zones/lz2) +"dq" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/white{ + pixel_y = 8 + }, +/obj/item/folder/yellow{ + pixel_y = 4 + }, +/obj/item/folder/red, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) +"dH" = ( +/obj/structure/machinery/blackbox_recorder, +/obj/item/prop/almayer/flight_recorder/colony{ + pixel_x = -6; + pixel_y = 10 + }, +/turf/open/floor/greengrid, +/area/lv624/lazarus/corporate_dome) +"dI" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib6" + }, +/turf/open/gm/dirt, +/area/lv624/ground/colony/west_tcomms_road) +"dO" = ( +/obj/item/weapon/pole/fancy_cane, +/obj/item/shard, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) +"dY" = ( +/turf/open/floor/plating{ + icon_state = "asteroidwarning" + }, +/area/lv624/lazarus/landing_zones/lz2) +"ev" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"eF" = ( +/obj/structure/barricade/deployable{ + damage_state = 1; + health = 245; + icon_state = "folding_1" + }, +/turf/open/floor{ + dir = 10; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"fm" = ( +/obj/effect/vehicle_spawner/van/decrepit, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/corporate_dome) +"fq" = ( +/obj/effect/acid_hole, +/turf/closed/wall/r_wall, +/area/lv624/lazarus/corporate_dome) +"ft" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/corporate_dome) +"fF" = ( +/obj/item/ammo_casing/bullet{ + icon_state = "casing_9_1" + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"fH" = ( +/turf/open/floor{ + dir = 4; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"gx" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating, +/area/lv624/lazarus/corporate_dome) +"gz" = ( +/obj/item/shard, +/turf/open/gm/grass/grass1, +/area/lv624/ground/jungle/west_central_jungle) +"gX" = ( +/obj/structure/machinery/door/airlock/almayer/engineering/colony{ + name = "\improper Garage"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/corporate_dome) +"ha" = ( +/turf/open/floor{ + dir = 10; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) +"hc" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/showcase{ + desc = "The display model for a Weyland Yutani generation one synthetic. It almost feels like the eyes on this one follow you."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Display synthetic" + }, +/obj/item/clothing/under/marine/veteran/pmc/corporate{ + pixel_y = -2 + }, +/turf/open/floor{ + dir = 5; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"he" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/corporate_dome) +"hf" = ( +/obj/structure/machinery/vending/snack, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"is" = ( +/obj/item/stack/sheet/wood, +/obj/effect/decal/cleanable/blood/gibs/xeno, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) +"iF" = ( +/obj/structure/closet/crate/secure/weyland, +/obj/item/reagent_container/food/snacks/packaged_hdogs, +/obj/item/reagent_container/food/snacks/packaged_hdogs, +/obj/item/reagent_container/food/snacks/packaged_burrito, +/obj/item/reagent_container/food/snacks/packaged_burrito, +/obj/item/reagent_container/food/snacks/packaged_burger, +/obj/item/reagent_container/food/snacks/packaged_burger, +/turf/open/floor{ + dir = 8; + icon_state = "whitebluecorner" + }, +/area/lv624/lazarus/corporate_dome) +"iT" = ( +/obj/structure/filingcabinet, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor{ + dir = 10; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) +"jH" = ( +/obj/structure/bookcase/manuals/medical, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/medical_diagnostics_manual, +/obj/item/book/manual/research_and_development, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) +"jJ" = ( +/obj/item/shard, +/turf/open/floor{ + dir = 8; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) +"kl" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + dir = 4; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"kU" = ( +/obj/structure/machinery/door_control{ + id = "garage_lv"; + name = "Garage Shutters"; + pixel_y = -28 + }, +/obj/effect/landmark/corpsespawner/colonist, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating{ + icon_state = "asteroidwarning" + }, +/area/lv624/lazarus/landing_zones/lz2) +"ln" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + dir = 9; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"lG" = ( +/obj/item/storage/firstaid/adv/empty, +/obj/structure/transmitter/colony_net{ + phone_category = "Lazarus Landing"; + phone_color = "blue"; + phone_id = "Corporate Office"; + pixel_y = 24 + }, +/turf/open/floor{ + dir = 5; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) +"lX" = ( +/obj/structure/window_frame/colony/reinforced, +/obj/item/shard, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/lv624/lazarus/corporate_dome) +"mg" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"mi" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/lv624/lazarus/corporate_dome) +"mp" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/item/stack/rods, +/obj/structure/machinery/vending/coffee, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"ms" = ( +/turf/open/floor{ + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"mw" = ( +/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon, +/obj/item/ammo_casing/bullet, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/corporate_dome) +"mK" = ( +/obj/effect/spawner/gibspawner/human, +/turf/open/gm/dirt, +/area/lv624/ground/colony/west_tcomms_road) +"ny" = ( +/obj/effect/landmark/corpsespawner/prisoner, +/obj/effect/decal/cleanable/blood, +/obj/item/clothing/glasses/sunglasses/blindfold, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/corporate_dome) +"oj" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper Corporation Office"; + req_access_txt = "100" + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"oq" = ( +/obj/structure/window_frame/colony/reinforced, +/turf/open/floor/plating, +/area/lv624/lazarus/corporate_dome) +"pg" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/showcase{ + desc = "The display model for a Weyland Yutani generation one synthetic. It almost feels like the eyes on this one follow you."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Display synthetic" + }, +/obj/item/clothing/under/liaison_suit/blazer, +/obj/item/clothing/head/manager{ + pixel_y = 13 + }, +/turf/open/floor{ + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"pR" = ( +/obj/structure/filingcabinet, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor{ + dir = 6; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) +"qn" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/closet/bodybag, +/obj/effect/landmark/corpsespawner/clf, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/corporate_dome) +"qH" = ( +/obj/structure/machinery/door/airlock/almayer/engineering/colony{ + dir = 1; + name = "\improper Workshop Storage"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/corporate_dome) +"qI" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin/wy{ + pixel_y = 8 + }, +/obj/item/tool/pen/clicky, +/obj/item/device/flashlight/lamp{ + pixel_x = -7; + pixel_y = 15 + }, +/turf/open/floor{ + dir = 5; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"qJ" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper Storage Room" + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"qM" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/structure/machinery/door_control{ + id = "garage_lv"; + name = "Garage Shutters"; + pixel_x = -28 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/corporate_dome) +"sc" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/bed/chair/office/light{ + dir = 1 + }, +/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_cl, +/turf/open/floor{ + dir = 1; + icon_state = "whitebluecorner" + }, +/area/lv624/lazarus/corporate_dome) +"sm" = ( +/obj/structure/machinery/vending/cigarette, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"sH" = ( +/obj/structure/window_frame/colony/reinforced, +/obj/item/stack/rods, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/lv624/lazarus/corporate_dome) +"sX" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/lv624/lazarus/corporate_dome) +"vf" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper Corporate Liaison"; + locked = 1 + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"vC" = ( +/obj/structure/prop/server_equipment/yutani_server/off, +/turf/open/floor/greengrid, +/area/lv624/lazarus/corporate_dome) +"vW" = ( +/obj/structure/barricade/wooden, +/turf/open/floor{ + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) +"wy" = ( +/obj/structure/machinery/door/airlock/almayer/engineering/colony{ + name = "\improper Workshop Storage"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/plating{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/lv624/lazarus/corporate_dome) +"wW" = ( +/obj/structure/closet/bodybag, +/obj/effect/landmark/corpsespawner/security/marshal, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/corporate_dome) +"xk" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 16 + }, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor{ + dir = 5; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"xG" = ( +/obj/structure/machinery/photocopier, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"yc" = ( +/turf/open/floor/plating{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/lv624/lazarus/landing_zones/lz2) +"yJ" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/lv624/lazarus/corporate_dome) +"zm" = ( +/obj/structure/safe{ + spawnkey = 0 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor{ + dir = 5; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) +"zs" = ( +/obj/structure/window_frame/colony/reinforced, +/obj/item/shard, +/turf/open/floor/plating, +/area/lv624/lazarus/corporate_dome) +"zw" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/folder/black{ + name = "Weyland-Yutani Classified folder"; + desc = "A black folder which has the Weyland-Yutani symbol inside it, along with CLASSIFIED in giant red letters." + }, +/obj/effect/landmark/objective_landmark/close, +/obj/item/reagent_container/food/drinks/coffeecup/wy{ + pixel_x = -9; + pixel_y = 7 + }, +/turf/open/floor{ + dir = 6; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"zx" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"zz" = ( +/obj/structure/window_frame/colony/reinforced, +/obj/item/tool/pen/red/clicky, +/turf/open/floor/plating, +/area/lv624/lazarus/corporate_dome) +"Aj" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/prop/invuln/pipe_water{ + dir = 8; + pixel_y = -12; + pixel_x = 6 + }, +/turf/open/floor/plating, +/area/lv624/lazarus/corporate_dome) +"AG" = ( +/obj/structure/barricade/wooden, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"AT" = ( +/obj/item/shard, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"Bh" = ( +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/corporate_dome) +"BL" = ( +/obj/structure/machinery/door/poddoor/almayer{ + dir = 8; + id = "garage_lv"; + name = "\improper Garage" + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/corporate_dome) +"BZ" = ( +/obj/item/ammo_casing/bullet{ + icon_state = "cartridge_6_1" + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"Ct" = ( +/obj/structure/window_frame/colony/reinforced, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/lv624/lazarus/corporate_dome) +"CF" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + locked = 1; + name = "\improper Corporate Liaison" + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"Df" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor{ + dir = 8; + icon_state = "whiteyellowcorner" + }, +/area/lv624/lazarus/corporate_dome) +"Dn" = ( +/obj/item/ammo_magazine/smg/mp5, +/obj/item/ammo_magazine/smg/mp5, +/obj/item/ammo_magazine/smg/mp5, +/obj/item/ammo_magazine/smg/mp5, +/obj/item/ammo_magazine/smg/mp5, +/obj/item/ammo_magazine/smg/mp5, +/obj/item/ammo_magazine/smg/mp5, +/obj/item/ammo_magazine/smg/mp5, +/obj/item/ammo_magazine/smg/mp5, +/obj/structure/closet/crate/secure/weyland, +/obj/item/weapon/gun/smg/mp5, +/obj/item/weapon/gun/smg/mp5, +/turf/open/floor{ + dir = 4; + icon_state = "whitebluecorner" + }, +/area/lv624/lazarus/corporate_dome) +"Dp" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/bed/roller, +/obj/effect/landmark/corpsespawner/wysec, +/obj/item/prop/colony/usedbandage{ + dir = 9; + pixel_x = 5; + pixel_y = 15 + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"DU" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 6 + }, +/obj/item/storage/toolbox/electrical, +/turf/open/floor{ + dir = 6; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"Ez" = ( +/obj/structure/machinery/light_construct{ + dir = 4 + }, +/obj/item/stack/cable_coil, +/turf/open/floor{ + dir = 6; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) +"EM" = ( +/obj/structure/flora/jungle/vines/light_3, +/turf/closed/wall/r_wall, +/area/lv624/lazarus/corporate_dome) +"Fh" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/fancy/cigarettes/emeraldgreen, +/obj/item/storage/fancy/cigarettes/wypacket{ + pixel_x = 5; + pixel_y = 6 + }, +/turf/open/floor{ + icon_state = "whitebluecorner" + }, +/area/lv624/lazarus/corporate_dome) +"Fk" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/plating{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/lv624/lazarus/landing_zones/lz2) +"Fl" = ( +/turf/open/floor{ + dir = 1; + icon_state = "whitebluecorner" + }, +/area/lv624/lazarus/corporate_dome) +"Fu" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/adv{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/firstaid/adv, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/greengrid, +/area/lv624/lazarus/corporate_dome) +"FP" = ( +/obj/item/shard, +/obj/item/stack/sheet/wood, +/turf/open/floor{ + dir = 6; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) +"FZ" = ( +/obj/structure/machinery/faxmachine/corporate/liaison, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor{ + dir = 10; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"Gi" = ( +/obj/structure/prop/server_equipment/yutani_server/broken, +/turf/open/floor/greengrid, +/area/lv624/lazarus/corporate_dome) +"Go" = ( +/obj/item/ammo_casing/bullet{ + icon_state = "cartridge_10_1" + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"Gt" = ( +/obj/structure/machinery/light_construct/small{ + dir = 8 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/lv624/lazarus/corporate_dome) +"GM" = ( +/turf/open/floor{ + dir = 1; + icon_state = "whiteyellowcorner" + }, +/area/lv624/lazarus/corporate_dome) +"GV" = ( +/turf/open/floor{ + dir = 8; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"Hn" = ( +/obj/item/ammo_casing/bullet{ + icon_state = "cartridge_9_1" + }, +/obj/effect/decal/cleanable/blood/gibs/xeno, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"Ho" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor{ + icon_state = "whiteyellowcorner" + }, +/area/lv624/lazarus/corporate_dome) +"Hv" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/fancy/cigar, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor{ + dir = 9; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) +"HK" = ( +/obj/structure/machinery/power/apc{ + dir = 1 + }, +/obj/effect/spawner/random/powercell, +/obj/item/tool/crowbar/red{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/tool/screwdriver, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor{ + dir = 9; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"Ii" = ( +/turf/open/gm/dirt, +/area/lv624/ground/colony/west_tcomms_road) +"IM" = ( +/obj/item/shard, +/obj/effect/decal/cleanable/blood/oil, +/obj/item/stack/rods{ + amount = 15 + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"Jg" = ( +/obj/structure/machinery/light, +/turf/open/floor/greengrid, +/area/lv624/lazarus/corporate_dome) +"Jq" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + locked = 1; + name = "\improper Corporation Dome"; + req_access_txt = "100" + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"JL" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/prop/colony/usedbandage{ + dir = 10 + }, +/turf/open/floor{ + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) +"Kv" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/gm/dirt, +/area/lv624/ground/colony/west_tcomms_road) +"KC" = ( +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowcorner" + }, +/area/lv624/lazarus/corporate_dome) +"KG" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"Le" = ( +/obj/effect/acid_hole{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/lv624/lazarus/corporate_dome) +"Lh" = ( +/obj/item/stack/cable_coil, +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/item/shard, +/obj/structure/machinery/vending/cola, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"Li" = ( +/obj/structure/window_frame/colony/reinforced, +/obj/item/shard, +/obj/item/stack/rods, +/turf/open/floor/plating, +/area/lv624/lazarus/corporate_dome) +"Ln" = ( +/obj/structure/barricade/plasteel/metal{ + health = 250 + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"LZ" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/lv624/lazarus/corporate_dome) +"Me" = ( +/turf/open/floor/plating{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/lv624/lazarus/landing_zones/lz2) +"Ml" = ( +/obj/structure/machinery/atm{ + name = "Weyland-Yutani Automatic Teller Machine"; + pixel_y = 30 + }, +/turf/open/floor{ + dir = 9; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"OH" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ + pixel_x = 29 + }, +/obj/structure/closet/crate/secure/weyland, +/obj/item/stack/sheet/metal/med_small_stack, +/obj/item/stack/sheet/plasteel/med_small_stack, +/obj/item/stack/sandbags/small_stack, +/obj/item/device/motiondetector/hacked/pmc, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/corporate_dome) +"Pa" = ( +/obj/structure/closet/toolcloset, +/turf/open/floor/plating, +/area/lv624/lazarus/corporate_dome) +"Pr" = ( +/obj/item/ammo_casing/bullet{ + icon_state = "casing_9_1" + }, +/turf/open/floor{ + dir = 4; + icon_state = "whiteyellowcorner" + }, +/area/lv624/lazarus/corporate_dome) +"Qi" = ( +/obj/structure/flora/jungle/vines/light_1, +/turf/closed/wall/r_wall, +/area/lv624/lazarus/corporate_dome) +"Rn" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/showcase{ + desc = "The display model for a Weyland Yutani generation one synthetic. It almost feels like the eyes on this one follow you."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Display synthetic" + }, +/obj/item/clothing/head/helmet/marine/veteran/pmc{ + pixel_y = 11; + pixel_x = -1 + }, +/obj/item/clothing/under/marine/veteran/pmc{ + pixel_y = -2 + }, +/turf/open/floor{ + dir = 9; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"RD" = ( +/obj/item/ammo_casing/bullet{ + icon_state = "casing_1_1" + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"RF" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"RN" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/structure/prop/server_equipment/laptop/on, +/turf/open/floor{ + dir = 9; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"Sb" = ( +/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"SO" = ( +/obj/structure/flora/jungle/vines/heavy, +/turf/closed/wall/r_wall, +/area/lv624/lazarus/corporate_dome) +"SV" = ( +/turf/open/floor/greengrid, +/area/lv624/lazarus/corporate_dome) +"Tc" = ( +/obj/item/paper_bin/wy{ + pixel_y = 8 + }, +/obj/item/frame/table/wood/fancy, +/turf/open/floor{ + dir = 5; + icon_state = "whiteyellow" + }, +/area/lv624/lazarus/corporate_dome) +"TF" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/largecrate/supply/medicine, +/turf/open/floor{ + dir = 10; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"Uo" = ( +/obj/item/shard, +/turf/open/floor/plating{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/lv624/lazarus/corporate_dome) +"Uz" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/corporate_dome) +"UF" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + dir = 6; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"Vj" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/ashtray/glass, +/obj/item/trash/cigbutt/cigarbutt{ + pixel_y = 12 + }, +/obj/item/trash/cigbutt, +/turf/open/floor{ + dir = 4; + icon_state = "whitebluecorner" + }, +/area/lv624/lazarus/corporate_dome) +"Wx" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor{ + icon_state = "whiteyellowcorner" + }, +/area/lv624/lazarus/corporate_dome) +"Xc" = ( +/obj/structure/barricade/metal{ + dir = 4; + health = 200 + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"Xf" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/lv624/lazarus/corporate_dome) +"Xp" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/showcase{ + desc = "The display model for a Weyland Yutani generation one synthetic. It almost feels like the eyes on this one follow you."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Display synthetic" + }, +/obj/item/clothing/under/colonist{ + pixel_y = -2 + }, +/turf/open/floor{ + dir = 10; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"Xt" = ( +/turf/template_noop, +/area/template_noop) +"Xz" = ( +/obj/item/ammo_casing/bullet{ + icon_state = "cartridge_3_1" + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"XC" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor{ + dir = 8; + icon_state = "whiteyellowcorner" + }, +/area/lv624/lazarus/corporate_dome) +"XG" = ( +/turf/closed/wall/r_wall, +/area/lv624/lazarus/corporate_dome) +"Ye" = ( +/obj/structure/largecrate/supply/supplies/water, +/turf/open/floor{ + dir = 5; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"Yg" = ( +/obj/item/moneybag, +/obj/structure/surface/rack, +/obj/item/coin/diamond, +/turf/open/floor{ + dir = 9; + icon_state = "whiteblue" + }, +/area/lv624/lazarus/corporate_dome) +"Yv" = ( +/obj/item/frame/table/reinforced, +/turf/open/floor/plating, +/area/lv624/lazarus/corporate_dome) +"YN" = ( +/turf/open/gm/dirt, +/area/lv624/lazarus/landing_zones/lz2) +"ZG" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/scientist, +/obj/item/handcuffs, +/turf/open/floor{ + icon_state = "dark" + }, +/area/lv624/lazarus/corporate_dome) +"ZO" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/item/stack/sheet/wood, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) +"ZT" = ( +/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_cl, +/turf/open/floor{ + icon_state = "white" + }, +/area/lv624/lazarus/corporate_dome) + +(1,1,1) = {" +Xt +Xt +Xt +Fk +Me +dY +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +"} +(2,1,1) = {" +Xt +Xt +Xt +yc +da +dY +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +"} +(3,1,1) = {" +Xt +Xt +Xt +yc +Me +kU +XG +XG +XG +XG +XG +XG +XG +Xt +Xt +Xt +Xt +Xt +Xt +Xt +"} +(4,1,1) = {" +Xt +Xt +XG +BL +BL +BL +XG +he +Bh +fm +he +XG +XG +XG +LZ +yJ +Xt +Xt +Xt +Xt +"} +(5,1,1) = {" +Xt +Xt +XG +Bh +Bh +Bh +qM +Uz +ft +Bh +Bh +XG +Pa +Gt +LZ +LZ +Xt +Xt +Xt +Xt +"} +(6,1,1) = {" +Xt +Xt +XG +ny +Bh +mw +Bh +Bh +Bh +Bh +Bh +qH +Uo +yJ +LZ +mi +Xt +Xt +Xt +Xt +"} +(7,1,1) = {" +Xt +Xt +XG +ZG +cB +mw +wW +qn +OH +Bh +Bh +XG +Yv +Aj +mi +XG +Xt +Xt +Xt +Xt +"} +(8,1,1) = {" +Xt +XG +XG +XG +XG +XG +XG +XG +XG +gX +XG +XG +XG +XG +wy +XG +XG +Xt +Xt +Xt +"} +(9,1,1) = {" +YN +XG +ln +GV +GV +TF +XG +Rn +Fl +cA +iF +Xp +XG +Ml +GV +eF +fq +Ii +Ii +Ii +"} +(10,1,1) = {" +YN +Lh +hf +ev +cA +cA +Jq +cA +cA +Go +cA +cA +aQ +cA +Hn +Ln +aQ +Kv +Ii +Ii +"} +(11,1,1) = {" +YN +mp +sm +RF +fF +KG +cA +cA +cA +Sb +cA +cA +cA +RD +Sb +AG +cA +Ii +dI +mK +"} +(12,1,1) = {" +YN +XG +xk +fH +fH +UF +XG +hc +Dn +cA +cA +pg +XG +Ye +kl +DU +XG +Ii +Ii +bD +"} +(13,1,1) = {" +Xt +XG +XG +XG +XG +XG +XG +XG +XG +cA +oj +XG +XG +XG +XG +XG +XG +Xt +Xt +Xt +"} +(14,1,1) = {" +Xt +Xt +Xt +XG +XG +Yg +bm +FZ +gx +cA +cA +cn +XG +Gi +vC +XG +Xt +Xt +Xt +Xt +"} +(15,1,1) = {" +Xt +Xt +XG +XG +HK +Fl +ZT +ms +IM +cA +BZ +cA +qJ +SV +Jg +XG +Xt +Xt +Xt +Xt +"} +(16,1,1) = {" +Xt +Xt +XG +RN +sc +bA +cA +ms +gx +cm +Sb +UF +XG +Fu +dH +EM +Xt +Xt +Xt +Xt +"} +(17,1,1) = {" +Xt +Xt +XG +qI +Vj +xG +Fh +zw +XG +cA +oj +XG +XG +XG +XG +Qi +Xt +Xt +Xt +Xt +"} +(18,1,1) = {" +Xt +Xt +XG +XG +XG +CF +XG +XG +XG +KG +bA +XC +jJ +iT +Xf +Xt +Xt +Xt +Xt +Xt +"} +(19,1,1) = {" +Xt +Xt +XG +Hv +GM +bA +Df +ha +zz +AT +mg +cA +bA +vW +zs +Xt +Xt +Xt +Xt +Xt +"} +(20,1,1) = {" +Xt +Xt +XG +zm +KC +zx +Dp +JL +oq +cA +Xz +cA +Ho +FP +sH +Xt +Xt +Xt +Xt +Xt +"} +(21,1,1) = {" +Xt +Xt +XG +XG +lG +Pr +cA +ZO +vf +bE +Xc +Wx +Ez +SO +cR +Xt +Xt +Xt +Xt +Xt +"} +(22,1,1) = {" +Xt +Xt +Xt +XG +XG +Tc +dq +dO +Xf +jH +is +pR +SO +SO +Xt +Xt +Xt +Xt +Xt +Xt +"} +(23,1,1) = {" +Xt +Xt +Xt +Xt +XG +Li +sX +Ct +Le +sX +lX +sX +SO +Xt +Xt +Xt +Xt +Xt +Xt +Xt +"} +(24,1,1) = {" +Xt +Xt +Xt +Xt +Xt +Xt +gz +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +"} +(25,1,1) = {" +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +Xt +"} diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index dc84289502cc..3d331fff024d 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -72,14 +72,6 @@ allow_construction = 0 }, /area/almayer/stair_clone/upper) -"aan" = ( -/obj/effect/projector{ - name = "Almayer_Up1"; - vector_x = -19; - vector_y = 98 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) "aaq" = ( /obj/item/bedsheet/purple{ layer = 3.2 @@ -120,75 +112,13 @@ icon_state = "plate" }, /area/almayer/living/port_emb) -"aas" = ( -/obj/vehicle/powerloader, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hallways/repair_bay) "aau" = ( /turf/closed/wall/almayer/reinforced/temphull, /area/almayer/living/pilotbunks) -"aav" = ( -/obj/vehicle/powerloader, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hallways/repair_bay) -"aax" = ( -/obj/effect/projector{ - name = "Almayer_Down2"; - vector_x = 1; - vector_y = -100 - }, -/turf/open/floor/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/aft_hallway) -"aay" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) "aaC" = ( /obj/structure/lattice, /turf/open/space/basic, /area/space) -"aaD" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" - }, -/area/almayer/hallways/repair_bay) -"aaE" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/hallways/aft_hallway) "aaF" = ( /obj/structure/stairs{ dir = 1; @@ -214,46 +144,24 @@ icon_state = "plate" }, /area/almayer/stair_clone/upper) -"aaK" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/machinery/recharge_station{ - layer = 2.9 - }, -/obj/structure/sign/safety/high_voltage{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" +"aaP" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + dir = 2; + name = "\improper Brig Armoury"; + req_access = null; + req_one_access_txt = "1;3" }, -/area/almayer/hallways/repair_bay) -"aaL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/hallways/aft_hallway) -"aaO" = ( /turf/open/floor/almayer{ - dir = 6; - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/shipboard/brig/starboard_hallway) "aaY" = ( /obj/structure/lattice, /turf/open/space, @@ -268,35 +176,10 @@ icon_state = "test_floor4" }, /area/almayer/powered) -"abd" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/closet/secure_closet/engineering_welding{ - req_one_access_txt = "7;23;27" - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/sign/safety/terminal{ - pixel_y = 32 - }, -/obj/structure/sign/safety/fire_haz{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "silver" - }, -/area/almayer/hallways/repair_bay) "abf" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"abg" = ( -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) "abh" = ( /turf/closed/wall/almayer/outer, /area/almayer/lifeboat_pumps/north2) @@ -304,10 +187,20 @@ /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, /area/almayer/lifeboat_pumps/north2) +"abj" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) "abk" = ( /obj/structure/window/reinforced/toughened, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cic) +"abn" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) "abs" = ( /turf/closed/wall/almayer/outer, /area/almayer/lifeboat_pumps/north1) @@ -315,9 +208,6 @@ /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, /area/almayer/lifeboat_pumps/north1) -"abx" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) "abB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -365,15 +255,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"abN" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_bow) "abQ" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -410,15 +291,6 @@ icon_state = "tcomms" }, /area/almayer/shipboard/weapon_room) -"aca" = ( -/obj/structure/surface/rack, -/obj/item/frame/table, -/obj/item/frame/table, -/obj/item/frame/table, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) "acc" = ( /obj/structure/machinery/door/airlock/almayer/security{ access_modified = 1; @@ -441,12 +313,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop/hangar) -"ace" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "acf" = ( /turf/closed/wall/almayer/outer, /area/almayer/living/starboard_garden) @@ -636,20 +502,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) -"acC" = ( -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/hallways/aft_hallway) -"acF" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) "acI" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -717,6 +569,9 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) +"acQ" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "acS" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -737,17 +592,6 @@ icon_state = "plate" }, /area/almayer/living/basketball) -"acV" = ( -/obj/effect/projector{ - name = "Almayer_Down2"; - vector_x = 1; - vector_y = -100 - }, -/turf/open/floor/almayer{ - allow_construction = 0; - icon_state = "plate" - }, -/area/almayer/hallways/aft_hallway) "acW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -787,42 +631,15 @@ icon_state = "plate" }, /area/almayer/living/offices/flight) -"adb" = ( -/obj/structure/stairs{ - dir = 8; - icon_state = "ramptop" - }, -/obj/effect/projector{ - name = "Almayer_Down2"; - vector_x = 1; - vector_y = -100 - }, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/aft_hallway) -"adc" = ( -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/aft_hallway) "add" = ( /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) "ade" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/radio{ - pixel_x = -6; - pixel_y = 3 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"adg" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/area/almayer/hallways/lower/starboard_aft_hallway) "adj" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down1"; @@ -834,18 +651,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/stair_clone/upper) -"adk" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/hallways/repair_bay) "ado" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -909,16 +714,6 @@ "adG" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/starboard_missiles) -"adH" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "adO" = ( /turf/closed/wall/almayer, /area/almayer/engineering/starboard_atmos) @@ -951,16 +746,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"aeb" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "northcheckpoint"; - name = "\improper Checkpoint Shutters" - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/hallways/starboard_hallway) "aec" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -1010,11 +795,6 @@ "ael" = ( /turf/closed/wall/almayer, /area/almayer/living/cafeteria_officer) -"aem" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "aep" = ( /turf/closed/wall/almayer, /area/almayer/engineering/airmix) @@ -1185,16 +965,6 @@ allow_construction = 0 }, /area/almayer/stair_clone/upper) -"aeU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/hallways/aft_hallway) "aeW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, @@ -1247,32 +1017,6 @@ icon_state = "redfull" }, /area/almayer/shipboard/starboard_missiles) -"afe" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) -"aff" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) "afj" = ( /obj/structure/machinery/portable_atmospherics/canister/empty, /turf/open/floor/engine, @@ -1298,61 +1042,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/basketball) -"afu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/hallways/repair_bay) -"afv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/aft_hallway) -"afx" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper Workshop Vendors" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/repair_bay) "afy" = ( /obj/structure/machinery/light{ dir = 8 }, /turf/open/floor/almayer, /area/almayer/living/offices/flight) -"afz" = ( -/turf/open/floor/almayer/empty, -/area/almayer/hallways/vehiclehangar) -"afA" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/stern) "afB" = ( /obj/structure/machinery/light{ dir = 1 @@ -1362,16 +1057,6 @@ icon_state = "red" }, /area/almayer/living/starboard_garden) -"afC" = ( -/obj/docking_port/stationary/vehicle_elevator/almayer, -/turf/open/floor/almayer/empty, -/area/almayer/hallways/vehiclehangar) -"afD" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "silver" - }, -/area/almayer/hallways/aft_hallway) "afE" = ( /obj/structure/machinery/vending/dinnerware, /obj/structure/machinery/firealarm{ @@ -1504,17 +1189,6 @@ icon_state = "plate" }, /area/almayer/command/cichallway) -"aga" = ( -/obj/item/tool/wirecutters{ - pixel_y = -7 - }, -/obj/structure/sign/poster{ - desc = "You are becoming hysterical."; - icon_state = "poster11"; - pixel_y = 30 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) "agb" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/reagent_container/food/snacks/bloodsoup{ @@ -1540,18 +1214,6 @@ "agj" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/living/commandbunks) -"agn" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) -"ago" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "agq" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -1580,19 +1242,27 @@ "agu" = ( /turf/open/floor/almayer, /area/almayer/living/officer_study) -"agw" = ( -/obj/structure/machinery/light{ - dir = 8 +"agv" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ + access_modified = 1; + dir = 2; + name = "\improper Requisitions Break Room"; + req_one_access_txt = "19;21" }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) -"agy" = ( -/obj/structure/pipes/vents/pump/on, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/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/req) "agA" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -1606,15 +1276,6 @@ icon_state = "red" }, /area/almayer/living/starboard_garden) -"agG" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) "agH" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/disposalpipe/segment{ @@ -1638,12 +1299,6 @@ icon_state = "silver" }, /area/almayer/living/officer_study) -"agJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/hallways/stern_hallway) "agK" = ( /obj/structure/bed/chair{ dir = 1 @@ -1693,13 +1348,6 @@ icon_state = "plate" }, /area/almayer/living/cafeteria_officer) -"agX" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "silver" - }, -/area/almayer/hallways/repair_bay) "agY" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -1742,12 +1390,6 @@ icon_state = "test_floor4" }, /area/almayer/powered) -"ahj" = ( -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/starboard_hallway) "ahl" = ( /turf/open/floor/almayer{ dir = 9; @@ -1758,24 +1400,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/offices/flight) -"ahq" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) -"ahr" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "ahy" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -1796,12 +1420,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) -"ahB" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) "ahG" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -1819,13 +1437,14 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/engineering/starboard_atmos) -"ahM" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "mono" +"ahL" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/drinks/cans/souto/diet/lime{ + pixel_x = 7; + pixel_y = 4 }, -/area/almayer/hallways/aft_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) "ahN" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/floor/grass, @@ -1858,17 +1477,6 @@ icon_state = "silver" }, /area/almayer/living/officer_study) -"aib" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/maint/reinforced{ - access_modified = 1; - req_one_access = null; - req_one_access_txt = "7;19" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/vehiclehangar) "aic" = ( /turf/open/floor/almayer{ dir = 1; @@ -1912,15 +1520,6 @@ icon_state = "test_floor4" }, /area/almayer/living/cafeteria_officer) -"aii" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) "aij" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -1934,18 +1533,6 @@ icon_state = "silver" }, /area/almayer/living/cafeteria_officer) -"aik" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) -"aim" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "ain" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -1954,18 +1541,6 @@ icon_state = "plate" }, /area/almayer/living/cafeteria_officer) -"aio" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/hallways/aft_hallway) "aiq" = ( /turf/open/floor/almayer, /area/almayer/living/cafeteria_officer) @@ -1981,31 +1556,9 @@ icon_state = "bluecorner" }, /area/almayer/living/offices/flight) -"ait" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/aft_hallway) "aiw" = ( /turf/open/floor/almayer, /area/almayer/engineering/starboard_atmos) -"aiy" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 3 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) -"aiB" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) -"aiC" = ( -/turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) "aiH" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -2062,16 +1615,6 @@ "aiX" = ( /turf/closed/wall/almayer, /area/almayer/living/pilotbunks) -"ajd" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 2.5 - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) "aje" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -2100,38 +1643,6 @@ icon_state = "redfull" }, /area/almayer/command/cic) -"ajp" = ( -/obj/structure/surface/table/almayer, -/obj/structure/dropship_equipment/fuel/cooling_system{ - layer = 3.5 - }, -/obj/item/clothing/glasses/welding{ - layer = 3.6; - pixel_x = 2; - pixel_y = 7 - }, -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/computer/working_joe{ - dir = 4; - pixel_x = -17 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/hallways/repair_bay) -"ajq" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) -"ajr" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "bluecorner" - }, -/area/almayer/hallways/aft_hallway) "ajs" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -2140,15 +1651,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) -"ajt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) "aju" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -2161,53 +1663,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north2) -"ajx" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/almayer{ - icon_state = "silver" - }, -/area/almayer/hallways/repair_bay) -"ajy" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/hallways/repair_bay) -"ajz" = ( -/turf/open/floor/almayer{ - icon_state = "silver" - }, -/area/almayer/hallways/repair_bay) "ajA" = ( /obj/structure/bed/chair/office/dark, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/offices/flight) -"ajB" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ - req_access = null; - req_one_access = null; - req_one_access_txt = "7;23;27;102" - }, -/obj/item/reagent_container/food/drinks/coffee{ - pixel_x = -3; - pixel_y = 18 - }, -/turf/open/floor/almayer{ - icon_state = "silver" - }, -/area/almayer/hallways/repair_bay) -"ajC" = ( -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "ajD" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -2222,24 +1683,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"ajF" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) -"ajG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) "ajH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -2258,21 +1701,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/cafeteria_officer) -"ajL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/obj/structure/machinery/light, -/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage{ - req_access = null; - req_one_access = null; - req_one_access_txt = "7;23;27;102" - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "silver" - }, -/area/almayer/hallways/repair_bay) "ajM" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -2281,36 +1709,6 @@ }, /turf/open/floor/plating, /area/almayer/living/offices/flight) -"ajN" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) -"ajO" = ( -/obj/structure/stairs, -/obj/effect/projector{ - name = "Almayer_Up1"; - vector_x = -19; - vector_y = 98 - }, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/starboard_hallway) -"ajP" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) -"ajR" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) "ajT" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -2323,19 +1721,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north1) -"ajW" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) -"ajX" = ( -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/port_hallway) "ajY" = ( /turf/open/floor/almayer_hull{ dir = 10; @@ -2372,6 +1757,18 @@ icon_state = "redcorner" }, /area/almayer/shipboard/weapon_room) +"akn" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/vehicle/powerloader{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "cargo" + }, +/area/almayer/hallways/lower/vehiclehangar) "ako" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2430,20 +1827,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"aky" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/machinery/cm_vending/sorted/tech/tool_storage{ - req_one_access = null; - req_one_access_txt = "7;23;27;102" - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "silver" - }, -/area/almayer/hallways/repair_bay) "akz" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -2473,52 +1856,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_two) -"akH" = ( -/obj/structure/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) -"akI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) -"akJ" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/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/hallways/stern_hallway) -"akK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) "akL" = ( /obj/structure/machinery/light{ dir = 1 @@ -2535,17 +1872,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"akO" = ( -/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/hallways/starboard_hallway) "akQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2565,37 +1891,6 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) -"akT" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) -"akU" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) -"akV" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/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/hallways/aft_hallway) "akW" = ( /turf/open/floor/almayer{ dir = 8; @@ -2640,12 +1935,10 @@ }, /turf/open/floor/grass, /area/almayer/living/starboard_garden) -"ali" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "bluecorner" - }, -/area/almayer/hallways/aft_hallway) +"alh" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_s) "alk" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -2658,31 +1951,17 @@ }, /turf/closed/wall/almayer/research/containment/wall/purple, /area/almayer/medical/containment/cell) -"all" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) "alp" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "silver" +/obj/structure/machinery/firealarm{ + pixel_y = -28 }, -/area/almayer/hallways/aft_hallway) -"alq" = ( -/obj/structure/disposalpipe/junction, -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) -"als" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 1; - icon_state = "bluecorner" + icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/shipboard/brig/starboard_hallway) "alw" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -2692,22 +1971,6 @@ icon_state = "test_floor4" }, /area/almayer/living/pilotbunks) -"alx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "northcheckpoint"; - name = "\improper Checkpoint Shutters" - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/hallways/starboard_hallway) "aly" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/starboard_missiles) @@ -2743,60 +2006,12 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/perma) -"alG" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/stern_hallway) -"alI" = ( -/obj/item/stack/cable_coil{ - pixel_x = 1; - pixel_y = 10 - }, -/obj/item/trash/pistachios, -/obj/item/tool/screwdriver, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/hallways/repair_bay) -"alJ" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/stern_hallway) -"alK" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/stern_hallway) "alL" = ( /turf/closed/wall/almayer, /area/almayer/command/telecomms) "alO" = ( /turf/closed/wall/almayer, /area/almayer/engineering/upper_engineering) -"alP" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/stern_hallway) -"alQ" = ( -/obj/item/tool/wrench{ - pixel_x = -8; - pixel_y = 10 - }, -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/prop/mech/hydralic_clamp, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) "alR" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -2821,12 +2036,6 @@ "alX" = ( /turf/open/floor/almayer, /area/almayer/command/cic) -"alY" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/mess) "alZ" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -2846,6 +2055,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/pilotbunks) +"amc" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/stern_hallway) "amd" = ( /obj/structure/machinery/vending/cola{ density = 0; @@ -2863,12 +2080,6 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) -"amj" = ( -/obj/item/reagent_container/food/drinks/cans/souto, -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/hallways/repair_bay) "amk" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -2893,12 +2104,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"amp" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) "ams" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/atmos_alert{ @@ -2908,6 +2113,14 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) +"amu" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/s_bow) "amw" = ( /turf/open/floor/almayer{ dir = 9; @@ -2927,17 +2140,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"amC" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) -"amD" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "amE" = ( /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, @@ -2966,63 +2168,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"amK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) -"amO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) -"amR" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/item/storage/belt/utility, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) -"amS" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/effect/projector{ - name = "Almayer_Up4"; - vector_x = -19; - vector_y = 104 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/port_hallway) -"amT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) -"amU" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/repair_bay) "amX" = ( /turf/open/floor/almayer{ dir = 1; @@ -3052,12 +2197,6 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) -"anc" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silvercorner" - }, -/area/almayer/hallways/aft_hallway) "and" = ( /obj/structure/window/reinforced{ dir = 4; @@ -3072,24 +2211,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/pilotbunks) -"anf" = ( -/turf/open/floor/almayer{ - icon_state = "silvercorner" +"ang" = ( +/obj/item/clothing/head/welding{ + pixel_y = 6 }, -/area/almayer/hallways/aft_hallway) -"anh" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "silver" +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 }, -/area/almayer/hallways/aft_hallway) -"ani" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/area/almayer/maint/hull/upper/u_a_p) "anm" = ( /obj/structure/stairs{ icon_state = "ramptop" @@ -3178,73 +2312,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/hydroponics) -"anB" = ( -/obj/structure/sign/safety/storage{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/hallways/repair_bay) -"anC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) -"anD" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) -"anG" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) -"anH" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) -"anJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) -"anK" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) -"anL" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) "anM" = ( /obj/structure/surface/table/almayer, /obj/item/clipboard, @@ -3264,18 +2331,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) -"anR" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" +"anU" = ( +/obj/structure/machinery/door/airlock/almayer/security{ + dir = 2; + name = "\improper Dropship Control Bubble"; + req_access = null; + req_one_access_txt = "3;22;2;19" }, -/area/almayer/hallways/stern_hallway) -"anT" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 4; - icon_state = "silvercorner" + icon_state = "test_floor4" }, -/area/almayer/hallways/repair_bay) +/area/almayer/living/offices/flight) "anV" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ @@ -3294,29 +2361,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/weapon_room) -"aoc" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/effect/projector{ - name = "Almayer_Up4"; - vector_x = -19; - vector_y = 104 - }, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/port_hallway) -"aod" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "aoe" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/morgue) +"aog" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/hangar) "aoh" = ( /obj/structure/morgue/crematorium, /turf/open/floor/almayer{ @@ -3371,11 +2424,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"aow" = ( -/turf/open/floor/almayer{ - icon_state = "bluecorner" - }, -/area/almayer/hallways/aft_hallway) "aoy" = ( /obj/structure/sign/safety/fire_haz{ pixel_x = 8; @@ -3395,68 +2443,12 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"aoB" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) "aoC" = ( /obj/structure/pipes/vents/pump{ dir = 1 }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"aoD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/stern_hallway) -"aoE" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) -"aoF" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "silver" - }, -/area/almayer/hallways/repair_bay) -"aoG" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) -"aoH" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" - }, -/area/almayer/hallways/repair_bay) "aoI" = ( /turf/open/floor/almayer{ dir = 6; @@ -3516,6 +2508,12 @@ icon_state = "dark_sterile" }, /area/almayer/medical/medical_science) +"aoN" = ( +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/hangar) "aoP" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -3523,59 +2521,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/telecomms) -"aoQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) -"aoR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/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/hallways/stern_hallway) -"aoS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) "aoT" = ( /turf/open/floor/almayer{ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"aoU" = ( -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/stern_hallway) "aoV" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/effect/decal/cleanable/dirt, @@ -3607,15 +2557,6 @@ icon_state = "plating" }, /area/almayer/engineering/upper_engineering) -"aoZ" = ( -/obj/structure/closet, -/obj/item/clothing/under/marine, -/obj/item/clothing/suit/storage/marine, -/obj/item/clothing/head/helmet/marine, -/obj/item/clothing/head/beret/cm, -/obj/item/clothing/head/beret/cm, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) "apa" = ( /obj/structure/surface/rack, /obj/item/tool/screwdriver, @@ -3623,20 +2564,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) -"apc" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/stern_hallway) -"apd" = ( -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/stern_hallway) "ape" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3646,12 +2573,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"apf" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/stern_hallway) "apg" = ( /turf/open/floor/almayer{ dir = 10; @@ -3664,12 +2585,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"apj" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/hallways/stern_hallway) "apk" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down1"; @@ -3678,20 +2593,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/stair_clone/upper) -"apl" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) -"apm" = ( -/obj/structure/machinery/line_nexter{ - dir = 1; - id = "MTline"; - pixel_y = 3 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "apo" = ( /obj/structure/disposalpipe/trunk, /obj/structure/machinery/disposal, @@ -3699,13 +2600,6 @@ icon_state = "plate" }, /area/almayer/command/cic) -"app" = ( -/obj/structure/barricade/handrail{ - dir = 1; - pixel_y = 2 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "apq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -3746,19 +2640,6 @@ icon_state = "red" }, /area/almayer/living/starboard_garden) -"apv" = ( -/obj/structure/sign/safety/ladder{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) -"apx" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/hull/upper/p_bow) "apz" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -3783,28 +2664,12 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/starboard) -"apC" = ( -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) "apE" = ( /turf/open/floor/almayer{ dir = 9; icon_state = "orange" }, /area/almayer/hallways/hangar) -"apJ" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/hallways/aft_hallway) -"apK" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/hallways/aft_hallway) "apL" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/cell_charger, @@ -4029,19 +2894,6 @@ icon_state = "mono" }, /area/almayer/living/pilotbunks) -"aqx" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "laddernorthwest"; - name = "\improper North West Ladders Shutters" - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) "aqy" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -4080,6 +2932,13 @@ icon_state = "plate" }, /area/almayer/medical/medical_science) +"aqH" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "aqI" = ( /turf/open/floor/almayer{ dir = 8; @@ -4098,17 +2957,19 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) -"aqM" = ( +"aqL" = ( +/obj/structure/stairs{ + dir = 1 + }, /obj/effect/projector{ - name = "Almayer_Up2"; - vector_x = -1; - vector_y = 100 + name = "Almayer_Up4"; + vector_x = -19; + vector_y = 104 }, -/obj/structure/machinery/light{ - dir = 8 +/turf/open/floor/plating/almayer{ + allow_construction = 0 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "aqN" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -4162,18 +3023,12 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/engineering/upper_engineering) +"aqZ" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/s_stern) "arb" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) -"arf" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "silvercorner" - }, -/area/almayer/hallways/aft_hallway) "arg" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -4239,17 +3094,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"arn" = ( -/obj/effect/projector{ - name = "Almayer_Up1"; - vector_x = -19; - vector_y = 98 - }, -/turf/open/floor/almayer{ - allow_construction = 0; - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) "arp" = ( /obj/structure/bed/chair{ dir = 4 @@ -4345,16 +3189,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"arO" = ( -/obj/effect/projector{ - name = "Almayer_Up2"; - vector_x = -1; - vector_y = 100 - }, -/turf/open/floor/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/starboard_hallway) "arP" = ( /obj/structure/sign/safety/hazard{ pixel_y = 32 @@ -4417,34 +3251,6 @@ icon_state = "dark_sterile" }, /area/almayer/living/pilotbunks) -"asj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/hallways/aft_hallway) -"asl" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/hallways/aft_hallway) "asm" = ( /obj/structure/stairs{ dir = 4 @@ -4466,15 +3272,6 @@ /obj/structure/machinery/door/poddoor/almayer/biohazard/white, /turf/open/floor/plating, /area/almayer/medical/upper_medical) -"asp" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "asr" = ( /obj/structure/bed/chair/comfy/alpha{ dir = 8 @@ -4507,6 +3304,18 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) +"asC" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + name = "\improper Brig Lobby"; + closeOtherId = "brignorth" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/starboard_hallway) "asD" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/door_control{ @@ -4520,6 +3329,12 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"asE" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "asF" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ access_modified = 1; @@ -4590,33 +3405,6 @@ icon_state = "silver" }, /area/almayer/command/cic) -"asO" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "laddernorthwest"; - name = "\improper North West Ladders Shutters" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) -"asP" = ( -/obj/structure/machinery/door_control{ - id = "laddernorthwest"; - name = "North West Ladders Shutters"; - pixel_x = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "greencorner" - }, -/area/almayer/hallways/starboard_hallway) "asQ" = ( /obj/structure/surface/rack, /obj/item/device/radio/marine, @@ -4647,24 +3435,6 @@ icon_state = "plate" }, /area/almayer/medical/morgue) -"asV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_p) -"asW" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "asX" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /turf/open/floor/almayer{ @@ -4727,16 +3497,6 @@ /obj/structure/bed/sofa/vert/grey/top, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"atj" = ( -/obj/effect/projector{ - name = "Almayer_Down3"; - vector_x = 1; - vector_y = -102 - }, -/turf/open/floor/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/aft_hallway) "atk" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -4751,17 +3511,6 @@ icon_state = "test_floor4" }, /area/almayer/command/telecomms) -"atl" = ( -/obj/effect/projector{ - name = "Almayer_Down3"; - vector_x = 1; - vector_y = -102 - }, -/turf/open/floor/almayer{ - allow_construction = 0; - icon_state = "plate" - }, -/area/almayer/hallways/aft_hallway) "atm" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/command/telecomms) @@ -4839,40 +3588,17 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"atC" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, +"atH" = ( /turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/aft_hallway) -"atI" = ( -/obj/structure/stairs{ - dir = 8; - icon_state = "ramptop" - }, -/obj/effect/projector{ - name = "Almayer_Down3"; - vector_x = 1; - vector_y = -102 - }, -/turf/open/floor/plating/almayer{ - allow_construction = 0 + icon_state = "plate" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "atK" = ( /turf/open/floor/almayer{ dir = 10; icon_state = "red" }, /area/almayer/command/lifeboat) -"atL" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/aft_hallway) "atM" = ( /turf/open/floor/almayer{ dir = 9; @@ -4915,6 +3641,12 @@ icon_state = "test_floor4" }, /area/almayer/command/cic) +"atS" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/stern) "atT" = ( /obj/structure/toilet{ dir = 1 @@ -4929,26 +3661,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/pilotbunks) -"atU" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) -"atV" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "aub" = ( /obj/structure/machinery/light{ dir = 1 @@ -4974,16 +3686,6 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) -"aue" = ( -/obj/effect/projector{ - name = "Almayer_Up3"; - vector_x = -1; - vector_y = 102 - }, -/turf/open/floor/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/port_hallway) "auf" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/closed/wall/almayer/white/hull, @@ -5009,30 +3711,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"auk" = ( -/obj/effect/projector{ - name = "Almayer_Up3"; - vector_x = -1; - vector_y = 102 - }, -/turf/open/floor/almayer{ - allow_construction = 0; - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) -"aul" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/effect/projector{ - name = "Almayer_Up3"; - vector_x = -1; - vector_y = 102 - }, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/port_hallway) "aum" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -5043,22 +3721,6 @@ icon_state = "test_floor4" }, /area/almayer/living/briefing) -"aun" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/effect/projector{ - name = "Almayer_Up3"; - vector_x = -1; - vector_y = 102 - }, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/port_hallway) "auu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -5066,26 +3728,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) -"auv" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) -"aux" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/upper/mess) "auy" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -5105,16 +3747,6 @@ icon_state = "orangecorner" }, /area/almayer/engineering/upper_engineering) -"auG" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/hallways/aft_hallway) "auH" = ( /obj/structure/machinery/door_control{ id = "tcomms_apc"; @@ -5239,26 +3871,20 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"avj" = ( -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) -"avm" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) -"avn" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "avo" = ( /turf/closed/wall/almayer/outer, /area/almayer/powered/agent) +"avp" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/poddoor/almayer{ + id = "s_umbilical"; + name = "\improper Umbillical Airlock"; + unacidable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_umbilical) "avs" = ( /turf/closed/wall/biodome, /area/almayer/powered/agent) @@ -5300,10 +3926,6 @@ icon_state = "test_floor4" }, /area/almayer/powered/agent) -"avD" = ( -/obj/effect/landmark/crap_item, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) "avF" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -5479,15 +4101,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) -"avX" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) "avY" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cic) @@ -5503,15 +4116,6 @@ icon_state = "rasputin15" }, /area/almayer/powered/agent) -"awb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "awd" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/living/pilotbunks) @@ -5605,16 +4209,6 @@ icon_state = "plate" }, /area/almayer/command/telecomms) -"aww" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "awx" = ( /turf/open/floor/almayer{ dir = 4; @@ -5665,6 +4259,9 @@ icon_state = "plate" }, /area/almayer/command/cic) +"awE" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) "awF" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/living/numbertwobunks) @@ -5837,19 +4434,6 @@ icon_state = "blue" }, /area/almayer/command/cic) -"axs" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - layer = 2.5 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/aft_hallway) "axu" = ( /obj/structure/machinery/computer/telecomms/server, /turf/open/floor/almayer{ @@ -5982,10 +4566,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"axT" = ( -/obj/docking_port/stationary/escape_pod/north, -/turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_m_p) "axV" = ( /obj/structure/machinery/telecomms/server/presets/command, /turf/open/floor/almayer{ @@ -6011,6 +4591,17 @@ icon_state = "tcomms" }, /area/almayer/command/telecomms) +"axY" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "laddernorthwest"; + name = "\improper North West Ladders Shutters" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_fore_hallway) "aya" = ( /turf/open/floor/almayer{ dir = 4; @@ -6191,21 +4782,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"ayE" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "laddersouthwest"; - name = "\improper South West Ladders Shutters" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) "ayI" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical{ @@ -6267,21 +4843,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north2) -"ayT" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) -"ayU" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "ayV" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -6326,16 +4887,19 @@ icon_state = "dark_sterile" }, /area/almayer/medical/medical_science) -"azb" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +"aza" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "laddernorthwest"; + name = "\improper North West Ladders Shutters" }, +/obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" + icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "azc" = ( /obj/structure/machinery/computer/telecomms/traffic, /turf/open/floor/almayer{ @@ -6360,6 +4924,12 @@ icon_state = "orangecorner" }, /area/almayer/engineering/upper_engineering) +"azg" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_bow) "azh" = ( /obj/structure/pipes/vents/pump/on, /turf/open/floor/almayer{ @@ -6477,19 +5047,6 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"azB" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "laddersouthwest"; - name = "\improper South West Ladders Shutters" - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) "azC" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/flashlight/lamp/green, @@ -6511,36 +5068,6 @@ allow_construction = 0 }, /area/almayer/stair_clone) -"azE" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "greencorner" - }, -/area/almayer/hallways/port_hallway) -"azG" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "laddersouthwest"; - name = "\improper South West Ladders Shutters" - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) -"azI" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "greencorner" - }, -/area/almayer/hallways/port_hallway) "azJ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -6556,23 +5083,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/cichallway) -"azS" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/step_trigger/clone_cleaner, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 2.5 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "greencorner" - }, -/area/almayer/hallways/port_hallway) -"azT" = ( -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) "azU" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -6616,28 +5126,11 @@ icon_state = "plate" }, /area/almayer/command/cic) -"azY" = ( -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) "azZ" = ( /obj/structure/machinery/keycard_auth, /obj/structure/surface/table/reinforced/black, /turf/open/floor/almayer, /area/almayer/command/cic) -"aAa" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/sign/safety/stairs{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "aAd" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -6719,17 +5212,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"aAv" = ( -/obj/effect/projector{ - name = "Almayer_Up4"; - vector_x = -19; - vector_y = 104 - }, -/turf/open/floor/almayer{ - allow_construction = 0; - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) "aAy" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -6846,22 +5328,15 @@ icon_state = "sterile_green" }, /area/almayer/medical/containment) -"aAW" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +"aAU" = ( +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" + dir = 4; + icon_state = "orange" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/lower/starboard_midship_hallway) "aAZ" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -7012,11 +5487,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering) -"aBq" = ( -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/aft_hallway) "aBr" = ( /obj/structure/ladder{ height = 2; @@ -7078,14 +5548,6 @@ icon_state = "red" }, /area/almayer/command/lifeboat) -"aBC" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/repair_bay) "aBD" = ( /obj/structure/closet/basketball, /obj/structure/sign/safety/maint{ @@ -7123,17 +5585,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/cic) -"aBK" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/stern) -"aBO" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_stern) "aBP" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ access_modified = 1; @@ -7144,6 +5595,15 @@ icon_state = "test_floor4" }, /area/almayer/living/synthcloset) +"aBQ" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/firstaid/o2, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/technology_scanner, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_p) "aBR" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/ashtray/glass, @@ -7256,18 +5716,6 @@ icon_state = "silvercorner" }, /area/almayer/command/cic) -"aCl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/hallways/aft_hallway) "aCo" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -7289,30 +5737,32 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"aCr" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) "aCt" = ( /obj/structure/bed/sofa/south/white/right, /turf/open/floor/almayer{ icon_state = "sterile_green" }, /area/almayer/medical/medical_science) +"aCu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) "aCw" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/medical/morgue) -"aCB" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/tool, +"aCA" = ( +/obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/maint/hull/upper/p_bow) "aCC" = ( /turf/open/floor/almayer{ icon_state = "sterile_green" @@ -7349,6 +5799,14 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/containment) +"aCX" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "aCZ" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -7411,15 +5869,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"aDk" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "aDm" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -7447,16 +5896,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"aDp" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silvercorner" - }, -/area/almayer/hallways/aft_hallway) "aDr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7484,6 +5923,10 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) +"aDt" = ( +/obj/structure/machinery/cm_vending/clothing/military_police_warden, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/warden_office) "aDv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -7492,15 +5935,6 @@ icon_state = "plate" }, /area/almayer/command/cic) -"aDx" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) "aDB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7555,17 +5989,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering) -"aDG" = ( -/obj/structure/machinery/door_control{ - id = "panicroomback"; - name = "\improper Safe Room"; - pixel_x = 25; - req_one_access_txt = "3" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/panic) "aDH" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -7591,16 +6014,6 @@ icon_state = "silver" }, /area/almayer/command/cic) -"aDM" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/lobby) "aDO" = ( /turf/open/floor/almayer{ dir = 8; @@ -7656,27 +6069,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"aDY" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/surface/rack, -/obj/item/storage/belt/utility/full{ - pixel_y = 8 - }, -/obj/item/storage/belt/utility/full, -/obj/item/clothing/suit/storage/hazardvest/black, -/obj/item/tool/crowbar, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) -"aDZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) "aEe" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -7686,14 +6078,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/upper_medical) -"aEf" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) "aEg" = ( /turf/open/floor/almayer{ icon_state = "redfull" @@ -7729,12 +6113,15 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"aEp" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, +"aEr" = ( +/obj/structure/largecrate/random/barrel/yellow, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/maint/hull/lower/l_a_p) "aEA" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -7765,14 +6152,6 @@ icon_state = "silver" }, /area/almayer/command/cic) -"aEE" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) "aEG" = ( /obj/structure/bed/chair{ dir = 8 @@ -7785,24 +6164,6 @@ icon_state = "silver" }, /area/almayer/command/cic) -"aEI" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) -"aEK" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "aEM" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/emails, @@ -7842,21 +6203,9 @@ "aET" = ( /turf/closed/wall/almayer, /area/almayer/living/captain_mess) -"aEV" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/hallways/aft_hallway) "aEW" = ( /turf/closed/wall/almayer, /area/almayer/living/numbertwobunks) -"aEX" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "bluecorner" - }, -/area/almayer/hallways/aft_hallway) "aEZ" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/gloves{ @@ -8004,20 +6353,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"aFx" = ( -/obj/structure/surface/table/almayer, -/obj/item/stack/sheet/glass{ - amount = 20; - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/weapon/dart, -/obj/item/weapon/dart, -/obj/item/weapon/dart, -/obj/item/weapon/dart/green, -/obj/item/weapon/dart/green, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "aFy" = ( /obj/structure/bed/chair{ dir = 8 @@ -8058,21 +6393,15 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"aFE" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) -"aFF" = ( -/obj/structure/machinery/light{ - dir = 4 +"aFG" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "vehicle1door"; + name = "Vehicle Bay One" }, /turf/open/floor/almayer{ - dir = 9; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/lower/vehiclehangar) "aFI" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -8095,23 +6424,13 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) -"aFV" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/stern_hallway) -"aFW" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, +"aGa" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/toolbox, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/maint/hull/upper/p_bow) "aGb" = ( /obj/structure/ladder{ height = 2; @@ -8125,22 +6444,6 @@ icon_state = "plate" }, /area/almayer/command/cichallway) -"aGc" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 2 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) -"aGd" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "greencorner" - }, -/area/almayer/hallways/aft_hallway) "aGg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8150,11 +6453,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) -"aGh" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/p_bow) "aGj" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 2; @@ -8165,6 +6463,12 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) +"aGm" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) "aGn" = ( /obj/structure/barricade/handrail, /turf/open/floor/almayer{ @@ -8234,19 +6538,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/starboard) -"aGC" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/hallways/stern_hallway) -"aGD" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/hallways/stern_hallway) "aGH" = ( /obj/structure/machinery/computer/ordercomp, /turf/open/floor/almayer{ @@ -8256,12 +6547,6 @@ "aGN" = ( /turf/open/floor/almayer, /area/almayer/command/computerlab) -"aGO" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/hallways/aft_hallway) "aGP" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -8441,19 +6726,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering) -"aHx" = ( -/obj/structure/ladder/fragile_almayer{ - height = 2; - id = "kitchen" - }, -/obj/structure/sign/safety/ladder{ - pixel_x = 8; - pixel_y = 24 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) "aHK" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -8468,12 +6740,6 @@ icon_state = "silver" }, /area/almayer/engineering/port_atmos) -"aHQ" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/stern_hallway) "aHR" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -8532,18 +6798,17 @@ "aId" = ( /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) -"aIe" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/hallways/stern_hallway) "aIf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/command/cic) +"aIh" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/stern) "aIl" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -8614,6 +6879,13 @@ /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/floor/grass, /area/almayer/living/starboard_garden) +"aIy" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/hallways/lower/starboard_umbilical) "aIB" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/floor/grass, @@ -8674,20 +6946,6 @@ icon_state = "test_floor4" }, /area/almayer/living/numbertwobunks) -"aIS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/sign/safety/autoopenclose{ - pixel_x = 7; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" - }, -/area/almayer/hallways/aft_hallway) "aIT" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -8725,6 +6983,22 @@ icon_state = "plate" }, /area/almayer/living/tankerbunks) +"aIY" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/toxin{ + pixel_x = 8; + pixel_y = -2 + }, +/obj/item/storage/firstaid/regular, +/obj/item/reagent_container/spray/cleaner, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/shipboard/brig/medical) "aJc" = ( /obj/structure/machinery/door/airlock/almayer/command{ name = "\improper Commanding Officer's Mess" @@ -8845,12 +7119,6 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering) -"aJs" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/aft_hallway) "aJw" = ( /obj/structure/machinery/light{ dir = 4 @@ -8860,16 +7128,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"aJB" = ( -/obj/structure/machinery/computer/working_joe{ - dir = 4; - pixel_x = -17 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/maint/upper/mess) "aJG" = ( /obj/structure/bed/chair/office/dark{ dir = 8; @@ -9166,18 +7424,42 @@ icon_state = "dark_sterile" }, /area/almayer/living/numbertwobunks) -"aLB" = ( -/turf/closed/wall/almayer, -/area/almayer/hallways/starboard_hallway) +"aLx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/machinery/door_control{ + id = "DeployWorkR"; + name = "Workshop Shutters"; + pixel_x = -7; + pixel_y = -26; + req_one_access_txt = "3;22;2;19;7" + }, +/obj/structure/surface/rack, +/obj/item/rappel_harness{ + pixel_y = 8 + }, +/obj/item/rappel_harness, +/obj/item/rappel_harness{ + pixel_y = -6 + }, +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = 15; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/hallways/lower/repair_bay) "aLE" = ( /obj/docking_port/stationary/emergency_response/external/hangar_starboard{ dwidth = 8 }, /turf/open/space, /area/space) -"aLG" = ( -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "aLJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -9242,6 +7524,11 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) +"aMf" = ( +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_f_s) "aMg" = ( /obj/structure/sign/safety/intercom{ layer = 2.9; @@ -9267,15 +7554,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"aMl" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/hallways/aft_hallway) "aMm" = ( /obj/structure/surface/table/almayer, /obj/item/tool/crowbar, @@ -9388,12 +7666,10 @@ /obj/effect/landmark/late_join/delta, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) -"aMM" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/hallways/starboard_hallway) +"aML" = ( +/obj/item/ammo_casing/bullet, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) "aMO" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 26 @@ -9425,12 +7701,6 @@ 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{ @@ -9458,14 +7728,6 @@ "aNm" = ( /turf/open/floor/wood/ship, /area/almayer/living/chapel) -"aNn" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "aNr" = ( /obj/effect/landmark/start/chef, /turf/open/floor/plating/plating_catwalk, @@ -9492,33 +7754,12 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha_bravo_shared) -"aNz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/storage{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) -"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; @@ -9542,6 +7783,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) +"aNW" = ( +/turf/open/floor/almayer{ + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/starboard_hallway) "aNY" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -9606,6 +7852,18 @@ icon_state = "cargo" }, /area/almayer/command/telecomms) +"aOw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) "aOy" = ( /obj/structure/machinery/light{ dir = 1 @@ -9712,15 +7970,6 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) -"aOP" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "aOQ" = ( /obj/structure/closet/crate, /obj/item/storage/briefcase/inflatable, @@ -9735,12 +7984,6 @@ "aOR" = ( /turf/open/floor/almayer, /area/almayer/living/chapel) -"aOS" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) "aOU" = ( /obj/structure/platform{ dir = 4 @@ -9780,21 +8023,14 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"aPb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/stern_hallway) -"aPd" = ( -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/almayer{ - icon_state = "plate" +"aPe" = ( +/obj/structure/largecrate/random/case/double, +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = 8; + pixel_y = -32 }, -/area/almayer/maint/hull/lower/l_f_p) +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "aPf" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer, @@ -9823,12 +8059,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha) -"aPm" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hallways/aft_hallway) "aPn" = ( /obj/structure/machinery/cm_vending/clothing/marine/bravo{ density = 0; @@ -9867,9 +8097,6 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) -"aPy" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/hallways/starboard_umbilical) "aPz" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -9880,6 +8107,15 @@ icon_state = "emerald" }, /area/almayer/command/cic) +"aPC" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "aPD" = ( /obj/structure/machinery/photocopier, /turf/open/floor/almayer{ @@ -9929,13 +8165,19 @@ /obj/structure/sign/nosmoking_1, /turf/closed/wall/almayer, /area/almayer/squads/alpha) -"aPP" = ( -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = 16 +"aPN" = ( +/obj/structure/ladder{ + height = 2; + id = "ForeStarboardMaint" + }, +/obj/structure/sign/safety/ladder{ + pixel_x = -17 }, +/turf/open/floor/plating/almayer, +/area/almayer/maint/hull/upper/s_bow) +"aPO" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) +/area/almayer/maint/hull/upper/u_a_p) "aPS" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/almayer{ @@ -9954,17 +8196,6 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) -"aPY" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_umbilical) -"aPZ" = ( -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_umbilical) "aQb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9984,15 +8215,6 @@ icon_state = "emerald" }, /area/almayer/command/cic) -"aQo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) "aQp" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -10024,13 +8246,6 @@ icon_state = "plate" }, /area/almayer/living/offices) -"aQt" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"aQv" = ( -/turf/closed/wall/almayer, -/area/almayer/hallways/starboard_umbilical) "aQy" = ( /obj/structure/transmitter{ dir = 8; @@ -10169,14 +8384,14 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering) -"aRm" = ( -/obj/structure/machinery/light/small{ - dir = 4 +"aRl" = ( +/obj/structure/machinery/door_control/cl/office/door{ + pixel_y = -20 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_a_s) +/area/almayer/hallways/upper/aft_hallway) "aRo" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -10201,6 +8416,15 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) +"aRr" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/hallways/upper/stern_hallway) "aRt" = ( /turf/open/floor/almayer{ dir = 8; @@ -10307,6 +8531,22 @@ }, /turf/open/floor/plating/almayer, /area/almayer/medical/upper_medical) +"aRL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "southcheckpoint"; + name = "\improper Checkpoint Shutters" + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hallways/lower/port_midship_hallway) "aRP" = ( /turf/open/floor/almayer{ dir = 1; @@ -10375,6 +8615,18 @@ icon_state = "tcomms" }, /area/almayer/engineering/lower/engine_core) +"aSl" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/cm_vending/sorted/medical/bolted, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/medical_science) "aSn" = ( /obj/item/stack/sheet/mineral/plastic{ amount = 15 @@ -10431,24 +8683,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, @@ -10456,18 +8690,6 @@ icon_state = "kitchen" }, /area/almayer/living/captain_mess) -"aSv" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "aSx" = ( /obj/structure/machinery/vending/dinnerware, /obj/structure/sign/safety/maint{ @@ -10477,18 +8699,6 @@ icon_state = "kitchen" }, /area/almayer/living/captain_mess) -"aSy" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) -"aSz" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) "aSA" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -10499,20 +8709,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) -"aSB" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) -"aSC" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) "aSE" = ( /obj/structure/bed/chair{ dir = 4 @@ -10561,24 +8757,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/operating_room_two) -"aSV" = ( -/obj/structure/sign/poster/blacklight{ - pixel_y = 35 - }, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/structure/reagent_dispensers/beerkeg/alt_dark{ - anchored = 1; - chemical = null; - density = 0; - pixel_x = -7; - pixel_y = 10 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) "aTa" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/junction{ @@ -10639,16 +8817,6 @@ icon_state = "green" }, /area/almayer/living/offices) -"aTq" = ( -/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_umbilical) "aTr" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -10658,12 +8826,6 @@ icon_state = "green" }, /area/almayer/living/offices) -"aTu" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) "aTv" = ( /obj/structure/machinery/cm_vending/clothing/marine/bravo{ density = 0; @@ -10748,35 +8910,6 @@ icon_state = "kitchen" }, /area/almayer/living/captain_mess) -"aTL" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) -"aTQ" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/aft_hallway) -"aTS" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/stern_hallway) "aTT" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -11030,6 +9163,12 @@ icon_state = "bluefull" }, /area/almayer/living/captain_mess) +"aVm" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/shipboard/brig/starboard_hallway) "aVo" = ( /obj/structure/machinery/light{ dir = 1 @@ -11096,6 +9235,13 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) +"aVM" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_aft_hallway) "aVR" = ( /obj/structure/ladder{ height = 2; @@ -11149,12 +9295,6 @@ icon_state = "test_floor4" }, /area/almayer/living/bridgebunks) -"aVY" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) "aWb" = ( /obj/structure/machinery/computer/working_joe{ dir = 4; @@ -11181,23 +9321,6 @@ icon_state = "silver" }, /area/almayer/engineering/port_atmos) -"aWd" = ( -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/stern_hallway) -"aWf" = ( -/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/hallways/stern_hallway) "aWg" = ( /obj/structure/machinery/door_control{ id = "CMP Office Shutters"; @@ -11216,15 +9339,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/chief_mp_office) -"aWj" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2; - name = "\improper Officer's Bunk" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/bridgebunks) "aWk" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -11233,15 +9347,6 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"aWl" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "aWm" = ( /obj/structure/machinery/light{ dir = 1 @@ -11343,23 +9448,6 @@ icon_state = "test_floor4" }, /area/almayer/living/offices) -"aWH" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) -"aWM" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) -"aWR" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "aWT" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -11383,14 +9471,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/bridgebunks) -"aWY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/u_f_p) "aWZ" = ( /obj/structure/pipes/standard/simple/visible, /obj/structure/window/framed/almayer, @@ -11415,12 +9495,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"aXd" = ( -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) "aXe" = ( /turf/open/floor/almayer{ dir = 1; @@ -11467,69 +9541,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/port) -"aXE" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) -"aXO" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/upper) -"aXS" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) -"aXT" = ( -/obj/structure/pipes/standard/cap/hidden{ - dir = 4 - }, -/obj/structure/sign/safety/life_support{ - pixel_x = 8; - pixel_y = -25 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/stern_hallway) -"aXV" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 1; - name = "\improper Brig"; - closeOtherId = "brigmaint_n" - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/s_bow) "aYd" = ( /obj/structure/dropship_equipment/medevac_system, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/hallways/hangar) -"aYf" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) -"aYj" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) -"aYn" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/aft_hallway) "aYq" = ( /turf/open/floor/almayer{ dir = 6; @@ -11572,15 +9589,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/hangar) -"aYD" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) "aYE" = ( /obj/structure/platform, /obj/structure/platform{ @@ -11599,27 +9607,6 @@ /obj/structure/safe/cl_office, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"aYI" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"aYN" = ( -/obj/structure/platform_decoration, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) -"aYO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) "aYQ" = ( /obj/structure/machinery/bioprinter{ stored_metal = 125 @@ -11637,59 +9624,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_two) -"aYT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) -"aYV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) -"aYW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) -"aYX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/vents/pump/on, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) -"aYY" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, +"aYU" = ( +/obj/effect/landmark/yautja_teleport, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) -"aYZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/maint/hull/upper/u_a_s) "aZe" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -11709,24 +9649,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha) -"aZg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"aZi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) "aZr" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -11739,6 +9661,14 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/chapel) +"aZv" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_m_p) "aZy" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -11749,10 +9679,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) -"aZB" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_umbilical) "aZC" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -11760,10 +9686,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"aZE" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) "aZF" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down4"; @@ -11774,27 +9696,12 @@ allow_construction = 0 }, /area/almayer/stair_clone/upper) -"aZH" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) -"aZJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, +"aZI" = ( +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/almayer{ - dir = 8; - icon_state = "green" + icon_state = "plate" }, -/area/almayer/squads/req) +/area/almayer/maint/hull/upper/p_stern) "aZK" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -11873,10 +9780,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/hangar) -"bad" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "baf" = ( /obj/structure/barricade/handrail/medical, /turf/open/floor/almayer{ @@ -11890,38 +9793,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_one) -"bai" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"bal" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"baq" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"bar" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = -32 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "bat" = ( /obj/structure/machinery/door_control{ id = "ARES Mainframe Right"; @@ -11937,24 +9808,6 @@ "baw" = ( /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"bax" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) -"baB" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "silver" - }, -/area/almayer/hallways/aft_hallway) "baG" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer, @@ -12002,6 +9855,14 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"baW" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "baX" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 8 @@ -12013,6 +9874,17 @@ "baZ" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/lower_medical_lobby) +"bba" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/reagent_dispensers/fueltank{ + anchored = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "bbd" = ( /obj/structure/machinery/light{ dir = 4 @@ -12036,83 +9908,18 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"bbg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"bbh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "bbi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) -"bbj" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) -"bbk" = ( -/obj/structure/barricade/handrail{ - dir = 8 - }, -/obj/structure/barricade/handrail{ - dir = 1; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/hallways/starboard_hallway) -"bbl" = ( -/obj/structure/barricade/handrail{ +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ dir = 1; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/hallways/starboard_hallway) -"bbm" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/hallways/starboard_hallway) -"bbn" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/sign/safety/airlock{ - pixel_x = 15; - pixel_y = 32 + name = "\improper Brig" }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - 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/hallways/starboard_umbilical) +/area/almayer/shipboard/brig/medical) "bbr" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -12150,43 +9957,6 @@ icon_state = "plating" }, /area/almayer/shipboard/starboard_point_defense) -"bbB" = ( -/obj/effect/projector{ - name = "Almayer_Up1"; - vector_x = -19; - vector_y = 98 - }, -/turf/open/floor/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/starboard_hallway) -"bbC" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/effect/projector{ - name = "Almayer_Up1"; - vector_x = -19; - vector_y = 98 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"bbL" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) -"bbO" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) "bbS" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/starboard_point_defense) @@ -12384,19 +10154,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_two) -"bcQ" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/device/radio{ - pixel_x = 8; - pixel_y = 7 - }, -/obj/item/clothing/head/soft/ferret{ - pixel_x = -7 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) "bcR" = ( /obj/structure/sink{ pixel_y = 32 @@ -12729,17 +10486,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/operating_room_one) -"beA" = ( -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/maint/hull/lower/l_m_s) -"beB" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) "beE" = ( /obj/structure/platform{ dir = 1 @@ -12825,6 +10571,31 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) +"bfb" = ( +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) +"bfd" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) +"bff" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "bfl" = ( /turf/open/floor/almayer{ dir = 5; @@ -12849,6 +10620,9 @@ icon_state = "redcorner" }, /area/almayer/living/cryo_cells) +"bfs" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/maint/hull/lower/l_f_s) "bft" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -12960,17 +10734,9 @@ }, /area/almayer/hallways/hangar) "bfO" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/photocopier{ - anchored = 0 - }, -/obj/structure/sign/poster/art{ - pixel_y = 32 - }, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliaison) +/obj/structure/pipes/vents/pump/on, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "bfV" = ( /obj/structure/machinery/landinglight/ds2{ dir = 8 @@ -12992,11 +10758,12 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"bga" = ( +"bgh" = ( /turf/open/floor/almayer{ - icon_state = "redcorner" + dir = 9; + icon_state = "silver" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/upper/aft_hallway) "bgj" = ( /obj/structure/machinery/landinglight/ds1{ dir = 8 @@ -13211,12 +10978,6 @@ icon_state = "red" }, /area/almayer/squads/alpha) -"bhe" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) "bhf" = ( /obj/structure/machinery/light{ dir = 4 @@ -13238,16 +10999,6 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) -"bhh" = ( -/obj/structure/machinery/door/poddoor/almayer{ - id = "n_umbilical"; - name = "\improper Umbillical Airlock"; - unacidable = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_umbilical) "bho" = ( /obj/structure/machinery/computer/med_data, /turf/open/floor/almayer{ @@ -13271,6 +11022,14 @@ icon_state = "plate" }, /area/almayer/living/chapel) +"bhy" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/tool, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) "bhG" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -13314,24 +11073,35 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "bhV" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/ladder/fragile_almayer{ + height = 2; + id = "kitchen" + }, +/obj/structure/sign/safety/ladder{ + pixel_x = 8; + pixel_y = 24 }, -/area/almayer/maint/hull/lower/l_a_s) -"bib" = ( -/obj/structure/largecrate/random/case, -/obj/structure/machinery/access_button/airlock_exterior, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) -"bic" = ( -/obj/structure/largecrate/machine/bodyscanner, +/area/almayer/maint/hull/upper/u_m_p) +"bhZ" = ( +/obj/structure/surface/table/almayer, +/obj/item/frame/table, +/obj/item/storage/toolbox/electrical, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_s) +"bij" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/hallways/upper/aft_hallway) "biq" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/beaker/large, @@ -13348,12 +11118,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/chemistry) -"bit" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "biu" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass{ access_modified = 1; @@ -13368,13 +11132,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/chemistry) -"biv" = ( -/obj/structure/prop/holidays/string_lights{ - pixel_y = 27 - }, -/obj/item/frame/rack, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) "biy" = ( /obj/structure/pipes/unary/freezer, /obj/structure/machinery/power/apc/almayer{ @@ -13392,6 +11149,22 @@ "biA" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/operating_room_three) +"biB" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) +"biC" = ( +/obj/structure/largecrate/random/case, +/obj/structure/machinery/access_button/airlock_exterior, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "biF" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/roller/surgical, @@ -13449,11 +11222,10 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/starboard_garden) -"bjh" = ( -/obj/structure/machinery/light/small, -/obj/structure/largecrate/random/secure, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/p_bow) +"bjg" = ( +/obj/item/trash/chips, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "bjk" = ( /obj/structure/machinery/door_control{ id = "perma_lockdown_2"; @@ -13476,6 +11248,14 @@ icon_state = "plate" }, /area/almayer/squads/bravo) +"bjt" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_stern) "bju" = ( /turf/open/floor/almayer{ dir = 1; @@ -13500,64 +11280,6 @@ icon_state = "cargo_arrow" }, /area/almayer/living/offices) -"bjH" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) -"bjJ" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) -"bjL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orangecorner" - }, -/area/almayer/hallways/starboard_umbilical) -"bjM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_umbilical) -"bjN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/starboard_umbilical) -"bjO" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/obj/structure/sign/safety/airlock{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_umbilical) "bjQ" = ( /obj/structure/machinery/shower{ dir = 8 @@ -13577,6 +11299,12 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"bkb" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/hallways/upper/aft_hallway) "bkd" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 8 @@ -13643,24 +11371,6 @@ "bkA" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/chemistry) -"bkB" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/cell_charger, -/obj/item/cell/apc, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) -"bkD" = ( -/obj/structure/machinery/door/poddoor/railing{ - dir = 2; - id = "vehicle_elevator_railing" - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/vehiclehangar) "bkE" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -13699,18 +11409,17 @@ icon_state = "sterile_green" }, /area/almayer/medical/lockerroom) -"bkQ" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +"bkS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, -/area/almayer/hallways/aft_hallway) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "bkT" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -13734,24 +11443,6 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) -"bkY" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) -"blb" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/stern_hallway) "blf" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -13815,6 +11506,22 @@ icon_state = "plate" }, /area/almayer/living/offices) +"blq" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass{ + access_modified = 1; + dir = 2; + name = "Firing Range"; + req_access = null; + req_one_access_txt = "2;4;7;9;21" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/cryo_cells) "bls" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -13855,9 +11562,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lockerroom) -"bma" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/upper/s_stern) "bmb" = ( /turf/open/floor/almayer{ dir = 8; @@ -13984,12 +11688,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"bmu" = ( -/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_umbilical) "bmv" = ( /obj/structure/machinery/door/airlock/almayer/marine/requisitions{ dir = 2; @@ -14004,21 +11702,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) -"bmw" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hallways/starboard_umbilical) -"bmx" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_umbilical) -"bmy" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/starboard_umbilical) "bmz" = ( /obj/structure/surface/table/almayer, /obj/item/tool/kitchen/utensil/spoon{ @@ -14041,6 +11724,18 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) +"bmC" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-y" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/req) "bmD" = ( /turf/open/floor/almayer{ dir = 5; @@ -14198,15 +11893,14 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/bravo) -"bnD" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 +"bnF" = ( +/obj/structure/machinery/cryopod{ + pixel_y = 6 }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/turf/open/floor/almayer{ + icon_state = "cargo" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/maint/hull/upper/u_m_p) "bnH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -14300,32 +11994,31 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) -"boq" = ( -/obj/structure/bed/chair/comfy/alpha, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/living/briefing) -"bot" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/light{ - dir = 8 +"bom" = ( +/obj/structure/sign/safety/south{ + pixel_x = -17; + pixel_y = 8 }, -/obj/effect/spawner/random/toolbox, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "blue" }, -/area/almayer/hallways/starboard_umbilical) -"bou" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/light{ - dir = 4 +/area/almayer/hallways/lower/port_midship_hallway) +"bop" = ( +/turf/open/floor/almayer{ + dir = 10; + icon_state = "cargo" }, -/obj/item/tank/emergency_oxygen/double, +/area/almayer/engineering/upper_engineering/port) +"boq" = ( +/obj/structure/bed/chair/comfy/alpha, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "redfull" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/living/briefing) +"bos" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/lower/s_bow) "boy" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -14368,6 +12061,11 @@ "boL" = ( /turf/open/floor/almayer, /area/almayer/living/starboard_garden) +"boU" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/weldingtool, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_s) "boV" = ( /obj/structure/cargo_container/wy/left, /obj/structure/prop/almayer/minigun_crate{ @@ -14545,26 +12243,30 @@ icon_state = "green" }, /area/almayer/squads/req) -"bpU" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/firstaid/o2, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_umbilical) "bpV" = ( /obj/effect/landmark/ert_spawns/distress_cryo, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/living/cryo_cells) -"bpW" = ( -/obj/structure/surface/table/almayer, -/obj/effect/spawner/random/technology_scanner, +"bqc" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) +"bqg" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/hallways/lower/starboard_fore_hallway) "bqm" = ( /obj/structure/closet/boxinggloves, /turf/open/floor/almayer{ @@ -14605,10 +12307,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"bqM" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) "bqN" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -14709,6 +12407,12 @@ icon_state = "test_floor5" }, /area/almayer/squads/req) +"brm" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) "brn" = ( /obj/structure/machinery/door/airlock/almayer/marine/bravo/smart, /turf/open/floor/almayer{ @@ -14719,6 +12423,11 @@ /obj/structure/supply_drop/bravo, /turf/open/floor/plating, /area/almayer/squads/req) +"brq" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_midship_hallway) "brr" = ( /obj/structure/machinery/cm_vending/clothing/medic/bravo, /turf/open/floor/almayer{ @@ -14764,17 +12473,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/bravo) -"brD" = ( -/obj/structure/closet, -/obj/item/clothing/suit/armor/riot/marine/vintage_riot, -/obj/item/clothing/head/helmet/riot/vintage_riot, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) "brH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -14786,31 +12484,6 @@ icon_state = "plate" }, /area/almayer/squads/bravo) -"brO" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orangecorner" - }, -/area/almayer/hallways/starboard_umbilical) -"brP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_umbilical) -"brQ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/starboard_umbilical) "brS" = ( /obj/structure/bed, /obj/item/bedsheet/brown, @@ -14837,18 +12510,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"bsk" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) "bsp" = ( /obj/structure/sink{ dir = 4; @@ -14901,6 +12562,15 @@ icon_state = "plate" }, /area/almayer/living/gym) +"bsF" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/mp_bunks) "bsG" = ( /obj/structure/machinery/disposal{ density = 0; @@ -14984,15 +12654,6 @@ icon_state = "plate" }, /area/almayer/squads/bravo) -"bsT" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "bsU" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -15009,12 +12670,6 @@ icon_state = "plate" }, /area/almayer/squads/bravo) -"bsX" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/starboard_hallway) "btc" = ( /obj/structure/bed/chair{ dir = 8; @@ -15038,12 +12693,6 @@ icon_state = "silver" }, /area/almayer/command/computerlab) -"btp" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_umbilical) "btr" = ( /obj/structure/closet/boxinggloves, /obj/structure/machinery/light, @@ -15085,9 +12734,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"btL" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/upper/u_f_s) "btM" = ( /obj/effect/spawner/random/toolbox, /obj/structure/pipes/vents/scrubber{ @@ -15107,6 +12753,15 @@ "btO" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"btV" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "btX" = ( /obj/structure/machinery/light{ dir = 4 @@ -15134,11 +12789,6 @@ icon_state = "red" }, /area/almayer/living/briefing) -"bua" = ( -/turf/open/floor/almayer{ - icon_state = "redcorner" - }, -/area/almayer/shipboard/brig/main_office) "buc" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -15214,17 +12864,6 @@ icon_state = "green" }, /area/almayer/living/offices) -"buH" = ( -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) -"buI" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"buJ" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "buM" = ( /obj/structure/machinery/cm_vending/clothing/smartgun/bravo, /turf/open/floor/almayer{ @@ -15257,24 +12896,21 @@ }, /area/almayer/squads/bravo) "buY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 +/obj/structure/stairs{ + dir = 1 }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 +/obj/structure/machinery/light{ + dir = 8 }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = 32 +/obj/effect/projector{ + name = "Almayer_Up4"; + vector_x = -19; + vector_y = 104 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/turf/open/floor/plating/almayer{ + allow_construction = 0 }, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/hallways/lower/port_midship_hallway) "bvb" = ( /obj/structure/machinery/light{ dir = 8 @@ -15300,12 +12936,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"bvm" = ( -/obj/structure/machinery/cm_vending/sorted/medical/bolted, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lower_medical_medbay) "bvr" = ( /obj/structure/bed/chair/office/dark, /obj/effect/decal/warning_stripes{ @@ -15326,6 +12956,19 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_one) +"bvD" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/hallways/lower/port_fore_hallway) "bvF" = ( /turf/open/floor/almayer{ dir = 8; @@ -15343,23 +12986,6 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/general_equipment) -"bvT" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_umbilical) -"bvV" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_umbilical) "bvX" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -15379,11 +13005,6 @@ icon_state = "test_floor5" }, /area/almayer/squads/req) -"bwd" = ( -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) "bwe" = ( /obj/structure/window/framed/almayer, /turf/open/floor/almayer{ @@ -15464,6 +13085,32 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"bwv" = ( +/obj/structure/disposalpipe/segment, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_x = -28 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_fore_hallway) +"bww" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) +"bwG" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/hull/lower/l_m_s) "bwH" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/crew/alt{ @@ -15474,12 +13121,21 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) -"bwM" = ( -/obj/structure/bed/sofa/south/grey/right, +"bwN" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "orange" }, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/hallways/upper/stern_hallway) +"bwP" = ( +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "bwR" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/med_data/laptop{ @@ -15505,18 +13161,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"bxd" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) "bxf" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out" @@ -15553,13 +13197,6 @@ icon_state = "mono" }, /area/almayer/squads/req) -"bxk" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "bxm" = ( /turf/open/floor/almayer{ dir = 4; @@ -15572,18 +13209,14 @@ icon_state = "redfull" }, /area/almayer/living/cryo_cells) -"bxw" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) -"bxx" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"bxt" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/area/almayer/hallways/starboard_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "bxA" = ( /obj/structure/machinery/power/apc/almayer/hardened, /obj/effect/decal/warning_stripes{ @@ -15622,26 +13255,45 @@ icon_state = "dark_sterile" }, /area/almayer/living/port_emb) -"bxD" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 +"bxE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/machinery/light, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "red" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/shipboard/brig/starboard_hallway) "bxN" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower/workshop) -"bxZ" = ( -/obj/structure/reagent_dispensers/fueltank, +"bxV" = ( +/obj/structure/sign/safety/ladder{ + pixel_x = 8; + pixel_y = 32 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "blue" }, -/area/almayer/maint/lower/s_bow) +/area/almayer/hallways/upper/aft_hallway) +"bxY" = ( +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21"; + pixel_y = 11 + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) "byb" = ( /obj/structure/barricade/handrail/medical, /turf/open/floor/almayer{ @@ -15709,15 +13361,15 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"bys" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, +"byt" = ( +/obj/structure/surface/rack, +/obj/item/tool/crowbar, +/obj/item/tool/weldingtool, +/obj/item/tool/wrench, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/maint/hull/lower/l_m_s) "byu" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -15745,41 +13397,15 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) -"byC" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) -"byD" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) -"byF" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) -"byI" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +"byH" = ( +/obj/structure/bed/sofa/south/white/right{ + pixel_y = 16 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "silver" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/maint/hull/upper/u_m_p) "bzg" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -15795,9 +13421,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) -"bzy" = ( -/turf/closed/wall/almayer, -/area/almayer/hallways/vehiclehangar) "bzz" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -15805,11 +13428,6 @@ /obj/structure/machinery/disposal, /turf/open/floor/almayer, /area/almayer/shipboard/starboard_missiles) -"bzA" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/vehiclehangar) "bzD" = ( /obj/structure/machinery/door/poddoor/almayer{ id = "tcomms" @@ -15818,13 +13436,6 @@ icon_state = "test_floor4" }, /area/almayer/command/telecomms) -"bzH" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/toolbox, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/vehiclehangar) "bzI" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -15836,10 +13447,6 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) -"bzK" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) "bzQ" = ( /obj/structure/largecrate/random/case, /turf/open/floor/plating/plating_catwalk, @@ -15858,34 +13465,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/chemistry) -"bzV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) -"bzW" = ( -/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/hallways/starboard_hallway) -"bzY" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - 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 @@ -15903,12 +13482,6 @@ dir = 1 }, /area/almayer/command/lifeboat) -"bAg" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/vehiclehangar) "bAh" = ( /obj/structure/disposalpipe/segment, /obj/structure/cargo_container/wy/mid, @@ -15918,12 +13491,6 @@ /obj/structure/cargo_container/wy/right, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"bAr" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/vehiclehangar) "bAs" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/weapon_room) @@ -15939,6 +13506,13 @@ icon_state = "test_floor4" }, /area/almayer/command/securestorage) +"bAy" = ( +/obj/structure/closet/fireaxecabinet{ + pixel_y = -32 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "bAH" = ( /obj/structure/largecrate/random/case, /turf/open/floor/almayer{ @@ -16015,17 +13589,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"bAV" = ( -/turf/open/floor/almayer{ - icon_state = "greencorner" - }, -/area/almayer/hallways/starboard_hallway) -"bAX" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hallways/starboard_hallway) "bAY" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out" @@ -16044,21 +13607,12 @@ icon_state = "plate" }, /area/almayer/living/auxiliary_officer_office) -"bBa" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/port_hallway) -"bBb" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/closet/firecloset, +"bBc" = ( +/obj/structure/surface/rack, /turf/open/floor/almayer{ - icon_state = "greencorner" + icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/maint/hull/upper/u_m_p) "bBd" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -16085,24 +13639,12 @@ icon_state = "cargo" }, /area/almayer/squads/alpha) -"bBh" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) "bBl" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"bBp" = ( -/obj/effect/landmark/crap_item, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) "bBu" = ( /obj/structure/surface/rack, /turf/open/floor/almayer{ @@ -16150,9 +13692,6 @@ "bBA" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/weapon_room) -"bBB" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/vehiclehangar) "bBC" = ( /obj/structure/bed/chair{ dir = 4 @@ -16189,21 +13728,6 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"bBO" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/emails{ - dir = 1; - pixel_x = 1; - pixel_y = 4 - }, -/obj/item/tool/kitchen/utensil/fork{ - pixel_x = -9; - pixel_y = 3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "bBQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -16215,6 +13739,18 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"bBR" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) +"bBU" = ( +/obj/structure/sign/safety/security{ + pixel_x = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/s_bow) "bBY" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/almayer{ @@ -16252,21 +13788,10 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/briefing) -"bCi" = ( -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) -"bCj" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "southcheckpoint"; - name = "\improper Checkpoint Shutters" - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/hallways/port_hallway) +"bCk" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) "bCl" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -16290,17 +13815,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_three) -"bCo" = ( -/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/hallways/port_hallway) "bCu" = ( /obj/structure/bed/chair/comfy/alpha{ dir = 4 @@ -16309,6 +13823,18 @@ icon_state = "redfull" }, /area/almayer/living/briefing) +"bCv" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -14; + pixel_y = 13 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) "bCx" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -16360,16 +13886,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/cryo_cells) -"bCI" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "Saferoom Channel"; - pixel_x = 27 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/panic) "bCM" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ @@ -16391,6 +13907,12 @@ icon_state = "red" }, /area/almayer/squads/alpha) +"bCR" = ( +/obj/structure/largecrate/random/case, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "bCS" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -16399,15 +13921,6 @@ icon_state = "red" }, /area/almayer/squads/alpha) -"bCW" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/starboard_hallway) "bCY" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -16424,6 +13937,11 @@ icon_state = "plate" }, /area/almayer/shipboard/weapon_room) +"bDi" = ( +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/aft_hallway) "bDn" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/closed/wall/almayer, @@ -16439,22 +13957,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/lockerroom) -"bDx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "southcheckpoint"; - name = "\improper Checkpoint Shutters" - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/hallways/port_hallway) "bDD" = ( /obj/structure/bed/chair{ dir = 8 @@ -16491,10 +13993,6 @@ icon_state = "plate" }, /area/almayer/living/cryo_cells) -"bDN" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) "bDO" = ( /turf/open/floor/almayer{ icon_state = "tcomms" @@ -16654,14 +14152,16 @@ }, /turf/open/floor/plating, /area/almayer/squads/req) -"bEj" = ( -/obj/structure/bed/chair{ - dir = 4 +"bEk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 6; + icon_state = "green" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/hallways/lower/starboard_aft_hallway) "bEl" = ( /obj/structure/machinery/computer/supply_drop_console/limited, /turf/closed/wall/almayer, @@ -16700,16 +14200,6 @@ icon_state = "cargo" }, /area/almayer/squads/req) -"bEt" = ( -/obj/structure/noticeboard{ - pixel_x = -10; - pixel_y = 31 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/squads/req) "bEv" = ( /turf/open/floor/almayer{ dir = 1; @@ -16728,14 +14218,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/weapon_room) -"bEz" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/vehiclehangar) "bEA" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -16794,16 +14276,6 @@ icon_state = "red" }, /area/almayer/squads/alpha) -"bEH" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/starboard_hallway) "bEK" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -16914,10 +14386,12 @@ icon_state = "plate" }, /area/almayer/squads/bravo) -"bEW" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +"bET" = ( +/obj/structure/machinery/cm_vending/sorted/medical/bolted, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lockerroom) "bFa" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -16926,19 +14400,6 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) -"bFf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) "bFj" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -16954,6 +14415,21 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/weapon_room) +"bFl" = ( +/obj/structure/surface/table/almayer, +/obj/item/pizzabox/meat, +/obj/item/reagent_container/food/drinks/cans/souto/diet/peach{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/reagent_container/food/drinks/cans/souto/diet/cherry{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) "bFp" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -16988,10 +14464,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"bFu" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "bFA" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -17001,6 +14473,15 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"bFB" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "bFC" = ( /obj/structure/machinery/light{ dir = 1 @@ -17023,6 +14504,14 @@ /obj/docking_port/stationary/marine_dropship/almayer_hangar_1, /turf/open/floor/plating, /area/almayer/hallways/hangar) +"bFX" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_aft_hallway) "bGa" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -17036,9 +14525,6 @@ icon_state = "mono" }, /area/almayer/hallways/upper/starboard) -"bGb" = ( -/turf/closed/wall/almayer, -/area/almayer/hallways/port_hallway) "bGc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -17048,60 +14534,6 @@ icon_state = "red" }, /area/almayer/command/lifeboat) -"bGe" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) -"bGg" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) -"bGh" = ( -/obj/structure/barricade/handrail{ - dir = 8 - }, -/obj/structure/barricade/handrail, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/hallways/port_hallway) -"bGi" = ( -/obj/structure/barricade/handrail, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/hallways/port_hallway) -"bGj" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/barricade/handrail, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/hallways/port_hallway) -"bGk" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/barricade/handrail, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/hallways/port_hallway) -"bGl" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" - }, -/area/almayer/hallways/port_hallway) "bGn" = ( /obj/structure/barricade/plasteel/metal, /turf/open/floor/almayer{ @@ -17118,17 +14550,6 @@ /obj/structure/window/framed/almayer/hull/hijack_bustable, /turf/open/floor/plating, /area/almayer/squads/req) -"bGp" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orangecorner" - }, -/area/almayer/hallways/port_umbilical) "bGq" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -17283,37 +14704,17 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"bGT" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/almayer{ - dir = 4; - id = "hangarentrancesouth"; - name = "\improper South Hangar Podlock" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) "bGU" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) -"bHa" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"bHb" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"bHd" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +"bHg" = ( +/obj/structure/bed, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "sterile_green_side" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/medical/lower_medical_medbay) "bHk" = ( /turf/open/floor/almayer/research/containment/floor2{ dir = 1 @@ -17352,32 +14753,19 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/navigation) -"bHt" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +"bHu" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/warden_office) "bHB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"bHC" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - req_access = null - }, -/obj/item/clothing/suit/chef/classic, -/obj/item/tool/kitchen/knife/butcher, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/s_bow) "bHD" = ( /obj/structure/ship_ammo/rocket/banshee, /turf/open/floor/almayer{ @@ -17392,20 +14780,6 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"bHH" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/almayer{ - dir = 4; - id = "hangarentrancesouth"; - name = "\improper South Hangar Podlock" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) "bHI" = ( /obj/structure/anti_air_cannon, /obj/structure/surface/table/almayer, @@ -17413,73 +14787,9 @@ /obj/item/tool/pen, /turf/open/floor/plating/almayer, /area/almayer/shipboard/weapon_room) -"bHL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) "bHP" = ( /turf/open/floor/plating/almayer, /area/almayer/shipboard/weapon_room) -"bHT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) -"bHV" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) -"bHW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) -"bHX" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) -"bHY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"bIb" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) "bId" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -17498,6 +14808,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"bIj" = ( +/turf/open/floor/almayer{ + icon_state = "emeraldcorner" + }, +/area/almayer/hallways/lower/port_midship_hallway) "bIn" = ( /obj/structure/machinery/computer/cameras/almayer_network, /obj/structure/surface/table/almayer, @@ -17578,16 +14893,6 @@ }, /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/navigation) -"bII" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) "bIJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -17611,23 +14916,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/hydroponics) -"bIR" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) -"bIS" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +"bIO" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/step_trigger/clone_cleaner, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) -"bIT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/turf/open/floor/almayer{ + dir = 8; + icon_state = "greencorner" }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "bIU" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes{ @@ -17644,11 +14945,13 @@ icon_state = "orange" }, /area/almayer/squads/bravo) -"bJb" = ( -/obj/structure/disposalpipe/junction, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +"bIW" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) "bJe" = ( /obj/structure/surface/table/reinforced/black, /obj/item/explosive/grenade/high_explosive/training, @@ -17673,21 +14976,6 @@ }, /turf/open/floor/plating, /area/almayer/living/cryo_cells) -"bJh" = ( -/turf/closed/wall/almayer, -/area/almayer/hallways/port_umbilical) -"bJi" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/starboard_hallway) "bJl" = ( /obj/structure/machinery/door/airlock/almayer/generic{ access_modified = 1; @@ -17707,15 +14995,6 @@ icon_state = "test_floor4" }, /area/almayer/living/auxiliary_officer_office) -"bJo" = ( -/turf/closed/wall/almayer, -/area/almayer/hallways/repair_bay) -"bJr" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) "bJt" = ( /turf/closed/wall/almayer, /area/almayer/living/grunt_rnr) @@ -17732,11 +15011,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"bJz" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) "bJC" = ( /turf/closed/wall/almayer, /area/almayer/squads/charlie) @@ -17759,27 +15033,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/bravo) -"bJK" = ( -/obj/item/storage/toolbox/mechanical{ - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) -"bJO" = ( -/obj/structure/machinery/light/small, -/obj/structure/sign/safety/nonpress_0g{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/press_area_ag{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_umbilical) "bJS" = ( /obj/structure/surface/rack, /obj/item/tool/wrench, @@ -17816,12 +15069,6 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"bKa" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/vehiclehangar) "bKb" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -17838,12 +15085,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/weapon_room) -"bKc" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -30 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "bKd" = ( /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler, @@ -17853,36 +15094,21 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"bKe" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) "bKf" = ( /turf/open/floor/almayer{ dir = 5; icon_state = "red" }, /area/almayer/shipboard/navigation) -"bKh" = ( -/turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) -"bKj" = ( -/obj/structure/machinery/gear{ - id = "vehicle_elevator_gears" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "mono" +"bKk" = ( +/obj/item/tool/wrench{ + pixel_x = -8; + pixel_y = 10 }, -/area/almayer/hallways/vehiclehangar) +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/prop/mech/hydralic_clamp, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "bKm" = ( /obj/structure/closet/crate/freezer{ desc = "A freezer crate. There is a note attached, it reads: Do not open, property of Pvt. Mendoza." @@ -17967,23 +15193,51 @@ icon_state = "cargo" }, /area/almayer/living/cryo_cells) -"bKE" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" +"bKI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/almayer/hallways/starboard_hallway) -"bKG" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out" +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) +/area/almayer/shipboard/brig/starboard_hallway) +"bKJ" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/lower/cryo_cells) "bKM" = ( /obj/effect/landmark/start/marine/medic/charlie, /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) +"bKN" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + dir = 2; + name = "\improper Brig Armoury"; + req_access = null; + req_one_access_txt = "1;3"; + closeOtherId = "brignorth" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/starboard_hallway) +"bKP" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/lower/s_bow) "bKQ" = ( /obj/structure/bed/chair{ dir = 8 @@ -17998,6 +15252,39 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) +"bLc" = ( +/obj/structure/surface/rack, +/obj/item/roller, +/obj/item/roller, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/item/clothing/glasses/disco_fever{ + pixel_x = 5; + pixel_y = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_s) +"bLf" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) +"bLg" = ( +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/stern_hallway) "bLh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -18111,24 +15398,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/navigation) -"bLt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) -"bLu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/vehiclehangar) "bLv" = ( /obj/structure/machinery/door_control{ id = "ARES StairsLower"; @@ -18222,25 +15491,6 @@ /obj/item/tool/pen, /turf/open/floor/almayer, /area/almayer/living/offices/flight) -"bLT" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/machinery/door_control{ - id = "hangarentrancesouth"; - name = "South Hangar Shutters"; - pixel_y = 30; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) "bLX" = ( /obj/vehicle/powerloader, /turf/open/floor/almayer{ @@ -18257,6 +15507,20 @@ icon_state = "green" }, /area/almayer/squads/req) +"bMf" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) +"bMi" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/upper/aft_hallway) "bMq" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /obj/structure/machinery/light{ @@ -18266,12 +15530,6 @@ 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; @@ -18330,9 +15588,16 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) -"bMH" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/upper/u_a_p) +"bME" = ( +/obj/structure/surface/rack, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/p_bow) "bMJ" = ( /obj/structure/machinery/light, /obj/structure/machinery/portable_atmospherics/canister/oxygen, @@ -18405,6 +15670,22 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) +"bMV" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_x = -8; + pixel_y = 28 + }, +/obj/structure/sign/safety/intercom{ + pixel_x = 14; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "bluecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "bNa" = ( /obj/structure/surface/table/almayer, /obj/item/folder/black, @@ -18419,6 +15700,12 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) +"bNc" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orangecorner" + }, +/area/almayer/maint/hull/upper/u_a_s) "bNe" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -18500,15 +15787,6 @@ /obj/structure/bed/chair/office/dark, /turf/open/floor/almayer, /area/almayer/shipboard/navigation) -"bNp" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "vehicle1door"; - name = "Vehicle Bay One" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/vehiclehangar) "bNq" = ( /obj/structure/surface/table/almayer, /obj/item/tool/wirecutters, @@ -18518,6 +15796,14 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) +"bNr" = ( +/obj/structure/sign/safety/storage{ + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "bNs" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -18601,6 +15887,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) +"bNI" = ( +/obj/structure/sign/safety/medical{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "bNL" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -18643,37 +15939,15 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"bNW" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hallways/vehiclehangar) -"bOb" = ( -/obj/item/tool/wet_sign, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"bOe" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/structure/machinery/door_control/railings{ - pixel_y = 24 +"bNT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/hallways/vehiclehangar) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "bOq" = ( /obj/structure/prop/almayer/cannon_cables, /turf/open/floor/almayer{ @@ -18689,29 +15963,21 @@ icon_state = "redcorner" }, /area/almayer/shipboard/weapon_room) -"bOv" = ( +"bOw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "emeraldcorner" + icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/vehiclehangar) "bOx" = ( /obj/structure/machinery/door/airlock/almayer/marine/charlie/tl, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/squads/charlie) -"bOy" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/lower/s_bow) -"bOz" = ( -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_f_s) "bOC" = ( /obj/structure/sign/safety/maint{ pixel_x = 8; @@ -18833,11 +16099,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 @@ -18881,15 +16142,6 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) -"bPj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/vehiclehangar) "bPk" = ( /obj/item/roller, /obj/item/roller, @@ -19067,17 +16319,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cells) -"bQd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_s) "bQt" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -19123,9 +16364,6 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) -"bQF" = ( -/turf/closed/wall/almayer, -/area/almayer/shipboard/panic) "bQG" = ( /obj/structure/surface/table/almayer, /obj/item/folder/black, @@ -19230,56 +16468,20 @@ icon_state = "plate" }, /area/almayer/squads/bravo) -"bRs" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/sign/safety/bridge{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/west{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/aft_hallway) -"bRx" = ( -/obj/structure/machinery/door/poddoor/railing{ - id = "vehicle_elevator_railing_aux" - }, -/obj/structure/machinery/light, +"bRo" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) -"bRz" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_umbilical) -"bRA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_umbilical) -"bRD" = ( -/obj/structure/largecrate/random/barrel/red, +/area/almayer/hallways/lower/port_midship_hallway) +"bRt" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/sign/safety/fire_haz{ - pixel_x = 8; - pixel_y = -32 + icon_state = "N"; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "orangecorner" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/starboard_umbilical) "bRP" = ( /obj/structure/machinery/body_scanconsole, /obj/structure/disposalpipe/segment{ @@ -19293,15 +16495,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"bRQ" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) "bRR" = ( /obj/structure/machinery/door/window/eastleft{ req_one_access_txt = "2;21" @@ -19318,14 +16511,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) -"bRU" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/vehiclehangar) "bRV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -19358,13 +16543,6 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) -"bSd" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "bSe" = ( /turf/open/floor/almayer{ dir = 6; @@ -19374,22 +16552,6 @@ "bSf" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/port_point_defense) -"bSg" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/hallways/port_umbilical) -"bSj" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/sign/safety/security{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 32 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "bSn" = ( /obj/structure/machinery/cm_vending/gear/tl{ density = 0; @@ -19476,15 +16638,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; @@ -19539,13 +16692,6 @@ }, /turf/open/floor/plating, /area/almayer/powered) -"bTr" = ( -/obj/structure/machinery/cm_vending/sorted/tech/tool_storage, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/maint/hull/lower/l_m_s) "bTt" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 2; @@ -19576,6 +16722,14 @@ icon_state = "bluecorner" }, /area/almayer/squads/delta) +"bTz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/port_umbilical) "bTA" = ( /turf/open/floor/almayer, /area/almayer/squads/delta) @@ -19588,6 +16742,12 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"bTD" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "greencorner" + }, +/area/almayer/hallways/upper/aft_hallway) "bTE" = ( /turf/open/floor/almayer{ dir = 4; @@ -19618,12 +16778,6 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"bTL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) "bTM" = ( /obj/structure/reagent_dispensers/water_cooler/stacks{ density = 0; @@ -19702,6 +16856,12 @@ icon_state = "plate" }, /area/almayer/living/tankerbunks) +"bTW" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/s_bow) "bUa" = ( /obj/structure/closet, /turf/open/floor/almayer{ @@ -19720,28 +16880,6 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) -"bUd" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "bluecorner" - }, -/area/almayer/hallways/port_hallway) -"bUe" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/machinery/door_control{ - id = "hangarentrancesouth"; - name = "South Hangar Shutters"; - pixel_y = 30; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) "bUf" = ( /obj/structure/machinery/light, /obj/structure/disposalpipe/segment{ @@ -19837,31 +16975,18 @@ icon_state = "test_floor5" }, /area/almayer/squads/req) -"bUE" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/hallways/aft_hallway) -"bUF" = ( -/turf/open/floor/almayer{ - icon_state = "bluecorner" - }, -/area/almayer/hallways/port_hallway) -"bUJ" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Port Viewing Room" +"bUH" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 }, -/area/almayer/maint/hull/upper/u_f_s) -"bUM" = ( /turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" + icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/maint/hull/lower/l_m_p) "bUN" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -19876,6 +17001,11 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) +"bUQ" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "bUT" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 26 @@ -19909,19 +17039,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) -"bVk" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "Saferoom Channel"; - pixel_y = -28 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/panic) "bVn" = ( /obj/structure/machinery/light{ dir = 8 @@ -19946,6 +17063,14 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"bVr" = ( +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "bVs" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -20030,6 +17155,12 @@ icon_state = "plate" }, /area/almayer/living/starboard_garden) +"bWg" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_p) "bWh" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; @@ -20040,12 +17171,6 @@ icon_state = "test_floor4" }, /area/almayer/powered) -"bWm" = ( -/obj/structure/largecrate/supply/floodlights, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) "bWn" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -20100,18 +17225,10 @@ icon_state = "plate" }, /area/almayer/squads/req) -"bWP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/hallways/aft_hallway) +"bWQ" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/warden_office) "bWT" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -20125,18 +17242,6 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"bWV" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/port_hallway) "bXe" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) @@ -20148,6 +17253,14 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"bXh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "bXo" = ( /obj/structure/ladder{ height = 1; @@ -20161,12 +17274,6 @@ icon_state = "plate" }, /area/almayer/shipboard/navigation) -"bXs" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) "bXw" = ( /obj/structure/machinery/bioprinter{ stored_metal = 125 @@ -20175,6 +17282,15 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/operating_room_two) +"bXy" = ( +/obj/structure/machinery/cm_vending/clothing/maintenance_technician, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/port) "bXz" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/plating_catwalk, @@ -20188,12 +17304,6 @@ icon_state = "plate" }, /area/almayer/squads/req) -"bXX" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) "bXY" = ( /obj/structure/ladder{ height = 1; @@ -20207,10 +17317,6 @@ icon_state = "plate" }, /area/almayer/shipboard/navigation) -"bXZ" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) "bYa" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend, /turf/open/floor/almayer{ @@ -20218,29 +17324,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"bYc" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) -"bYd" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) -"bYe" = ( -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/aft_hallway) -"bYh" = ( -/obj/structure/disposalpipe/junction, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) "bYn" = ( /turf/closed/wall/almayer/outer, /area/almayer/engineering/upper_engineering/port) @@ -20290,16 +17373,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"bYE" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/port_hallway) "bYF" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -20307,6 +17380,9 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) +"bYW" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/panic) "bYY" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -20348,6 +17424,18 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) +"bZf" = ( +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice-simple"; + pixel_x = -16; + pixel_y = 17 + }, +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) "bZi" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -20368,54 +17456,31 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"bZo" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) +"bZq" = ( +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/hallways/upper/stern_hallway) "bZr" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "plating_striped" }, /area/almayer/squads/req) -"bZu" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "bZw" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/command/combat_correspondent) -"bZz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "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 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) -"bZL" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "Hangar Lockdown"; - name = "\improper Hangar Lockdown Blast Door" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) "bZO" = ( /obj/structure/machinery/light{ dir = 8 @@ -20437,6 +17502,13 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"bZS" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "silver" + }, +/area/almayer/hallways/lower/repair_bay) "bZU" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -20517,12 +17589,19 @@ icon_state = "green" }, /area/almayer/squads/req) -"can" = ( -/obj/structure/machinery/conveyor{ - id = "req_belt" +"cap" = ( +/obj/structure/surface/rack, +/obj/item/tool/wirecutters, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/maint/hull/upper/u_a_s) +"caq" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "car" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 @@ -20535,14 +17614,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"cat" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "Hangar Lockdown"; - name = "\improper Hangar Lockdown Blast Door" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/vehiclehangar) "cau" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/airlock/almayer/security/glass{ @@ -20559,61 +17630,6 @@ icon_state = "test_floor4" }, /area/almayer/living/cryo_cells) -"cav" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/port_hallway) -"cax" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_umbilical) -"caC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "Hangar Lockdown"; - name = "\improper Hangar Lockdown Blast Door" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) -"caD" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "Hangar Lockdown"; - name = "\improper Hangar Lockdown Blast Door" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/vehiclehangar) -"caL" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/wirecutters, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) "caM" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ @@ -20667,14 +17683,17 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_three) -"caZ" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 +"cbc" = ( +/obj/structure/platform_decoration, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -14; + pixel_y = 13 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/hull/upper/u_a_s) "cbg" = ( /obj/structure/machinery/door/airlock/almayer/command{ dir = 2; @@ -20713,12 +17732,6 @@ icon_state = "silver" }, /area/almayer/command/computerlab) -"cbr" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silvercorner" - }, -/area/almayer/hallways/aft_hallway) "cbu" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ layer = 1.9 @@ -20733,122 +17746,25 @@ icon_state = "test_floor4" }, /area/almayer/medical/lower_medical_medbay) -"cbv" = ( +"cbK" = ( +/obj/structure/machinery/light, /turf/open/floor/almayer{ - dir = 4; - icon_state = "greencorner" + icon_state = "red" }, -/area/almayer/hallways/port_hallway) -"cbw" = ( -/turf/open/floor/almayer{ +/area/almayer/hallways/upper/aft_hallway) +"cbL" = ( +/obj/structure/machinery/camera/autoname/almayer{ dir = 1; - icon_state = "greencorner" - }, -/area/almayer/hallways/port_hallway) -"cbz" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) -"cbD" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) -"cbE" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "test_floor4" + name = "ship-grade camera" }, -/area/almayer/hallways/port_hallway) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "cbM" = ( /obj/structure/closet/crate, /obj/item/clothing/glasses/welding, /obj/item/circuitboard, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north1) -"cbQ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) -"cbR" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) -"cbS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) -"cbU" = ( -/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/hallways/port_hallway) -"cbV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/sign/safety/maint{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/storage{ - pixel_y = 32 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 3 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) -"cbW" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) -"cbX" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) "ccb" = ( /obj/structure/surface/table/reinforced/black, /turf/open/floor/almayer{ @@ -20913,27 +17829,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"ccq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) -"ccr" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) "ccs" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -20942,22 +17837,6 @@ icon_state = "plate" }, /area/almayer/medical/morgue) -"ccu" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) -"ccv" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) "ccG" = ( /obj/structure/largecrate/random/secure, /obj/effect/decal/warning_stripes{ @@ -20967,64 +17846,23 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"ccJ" = ( -/turf/open/floor/almayer{ - icon_state = "silvercorner" +"ccL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/area/almayer/hallways/repair_bay) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_umbilical) "ccN" = ( /turf/open/floor/almayer{ dir = 4; icon_state = "redcorner" }, /area/almayer/living/cryo_cells) -"ccO" = ( -/obj/structure/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) "ccQ" = ( /obj/effect/landmark/ert_spawns/distress_cryo, /obj/effect/landmark/late_join, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) -"ccU" = ( -/obj/structure/pipes/vents/pump{ - dir = 8; - id_tag = "mining_outpost_pump" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"cdb" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_umbilical) -"cdc" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_umbilical) -"cdd" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_umbilical) "cdf" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -21065,27 +17903,6 @@ }, /turf/open/floor/plating, /area/almayer/living/cryo_cells) -"cdw" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_umbilical) -"cdx" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_umbilical) -"cdy" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_umbilical) -"cdz" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_umbilical) "cdA" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -21097,37 +17914,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"cdE" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/drinks/cans/waterbottle{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/item/prop/helmetgarb/flair_io{ - pixel_x = -10; - pixel_y = 6 - }, -/obj/item/prop/magazine/boots/n160{ - pixel_x = -6; - pixel_y = -5 - }, -/obj/structure/transmitter/rotary{ - name = "Flight Deck Telephone"; - phone_category = "Almayer"; - phone_id = "Flight Deck"; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/repair_bay) -"cdF" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) "cdI" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -21184,54 +17970,12 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha) -"cep" = ( -/obj/item/tool/wet_sign, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) -"ces" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_umbilical) -"cet" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_umbilical) "ceu" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "green" }, /area/almayer/living/starboard_garden) -"cev" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_umbilical) -"cew" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/port_umbilical) -"cex" = ( -/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_umbilical) "ceC" = ( /obj/structure/prop/almayer/ship_memorial, /turf/open/floor/plating/almayer, @@ -21249,39 +17993,17 @@ "ceE" = ( /turf/closed/wall/almayer, /area/almayer/command/cichallway) -"ceI" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) "ceK" = ( /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"ceQ" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/machinery/part_fabricator/dropship, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/repair_bay) -"ceR" = ( -/obj/structure/machinery/prop/almayer/computer{ - pixel_y = 20 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/repair_bay) -"ceU" = ( -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" +"ceY" = ( +/obj/structure/machinery/light/small{ + dir = 8 }, -/area/almayer/hallways/repair_bay) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "ceZ" = ( /obj/structure/bed/sofa/south/grey/left, /turf/open/floor/almayer{ @@ -21299,6 +18021,24 @@ icon_state = "red" }, /area/almayer/shipboard/port_missiles) +"cfm" = ( +/obj/structure/flora/pottedplant{ + desc = "Life is underwhelming, especially when you're a potted plant."; + icon_state = "pottedplant_22"; + name = "Jerry"; + pixel_y = 8 + }, +/obj/item/clothing/glasses/sunglasses/prescription{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "cfo" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) @@ -21327,128 +18067,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) -"cfx" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_umbilical) -"cfy" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hallways/port_umbilical) -"cfz" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/port_umbilical) -"cfA" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/effect/spawner/random/tool, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_umbilical) "cfE" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) -"cfM" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Hangar Lockdown"; - name = "\improper Hangar Lockdown Blast Door" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "DeployWorkR"; - name = "\improper Workshop Shutters" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/repair_bay) -"cfN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) "cfT" = ( /turf/open/floor/almayer{ dir = 10; icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"cgd" = ( -/obj/item/clothing/under/blackskirt{ - desc = "A stylish skirt, in a business-black and red colour scheme."; - name = "liaison's skirt" - }, -/obj/item/clothing/under/suit_jacket/charcoal{ - desc = "A professional black suit and blue tie. A combination popular among government agents and corporate Yes-Men alike."; - name = "liaison's black suit" - }, -/obj/item/clothing/under/suit_jacket/navy{ - desc = "A navy suit and red tie, intended for the Almayer's finest. And accountants."; - name = "liaison's navy suit" - }, -/obj/item/clothing/under/suit_jacket/trainee, -/obj/item/clothing/under/liaison_suit/charcoal, -/obj/item/clothing/under/liaison_suit/blazer, -/obj/item/clothing/suit/storage/snow_suit/liaison, -/obj/item/clothing/gloves/black, -/obj/item/clothing/gloves/marine/dress, -/obj/item/clothing/glasses/sunglasses/big, -/obj/item/clothing/accessory/blue, -/obj/item/clothing/accessory/red, -/obj/structure/machinery/status_display{ - pixel_x = -32 - }, -/obj/item/clothing/accessory/black, -/obj/item/clothing/accessory/green, -/obj/item/clothing/accessory/gold, -/obj/item/clothing/accessory/purple, -/obj/item/clothing/under/liaison_suit/corporate_formal, -/obj/item/clothing/under/liaison_suit/field, -/obj/item/clothing/under/liaison_suit/ivy, -/obj/item/clothing/under/liaison_suit/blue, -/obj/item/clothing/under/liaison_suit/brown, -/obj/item/clothing/under/liaison_suit/black, -/obj/item/clothing/suit/storage/jacket/marine/vest, -/obj/item/clothing/suit/storage/jacket/marine/vest/grey, -/obj/item/clothing/suit/storage/jacket/marine/vest/tan, -/obj/item/clothing/suit/storage/jacket/marine/bomber, -/obj/item/clothing/suit/storage/jacket/marine/bomber/red, -/obj/item/clothing/suit/storage/jacket/marine/bomber/grey, -/obj/item/clothing/suit/storage/jacket/marine/corporate, -/obj/item/clothing/suit/storage/jacket/marine/corporate/black, -/obj/item/clothing/suit/storage/jacket/marine/corporate/blue, -/obj/item/clothing/suit/storage/jacket/marine/corporate/brown, -/obj/item/clothing/suit/storage/jacket/marine/corporate/formal, -/obj/structure/closet/cabinet{ - storage_capacity = 35 - }, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliaison) "cgl" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/charlie_delta{ @@ -21516,34 +18146,11 @@ "cgE" = ( /turf/open/floor/almayer, /area/almayer/living/cryo_cells) -"cgG" = ( +"cgO" = ( /obj/structure/surface/table/almayer, -/obj/item/tank/emergency_oxygen/double, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_umbilical) -"cgH" = ( -/obj/structure/surface/table/almayer, -/obj/item/tank/oxygen/red, -/obj/item/tool/screwdriver, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_umbilical) -"cgJ" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) -"cgO" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/emails{ - dir = 8; - pixel_y = 6 +/obj/structure/machinery/computer/emails{ + dir = 8; + pixel_y = 6 }, /turf/open/floor/almayer{ dir = 6; @@ -21558,11 +18165,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) "cgU" = ( -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/powercell, +/obj/effect/spawner/random/powercell, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/hull/lower/l_m_p) "chb" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/maint{ @@ -21591,12 +18202,6 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/charlie_delta_shared) -"chi" = ( -/obj/structure/bed/stool, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) "chk" = ( /obj/structure/machinery/door/airlock/almayer/marine/charlie/medic, /turf/open/floor/almayer{ @@ -21634,29 +18239,19 @@ 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) "chv" = ( /obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) -"chE" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "laddersouthwest"; - name = "\improper South West Ladders Shutters" +"chC" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, -/obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "orange" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/upper/stern_hallway) "chL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -21779,6 +18374,16 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha) +"cif" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/item/tank/emergency_oxygen/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_umbilical) "cil" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/waterhazard{ @@ -21789,31 +18394,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) -"cim" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orangecorner" - }, -/area/almayer/hallways/port_umbilical) -"cin" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_umbilical) -"cio" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/port_umbilical) "cir" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -21855,6 +18435,21 @@ icon_state = "test_floor4" }, /area/almayer/powered) +"ciB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice-simple"; + pixel_x = 16; + pixel_y = -15 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "ciD" = ( /obj/structure/platform_decoration{ dir = 1 @@ -21863,31 +18458,21 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north2) +"ciI" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "ciN" = ( /turf/open/floor/almayer{ dir = 6; icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"ciO" = ( -/obj/structure/surface/table/almayer, -/obj/item/clothing/head/hardhat{ - pixel_y = 15 - }, -/obj/item/clothing/head/hardhat/dblue{ - pixel_x = -7; - pixel_y = 10 - }, -/obj/item/clothing/head/hardhat{ - pixel_x = 4; - pixel_y = 7 - }, -/obj/item/clothing/head/hardhat/orange{ - pixel_x = 7; - pixel_y = -5 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "ciQ" = ( /obj/structure/sign/safety/fire_haz{ pixel_x = 8; @@ -21895,31 +18480,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"ciT" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/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, @@ -21967,59 +18527,11 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cells) -"cjl" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/poddoor/almayer{ - id = "s_umbilical"; - name = "\improper Umbillical Airlock"; - unacidable = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_umbilical) -"cjm" = ( -/obj/structure/machinery/door/poddoor/almayer{ - id = "s_umbilical"; - name = "\improper Umbillical Airlock"; - unacidable = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_umbilical) -"cjo" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 32; - pixel_y = 6 - }, -/obj/structure/sign/safety/reduction{ - pixel_x = 32; - pixel_y = -8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/aft_hallway) "cjt" = ( /turf/open/floor/almayer{ icon_state = "orange" }, /area/almayer/engineering/lower) -"cjw" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/hallways/port_hallway) "cjA" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -22059,41 +18571,6 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) -"cjK" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_umbilical) -"cjS" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/hallways/port_hallway) -"cjT" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/structure/pipes/vents/scrubber{ - dir = 8 - }, -/obj/structure/sign/safety/escapepod{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/port_hallway) "cjW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22136,36 +18613,34 @@ icon_state = "silver" }, /area/almayer/engineering/port_atmos) -"ckl" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 +"cke" = ( +/obj/structure/machinery/vending/cola{ + density = 0; + pixel_y = 18 }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/hallways/port_hallway) -"ckm" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/area/almayer/maint/hull/upper/u_a_p) +"ckh" = ( +/obj/structure/disposalpipe/junction{ + dir = 4 }, -/obj/structure/machinery/status_display{ - pixel_x = 32 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) +"ckj" = ( +/obj/structure/surface/table/almayer, +/obj/item/stack/nanopaste{ + pixel_x = -3; + pixel_y = 14 }, -/area/almayer/hallways/port_hallway) -"ckq" = ( -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = 32 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/hull/upper/p_stern) "ckr" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -22173,21 +18648,6 @@ icon_state = "plate" }, /area/almayer/squads/delta) -"ckw" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/upper/u_m_p) -"ckI" = ( -/obj/structure/disposalpipe/segment, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_x = -28 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) "ckK" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -22220,22 +18680,6 @@ icon_state = "plate" }, /area/almayer/squads/delta) -"ckS" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "Interrogation Shutters"; - name = "\improper Privacy Shutters" - }, -/obj/structure/machinery/door/airlock/almayer/security{ - dir = 2; - name = "\improper Interrogation" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/main_office) "ckW" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -22246,29 +18690,15 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"cla" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/hallways/port_hallway) -"clb" = ( +"ckZ" = ( /obj/structure/machinery/light{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 + dir = 8 }, +/obj/structure/machinery/power/reactor, /turf/open/floor/almayer{ - dir = 10; - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/engineering/lower/engine_core) "cle" = ( /turf/open/floor/almayer{ dir = 4; @@ -22406,45 +18836,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"cly" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/sign/safety/maint{ - pixel_x = -17; - pixel_y = -8 - }, -/obj/structure/sign/safety/storage{ - pixel_x = -17; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "redcorner" - }, -/area/almayer/hallways/port_hallway) -"clz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" - }, -/area/almayer/hallways/port_hallway) -"clC" = ( -/obj/structure/stairs, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/projector{ - name = "Almayer_Up1"; - vector_x = -19; - vector_y = 98 - }, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/starboard_hallway) "clE" = ( /obj/structure/machinery/door/airlock/almayer/marine/delta/medic, /turf/open/floor/almayer{ @@ -22504,12 +18895,6 @@ icon_state = "plate" }, /area/almayer/squads/delta) -"clR" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/hallways/port_hallway) "clS" = ( /obj/structure/machinery/cm_vending/gear/spec, /obj/structure/sign/safety/hazard{ @@ -22529,6 +18914,13 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"clV" = ( +/obj/structure/machinery/computer/arcade, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, +/area/almayer/squads/req) "clW" = ( /obj/structure/machinery/cm_vending/clothing/smartgun/delta, /turf/open/floor/almayer{ @@ -22560,46 +18952,17 @@ icon_state = "plate" }, /area/almayer/squads/delta) -"cmb" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/maint/hull/upper/u_f_s) -"cmd" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) -"cmg" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) -"cmh" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/disposalpipe/up/almayer{ - dir = 8; - id = "almayerlink" +"cme" = ( +/obj/structure/largecrate/random/barrel/red, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "green" +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 }, -/area/almayer/hallways/port_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "cml" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -22640,6 +19003,9 @@ icon_state = "green" }, /area/almayer/squads/req) +"cmr" = ( +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "cmv" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_x = -30 @@ -22677,18 +19043,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north2) -"cmH" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "Hangar Lockdown"; - name = "\improper Hangar Lockdown Blast Door" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_umbilical) "cmI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22728,6 +19082,32 @@ icon_state = "silver" }, /area/almayer/command/securestorage) +"cmL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"cmM" = ( +/turf/closed/wall/almayer, +/area/almayer/shipboard/brig/medical) +"cmN" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) +"cmV" = ( +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "cna" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -22763,18 +19143,6 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"cno" = ( -/obj/structure/stairs, -/obj/effect/projector{ - name = "Almayer_Up1"; - vector_x = -19; - vector_y = 98 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/starboard_hallway) "cnp" = ( /obj/structure/machinery/light{ dir = 4 @@ -22814,12 +19182,6 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) -"cnv" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silvercorner" - }, -/area/almayer/hallways/aft_hallway) "cnE" = ( /obj/structure/machinery/prop/almayer/computer{ dir = 4; @@ -22845,6 +19207,15 @@ icon_state = "test_floor4" }, /area/almayer/command/computerlab) +"cnI" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/hallways/lower/port_umbilical) "cnM" = ( /obj/structure/window/reinforced{ dir = 4; @@ -22875,11 +19246,13 @@ }, /area/almayer/living/port_emb) "cnP" = ( -/obj/structure/sign/safety/cryo{ - pixel_y = -26 +/obj/structure/platform_decoration{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "cnR" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -22981,6 +19354,20 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"coo" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) "cop" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/tankerbunks) @@ -23074,22 +19461,12 @@ }, /turf/open/floor/almayer, /area/almayer/living/offices) -"cpw" = ( +"cpz" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/aft_hallway) -"cpG" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/maint/hull/lower/l_m_s) "cpJ" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -23111,62 +19488,22 @@ /obj/structure/window/framed/almayer/hull/hijack_bustable, /turf/open/floor/plating, /area/almayer/squads/req) -"cpU" = ( -/obj/structure/surface/rack{ - desc = "A bunch of metal shelves stacked on top of eachother. Excellent for storage purposes, less so as cover. One of the shelf legs is damaged, resulting in the rack being propped up by what appears to be circuit boards." - }, -/obj/structure/machinery/light/small{ - dir = 4; - status = 3; - icon_state = "bulb-burned" - }, -/obj/effect/decal/cleanable/blood, -/obj/item/prop{ - icon = 'icons/obj/items/bloodpack.dmi'; - icon_state = "bloodpack"; - name = "blood bag"; - desc = "A blood bag with a hole in it. The rats must have gotten to it first." - }, -/obj/item/prop{ - icon = 'icons/obj/items/bloodpack.dmi'; - icon_state = "bloodpack"; - name = "blood bag"; - desc = "A blood bag with a hole in it. The rats must have gotten to it first." - }, -/obj/item/prop{ - icon = 'icons/obj/items/bloodpack.dmi'; - icon_state = "bloodpack"; - name = "blood bag"; - desc = "A blood bag with a hole in it. The rats must have gotten to it first." - }, -/obj/item/prop{ - icon = 'icons/obj/items/circuitboards.dmi'; - icon_state = "id_mod"; - name = "circuit board"; - desc = "The words \"Cloning Pod\" are scrawled onto it. It appears to be heavily damaged."; - layer = 2.78; - pixel_y = 10; - pixel_x = 8 - }, -/obj/item/prop{ - icon = 'icons/obj/items/circuitboards.dmi'; - icon_state = "id_mod"; - name = "circuit board"; - desc = "The words \"Cloning Scanner\" are scrawled onto it. It appears to be heavily damaged."; - layer = 2.79; - pixel_y = 7; - pixel_x = 8 +"cpQ" = ( +/obj/structure/sign/safety/autoopenclose{ + pixel_x = 7; + pixel_y = 32 }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_corner" +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_p) +"cqd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/medical/lower_medical_medbay) -"cqa" = ( /turf/open/floor/almayer{ - dir = 10; - icon_state = "green" + dir = 1; + icon_state = "orangecorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_umbilical) "cqm" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/folder/white{ @@ -23180,11 +19517,23 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"cqp" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) "cqz" = ( /obj/structure/surface/table/almayer, /obj/item/facepaint/black, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) +"cqH" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/lower/l_m_s) "cqJ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -23216,15 +19565,19 @@ /obj/item/storage/fancy/cigar/tarbacktube, /turf/open/floor/almayer, /area/almayer/living/bridgebunks) -"cre" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 32 +"crc" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 8; + id = "laddersoutheast"; + name = "\improper South East Ladders Shutters" }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "green" + icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "crh" = ( /obj/structure/machinery/light{ dir = 1 @@ -23234,49 +19587,37 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"crp" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ - dir = 4 +"cri" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/shipboard/brig/chief_mp_office) -"crr" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/closed/wall/almayer, -/area/almayer/maint/hull/lower/l_a_p) -"crG" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/effect/spawner/random/tool, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) -"csl" = ( -/obj/structure/pipes/vents/scrubber, +/area/almayer/maint/hull/upper/u_f_s) +"crD" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "greencorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/squads/req) +"csd" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/stern) +"csy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/warden_office) "csI" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"csT" = ( -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = -16 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) "csZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -23302,10 +19643,29 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/bravo) +"cth" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_bow) +"ctp" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) "cts" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"ctw" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/port_umbilical) "ctx" = ( /obj/structure/bed{ icon_state = "abed" @@ -23335,15 +19695,11 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"ctC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +"ctQ" = ( /turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" + icon_state = "silver" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/lower/repair_bay) "ctT" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ dir = 1; @@ -23356,49 +19712,15 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cryo) -"ctW" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/regular, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) -"ctX" = ( -/obj/structure/reagent_dispensers/fueltank/oxygentank{ - anchored = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering/lower/workshop/hangar) -"cua" = ( -/obj/structure/stairs{ - icon_state = "ramptop" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) -"cuk" = ( -/obj/structure/filingcabinet{ - density = 0; - pixel_x = 8; - pixel_y = 18 - }, -/obj/structure/filingcabinet{ - density = 0; - pixel_x = -8; - pixel_y = 18 +"cui" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "orange" }, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/hallways/upper/stern_hallway) "cuq" = ( /obj/structure/machinery/computer/arcade, /turf/open/floor/wood/ship, @@ -23424,6 +19746,19 @@ "cuC" = ( /turf/closed/wall/almayer/outer, /area/almayer/engineering/upper_engineering/starboard) +"cuI" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/sign/safety/stairs{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "cuN" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -23444,12 +19779,39 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha) -"cvp" = ( -/obj/structure/girder, +"cva" = ( +/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + name = "\improper Armourer's Workshop"; + req_access = null + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_m_s) +"cvb" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/squads/req) +"cvg" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) +"cvi" = ( +/obj/structure/machinery/vending/hydroseeds, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) +"cvx" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/lower/cryo_cells) "cvH" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -23462,12 +19824,10 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"cvL" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/s_bow) +"cvI" = ( +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) "cvZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -23477,6 +19837,16 @@ icon_state = "silver" }, /area/almayer/command/cic) +"cwi" = ( +/obj/structure/sign/safety/rewire{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "cwo" = ( /obj/structure/largecrate/random/mini/chest{ pixel_x = 4 @@ -23487,26 +19857,20 @@ }, /turf/open/floor/almayer, /area/almayer/squads/req) -"cwJ" = ( +"cwC" = ( /turf/open/floor/almayer{ - dir = 10; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) -"cwQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 + dir = 4; + icon_state = "red" }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 8; - id = "laddersoutheast"; - name = "\improper South East Ladders Shutters" +/area/almayer/shipboard/brig/starboard_hallway) +"cwL" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -25 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "orange" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/upper/stern_hallway) "cwS" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer/no_build{ @@ -23532,20 +19896,29 @@ icon_state = "tcomms" }, /area/almayer/command/airoom) -"cxi" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) "cxk" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"cxA" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, +"cxF" = ( +/obj/structure/barricade/handrail{ + dir = 8 + }, +/obj/structure/barricade/handrail, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "test_floor5" + }, +/area/almayer/hallways/lower/port_midship_hallway) +"cyc" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/starboard_hallway) "cyo" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ @@ -23553,13 +19926,39 @@ icon_state = "green" }, /area/almayer/squads/req) -"cyG" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor/plating/almayer{ - allow_construction = 0 +"cyp" = ( +/obj/structure/machinery/conveyor{ + id = "lower_garbage" + }, +/obj/structure/plasticflaps, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "plating_striped" + }, +/area/almayer/maint/hull/lower/l_a_p) +"cyv" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_f_p) +"cyL" = ( +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/toolbox, +/obj/item/storage/firstaid/o2, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "orange" + }, +/area/almayer/maint/upper/mess) +"cyR" = ( +/obj/structure/bed/chair{ + dir = 8 }, -/area/almayer/hallways/port_hallway) +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "cyU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -23574,13 +19973,38 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"czM" = ( +"czJ" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 15; + pixel_y = 32 + }, /obj/structure/sign/safety/intercom{ - pixel_x = 8; pixel_y = 32 }, -/turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) +"czN" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = -28 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"czR" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "cAm" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -23598,6 +20022,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) +"cAz" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/item/stack/sheet/metal, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "cAF" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -23610,6 +20043,9 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"cAR" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/mp_bunks) "cBb" = ( /obj/structure/machinery/light{ dir = 1 @@ -23642,14 +20078,6 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/port) -"cBl" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/vehiclehangar) "cBm" = ( /obj/effect/projector{ name = "Almayer_AresUp"; @@ -23684,110 +20112,27 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/general_equipment) -"cBz" = ( +"cBC" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 2 }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) -"cBA" = ( -/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" - }, -/area/almayer/hallways/starboard_hallway) -"cBE" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/stack/sheet/mineral/phoron/medium_stack, -/obj/item/stack/sheet/mineral/phoron/medium_stack{ - pixel_y = 10 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) -"cBI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/machinery/door_control{ - id = "hangarentrancenorth"; - name = "North Hangar Podlocks"; - pixel_y = -26; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) -"cBQ" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) -"cBR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) -"cBZ" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/door_control{ - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutters"; - pixel_x = 6; - req_access_txt = "3" - }, -/obj/structure/machinery/door_control{ - id = "Brig Lockdown Shutters"; - name = "Brig Lockdown Shutters"; - pixel_x = -6; - req_access_txt = "3" - }, -/obj/structure/machinery/door_control{ - id = "courtyard window"; - name = "Courtyard Window Shutters"; - pixel_x = -6; - pixel_y = 9; - req_access_txt = "3" - }, -/obj/structure/machinery/door_control{ - id = "Cell Privacy Shutters"; - name = "Cell Privacy Shutters"; - pixel_x = 6; - pixel_y = 9; - req_access_txt = "3" + dir = 5; + icon_state = "green" }, -/obj/structure/machinery/light{ - dir = 1 +/area/almayer/hallways/lower/port_aft_hallway) +"cBV" = ( +/obj/structure/closet/firecloset, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + dir = 4; + icon_state = "greencorner" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/hallways/lower/port_fore_hallway) "cCa" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -23811,9 +20156,22 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"cCG" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/s_bow) +"cCL" = ( +/obj/effect/landmark/crap_item, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) +"cDb" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + req_access = null + }, +/obj/item/clothing/mask/rebreather/scarf/tacticalmask/red, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/p_bow) "cDn" = ( /obj/structure/surface/table/almayer, /obj/item/ashtray/glass{ @@ -23841,6 +20199,15 @@ icon_state = "cargo" }, /area/almayer/squads/charlie) +"cDx" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_m_p) "cDC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -23894,6 +20261,21 @@ icon_state = "plating" }, /area/almayer/command/cic) +"cEA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) "cEC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -23916,25 +20298,6 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/charlie) -"cER" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) -"cES" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) -"cET" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) -"cFb" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_s) "cFh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -23963,6 +20326,18 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"cFH" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "cFP" = ( /obj/structure/sign/safety/outpatient{ pixel_x = -17; @@ -23972,37 +20347,34 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"cGr" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/aft_hallway) -"cGC" = ( +"cGd" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/hull/upper/u_m_s) +"cGA" = ( /obj/structure/sign/poster{ - pixel_y = 32 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_p) -"cGP" = ( -/obj/item/toy/deck{ - pixel_y = 12 - }, -/obj/structure/sign/safety/storage{ - pixel_x = 32 + pixel_y = -32 }, -/obj/structure/surface/table/woodentable/poor, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) +"cGB" = ( +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "orange" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/hull/lower/l_m_s) +"cGR" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_s) "cGV" = ( /turf/open/floor/almayer{ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha_bravo_shared) +"cGY" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "cHc" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/ladder{ @@ -24013,6 +20385,9 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) +"cHk" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/warden_office) "cHl" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -24025,6 +20400,12 @@ icon_state = "plate" }, /area/almayer/squads/bravo) +"cHn" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) "cHu" = ( /turf/closed/wall/almayer/research/containment/wall/south, /area/almayer/medical/containment/cell/cl) @@ -24033,6 +20414,12 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) +"cHC" = ( +/obj/structure/machinery/cm_vending/clothing/combat_correspondent, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "cHE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -24055,26 +20442,14 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"cIl" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/card{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/panic) -"cIq" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/item/toy/deck, +"cIm" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 5; - icon_state = "red" + dir = 1; + icon_state = "greencorner" }, -/area/almayer/living/offices/flight) +/area/almayer/hallways/lower/port_fore_hallway) "cIr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24096,6 +20471,11 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) +"cIO" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "cIW" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ name = "\improper Engineering Engine Monitoring" @@ -24104,17 +20484,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) -"cIZ" = ( -/obj/structure/closet/crate/freezer{ - desc = "A freezer crate. Someone has written 'open on christmas' in marker on the top." - }, -/obj/item/reagent_container/food/snacks/mre_pack/xmas2, -/obj/item/reagent_container/food/snacks/mre_pack/xmas1, -/obj/item/reagent_container/food/snacks/mre_pack/xmas3, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/s_stern) "cJh" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -24124,6 +20493,20 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/cells) +"cJm" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/bed/chair{ + dir = 16 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/panic) +"cJs" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_aft_hallway) "cJu" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -24136,17 +20519,19 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) -"cJz" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = -17 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/mess) "cJE" = ( /obj/structure/sign/prop2, /turf/closed/wall/almayer, /area/almayer/shipboard/sea_office) +"cJK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_fore_hallway) "cJM" = ( /obj/structure/machinery/door_display/research_cell{ dir = 8; @@ -24189,24 +20574,55 @@ icon_state = "sterile_green" }, /area/almayer/medical/containment) +"cJV" = ( +/obj/effect/projector{ + name = "Almayer_Down3"; + vector_x = 1; + vector_y = -102 + }, +/turf/open/floor/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/upper/aft_hallway) +"cKm" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/glass/bucket/mopbucket{ + pixel_x = -8 + }, +/obj/item/reagent_container/glass/bucket/mopbucket{ + pixel_y = 12 + }, +/obj/item/clothing/head/militia/bucket{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/reagent_container/spray/cleaner{ + pixel_x = 8; + pixel_y = -1 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) +"cKJ" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/shipboard/brig/interrogation) "cKL" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "orangecorner" }, /area/almayer/engineering/upper_engineering/port) -"cKY" = ( -/obj/structure/machinery/light, +"cKW" = ( /turf/open/floor/almayer{ - icon_state = "silver" + dir = 5; + icon_state = "blue" }, -/area/almayer/hallways/aft_hallway) -"cLk" = ( -/obj/structure/largecrate/random/case, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/lower/s_bow) +/area/almayer/hallways/upper/aft_hallway) "cLl" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -24237,23 +20653,6 @@ icon_state = "plating" }, /area/almayer/shipboard/stern_point_defense) -"cLt" = ( -/obj/structure/machinery/optable, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_stern) -"cLx" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/u_m_s) "cLA" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -24278,26 +20677,6 @@ icon_state = "cargo" }, /area/almayer/living/bridgebunks) -"cMb" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm{ - pixel_y = 7 - }, -/obj/item/tool/pen, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) -"cMk" = ( -/obj/structure/machinery/vending/snack{ - density = 0; - pixel_y = 18 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_f_p) "cMl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24343,17 +20722,12 @@ icon_state = "orange" }, /area/almayer/living/briefing) -"cNn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/rifle/m41a{ - pixel_y = 6 - }, -/obj/item/weapon/gun/rifle/m41a, +"cNm" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "orange" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/hallways/lower/port_aft_hallway) "cNH" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/containment{ id = "Containment Cell 4"; @@ -24369,12 +20743,17 @@ icon_state = "test_floor4" }, /area/almayer/medical/containment/cell/cl) +"cNI" = ( +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/shipboard/brig/medical) "cNJ" = ( -/obj/structure/largecrate/random/case, +/obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "red" }, -/area/almayer/maint/upper/u_m_p) +/area/almayer/shipboard/brig/mp_bunks) "cNK" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -24407,10 +20786,26 @@ }, /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) -"cOy" = ( -/obj/item/trash/chips, +"cOh" = ( +/obj/item/stool{ + pixel_x = 15; + pixel_y = 6 + }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) +"cOo" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_a_p) +"cOt" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) "cOK" = ( /obj/structure/prop/invuln{ desc = "An inflated membrane. This one is puncture proof. Wow!"; @@ -24424,13 +20819,57 @@ icon_state = "outerhull_dir" }, /area/almayer/engineering/upper_engineering/starboard) -"cOM" = ( -/obj/structure/sign/safety/medical{ - pixel_x = 8; - pixel_y = -32 +"cOY" = ( +/obj/item/clothing/under/blackskirt{ + desc = "A stylish skirt, in a business-black and red colour scheme."; + name = "liaison's skirt" }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/obj/item/clothing/under/suit_jacket/charcoal{ + desc = "A professional black suit and blue tie. A combination popular among government agents and corporate Yes-Men alike."; + name = "liaison's black suit" + }, +/obj/item/clothing/under/suit_jacket/navy{ + desc = "A navy suit and red tie, intended for the Almayer's finest. And accountants."; + name = "liaison's navy suit" + }, +/obj/item/clothing/under/suit_jacket/trainee, +/obj/item/clothing/under/liaison_suit/charcoal, +/obj/item/clothing/under/liaison_suit/blazer, +/obj/item/clothing/suit/storage/snow_suit/liaison, +/obj/item/clothing/gloves/black, +/obj/item/clothing/gloves/marine/dress, +/obj/item/clothing/glasses/sunglasses/big, +/obj/item/clothing/accessory/blue, +/obj/item/clothing/accessory/red, +/obj/structure/machinery/status_display{ + pixel_x = -32 + }, +/obj/item/clothing/accessory/black, +/obj/item/clothing/accessory/green, +/obj/item/clothing/accessory/gold, +/obj/item/clothing/accessory/purple, +/obj/item/clothing/under/liaison_suit/corporate_formal, +/obj/item/clothing/under/liaison_suit/field, +/obj/item/clothing/under/liaison_suit/ivy, +/obj/item/clothing/under/liaison_suit/blue, +/obj/item/clothing/under/liaison_suit/brown, +/obj/item/clothing/under/liaison_suit/black, +/obj/item/clothing/suit/storage/jacket/marine/vest, +/obj/item/clothing/suit/storage/jacket/marine/vest/grey, +/obj/item/clothing/suit/storage/jacket/marine/vest/tan, +/obj/item/clothing/suit/storage/jacket/marine/bomber, +/obj/item/clothing/suit/storage/jacket/marine/bomber/red, +/obj/item/clothing/suit/storage/jacket/marine/bomber/grey, +/obj/item/clothing/suit/storage/jacket/marine/corporate, +/obj/item/clothing/suit/storage/jacket/marine/corporate/black, +/obj/item/clothing/suit/storage/jacket/marine/corporate/blue, +/obj/item/clothing/suit/storage/jacket/marine/corporate/brown, +/obj/item/clothing/suit/storage/jacket/marine/corporate/formal, +/obj/structure/closet/cabinet{ + storage_capacity = 35 + }, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliaison) "cPg" = ( /obj/structure/sign/safety/north{ pixel_x = 32; @@ -24445,14 +20884,10 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"cPy" = ( -/obj/item/tool/minihoe{ - pixel_x = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) +"cPj" = ( +/obj/structure/window/framed/almayer/hull, +/turf/open/floor/plating, +/area/almayer/maint/hull/upper/p_bow) "cPK" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -24465,6 +20900,23 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) +"cPP" = ( +/obj/structure/sign/poster/pinup{ + pixel_x = -30 + }, +/obj/structure/sign/poster/hunk{ + pixel_x = -25; + pixel_y = 10 + }, +/obj/item/trash/buritto, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "cQc" = ( /turf/open/floor/almayer{ dir = 1; @@ -24496,6 +20948,9 @@ "cQv" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/general_equipment) +"cQG" = ( +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/starboard_hallway) "cQL" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -24559,15 +21014,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) -"cSi" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) "cSk" = ( /obj/structure/machinery/door/window/southleft, /turf/open/floor/almayer{ @@ -24575,18 +21021,6 @@ icon_state = "silver" }, /area/almayer/command/securestorage) -"cSl" = ( -/obj/structure/surface/table/almayer, -/obj/item/stack/rods/plasteel{ - amount = 36 - }, -/obj/item/stack/catwalk{ - amount = 60; - pixel_x = 5; - pixel_y = 4 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "cSm" = ( /obj/structure/sign/safety/ladder{ pixel_x = 8; @@ -24608,6 +21042,30 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) +"cSH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) +"cSM" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) +"cSP" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) "cSQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24625,18 +21083,6 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) -"cTb" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) -"cTc" = ( -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) "cTf" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -24646,6 +21092,12 @@ icon_state = "cargo" }, /area/almayer/squads/req) +"cTy" = ( +/obj/structure/closet/secure_closet/medical2, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/shipboard/brig/medical) "cTC" = ( /obj/structure/machinery/vending/walkman, /turf/open/floor/almayer{ @@ -24653,24 +21105,59 @@ icon_state = "green" }, /area/almayer/living/offices) -"cUf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"cTM" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/light/small{ + dir = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/mess) +"cTX" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/lower/cryo_cells) +"cUl" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_bow) "cVb" = ( /obj/structure/machinery/sentry_holder/almayer, /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) +"cVf" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "cVq" = ( /obj/structure/machinery/power/apc/almayer/hardened{ dir = 1 }, /turf/open/floor/almayer, /area/almayer/command/corporateliaison) +"cVt" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_fore_hallway) "cVw" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -24691,12 +21178,47 @@ icon_state = "plate" }, /area/almayer/living/gym) +"cVT" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) "cVZ" = ( -/obj/structure/largecrate/random/barrel/yellow, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) +"cWb" = ( +/obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/maint/hull/lower/stern) +"cWm" = ( +/obj/structure/surface/rack, +/obj/item/storage/firstaid/adv/empty, +/obj/item/storage/firstaid/adv/empty, +/obj/item/storage/firstaid/adv/empty, +/obj/structure/sign/safety/med_life_support{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/lower_medical_medbay) +"cWo" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_a_p) "cWr" = ( /obj/structure/machinery/photocopier{ density = 0; @@ -24735,30 +21257,6 @@ icon_state = "green" }, /area/almayer/living/offices) -"cWs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) -"cWt" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "InnerShutter"; - name = "\improper Saferoom Shutters" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/panic) "cWv" = ( /turf/open/floor/almayer{ dir = 8; @@ -24784,78 +21282,17 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"cWF" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - dir = 1; - req_one_access = null; - req_one_access_txt = "2;7" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/u_a_p) -"cWP" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/closet/crate, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0 +"cXd" = ( +/obj/structure/surface/rack, +/obj/item/stack/cable_coil, +/obj/item/attachable/flashlight/grip, +/obj/item/ammo_box/magazine/l42a{ + pixel_y = 14 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_s) -"cXh" = ( -/obj/structure/prop/almayer/computers/sensor_computer3, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/maint/hull/upper/u_m_s) "cXi" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -24871,12 +21308,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"cXy" = ( -/obj/structure/closet/emcloset, +"cXm" = ( +/obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/maint/hull/lower/l_m_s) "cXC" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -24886,6 +21323,19 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/containment) +"cXD" = ( +/obj/structure/surface/rack, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/glasses/sunglasses/blindfold, +/obj/item/clothing/mask/muzzle, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/execution_storage) "cXF" = ( /obj/structure/machinery/flasher{ alpha = 1; @@ -24904,6 +21354,12 @@ icon_state = "greencorner" }, /area/almayer/squads/req) +"cXV" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/mp_bunks) "cXW" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -24915,12 +21371,27 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) +"cXX" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "cXY" = ( /obj/item/stack/catwalk, /turf/open/floor/almayer{ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"cYo" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_bow) "cYu" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -24953,6 +21424,9 @@ icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/south1) +"cZe" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/upper/u_f_s) "cZh" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -24962,31 +21436,35 @@ }, /turf/open/floor/plating, /area/almayer/command/cichallway) -"cZj" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, +"cZp" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"cZB" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_umbilical) +"cZI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/almayer{ - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) -"cZm" = ( -/obj/structure/machinery/light{ - dir = 1 +/area/almayer/maint/hull/lower/l_m_p) +"cZO" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) -"cZw" = ( -/obj/item/tool/wet_sign, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/maint/hull/upper/u_f_p) "cZV" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/fancy/cigarettes/wypacket, @@ -25022,30 +21500,15 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"dac" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 8; - id = "laddernortheast"; - name = "\improper North East Ladders Shutters" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) -"dan" = ( -/obj/structure/ladder{ - height = 2; - id = "cicladder4" - }, -/turf/open/floor/plating/almayer, -/area/almayer/medical/medical_science) "daz" = ( /turf/closed/wall/almayer/white/hull, /area/almayer/command/airoom) +"daF" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) "dbc" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -25069,13 +21532,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"dbj" = ( -/obj/structure/largecrate/supply/supplies/tables_racks, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/maint/hull/upper/u_a_p) "dbn" = ( /obj/structure/surface/table/almayer, /obj/item/spacecash/c200{ @@ -25135,6 +21591,12 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) +"dbX" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/maint/upper/mess) "dcd" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -25148,38 +21610,57 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"dco" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/shipboard/brig/chief_mp_office) "dcp" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) +"dcx" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_umbilical) "dcy" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "red" }, /area/almayer/shipboard/brig/perma) +"dcT" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) +"dcZ" = ( +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_p) "ddf" = ( /obj/structure/machinery/portable_atmospherics/canister/air, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/engineering/lower/engine_core) +"ddj" = ( +/obj/structure/bed/chair/bolted, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/shipboard/brig/interrogation) "ddk" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ icon_state = "redfull" }, /area/almayer/living/briefing) +"ddp" = ( +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "ddw" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /obj/structure/sign/safety/terminal{ @@ -25189,59 +21670,64 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop/hangar) +"ddx" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "ddz" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/weapon_room) -"ddC" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer{ - icon_state = "plate" +"ddF" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_p) +"ddL" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) "ddM" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall/almayer, /area/almayer/engineering/lower/workshop/hangar) -"ddN" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1; - name = "\improper Tool Closet" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/lower/l_m_s) -"deg" = ( -/obj/structure/platform_decoration{ - dir = 1 +"deg" = ( +/obj/structure/platform_decoration{ + dir = 1 }, /turf/open/floor/almayer{ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) -"dej" = ( -/obj/structure/machinery/door_control{ - id = "OuterShutter"; - name = "Outer Shutter"; - pixel_x = 5; - pixel_y = -2; - req_one_access_txt = "1;3" +"deq" = ( +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/door_control{ - id = "OfficeSafeRoom"; - name = "Office Safe Room"; - pixel_x = 5; - pixel_y = 5; - req_one_access_txt = "1;3" +/area/almayer/maint/hull/lower/l_m_s) +"deA" = ( +/obj/item/reagent_container/glass/bucket/janibucket{ + pixel_x = -1; + pixel_y = 13 + }, +/obj/structure/sign/safety/water{ + pixel_x = -17 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/panic) +/area/almayer/maint/upper/u_m_s) "deD" = ( /obj/structure/machinery/prop/almayer/CICmap{ pixel_x = -5 @@ -25249,14 +21735,13 @@ /obj/structure/surface/table/reinforced/black, /turf/open/floor/almayer, /area/almayer/command/cic) +"deF" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "deH" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -28 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/warden_office) "deT" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -25273,19 +21758,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) -"dfc" = ( -/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, -/obj/structure/sign/safety/airlock{ - pixel_y = -32 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_umbilical) "dfg" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -25309,46 +21781,12 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cells) -"dfv" = ( -/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/maint/hull/upper/s_stern) "dfC" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"dfE" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_10"; - pixel_y = 14 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/medical/upper_medical) -"dfO" = ( -/obj/structure/machinery/medical_pod/bodyscanner{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/shipboard/brig/surgery) "dgg" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -25383,6 +21821,12 @@ icon_state = "red" }, /area/almayer/shipboard/brig/chief_mp_office) +"dgP" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "dha" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -25400,11 +21844,6 @@ icon_state = "plating_striped" }, /area/almayer/shipboard/brig/execution) -"dhe" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) "dho" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -25418,6 +21857,19 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) +"dhp" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"dhQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_umbilical) "dhR" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; @@ -25428,30 +21880,19 @@ icon_state = "redfull" }, /area/almayer/living/briefing) -"dhU" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hallways/port_hallway) -"dhZ" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 +"div" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/sign/safety/airlock{ - pixel_x = 15; - pixel_y = 32 +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 8; + id = "laddernortheast"; + name = "\improper North East Ladders Shutters" }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_umbilical) -"diy" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/hull/upper/s_stern) +/area/almayer/hallways/lower/starboard_midship_hallway) "diz" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ id_tag = "Boat1-D4"; @@ -25475,18 +21916,13 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha_bravo_shared) -"diP" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - name = "\improper Brig Lobby"; - closeOtherId = "brignorth" - }, +"djd" = ( +/obj/structure/machinery/light, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 6; + icon_state = "blue" }, -/area/almayer/shipboard/brig/lobby) +/area/almayer/hallways/upper/aft_hallway) "djQ" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -25506,23 +21942,21 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) -"djW" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "OfficeSafeRoom"; - name = "\improper Office Safe Room" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/panic) "dka" = ( /obj/structure/machinery/optable, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_four) +"dkj" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/radio/intercom/alamo{ + layer = 2.9 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/living/offices/flight) "dkq" = ( /obj/structure/machinery/door_control{ id = "hangarentrancenorth"; @@ -25540,10 +21974,36 @@ icon_state = "red" }, /area/almayer/living/briefing) -"dkv" = ( -/obj/structure/largecrate/supply/supplies/tables_racks, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) +"dkt" = ( +/obj/structure/surface/rack, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0; + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0; + pixel_x = -6; + pixel_y = -3 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0; + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0; + pixel_x = 5; + pixel_y = -3 + }, +/obj/structure/noticeboard{ + desc = "The note is haphazardly attached to the cork board by what looks like a bent firing pin. 'The order has come in to perform end of life service checks on all L42A service rifles, any that are defective are to be dis-assembled and packed into a crate and sent to to the cargo hold. L42A service rifles that are in working order after servicing, are to be locked in secure cabinets ready to be off-loaded at Chinook. Scheduled end of life service for the L42A - Complete'"; + pixel_y = 29 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "dkO" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down2"; @@ -25560,16 +22020,12 @@ allow_construction = 0 }, /area/almayer/stair_clone/upper) -"dkR" = ( -/obj/structure/surface/rack, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, +"dkP" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "orangecorner" }, -/area/almayer/maint/hull/lower/p_bow) +/area/almayer/hallways/lower/starboard_midship_hallway) "dkX" = ( /obj/structure/bed/chair/comfy/delta, /obj/effect/decal/cleanable/dirt, @@ -25577,31 +22033,18 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) -"dle" = ( -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) "dll" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ icon_state = "orangefull" }, /area/almayer/living/briefing) -"dlt" = ( -/obj/structure/sign/safety/autoopenclose{ - pixel_x = 7; - pixel_y = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) -"dlW" = ( -/obj/structure/bed/sofa/south/grey{ - pixel_y = 12 +"dlT" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "mono" }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/hallways/upper/aft_hallway) "dmg" = ( /obj/structure/machinery/vending/coffee, /obj/structure/sign/safety/coffee{ @@ -25613,6 +22056,18 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"dmr" = ( +/obj/structure/transmitter{ + name = "Brig Offices Telephone"; + phone_category = "MP Dept."; + phone_id = "Brig Main Offices"; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) "dmv" = ( /turf/open/floor/almayer{ dir = 8; @@ -25630,6 +22085,17 @@ icon_state = "cargo" }, /area/almayer/squads/req) +"dmF" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/squads/req) "dmR" = ( /obj/effect/glowshroom, /obj/effect/glowshroom{ @@ -25667,6 +22133,13 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cells) +"dni" = ( +/obj/structure/sign/safety/life_support{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "dnm" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/intelligence_officer, /obj/structure/machinery/light{ @@ -25700,6 +22173,13 @@ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/starboard) +"dnP" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "dnS" = ( /obj/structure/safe, /turf/open/floor/almayer{ @@ -25707,17 +22187,19 @@ icon_state = "silver" }, /area/almayer/command/securestorage) -"dnW" = ( -/obj/item/reagent_container/food/snacks/wrapped/barcardine, -/obj/structure/surface/rack, +"dnZ" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/disposaloutlet, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "plating_striped" }, -/area/almayer/maint/hull/upper/p_stern) -"dod" = ( -/obj/structure/closet/crate/trashcart, -/turf/open/floor/almayer, -/area/almayer/engineering/upper_engineering/port) +/area/almayer/maint/hull/lower/l_a_p) "dof" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ name = "\improper Upper Engineering" @@ -25729,14 +22211,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering) -"doj" = ( -/obj/structure/machinery/medical_pod/sleeper{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/shipboard/brig/surgery) "doJ" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -25747,12 +22221,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"doM" = ( -/obj/structure/sign/safety/water{ - pixel_x = -17 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) "doP" = ( /obj/structure/disposaloutlet{ density = 0; @@ -25774,12 +22242,6 @@ /obj/structure/surface/rack, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"doX" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) "dpo" = ( /obj/structure/machinery/light{ dir = 1 @@ -25795,20 +22257,27 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) -"dpD" = ( -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) -"dpM" = ( -/obj/structure/sign/safety/autoopenclose{ - pixel_y = 32 +"dpA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/sign/safety/water{ - pixel_x = 15; - pixel_y = 32 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/hallways/lower/starboard_aft_hallway) +"dpN" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) "dpO" = ( /obj/structure/machinery/cm_vending/clothing/marine/delta{ density = 0; @@ -25819,6 +22288,12 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/delta) +"dpS" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "bluecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "dqb" = ( /obj/structure/sign/safety/security{ pixel_x = -16 @@ -25863,16 +22338,6 @@ icon_state = "test_floor4" }, /area/almayer/living/offices) -"dqN" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) -"dqZ" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/chief_mp_office) "drj" = ( /obj/structure/window/reinforced{ dir = 4; @@ -25893,18 +22358,16 @@ icon_state = "silver" }, /area/almayer/engineering/port_atmos) -"drQ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +"dro" = ( +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/powercell, +/obj/effect/spawner/random/powercell, +/obj/effect/spawner/random/bomb_supply, +/obj/effect/spawner/random/bomb_supply, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/maint/hull/lower/l_m_s) "drT" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -25925,26 +22388,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/hydroponics) -"dsk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) -"dsp" = ( -/obj/structure/sign/safety/bathunisex{ - pixel_x = -18 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_stern) "dsA" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/almayer{ @@ -25952,18 +22395,17 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/execution) +"dsY" = ( +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "dtH" = ( /obj/structure/bed/chair/comfy{ dir = 8 }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"dtM" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "dtZ" = ( /obj/structure/platform_decoration{ dir = 4 @@ -26046,18 +22488,14 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"duP" = ( -/obj/structure/surface/table/almayer, -/obj/item/fuel_cell, -/obj/item/fuel_cell, -/obj/item/fuel_cell, -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" +"duR" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" }, -/area/almayer/engineering/lower/engine_core) +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "duT" = ( /obj/structure/bed, /obj/structure/machinery/flasher{ @@ -26078,20 +22516,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha) -"duX" = ( -/obj/structure/bed/chair/office/dark, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/shipboard/panic) "dvg" = ( /obj/structure/reagent_dispensers/fueltank/custom, /obj/structure/sign/safety/chem_lab{ @@ -26102,14 +22526,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/chemistry) -"dvi" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/tool, -/obj/effect/spawner/random/tool, -/obj/effect/spawner/random/powercell, -/obj/effect/spawner/random/powercell, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) "dvl" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -26129,46 +22545,31 @@ icon_state = "cargo" }, /area/almayer/living/cryo_cells) -"dvx" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, +"dvD" = ( /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/maint/upper/u_m_p) -"dvD" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 +/area/almayer/maint/hull/lower/l_f_s) +"dvZ" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_m_p) -"dvN" = ( -/obj/structure/machinery/vending/coffee, -/obj/item/toy/bikehorn/rubberducky{ - desc = "You feel as though this rubber duck has been here for a long time. It's Mr. Quackers! He loves you!"; - name = "Quackers"; - pixel_x = 5; - pixel_y = 17 +/area/almayer/maint/upper/mess) +"dwj" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) "dwl" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/living/briefing) -"dwn" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) "dwr" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/centrifuge{ @@ -26196,20 +22597,15 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) -"dwU" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"dwJ" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 32 }, -/area/almayer/maint/hull/lower/l_m_s) -"dwX" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 6; + icon_state = "red" }, -/area/almayer/maint/hull/upper/s_bow) +/area/almayer/hallways/upper/stern_hallway) "dxu" = ( /obj/structure/sink{ dir = 1; @@ -26235,6 +22631,17 @@ allow_construction = 0 }, /area/almayer/stair_clone/upper) +"dxJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_fore_hallway) "dxK" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -26303,6 +22710,15 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) +"dyq" = ( +/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_umbilical) "dyx" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; @@ -26320,6 +22736,11 @@ icon_state = "plating" }, /area/almayer/squads/req) +"dyJ" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/upper/aft_hallway) "dyK" = ( /obj/structure/machinery/light{ dir = 8 @@ -26332,61 +22753,26 @@ "dzp" = ( /turf/open/floor/almayer, /area/almayer/command/corporateliaison) -"dzF" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 8; - id = "laddernortheast"; - name = "\improper North East Ladders Shutters" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) "dzG" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_y = 26 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/general_equipment) -"dzS" = ( -/obj/structure/surface/rack, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0; - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0; - pixel_x = -6; - pixel_y = -3 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0; - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/ammo_magazine/rifle/l42a/ap{ - current_rounds = 0; - pixel_x = 5; - pixel_y = -3 - }, -/obj/structure/noticeboard{ - desc = "The note is haphazardly attached to the cork board by what looks like a bent firing pin. 'The order has come in to perform end of life service checks on all L42A service rifles, any that are defective are to be dis-assembled and packed into a crate and sent to to the cargo hold. L42A service rifles that are in working order after servicing, are to be locked in secure cabinets ready to be off-loaded at Chinook. Scheduled end of life service for the L42A - Complete'"; - pixel_y = 29 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"dzX" = ( +/obj/structure/sign/safety/water{ + pixel_x = -17 }, -/area/almayer/maint/hull/upper/u_m_s) -"dzU" = ( -/obj/structure/machinery/light/small{ +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"dAm" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/s_bow) +/area/almayer/hallways/lower/starboard_midship_hallway) "dAq" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -26399,6 +22785,24 @@ icon_state = "test_floor4" }, /area/almayer/squads/bravo) +"dAr" = ( +/obj/structure/pipes/standard/cap/hidden{ + dir = 4 + }, +/obj/structure/sign/safety/life_support{ + pixel_x = 14; + pixel_y = -25 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/stern_hallway) +"dAA" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "dAQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -26421,6 +22825,20 @@ icon_state = "plate" }, /area/almayer/command/cic) +"dBg" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/effect/projector{ + name = "Almayer_Up4"; + vector_x = -19; + vector_y = 104 + }, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/port_midship_hallway) "dBj" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -26485,13 +22903,21 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_one) -"dBQ" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +"dBR" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/obj/structure/machinery/light, +/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage{ + req_access = null; + req_one_access = null; + req_one_access_txt = "7;23;27;102" + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/hallways/lower/repair_bay) "dBS" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -26503,14 +22929,24 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/execution) "dCb" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/cameras/almayer{ - dir = 1 +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_y = 32 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "silver" }, -/area/almayer/shipboard/panic) +/area/almayer/hallways/upper/aft_hallway) "dCe" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -26548,6 +22984,13 @@ icon_state = "plate" }, /area/almayer/command/cichallway) +"dCz" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/wrench{ + pixel_y = 2 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "dCD" = ( /obj/structure/sign/nosmoking_2{ pixel_x = 32 @@ -26565,17 +23008,29 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cichallway) -"dDd" = ( -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) -"dDo" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/obj/effect/step_trigger/clone_cleaner, +"dCM" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/hallways/lower/port_aft_hallway) +"dDc" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/upper/aft_hallway) "dDp" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -26599,6 +23054,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +"dDJ" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/stern) "dDL" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/research/main_terminal{ @@ -26625,24 +23086,12 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop/hangar) -"dDQ" = ( -/obj/structure/surface/rack, -/obj/item/tool/wirecutters, -/obj/item/tool/shovel/snow, +"dDT" = ( +/obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_s) -"dDR" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin{ - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/tool/pen, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/hull/lower/stern) "dEm" = ( /obj/structure/machinery/power/apc/almayer, /obj/effect/decal/warning_stripes{ @@ -26664,6 +23113,16 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) +"dEo" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/lower/vehiclehangar) +"dEp" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/lower/cryo_cells) "dEt" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -26674,16 +23133,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/port) -"dEC" = ( -/obj/structure/sign/safety/escapepod{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "greencorner" - }, -/area/almayer/hallways/starboard_hallway) "dEG" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -26700,6 +23149,23 @@ icon_state = "cargo" }, /area/almayer/lifeboat_pumps/north2) +"dEK" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) +"dEL" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_aft_hallway) "dEQ" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/tabasco, @@ -26717,52 +23183,75 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) +"dFd" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "dFk" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "redcorner" }, /area/almayer/command/lifeboat) +"dFl" = ( +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) "dFF" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) -"dFH" = ( +"dFL" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) +"dFM" = ( /obj/structure/machinery/light{ dir = 8 }, -/obj/structure/bed/chair/bolted, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/brig/perma) +/area/almayer/hallways/lower/vehiclehangar) "dFR" = ( /turf/open/floor/almayer{ dir = 9; icon_state = "silver" }, /area/almayer/command/cichallway) -"dFU" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/main_office) "dFW" = ( -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/cell_charger, +/obj/item/cell/apc, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -12; - pixel_y = 13 +/area/almayer/maint/hull/lower/l_f_p) +"dGg" = ( +/obj/structure/bed/chair{ + dir = 4 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/hull/upper/u_m_s) "dGl" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_AresUp"; @@ -26800,6 +23289,30 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"dGP" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; + dir = 1; + req_access = null; + req_one_access = null; + req_one_access_txt = "3;22;19" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_f_s) +"dGT" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/obj/structure/surface/table/almayer, +/obj/item/storage/donut_box, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/mp_bunks) "dGU" = ( /obj/structure/sign/poster/propaganda{ pixel_x = -27 @@ -26906,19 +23419,42 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha) -"dJm" = ( -/obj/structure/largecrate/random/barrel/blue, +"dJe" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/stack/sheet/mineral/phoron/medium_stack, +/obj/item/stack/sheet/mineral/phoron/medium_stack{ + pixel_y = 10 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_a_s) +/area/almayer/maint/hull/upper/u_a_p) +"dJy" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_bow) "dJF" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = -32 +/obj/structure/pipes/standard/cap/hidden{ + dir = 4 + }, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/stern_hallway) +"dJG" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) +/area/almayer/hallways/lower/starboard_aft_hallway) "dJI" = ( /obj/structure/bed/chair/comfy/bravo{ dir = 4 @@ -26931,38 +23467,20 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"dKm" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - layer = 3.33; - pixel_x = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - layer = 3.33; - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 3.3 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/hallways/stern_hallway) +"dJJ" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution_storage) "dKp" = ( /turf/open/floor/almayer/research/containment/corner{ dir = 4 }, /area/almayer/medical/containment/cell/cl) +"dKD" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silvercorner" + }, +/area/almayer/hallways/upper/aft_hallway) "dKK" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -26976,6 +23494,27 @@ "dKL" = ( /turf/closed/wall/almayer/outer, /area/almayer/engineering/airmix) +"dKO" = ( +/obj/structure/machinery/door_control{ + id = "panicroomback"; + name = "\improper Safe Room"; + pixel_x = 25; + req_one_access_txt = "3" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/panic) +"dKS" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/s_bow) "dLc" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -27006,52 +23545,12 @@ icon_state = "plating_striped" }, /area/almayer/shipboard/sea_office) -"dLx" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = 12; - pixel_y = 13 - }, -/obj/structure/sign/safety/bathunisex{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "dLz" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/lifeboat_pumps/south1) -"dLE" = ( -/turf/open/floor/almayer{ - icon_state = "silver" - }, -/area/almayer/hallways/aft_hallway) -"dMf" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/photo_album{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/item/folder/black{ - pixel_x = 7; - pixel_y = -3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "dMB" = ( /turf/open/floor/almayer{ dir = 8; @@ -27085,12 +23584,6 @@ }, /turf/open/floor/plating, /area/almayer/living/cryo_cells) -"dNy" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/maint/hull/upper/u_f_p) "dNM" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/tabasco{ @@ -27101,6 +23594,13 @@ icon_state = "redfull" }, /area/almayer/living/briefing) +"dNW" = ( +/obj/structure/machinery/firealarm{ + dir = 1; + pixel_y = -28 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "dNZ" = ( /obj/structure/machinery/light{ dir = 1 @@ -27132,37 +23632,53 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) -"dOr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/largecrate/random/case/double, +"dOG" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) -"dOX" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 4 +/area/almayer/hallways/lower/port_midship_hallway) +"dON" = ( +/obj/item/stack/cable_coil{ + pixel_x = 1; + pixel_y = 10 + }, +/obj/item/trash/pistachios, +/obj/item/tool/screwdriver, +/turf/open/floor/almayer{ + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/lower/repair_bay) +"dOW" = ( +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/upper/aft_hallway) +"dPd" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/flashlight/lamp{ + pixel_x = 5; + pixel_y = 10 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) -"dPf" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - access_modified = 1; - dir = 2; - name = "Firing Range"; - req_access = null; - req_one_access_txt = "2;4;7;9;21" +/area/almayer/maint/hull/upper/u_f_p) +"dPk" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 8 }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +/obj/effect/spawner/random/toolbox, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/disposalpipe/segment, +/area/almayer/hallways/lower/starboard_umbilical) +"dPl" = ( /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 4; + icon_state = "red" }, -/area/almayer/living/cryo_cells) +/area/almayer/maint/hull/upper/u_a_p) "dPm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -27171,6 +23687,14 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"dPq" = ( +/obj/structure/surface/table/almayer, +/obj/item/stack/sheet/cardboard{ + amount = 50; + pixel_x = 4 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "dPC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -27186,6 +23710,12 @@ icon_state = "cargo" }, /area/almayer/engineering/lower/engine_core) +"dPO" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) "dPQ" = ( /obj/structure/surface/table/almayer, /obj/item/tool/pen, @@ -27239,23 +23769,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cells) -"dQs" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) -"dQv" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/shipboard/brig/surgery) "dQA" = ( /obj/structure/pipes/standard/simple/visible{ dir = 4 @@ -27265,13 +23778,12 @@ icon_state = "orangecorner" }, /area/almayer/engineering/lower) -"dRf" = ( -/obj/structure/largecrate/random/case/double, -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" +"dQV" = ( +/obj/structure/machinery/light{ + dir = 1 }, -/area/almayer/maint/hull/upper/u_m_p) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "dRh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -27282,6 +23794,34 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/hydroponics) +"dRj" = ( +/obj/structure/toilet{ + pixel_y = 13 + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/shipboard/brig/mp_bunks) +"dRo" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/sign/safety/bridge{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/west{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/aft_hallway) "dRs" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -27297,18 +23837,20 @@ icon_state = "red" }, /area/almayer/squads/alpha) -"dRw" = ( -/obj/structure/surface/rack, -/obj/item/tool/crowbar, -/obj/item/tool/weldingtool, -/obj/item/tool/wrench, -/obj/structure/sign/safety/restrictedarea{ - pixel_x = -17 +"dRA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/status_display{ + pixel_y = -32 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "red" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/shipboard/brig/starboard_hallway) "dRD" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/security{ @@ -27321,29 +23863,6 @@ icon_state = "test_floor4" }, /area/almayer/living/offices/flight) -"dRE" = ( -/obj/structure/largecrate/random, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) -"dRG" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/starboard_hallway) -"dRN" = ( -/obj/structure/machinery/light/small, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/s_bow) "dRP" = ( /obj/structure/bed/chair/comfy/orange, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -27361,6 +23880,18 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"dSm" = ( +/obj/structure/sign/safety/airlock{ + pixel_y = -32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) "dSp" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -27371,19 +23902,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"dSC" = ( -/obj/structure/largecrate/random/secure, -/obj/item/weapon/baseballbat/metal{ - pixel_x = -2; - pixel_y = 8 - }, -/obj/item/clothing/glasses/sunglasses{ - pixel_y = 5 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) "dSJ" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -27406,6 +23924,16 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) +"dTd" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 8; + id = "laddernortheast"; + name = "\improper North East Ladders Shutters" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "dTn" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -27436,22 +23964,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"dUf" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"dUA" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/surface/rack, -/obj/effect/spawner/random/tool, -/obj/effect/spawner/random/tool, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) "dUE" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -27517,6 +24029,21 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"dVH" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "dVO" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -27526,6 +24053,23 @@ icon_state = "plate" }, /area/almayer/living/offices) +"dVR" = ( +/obj/structure/ladder{ + height = 2; + id = "AftPortMaint" + }, +/turf/open/floor/plating/almayer, +/area/almayer/maint/hull/upper/u_a_p) +"dWc" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) "dWg" = ( /obj/effect/landmark/start/cargo, /obj/structure/machinery/light, @@ -27537,6 +24081,31 @@ icon_state = "bluecorner" }, /area/almayer/living/basketball) +"dWA" = ( +/obj/structure/sign/poster{ + pixel_y = 32 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_p) +"dWJ" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) "dWX" = ( /obj/structure/machinery/light{ dir = 8 @@ -27545,18 +24114,12 @@ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/starboard) -"dXc" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 - }, -/obj/item/clipboard, -/obj/item/paper, -/obj/item/tool/pen, +"dXb" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/maint/lower/cryo_cells) "dXd" = ( /obj/item/storage/fancy/cigarettes/kpack, /obj/structure/surface/rack, @@ -27567,10 +24130,6 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) -"dXm" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) "dXo" = ( /obj/structure/surface/table/almayer, /obj/item/device/taperecorder, @@ -27596,6 +24155,14 @@ icon_state = "plate" }, /area/almayer/squads/req) +"dXH" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/camera_film{ + pixel_x = 4; + pixel_y = -2 + }, +/turf/open/floor/almayer, +/area/almayer/squads/charlie_delta_shared) "dXI" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ name = "\improper Exterior Airlock"; @@ -27605,17 +24172,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/stern_point_defense) -"dXU" = ( -/obj/item/tool/warning_cone{ - pixel_x = -20; - pixel_y = 18 - }, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = -16 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) "dXV" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 16 @@ -27635,6 +24191,19 @@ icon_state = "blue" }, /area/almayer/living/pilotbunks) +"dYb" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) +"dYc" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) "dYu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -27652,13 +24221,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"dYM" = ( -/obj/effect/decal/cleanable/blood/oil/streak, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) "dYR" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/reagentgrinder{ @@ -27666,6 +24228,30 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) +"dYU" = ( +/obj/structure/surface/rack, +/obj/effect/decal/cleanable/cobweb{ + dir = 8; + plane = -6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_container/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner" + }, +/obj/item/reagent_container/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner" + }, +/obj/item/reagent_container/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/lower_medical_medbay) "dYX" = ( /obj/structure/machinery/door/airlock/almayer/marine/bravo{ dir = 1 @@ -27678,12 +24264,6 @@ icon_state = "test_floor4" }, /area/almayer/living/briefing) -"dZd" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) "dZr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27702,16 +24282,28 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) -"dZT" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 +"dZP" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" }, -/obj/structure/disposalpipe/segment, +/area/almayer/hallways/upper/aft_hallway) +"dZR" = ( /obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "orange" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/hallways/upper/stern_hallway) +"dZZ" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldpack, +/obj/effect/spawner/random/tool, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "eaf" = ( /obj/structure/machinery/cm_vending/clothing/military_police{ density = 0; @@ -27742,6 +24334,12 @@ dir = 4 }, /area/almayer/medical/containment/cell) +"ear" = ( +/obj/structure/largecrate/random/case, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) "eas" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27758,10 +24356,33 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) +"eaz" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) "ebd" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +"ebf" = ( +/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/maint/hull/upper/s_stern) "ebn" = ( /obj/structure/sign/safety/airlock{ pixel_x = 15; @@ -27780,46 +24401,35 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"ebv" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/toxin{ - pixel_x = 8; - pixel_y = -2 - }, -/obj/item/storage/firstaid/regular, -/obj/item/reagent_container/spray/cleaner, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/shipboard/brig/surgery) -"ebz" = ( -/obj/structure/closet/emcloset, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_stern) -"ebL" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_container/food/snacks/tomatomeat, -/obj/item/reagent_container/food/snacks/tomatomeat, -/obj/item/reagent_container/food/snacks/tomatomeat, +"ebI" = ( +/obj/item/clothing/shoes/red, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/maint/hull/upper/u_m_p) "ebN" = ( /turf/closed/wall/almayer/white/reinforced, /area/almayer/command/airoom) -"ecf" = ( -/obj/structure/largecrate/random/case/small, +"ebV" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/stern_hallway) +"ecb" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) +"ecj" = ( +/obj/structure/largecrate/supply/supplies/mre, +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 32 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/maint/hull/lower/l_m_p) "eco" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17; @@ -27833,19 +24443,24 @@ "ecr" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/living/captain_mess) -"ecR" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +"ecz" = ( +/obj/structure/machinery/light{ + dir = 8 }, -/obj/structure/pipes/vents/pump{ - dir = 1 +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/upper/aft_hallway) +"ecS" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/maint/hull/lower/s_bow) "ecZ" = ( /obj/structure/ladder{ height = 1; @@ -27856,14 +24471,11 @@ }, /area/almayer/shipboard/navigation) "edn" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/structure/sign/poster/ad{ - pixel_x = 30 +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliaison) +/area/almayer/hallways/lower/starboard_aft_hallway) "edo" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -27876,15 +24488,16 @@ icon_state = "sterile_green" }, /area/almayer/medical/medical_science) -"edx" = ( -/obj/structure/sign/safety/restrictedarea{ - pixel_x = 8; - pixel_y = 32 - }, +"edG" = ( +/obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/p_bow) +/area/almayer/maint/hull/upper/u_m_p) +"edV" = ( +/obj/structure/machinery/power/terminal, +/turf/open/floor/almayer, +/area/almayer/maint/upper/mess) "eed" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -27946,30 +24559,44 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) -"eeL" = ( -/obj/structure/flora/pottedplant{ - desc = "Life is underwhelming, especially when you're a potted plant."; - icon_state = "pottedplant_22"; - name = "Jerry"; - pixel_y = 8 - }, -/obj/item/clothing/glasses/sunglasses/prescription{ - pixel_x = -3; - pixel_y = -3 +"eeA" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/machinery/light/small{ - dir = 4 +/area/almayer/maint/hull/upper/s_bow) +"eeC" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/hull/lower/stern) +"eeR" = ( +/obj/structure/surface/rack, +/obj/item/frame/table, +/obj/item/frame/table, +/obj/item/frame/table, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "efj" = ( /turf/open/floor/almayer{ dir = 4; icon_state = "red" }, /area/almayer/hallways/upper/port) +"efk" = ( +/obj/structure/machinery/door/poddoor/almayer{ + id = "s_umbilical"; + name = "\improper Umbillical Airlock"; + unacidable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_umbilical) "efC" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -27979,6 +24606,11 @@ icon_state = "plate" }, /area/almayer/engineering/lower) +"efJ" = ( +/obj/item/tool/wet_sign, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "efK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27990,6 +24622,20 @@ icon_state = "plate" }, /area/almayer/squads/alpha) +"efP" = ( +/obj/structure/surface/table/almayer, +/obj/item/toy/deck{ + pixel_y = 14 + }, +/obj/item/trash/cigbutt/ucigbutt{ + layer = 3.7; + pixel_x = 5; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) "efT" = ( /obj/structure/machinery/atm{ pixel_y = 32 @@ -28023,12 +24669,6 @@ /obj/structure/platform_decoration, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"egq" = ( -/obj/structure/sign/safety/ladder{ - pixel_x = -16 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) "egt" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Chapel" @@ -28043,17 +24683,34 @@ icon_state = "test_floor4" }, /area/almayer/living/chapel) -"egM" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) -"egW" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 +"egD" = ( +/obj/structure/bed/stool, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) +"egQ" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 12; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -16; + pixel_y = 13 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/maint/hull/upper/u_m_p) "ehc" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -28081,19 +24738,14 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"ehl" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/interrogation) "ehx" = ( /obj/effect/landmark/start/marine/tl/alpha, /obj/effect/landmark/late_join/alpha, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) -"ehH" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 2; - pixel_y = 3 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) "ehL" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/maint{ @@ -28112,6 +24764,14 @@ icon_state = "test_floor4" }, /area/almayer/hallways/upper/starboard) +"ehM" = ( +/obj/structure/surface/rack, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "ehR" = ( /obj/structure/window/reinforced{ dir = 4; @@ -28208,16 +24868,15 @@ icon_state = "plate" }, /area/almayer/living/gym) -"eje" = ( -/obj/structure/closet, -/obj/item/reagent_container/food/drinks/bottle/sake, -/obj/item/newspaper, -/obj/item/clothing/gloves/yellow, -/obj/item/stack/tile/carpet{ - amount = 20 +"ejj" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/tool/wrench{ + pixel_x = -2; + pixel_y = -1 }, -/obj/structure/machinery/light/small{ - dir = 8 +/obj/item/tool/wrench{ + pixel_x = 2; + pixel_y = 7 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -28236,12 +24895,6 @@ icon_state = "plate" }, /area/almayer/squads/charlie) -"ejp" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hallways/aft_hallway) "ejt" = ( /turf/open/floor/almayer/uscm/directional{ dir = 4 @@ -28251,6 +24904,17 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/grunt_rnr) +"ejV" = ( +/obj/structure/closet, +/obj/item/device/flashlight/pen, +/obj/item/attachable/reddot, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "ejY" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -28261,20 +24925,27 @@ /turf/open/floor/almayer, /area/almayer/command/lifeboat) "ekz" = ( -/obj/structure/platform, +/obj/structure/girder/displaced, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_p) -"ekF" = ( +"ekM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_aft_hallway) +"ekR" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/shipboard/brig/main_office) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" + }, +/area/almayer/hallways/lower/starboard_umbilical) "ekY" = ( /obj/structure/machinery/door/airlock/almayer/generic/glass{ name = "\improper Memorial Room" @@ -28286,6 +24957,16 @@ icon_state = "test_floor4" }, /area/almayer/living/starboard_garden) +"ekZ" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/secure_data{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/warden_office) "elf" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -28306,12 +24987,6 @@ "elx" = ( /turf/open/floor/almayer, /area/almayer/engineering/lower) -"elA" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) "elE" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -28324,23 +24999,41 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_one) -"elF" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper Starboard Viewing Room" +"elR" = ( +/turf/closed/wall/almayer/research/containment/wall/corner{ + dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/area/almayer/medical/containment/cell) +"elV" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + dir = 2; + name = "\improper Execution Equipment" }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_f_s) -"elR" = ( -/turf/closed/wall/almayer/research/containment/wall/corner{ +/area/almayer/shipboard/brig/execution_storage) +"elY" = ( +/obj/structure/machinery/light/small{ dir = 1 }, -/area/almayer/medical/containment/cell) +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/obj/structure/sign/safety/airlock{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_umbilical) "eme" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -28349,6 +25042,14 @@ icon_state = "dark_sterile" }, /area/almayer/medical/upper_medical) +"eml" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_umbilical) "emn" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -28368,6 +25069,19 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) +"emw" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_fore_hallway) +"emA" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/lower/l_a_s) +"emC" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/hull/lower/l_f_p) "emK" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -28375,20 +25089,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"emX" = ( -/obj/structure/largecrate/random, -/obj/item/reagent_container/food/snacks/cheesecakeslice{ - pixel_y = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "ene" = ( /turf/open/floor/almayer{ dir = 4; @@ -28403,31 +25103,72 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) -"enq" = ( -/obj/structure/largecrate/random/barrel/red, +"enz" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/sign/safety/bridge{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/west{ + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/aft_hallway) +"enF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) +"enK" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/starboard_fore_hallway) +"enQ" = ( +/obj/structure/surface/rack, +/obj/item/frame/table, +/obj/item/frame/table, +/obj/item/frame/table, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_a_s) -"enx" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/machinery/status_display{ - pixel_y = 30 +/area/almayer/maint/hull/lower/l_m_p) +"enY" = ( +/obj/item/storage/firstaid, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"eob" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 1; - icon_state = "green" + icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) -"enA" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 +/area/almayer/maint/hull/lower/l_m_s) +"eox" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/s_bow) +"eoy" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/hallways/lower/port_midship_hallway) +"eoE" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) "eoG" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -28435,25 +25176,19 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) -"epp" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/wirecutters/clippers, -/obj/item/handcuffs/zip, +"eoK" = ( +/obj/structure/machinery/optable, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_p) -"epq" = ( -/obj/structure/surface/rack, -/obj/item/clothing/head/headband/red{ - pixel_x = 4; - pixel_y = 8 - }, -/obj/item/clothing/glasses/regular/hipster, +/area/almayer/maint/hull/upper/p_stern) +"epk" = ( +/obj/structure/surface/table/almayer, +/obj/item/tank/emergency_oxygen/double, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_p) +/area/almayer/hallways/lower/port_umbilical) "epu" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -28474,13 +25209,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"epW" = ( -/obj/structure/machinery/cm_vending/sorted/medical/bolted, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lockerroom) "eqb" = ( /obj/structure/surface/table/almayer, /obj/item/tool/stamp/denied{ @@ -28507,12 +25235,27 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) -"eqh" = ( -/obj/structure/sign/poster{ - pixel_y = 32 +"eqd" = ( +/obj/item/stack/folding_barricade/three, +/obj/item/stack/folding_barricade/three, +/obj/structure/surface/rack, +/turf/open/floor/almayer{ + icon_state = "redfull" }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/shipboard/panic) +"eqm" = ( +/obj/structure/prop/almayer/computers/sensor_computer2, +/obj/structure/machinery/door_control{ + id = "Secretroom"; + indestructible = 1; + layer = 2.5; + name = "Shutters"; + use_power = 0 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "eqB" = ( /obj/item/bedsheet/brown{ layer = 3.2 @@ -28566,12 +25309,6 @@ icon_state = "test_floor5" }, /area/almayer/squads/req) -"era" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "erd" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -28581,6 +25318,12 @@ dir = 1 }, /area/almayer/medical/containment/cell/cl) +"ere" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) "erh" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -28608,6 +25351,14 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/engineering/lower/engine_core) +"erE" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/stern) "erF" = ( /obj/structure/surface/table/almayer, /obj/item/storage/firstaid/toxin{ @@ -28628,6 +25379,25 @@ /obj/effect/landmark/late_join/delta, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) +"erL" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/crushed_cup, +/obj/item/reagent_container/food/drinks/cup{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/spacecash/c10{ + pixel_x = 5; + pixel_y = 10 + }, +/obj/item/ashtray/plastic{ + pixel_x = 5; + pixel_y = -10 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "erN" = ( /obj/structure/machinery/light{ dir = 8 @@ -28639,48 +25409,24 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"erR" = ( -/obj/structure/machinery/light/small{ +"esd" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) -"erS" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_umbilical) -"esi" = ( -/obj/structure/sign/safety/stairs{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/west{ - pixel_y = 32 - }, -/obj/structure/machinery/door_control{ - id = "laddernorthwest"; - name = "North West Ladders Shutters"; - pixel_y = 24; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) -"esl" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_y = 17 + icon_state = "test_floor4" }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +/area/almayer/hallways/lower/port_midship_hallway) +"esm" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = -32 }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) "esC" = ( /obj/structure/toilet{ pixel_y = 13 @@ -28725,11 +25471,6 @@ dir = 9 }, /area/almayer/command/lifeboat) -"esV" = ( -/obj/effect/landmark/start/researcher, -/obj/effect/landmark/late_join/researcher, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/offices) "etf" = ( /turf/open/floor/almayer{ dir = 1; @@ -28772,11 +25513,11 @@ }, /area/almayer/engineering/upper_engineering) "ety" = ( +/obj/structure/closet/firecloset, /turf/open/floor/almayer{ - dir = 6; - icon_state = "silver" + icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/hull/lower/l_m_s) "etE" = ( /obj/structure/prop/almayer/name_stencil, /turf/open/floor/almayer_hull{ @@ -28791,6 +25532,10 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) +"etN" = ( +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/s_bow) "eua" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ @@ -28805,16 +25550,18 @@ icon_state = "test_floor4" }, /area/almayer/living/officer_study) -"euu" = ( -/obj/effect/step_trigger/clone_cleaner, -/turf/closed/wall/almayer, -/area/almayer/maint/hull/upper/u_m_s) -"euw" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, +"euL" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Starboard Railguns and Viewing Room" + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/hull/upper/u_f_s) "euN" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -28886,24 +25633,6 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/starboard) -"evF" = ( -/obj/structure/surface/rack, -/obj/item/roller, -/obj/item/roller, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_s) -"evQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/sign/safety/cryo{ - pixel_x = 36 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/lower/cryo_cells) "evR" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/mechanical/green{ @@ -28918,16 +25647,13 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north1) -"ewo" = ( -/obj/structure/sign/safety/escapepod{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "greencorner" +"ewc" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/light{ + dir = 4 }, -/area/almayer/hallways/starboard_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_fore_hallway) "ewr" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -28968,20 +25694,30 @@ icon_state = "silvercorner" }, /area/almayer/command/cichallway) +"exb" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = -16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"exc" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/hallways/lower/port_midship_hallway) "exi" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"exx" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/flashlight/lamp{ - pixel_x = 5; - pixel_y = 10 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_f_p) +"exl" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) "exy" = ( /obj/structure/machinery/power/monitor{ name = "Main Power Grid Monitoring" @@ -28993,27 +25729,33 @@ icon_state = "tcomms" }, /area/almayer/engineering/upper_engineering/starboard) -"exX" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, +"exQ" = ( /turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_stern) -"eyp" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" + icon_state = "greencorner" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/hallways/lower/starboard_midship_hallway) +"eyD" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/starboard_hallway) "eyG" = ( /obj/structure/platform, /turf/open/floor/almayer{ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) +"eyI" = ( +/obj/structure/window/framed/almayer, +/obj/structure/curtain/open/shower{ + name = "hypersleep curtain" + }, +/turf/open/floor/plating, +/area/almayer/maint/hull/upper/u_m_p) +"eyM" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "eyQ" = ( /obj/structure/machinery/light{ dir = 1 @@ -29064,19 +25806,10 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"ezR" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/maint/hull/lower/l_f_s) "ezX" = ( /obj/structure/bed/chair/wood/normal, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) -"eAa" = ( -/obj/structure/sign/poster{ - pixel_y = -32 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) "eAg" = ( /obj/structure/flora/pottedplant{ desc = "It is made of Fiberbush(tm). It contains asbestos."; @@ -29089,6 +25822,12 @@ icon_state = "red" }, /area/almayer/squads/alpha) +"eAm" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_umbilical) "eAC" = ( /obj/structure/machinery/light{ dir = 4 @@ -29106,21 +25845,21 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"eAG" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/firstaid/regular, +/obj/item/clipboard, +/obj/item/tool/pen, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/req) "eAI" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "orangecorner" }, /area/almayer/engineering/lower/engine_core) -"eAK" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -25 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) "eAL" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -29131,24 +25870,6 @@ "eAN" = ( /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"eAP" = ( -/obj/structure/largecrate/random/barrel/red, -/obj/structure/sign/safety/fire_haz{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) -"eAT" = ( -/obj/structure/machinery/door_control/cl/office/door{ - pixel_y = -20 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/aft_hallway) "eAU" = ( /obj/structure/bed/chair{ dir = 8 @@ -29182,27 +25903,30 @@ /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 - }, +"eBx" = ( +/obj/structure/closet/emcloset/legacy, /turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/starboard_hallway) -"eBC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 + icon_state = "cargo" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/shipboard/brig/starboard_hallway) "eBE" = ( /obj/structure/machinery/photocopier{ anchored = 0 }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"eBG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) "eBO" = ( /obj/structure/bed, /turf/open/floor/almayer{ @@ -29287,20 +26011,13 @@ icon_state = "plating" }, /area/almayer/shipboard/brig/execution) -"eCZ" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice2"; - pixel_x = 16; - pixel_y = 16 - }, -/obj/structure/largecrate/supply/supplies/flares, +"eDk" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldpack, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/maint/hull/upper/u_a_p) "eDo" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -29311,6 +26028,12 @@ icon_state = "plating" }, /area/almayer/medical/upper_medical) +"eDq" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "eDt" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/almayer_network{ @@ -29327,34 +26050,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/bridgebunks) -"eDF" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/tool, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) -"eDG" = ( -/obj/structure/barricade/handrail{ - dir = 1; - pixel_y = 2 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/fire_haz{ - pixel_y = -32 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) -"eDN" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/s_bow) "eEc" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -29379,37 +26074,27 @@ /obj/structure/filingcabinet, /turf/open/floor/almayer, /area/almayer/command/computerlab) -"eEq" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/p_bow) -"eEv" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) "eEw" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) -"eFg" = ( +"eEF" = ( /obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 }, -/area/almayer/maint/upper/mess) +/turf/open/floor/almayer, +/area/almayer/hallways/upper/stern_hallway) +"eFa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "eFj" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -29439,11 +26124,16 @@ }, /area/almayer/medical/chemistry) "eFI" = ( -/obj/effect/landmark/yautja_teleport, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "blue" }, -/area/almayer/maint/hull/lower/s_bow) +/area/almayer/hallways/upper/aft_hallway) "eFK" = ( /obj/structure/bed{ icon_state = "abed" @@ -29528,13 +26218,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) -"eGg" = ( -/obj/structure/machinery/door/poddoor/railing{ - dir = 8; - id = "vehicle_elevator_railing_aux" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) "eGh" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/tool/surgery/scalpel{ @@ -29544,34 +26227,13 @@ /obj/item/stack/cable_coil, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) -"eGl" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_x = -8; - pixel_y = 28 - }, -/obj/structure/sign/safety/intercom{ - pixel_x = 14; - pixel_y = 32 - }, +"eGq" = ( +/obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ dir = 4; - icon_state = "bluecorner" - }, -/area/almayer/hallways/aft_hallway) -"eGr" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 1; - name = "\improper Brig" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "green" }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/hallways/lower/port_midship_hallway) "eGB" = ( /obj/structure/platform_decoration, /turf/open/floor/almayer, @@ -29605,12 +26267,22 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) -"eHJ" = ( -/obj/structure/machinery/vending/hydronutrients, +"eHy" = ( +/obj/structure/machinery/conveyor{ + id = "lower_garbage" + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "plating_striped" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/hull/lower/l_a_p) +"eHz" = ( +/obj/structure/largecrate/supply/supplies/mre, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/maint/hull/upper/u_a_p) "eHY" = ( /obj/structure/surface/rack, /obj/item/device/taperecorder, @@ -29618,6 +26290,45 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"eIN" = ( +/obj/item/tool/kitchen/utensil/pfork, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_stern) +"eIO" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/machinery/door_control{ + id = "hangarentrancenorth"; + name = "North Hangar Podlocks"; + pixel_y = -26; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_fore_hallway) +"eJg" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/hallways/upper/aft_hallway) +"eJj" = ( +/obj/structure/closet/crate, +/obj/item/ammo_box/magazine/l42a, +/obj/item/ammo_box/magazine/l42a, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "eJQ" = ( /obj/structure/prop/invuln{ desc = "An inflated membrane. This one is puncture proof. Wow!"; @@ -29634,6 +26345,10 @@ "eJX" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/ce_room) +"eJZ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_s) "eKa" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ dir = 2; @@ -29645,17 +26360,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/processing) -"eKi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_p) -"eKk" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/weldingtool, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_s) "eKy" = ( /obj/structure/pipes/standard/simple/visible{ dir = 6 @@ -29667,12 +26371,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower) -"eKE" = ( -/obj/item/trash/cigbutt, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) "eKH" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -29717,20 +26415,76 @@ icon_state = "green" }, /area/almayer/living/offices) -"eLq" = ( -/obj/structure/machinery/light/small, +"eKZ" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper Port Viewing Room" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_f_p) +"eLp" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/computer/supplycomp/vehicle, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_p) -"eLz" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/area/almayer/hallways/lower/vehiclehangar) +"eLu" = ( +/obj/structure/sign/safety/three{ + pixel_x = 31; + pixel_y = -8 + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 32; + pixel_y = 7 }, /turf/open/floor/almayer{ - icon_state = "silver" + dir = 4; + icon_state = "emerald" + }, +/area/almayer/hallways/lower/port_midship_hallway) +"eLC" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/kitchen/tray, +/obj/item/tool/kitchen/tray{ + pixel_y = 6 + }, +/obj/item/reagent_container/food/snacks/sliceable/bread{ + pixel_y = 8 + }, +/obj/item/tool/kitchen/knife{ + pixel_x = 6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/area/almayer/hallways/repair_bay) +/area/almayer/maint/hull/lower/l_f_p) +"eLH" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/beer_pack, +/obj/structure/sign/poster{ + desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; + icon_state = "poster11"; + name = "YOU ALWAYS KNOW A WORKING JOE."; + pixel_x = -27; + serial_number = 11 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"eLX" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/mp_bunks) "eMh" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Laundry Room" @@ -29739,12 +26493,18 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) -"eMt" = ( -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/almayer{ - icon_state = "plate" +"eMx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_p) +"eMI" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/hallways/lower/port_midship_hallway) "eMJ" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -29771,38 +26531,16 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) -"eNf" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "plate" +"eMZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/area/almayer/maint/hull/lower/l_m_s) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "eNi" = ( /turf/closed/wall/almayer, /area/almayer/engineering/ce_room) -"eNq" = ( -/obj/structure/largecrate/random/barrel/white, -/obj/structure/sign/safety/storage{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) -"eNv" = ( -/obj/structure/largecrate/random, -/turf/open/floor/almayer, -/area/almayer/engineering/upper_engineering/port) -"eNw" = ( -/obj/structure/surface/table/almayer, -/obj/item/spacecash/c1000/counterfeit, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/fancy/cigar, -/obj/structure/machinery/atm{ - pixel_y = 32 - }, -/turf/open/floor/almayer, -/area/almayer/command/corporateliaison) "eNI" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -29813,12 +26551,12 @@ icon_state = "test_floor4" }, /area/almayer/medical/containment) -"eNO" = ( -/obj/effect/landmark/yautja_teleport, +"eNL" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "green" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/hallways/lower/starboard_midship_hallway) "eNR" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -29826,6 +26564,14 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/processing) +"eOx" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = -28 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "eOM" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; @@ -29846,27 +26592,15 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) -"eOY" = ( -/obj/structure/surface/rack, -/obj/item/facepaint/sniper, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) -"ePc" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) -"ePA" = ( -/obj/structure/machinery/light{ - dir = 1 +"ePq" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 8; + icon_state = "orange" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/starboard_umbilical) "ePM" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 32 @@ -29908,12 +26642,55 @@ icon_state = "cargo" }, /area/almayer/engineering/lower/workshop/hangar) -"eQa" = ( -/obj/structure/largecrate/random/barrel/red, +"eQd" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/smg/m39{ + pixel_y = 6 + }, +/obj/item/weapon/gun/smg/m39{ + pixel_y = -6 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/maint/hull/upper/u_m_s) +"eQh" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "silvercorner" + }, +/area/almayer/hallways/upper/aft_hallway) +"eQm" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_bow) +"eQz" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/vehiclehangar) +"eQJ" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/structure/sign/poster/ad{ + pixel_x = 30 + }, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliaison) +"eQR" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/s_bow) "eRi" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/folder/black{ @@ -29926,21 +26703,6 @@ }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) -"eRm" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, -/obj/item/storage/firstaid{ - pixel_x = -13; - pixel_y = 13 - }, -/obj/item/clipboard, -/obj/item/paper, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) "eRu" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -29969,9 +26731,14 @@ icon_state = "test_floor4" }, /area/almayer/medical/lower_medical_medbay) -"eRL" = ( -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +"eRG" = ( +/obj/structure/closet, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/glasses/regular/hipster, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "eRR" = ( /obj/item/clothing/head/helmet/marine{ pixel_x = 16; @@ -30013,15 +26780,11 @@ }, /area/almayer/medical/medical_science) "eSp" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/sign/safety/ladder{ + pixel_x = -16 }, -/area/almayer/maint/hull/upper/u_m_p) -"eSH" = ( -/obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/vehiclehangar) "eSU" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer1" @@ -30030,12 +26793,9 @@ icon_state = "outerhull_dir" }, /area/space) -"eSZ" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_s) +"eTb" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/hull/lower/stern) "eTd" = ( /obj/structure/surface/table/almayer, /obj/item/trash/boonie{ @@ -30046,35 +26806,36 @@ /obj/effect/landmark/crap_item, /turf/open/floor/almayer, /area/almayer/living/briefing) -"eTJ" = ( -/obj/structure/curtain/red, +"eTx" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "green" }, -/area/almayer/maint/hull/lower/l_a_s) -"eTO" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 +/area/almayer/hallways/lower/port_aft_hallway) +"eTD" = ( +/obj/structure/bed/chair{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 10; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/maint/hull/lower/l_a_s) "eUe" = ( -/obj/structure/surface/rack, -/obj/item/device/radio{ - pixel_x = 5; - pixel_y = 4 +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 }, -/obj/item/device/radio, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/stern) +"eUf" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "orange" }, -/area/almayer/maint/hull/upper/s_bow) -"eUf" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/lower/stern) +/area/almayer/hallways/lower/starboard_midship_hallway) "eUh" = ( /obj/structure/window/reinforced{ dir = 8 @@ -30154,16 +26915,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) -"eVP" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/extinguisher, -/obj/item/tool/extinguisher, -/obj/item/tool/crowbar, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" - }, -/area/almayer/maint/upper/mess) "eVQ" = ( /obj/structure/machinery/light{ dir = 4 @@ -30201,18 +26952,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"eVY" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/screwdriver{ - pixel_x = -1; - pixel_y = 2 - }, -/obj/item/stack/cable_coil{ - pixel_x = 8; - pixel_y = -4 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "eWp" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/bed/chair/comfy/charlie{ @@ -30222,6 +26961,20 @@ icon_state = "emeraldfull" }, /area/almayer/living/briefing) +"eWs" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/hull/lower/l_f_s) +"eWv" = ( +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) +"eWx" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_fore_hallway) "eWF" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -30230,15 +26983,12 @@ icon_state = "test_floor4" }, /area/almayer/living/basketball) -"eWV" = ( -/obj/structure/machinery/light/small, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +"eWN" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "blue" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/hallways/upper/aft_hallway) "eXb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30267,6 +27017,17 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/living/offices) +"eXD" = ( +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice-simple"; + pixel_x = 16; + pixel_y = -16 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "eYj" = ( /obj/structure/machinery/light{ dir = 8 @@ -30282,6 +27043,15 @@ /obj/structure/filingcabinet/security, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) +"eYp" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Tool Closet" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_m_s) "eYr" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -30309,14 +27079,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"eYw" = ( -/obj/effect/decal/cleanable/blood/drip, -/obj/item/tool/crowbar{ - pixel_x = 6; - pixel_y = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) "eYz" = ( /obj/structure/machinery/camera/autoname/almayer/containment/ares{ dir = 1 @@ -30329,18 +27091,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"eYC" = ( -/obj/structure/machinery/door/airlock/almayer/engineering{ - name = "\improper Disposals" - }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/lower/l_a_p) "eYD" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -30370,12 +27120,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"eYN" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/s_bow) "eYQ" = ( /obj/structure/closet/fireaxecabinet{ pixel_x = -32 @@ -30392,16 +27136,9 @@ icon_state = "orangecorner" }, /area/almayer/engineering/upper_engineering/port) -"eZi" = ( -/obj/effect/projector{ - name = "Almayer_Up4"; - vector_x = -19; - vector_y = 104 - }, -/turf/open/floor/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/port_hallway) +"eZm" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/hull/upper/p_stern) "eZo" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -30429,24 +27166,26 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) +"eZC" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_fore_hallway) "eZH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"eZK" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/almayer{ - icon_state = "plate" +"eZR" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/maint/lower/s_bow) -"fad" = ( -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - icon_state = "green" +/obj/structure/disposalpipe/junction{ + dir = 8 }, -/area/almayer/hallways/aft_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_aft_hallway) "fag" = ( /obj/effect/decal/cleanable/blood, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -30455,34 +27194,15 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/execution) "far" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = 6 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/item/weapon/gun/rifle/l42a, /turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) -"fau" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/junction{ dir = 4; - icon_state = "pipe-j2" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"faC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = 32 + icon_state = "orangecorner" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/hallways/lower/port_aft_hallway) "faE" = ( /obj/structure/bookcase{ icon_state = "book-5"; @@ -30506,6 +27226,18 @@ /obj/item/stack/cable_coil, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) +"faR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice-simple"; + pixel_x = -16; + pixel_y = 17 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "faX" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -30538,6 +27270,15 @@ icon_state = "plate" }, /area/almayer/squads/alpha) +"fbe" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "fbo" = ( /obj/structure/machinery/door_control{ id = "kitchen2"; @@ -30577,6 +27318,13 @@ icon_state = "dark_sterile" }, /area/almayer/medical/upper_medical) +"fbC" = ( +/obj/structure/closet/toolcloset, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "orange" + }, +/area/almayer/maint/hull/lower/l_m_s) "fbR" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -30590,27 +27338,41 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) +"fbU" = ( +/obj/item/stool, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/lower/vehiclehangar) +"fca" = ( +/obj/structure/disposalpipe/segment{ + layer = 5.1; + name = "water pipe" + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "fcf" = ( /obj/structure/pipes/vents/pump{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"fcl" = ( -/obj/structure/bookcase/manuals/engineering, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_f_s) -"fcx" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 +"fco" = ( +/obj/structure/surface/rack, +/obj/item/device/radio{ + pixel_x = 5; + pixel_y = 4 }, +/obj/item/device/radio, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/maint/hull/upper/s_bow) "fcy" = ( /obj/structure/machinery/light{ dir = 8 @@ -30632,14 +27394,6 @@ icon_state = "bluecorner" }, /area/almayer/living/basketball) -"fcK" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -14; - pixel_y = 13 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) "fcM" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -30663,9 +27417,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"fcW" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/hull/upper/u_a_p) "fcX" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/light{ @@ -30679,6 +27430,12 @@ icon_state = "silver" }, /area/almayer/command/airoom) +"fdf" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "fdx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -30688,15 +27445,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"fdD" = ( -/obj/structure/surface/table/almayer, -/obj/effect/spawner/random/toolbox, -/obj/item/storage/firstaid/o2, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" - }, -/area/almayer/maint/upper/mess) "fdE" = ( /obj/item/clothing/mask/rebreather/scarf, /obj/structure/closet/secure_closet/personal/cabinet{ @@ -30718,9 +27466,31 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lockerroom) +"fea" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) "feb" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/brig/execution) +"feo" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 2; + pixel_y = 3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) "feq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30743,6 +27513,10 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"feG" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) "feI" = ( /obj/item/trash/cigbutt, /turf/open/floor/almayer, @@ -30767,32 +27541,55 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_two) -"feZ" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/stern) "ffg" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/perma) +"ffq" = ( +/obj/structure/surface/table/almayer, +/obj/item/clothing/head/hardhat{ + pixel_y = 15 + }, +/obj/item/clothing/head/hardhat/dblue{ + pixel_x = -7; + pixel_y = 10 + }, +/obj/item/clothing/head/hardhat{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/item/clothing/head/hardhat/orange{ + pixel_x = 7; + pixel_y = -5 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) +"ffx" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/item/clothing/head/helmet/marine/tech/tanker, +/obj/structure/largecrate/random/secure, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) "ffE" = ( /turf/open/floor/almayer/no_build{ icon_state = "plating" }, /area/almayer/command/airoom) -"ffL" = ( +"ffN" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, /obj/structure/sign/safety/water{ pixel_x = 8; pixel_y = -32 }, +/obj/structure/machinery/power/apc/almayer, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) -"ffX" = ( -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/p_bow) +/area/almayer/maint/hull/lower/s_bow) "fgh" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -30819,26 +27616,15 @@ icon_state = "green" }, /area/almayer/squads/req) -"fgv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) -"fgA" = ( -/obj/structure/disposalpipe/segment{ +"fgt" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/sign/safety/nonpress_ag{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/west{ - pixel_y = -32 +/turf/open/floor/almayer{ + dir = 9; + icon_state = "sterile_green_side" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) +/area/almayer/shipboard/brig/medical) "fgE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -30877,13 +27663,14 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/cells) -"fhb" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/structure/sign/safety/water{ - pixel_x = -17 +"fgU" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "fhf" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical, @@ -30895,24 +27682,25 @@ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/starboard) -"fhT" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"fic" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/maint/hull/lower/l_a_s) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "fie" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "orange" }, /area/almayer/engineering/lower/workshop) -"fiz" = ( -/obj/structure/machinery/vending/snack, -/turf/open/floor/almayer{ - icon_state = "plate" +"fix" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/area/almayer/shipboard/panic) +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "fiE" = ( /obj/structure/machinery/computer/cameras/containment/hidden{ dir = 4; @@ -30923,6 +27711,15 @@ /obj/item/device/camera_film, /turf/open/floor/almayer, /area/almayer/command/corporateliaison) +"fiH" = ( +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/stern_hallway) +"fiN" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) "fiQ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -30931,28 +27728,36 @@ icon_state = "plate" }, /area/almayer/engineering/lower) -"fkF" = ( -/obj/structure/closet/emcloset, +"fjz" = ( +/obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" + }, +/area/almayer/maint/hull/upper/u_f_p) +"fkK" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/area/almayer/maint/hull/lower/l_m_p) -"fkO" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer{ - dir = 1; - icon_state = "green" + icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/maint/hull/upper/u_m_s) "fkX" = ( /turf/closed/wall/almayer/research/containment/wall/corner{ dir = 8 }, /area/almayer/medical/containment/cell/cl) -"flK" = ( -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +"flr" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/p_bow) "flW" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/light{ @@ -30964,15 +27769,18 @@ icon_state = "silver" }, /area/almayer/living/briefing) -"flY" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 +"fml" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "greencorner" }, -/area/almayer/maint/hull/lower/stern) +/area/almayer/hallways/lower/port_fore_hallway) "fmv" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -30994,15 +27802,20 @@ icon_state = "bluecorner" }, /area/almayer/living/pilotbunks) -"fmY" = ( +"fmZ" = ( /turf/open/floor/almayer{ - icon_state = "orangecorner" + dir = 8; + icon_state = "orange" }, -/area/almayer/maint/hull/upper/u_a_s) -"fmZ" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/hallways/lower/starboard_umbilical) +"fnc" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) "fnv" = ( /obj/structure/machinery/light{ dir = 4 @@ -31036,15 +27849,6 @@ icon_state = "redfull" }, /area/almayer/medical/upper_medical) -"fnC" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "fnH" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -31056,19 +27860,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) -"foa" = ( -/obj/structure/prop/holidays/string_lights{ - pixel_y = 27 - }, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/item/storage/box/drinkingglasses, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) "foC" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -31115,21 +27906,26 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) -"foU" = ( -/obj/item/tool/screwdriver, -/obj/structure/platform_decoration{ - dir = 8 +"foS" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) -"fpj" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 +/area/almayer/maint/hull/lower/l_a_p) +"fpi" = ( +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/maint/hull/lower/stern) "fpA" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -31142,10 +27938,21 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"fpO" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +"fpI" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) +"fpM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) "fpR" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/tool, @@ -31173,6 +27980,21 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) +"fqb" = ( +/obj/item/paper/prison_station/interrogation_log{ + pixel_x = 10; + pixel_y = 7 + }, +/obj/structure/largecrate/random/barrel/green, +/obj/item/limb/hand/l_hand{ + pixel_x = -5; + pixel_y = 14 + }, +/obj/effect/spawner/random/balaclavas, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "fqc" = ( /obj/structure/machinery/vending/cigarette, /obj/structure/machinery/light, @@ -31180,17 +28002,38 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) -"fqh" = ( -/turf/open/floor/almayer{ - icon_state = "plate" +"fqw" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" }, -/area/almayer/maint/lower/cryo_cells) +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) +"fqA" = ( +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/port_midship_hallway) "fqC" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) +"fqJ" = ( +/obj/structure/machinery/door_control{ + id = "safe_armory"; + name = "Hangar Armory Lockdown"; + pixel_y = 24; + req_access_txt = "4" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/panic) "fqO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -31198,12 +28041,26 @@ /obj/structure/surface/table/reinforced/black, /turf/open/floor/carpet, /area/almayer/command/cichallway) -"fqP" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"fqQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) +"fqU" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_fore_hallway) "fqW" = ( /obj/structure/machinery/recharge_station, /turf/open/floor/almayer{ @@ -31221,14 +28078,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"fra" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) "frb" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -31252,11 +28101,42 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"frq" = ( +"frt" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door_control{ + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutters"; + pixel_x = 6; + req_access_txt = "3" + }, +/obj/structure/machinery/door_control{ + id = "Brig Lockdown Shutters"; + name = "Brig Lockdown Shutters"; + pixel_x = -6; + req_access_txt = "3" + }, +/obj/structure/machinery/door_control{ + id = "courtyard window"; + name = "Courtyard Window Shutters"; + pixel_x = -6; + pixel_y = 9; + req_access_txt = "3" + }, +/obj/structure/machinery/door_control{ + id = "Cell Privacy Shutters"; + name = "Cell Privacy Shutters"; + pixel_x = 6; + pixel_y = 9; + req_access_txt = "3" + }, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "red" }, -/area/almayer/maint/hull/upper/s_stern) +/area/almayer/shipboard/brig/warden_office) "frz" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ name = "\improper Exterior Airlock"; @@ -31274,6 +28154,13 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) +"frI" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "frM" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -31287,26 +28174,22 @@ icon_state = "tcomms" }, /area/almayer/command/airoom) -"frX" = ( -/obj/structure/machinery/optable, -/obj/structure/sign/safety/medical{ - pixel_x = 8; - pixel_y = 29 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_corner" +"frV" = ( +/obj/structure/toilet{ + dir = 1 }, -/area/almayer/shipboard/brig/surgery) -"fsd" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) +"fsf" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "N"; + pixel_y = 1 }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "orangecorner" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/lower/port_umbilical) "fsp" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -31317,15 +28200,18 @@ icon_state = "plate" }, /area/almayer/living/gym) -"fsH" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 +"fsu" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "green" + icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/upper/aft_hallway) "fsR" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -31348,52 +28234,33 @@ icon_state = "plating_striped" }, /area/almayer/living/cryo_cells) -"fti" = ( -/obj/structure/machinery/door/poddoor/railing{ - dir = 2; - id = "vehicle_elevator_railing" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"ftb" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/vehiclehangar) -"ftr" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 + dir = 5; + icon_state = "blue" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) -"ftA" = ( -/obj/structure/largecrate/random/secure, -/turf/open/floor/almayer{ - icon_state = "plate" +/area/almayer/hallways/upper/aft_hallway) +"ftG" = ( +/obj/structure/sign/safety/life_support{ + pixel_x = 8; + pixel_y = 32 }, -/area/almayer/maint/hull/lower/p_bow) -"ftE" = ( -/obj/item/storage/firstaid/regular, -/obj/structure/surface/rack, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_s) -"ful" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) -"fut" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +"ftZ" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 32 }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + dir = 4; + icon_state = "green" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/hallways/upper/aft_hallway) "fuz" = ( /obj/structure/machinery/cm_vending/clothing/pilot_officer, /turf/open/floor/almayer{ @@ -31420,6 +28287,22 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"fuU" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/hallways/lower/port_umbilical) +"fuY" = ( +/obj/structure/bed/chair/bolted{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/interrogation) "fva" = ( /obj/structure/machinery/light{ dir = 1 @@ -31448,11 +28331,36 @@ icon_state = "silver" }, /area/almayer/living/briefing) -"fvs" = ( +"fvj" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/aft_hallway) +"fvo" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/clothing/glasses/welding{ + pixel_x = 8; + pixel_y = 3 + }, +/obj/item/tool/weldingtool{ + pixel_x = -11; + pixel_y = 5 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/s_bow) +/area/almayer/maint/hull/upper/u_a_p) "fvA" = ( /obj/structure/closet/secure_closet/brig, /turf/open/floor/almayer, @@ -31463,13 +28371,19 @@ icon_state = "redfull" }, /area/almayer/command/cic) -"fvK" = ( -/obj/structure/sign/safety/galley{ - pixel_x = 8; - pixel_y = 32 +"fvE" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "bluecorner" }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/upper/aft_hallway) +"fvJ" = ( +/obj/structure/machinery/cm_vending/sorted/medical/bolted, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lockerroom) "fvN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -31480,6 +28394,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/port_point_defense) +"fvV" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "fwD" = ( /obj/item/reagent_container/food/snacks/grown/poppy{ pixel_x = 4; @@ -31490,6 +28417,9 @@ icon_state = "plate" }, /area/almayer/living/starboard_garden) +"fwK" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/hallways/lower/starboard_umbilical) "fwM" = ( /obj/structure/surface/table/almayer, /obj/item/paper, @@ -31501,22 +28431,13 @@ icon_state = "redfull" }, /area/almayer/living/briefing) -"fwQ" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) -"fwT" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +"fwP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/small{ dir = 4 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper Starboard Viewing Room" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/u_f_s) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_s) "fwY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -31574,10 +28495,6 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cryo) -"fyq" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) "fyD" = ( /obj/structure/machinery/light, /obj/structure/ladder{ @@ -31586,6 +28503,41 @@ }, /turf/open/floor/plating/almayer, /area/almayer/living/briefing) +"fyI" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -25 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/warden_office) +"fyT" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 2; + id = "CIC Lockdown"; + layer = 2.2; + name = "\improper Combat Information Center Blast Door" + }, +/obj/structure/machinery/door/airlock/almayer/engineering/reinforced{ + dir = 1; + name = "\improper Command Power Substation" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/mess) +"fzc" = ( +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_fore_hallway) +"fzm" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/hallways/upper/stern_hallway) "fzq" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -31598,6 +28550,18 @@ icon_state = "test_floor4" }, /area/almayer/squads/charlie) +"fzx" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) "fzP" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -31614,42 +28578,69 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/ce_room) +"fzT" = ( +/obj/structure/surface/rack, +/obj/item/tool/wirecutters, +/obj/item/tool/shovel/snow, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) +"fAa" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/item/ammo_magazine/pistol{ + current_rounds = 0 + }, +/obj/item/weapon/gun/pistol/m4a3{ + current_mag = null + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/living/offices/flight) "fAr" = ( /obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) -"fAE" = ( -/obj/structure/closet/firecloset/full, +"fAW" = ( +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) +"fBi" = ( /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 4; + icon_state = "redcorner" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"fBo" = ( +/obj/structure/machinery/light/small{ + dir = 4 }, -/area/almayer/shipboard/brig/main_office) -"fAH" = ( -/obj/structure/largecrate/supply, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/p_stern) -"fBD" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/area/almayer/maint/hull/lower/l_a_s) +"fBA" = ( +/obj/structure/sign/safety/high_voltage{ + pixel_y = -32 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/hallways/vehiclehangar) -"fBL" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" + icon_state = "blue" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "fBO" = ( /obj/structure/machinery/chem_master{ vial_maker = 1 @@ -31662,6 +28653,21 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) +"fCg" = ( +/obj/effect/projector{ + name = "Almayer_Up4"; + vector_x = -19; + vector_y = 104 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) +"fCi" = ( +/obj/structure/surface/table/almayer, +/obj/item/organ/lungs/prosthetic, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_p) "fCp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -31669,32 +28675,32 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/command/lifeboat) "fCG" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/bed/chair/office/dark{ + dir = 8 }, -/area/almayer/maint/lower/s_bow) +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "fCL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"fCZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"fCP" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" }, +/area/almayer/hallways/upper/aft_hallway) +"fCT" = ( /obj/structure/surface/table/almayer, -/obj/item/toy/handcard/uno_reverse_red{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/toy/deck/uno, -/obj/structure/machinery/light/small, +/obj/item/fuel_cell, +/obj/item/fuel_cell, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/engineering/lower/engine_core) "fDh" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -31717,27 +28723,14 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) -"fDm" = ( -/obj/structure/surface/table/almayer, -/obj/item/stack/nanopaste{ - pixel_x = -3; - pixel_y = 14 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_stern) -"fDC" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = -17 +"fDk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "orangecorner" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/hallways/upper/stern_hallway) "fDG" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light{ @@ -31760,12 +28753,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"fDT" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_p) "fDU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -31809,6 +28796,12 @@ icon_state = "plate" }, /area/almayer/medical/morgue) +"fEF" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "fEN" = ( /obj/structure/machinery/camera/autoname/almayer/containment/ares{ dir = 4 @@ -31862,10 +28855,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) -"fFN" = ( -/obj/item/tool/weldingtool, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) "fFO" = ( /obj/structure/machinery/light{ dir = 4 @@ -31877,6 +28866,23 @@ icon_state = "plate" }, /area/almayer/medical/morgue) +"fFQ" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/spray/cleaner{ + pixel_x = 7; + pixel_y = 14 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_s) +"fFU" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) "fGa" = ( /obj/structure/surface/rack, /obj/effect/decal/warning_stripes{ @@ -31887,10 +28893,26 @@ icon_state = "dark_sterile" }, /area/almayer/living/numbertwobunks) +"fGd" = ( +/obj/structure/machinery/door/poddoor/railing{ + dir = 2; + id = "vehicle_elevator_railing" + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/lower/vehiclehangar) "fGg" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"fGi" = ( +/obj/effect/spawner/random/toolbox, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) "fGu" = ( /obj/structure/machinery/door_control{ dir = 1; @@ -31918,15 +28940,24 @@ }, /area/almayer/medical/medical_science) "fGB" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) -"fGG" = ( +/obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "plate" }, -/area/almayer/shipboard/panic) +/area/almayer/maint/hull/lower/l_a_s) +"fGD" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/aft_hallway) +"fHb" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/s_bow) "fHh" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -31949,16 +28980,10 @@ icon_state = "greenfull" }, /area/almayer/living/offices) -"fHY" = ( -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = -16 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) -"fII" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) +"fHM" = ( +/obj/docking_port/stationary/escape_pod/cl, +/turf/open/floor/plating, +/area/almayer/maint/hull/upper/u_m_p) "fIM" = ( /obj/effect/landmark/start/marine/tl/bravo, /obj/effect/landmark/late_join/bravo, @@ -31996,6 +29021,25 @@ icon_state = "plate" }, /area/almayer/command/cichallway) +"fJp" = ( +/obj/structure/girder, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"fJt" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) +"fJu" = ( +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/p_bow) "fJy" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/toy/deck{ @@ -32004,16 +29048,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/pilotbunks) -"fJA" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/tool, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) "fJO" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -32071,16 +29105,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/chief_mp_office) -"fKj" = ( -/obj/structure/largecrate/random/barrel/green, -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_s) "fKt" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/prop/dam/crane{ @@ -32097,13 +29121,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"fKv" = ( -/obj/structure/surface/rack, -/obj/item/stack/folding_barricade/three, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/panic) "fKw" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1 @@ -32123,20 +29140,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cells) -"fKC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) -"fKL" = ( -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_s) "fKT" = ( /obj/structure/machinery/vending/coffee, /obj/structure/sign/safety/coffee{ @@ -32166,6 +29169,13 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"fLf" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) "fLg" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/reagent_container/food/snacks/wrapped/barcardine{ @@ -32176,10 +29186,26 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"fLi" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_p) "fLl" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) +/turf/closed/wall/almayer, +/area/almayer/maint/hull/upper/s_stern) +"fLt" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "fLu" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -32209,18 +29235,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) -"fLI" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/beer_pack, -/obj/structure/sign/poster{ - desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; - icon_state = "poster11"; - name = "YOU ALWAYS KNOW A WORKING JOE."; - pixel_x = -27; - serial_number = 11 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) "fMe" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -32248,12 +29262,6 @@ icon_state = "silver" }, /area/almayer/command/airoom) -"fMn" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) "fMt" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES Interior"; @@ -32282,36 +29290,28 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) -"fMA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out" - }, -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/sign/safety/stairs{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" +"fMU" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/hallways/aft_hallway) -"fMK" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +/obj/structure/sign/safety/east{ + pixel_x = 15; + pixel_y = 32 }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "green" +/obj/structure/sign/safety/coffee{ + pixel_y = 32 }, -/area/almayer/squads/req) -"fMZ" = ( -/obj/structure/machinery/light/small{ - dir = 8 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_p) +"fNd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/structure/pipes/vents/pump/on, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/hallways/lower/starboard_midship_hallway) "fNi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -32327,31 +29327,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"fNv" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +"fNH" = ( /turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) -"fNC" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) -"fNY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = 32 + dir = 8; + icon_state = "cargo_arrow" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/hallways/lower/starboard_midship_hallway) "fOk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -32383,6 +29364,15 @@ icon_state = "orangecorner" }, /area/almayer/engineering/upper_engineering) +"fOK" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/camera, +/obj/item/device/camera_film, +/obj/item/device/camera_film, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_s) "fOL" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -32392,12 +29382,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"fOO" = ( -/obj/item/ammo_box/magazine/misc/mre, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_stern) "fPn" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -32454,6 +29438,26 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) +"fPF" = ( +/obj/structure/closet/crate/trashcart, +/obj/item/clothing/gloves/yellow, +/obj/item/device/multitool, +/obj/item/tool/screwdriver{ + icon_state = "screwdriver7" + }, +/obj/item/tool/crowbar/red, +/obj/item/book/manual/engineering_hacking, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"fQl" = ( +/obj/structure/largecrate/supply/supplies/flares, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/maint/hull/upper/u_a_p) "fQn" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -32475,6 +29479,14 @@ }, /turf/open/floor/plating, /area/almayer/medical/upper_medical) +"fQy" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) "fQS" = ( /obj/structure/bed/chair/comfy/orange, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -32485,6 +29497,25 @@ }, /turf/open/floor/carpet, /area/almayer/command/corporateliaison) +"fQU" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) +"fRg" = ( +/obj/structure/closet/emcloset, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/upper/u_f_s) "fRr" = ( /obj/structure/machinery/light{ dir = 1 @@ -32500,12 +29531,13 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"fRD" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" +"fRL" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" }, -/area/almayer/maint/lower/cryo_cells) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) "fRS" = ( /obj/effect/landmark/start/warden, /obj/effect/decal/warning_stripes{ @@ -32514,12 +29546,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cryo) -"fSj" = ( -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_s) "fSl" = ( /obj/structure/machinery/line_nexter{ id = "line2"; @@ -32546,13 +29572,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"fSK" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) "fTj" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -32564,6 +29583,9 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) +"fTl" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/upper/u_a_s) "fTm" = ( /obj/structure/bed/chair/office/dark, /turf/open/floor/almayer, @@ -32584,19 +29606,17 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) -"fTU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/machinery/light{ - dir = 1 +"fUz" = ( +/obj/structure/surface/rack, +/obj/item/storage/box/cups{ + pixel_x = 4; + pixel_y = 9 }, +/obj/item/storage/box/cups, /turf/open/floor/almayer{ - dir = 4; - icon_state = "green" + icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/maint/hull/lower/s_bow) "fUA" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) @@ -32615,24 +29635,22 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"fUF" = ( -/obj/structure/largecrate/random/barrel/white, +"fUZ" = ( +/obj/structure/largecrate/random/barrel/green, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/s_stern) -"fUL" = ( -/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/maint/hull/lower/l_f_p) +"fVa" = ( +/obj/item/stack/catwalk, +/obj/structure/platform_decoration{ + dir = 4 }, -/area/almayer/squads/req) +/turf/open/floor/plating, +/area/almayer/maint/hull/upper/u_a_p) +"fVe" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/upper/u_a_p) "fVo" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -32669,6 +29687,14 @@ icon_state = "dark_sterile" }, /area/almayer/medical/chemistry) +"fWg" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/p_bow) "fWi" = ( /obj/structure/toilet{ dir = 1 @@ -32681,22 +29707,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"fWj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +"fXf" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/maint/hull/upper/u_m_p) -"fWP" = ( -/obj/structure/machinery/light{ - dir = 1 + dir = 1; + icon_state = "blue" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/hallways/upper/aft_hallway) "fXg" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -32711,16 +29730,6 @@ icon_state = "silver" }, /area/almayer/command/computerlab) -"fXy" = ( -/obj/structure/largecrate/supply/supplies/mre, -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) "fXz" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -32729,11 +29738,6 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) -"fXB" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) "fXE" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -32747,17 +29751,6 @@ icon_state = "plate" }, /area/almayer/command/combat_correspondent) -"fXG" = ( -/obj/structure/stairs{ - icon_state = "ramptop" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) "fXN" = ( /obj/effect/landmark/start/marine/delta, /obj/effect/landmark/late_join/delta, @@ -32792,13 +29785,17 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cichallway) -"fYV" = ( -/obj/structure/bed, -/obj/item/bedsheet/green, +"fYr" = ( +/obj/structure/surface/rack, +/obj/item/device/radio{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/device/radio, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "plate" }, -/area/almayer/medical/upper_medical) +/area/almayer/maint/hull/upper/u_f_s) "fYZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -32829,24 +29826,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) -"fZu" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/maint/hull/upper/u_a_p) -"fZx" = ( -/obj/structure/sign/safety/security{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 32 +"fZy" = ( +/obj/structure/sign/poster{ + pixel_y = -32 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/hallways/port_hallway) +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "fZA" = ( /obj/structure/pipes/standard/simple/visible{ dir = 9 @@ -32860,6 +29848,9 @@ icon_state = "orangecorner" }, /area/almayer/engineering/lower) +"fZE" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "fZG" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -32868,6 +29859,22 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"fZI" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/obj/item/reagent_container/glass/bucket/mopbucket{ + pixel_x = 7; + pixel_y = -3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"fZR" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/stern) "fZX" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -32891,15 +29898,12 @@ icon_state = "test_floor4" }, /area/almayer/living/briefing) -"gax" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +"gar" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer, +/area/almayer/hallways/upper/stern_hallway) "gaJ" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/cryo) @@ -32917,15 +29921,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"gaW" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) "gba" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/faxmachine/uscm/command{ @@ -32988,16 +29983,16 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"gbz" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) -"gck" = ( -/obj/structure/sign/safety/storage{ +"gbR" = ( +/obj/structure/sign/safety/maint{ pixel_x = 8; - pixel_y = -32 + pixel_y = 32 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) "gcm" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -33021,22 +30016,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/upper/starboard) -"gcu" = ( -/obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) -"gcz" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) "gcN" = ( /obj/structure/machinery/door/airlock/almayer/command{ access_modified = 1; @@ -33048,12 +30027,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/sea_office) -"gcT" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "gde" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -33073,15 +30046,16 @@ icon_state = "red" }, /area/almayer/hallways/hangar) -"gds" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"gdG" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "silvercorner" + dir = 5; + icon_state = "red" }, -/area/almayer/hallways/repair_bay) +/area/almayer/shipboard/brig/mp_bunks) "gdJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -33118,6 +30092,20 @@ "gel" = ( /turf/closed/wall/almayer/research/containment/wall/west, /area/almayer/medical/containment/cell/cl) +"gen" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/flashlight/lamp{ + layer = 3.1; + pixel_x = 7; + pixel_y = 10 + }, +/obj/item/paper_bin/uscm, +/obj/item/tool/pen, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_p) "ger" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/wy{ @@ -33137,19 +30125,30 @@ icon_state = "dark_sterile" }, /area/almayer/medical/medical_science) -"gew" = ( -/obj/structure/largecrate/random/case/small, +"geu" = ( +/obj/structure/machinery/light, +/obj/effect/projector{ + name = "Almayer_Up4"; + vector_x = -19; + vector_y = 104 + }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) -"geH" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" +/area/almayer/hallways/lower/port_midship_hallway) +"gfd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/power/apc/almayer, +/obj/structure/sign/safety/rewire{ + pixel_y = -38 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" + icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/shipboard/brig/starboard_hallway) "gfo" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -33163,6 +30162,15 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"gft" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/stern_hallway) "gfu" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -33176,6 +30184,9 @@ icon_state = "tcomms" }, /area/almayer/command/airoom) +"gfv" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "gfE" = ( /obj/structure/machinery/recharge_station, /turf/open/floor/plating, @@ -33215,41 +30226,30 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) +"ggo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) "ggt" = ( /turf/open/floor/almayer{ dir = 5; icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"ggx" = ( -/obj/structure/surface/table/almayer, -/obj/item/folder/yellow, -/obj/structure/machinery/keycard_auth{ - pixel_x = -8; - pixel_y = 25 - }, -/obj/structure/sign/safety/high_rad{ - pixel_x = 32; - pixel_y = -8 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 32; - pixel_y = 7 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 14; - pixel_y = 26 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/lower/workshop) "ggz" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_four) +"ggD" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_s) "ggJ" = ( /obj/structure/machinery/door_control{ dir = 1; @@ -33267,31 +30267,42 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/engineering/airmix) -"ght" = ( -/obj/item/stack/tile/carpet{ - amount = 20 +"ggS" = ( +/obj/structure/machinery/light{ + dir = 8 }, -/obj/structure/surface/rack, +/obj/structure/bed/chair/bolted, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) -"ghD" = ( -/obj/structure/sign/safety/autoopenclose{ - pixel_x = 7; - pixel_y = 32 +/area/almayer/shipboard/brig/perma) +"ghA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) -"gib" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 32 +/obj/structure/surface/table/almayer, +/obj/item/toy/handcard/uno_reverse_red{ + pixel_x = 5; + pixel_y = 5 }, +/obj/item/toy/deck/uno, +/obj/structure/machinery/light/small, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/p_bow) +/area/almayer/maint/hull/lower/l_f_s) +"ghF" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/lower/vehiclehangar) +"gii" = ( +/obj/structure/bed/chair/bolted{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/interrogation) "gio" = ( /obj/structure/closet/emcloset, /obj/structure/sign/safety/restrictedarea{ @@ -33313,15 +30324,6 @@ icon_state = "orange" }, /area/almayer/squads/bravo) -"giB" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "giR" = ( /obj/structure/machinery/status_display{ pixel_y = -30 @@ -33335,6 +30337,20 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"gjg" = ( +/obj/structure/sign/safety/escapepod{ + pixel_x = -17; + pixel_y = -8 + }, +/obj/structure/sign/safety/stairs{ + pixel_x = -17; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/hallways/lower/port_midship_hallway) "gjm" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -33347,10 +30363,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"gjn" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) "gjq" = ( /obj/structure/platform{ dir = 8 @@ -33411,6 +30423,20 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) +"gkr" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_bow) +"gkE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/mess) "gkK" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/surface/table/reinforced/almayer_B, @@ -33421,16 +30447,21 @@ icon_state = "plate" }, /area/almayer/command/cic) +"glc" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "gll" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"glm" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) "gls" = ( /obj/structure/filingcabinet/filingcabinet, /obj/item/clipboard, @@ -33443,17 +30474,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) -"glz" = ( -/obj/structure/largecrate/supply/generator, -/obj/item/reagent_container/food/drinks/bottle/whiskey{ - layer = 2.9; - pixel_x = -10; - pixel_y = 3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) "glB" = ( /obj/structure/sign/safety/chem_lab{ pixel_x = 5; @@ -33464,12 +30484,17 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"glC" = ( -/obj/structure/largecrate/random/case, +"glG" = ( +/obj/structure/surface/rack, +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/masks, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "sterile_green_side" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/shipboard/brig/medical) "glH" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -33483,6 +30508,13 @@ icon_state = "test_floor4" }, /area/almayer/engineering/lower/workshop) +"glP" = ( +/obj/structure/janitorialcart, +/obj/item/tool/mop, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/execution_storage) "gmb" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -33510,10 +30542,12 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"gnh" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) +"gmZ" = ( +/turf/open/floor/almayer{ + dir = 9; + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) "gnu" = ( /obj/structure/surface/table/almayer, /obj/item/facepaint/green, @@ -33525,35 +30559,27 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"gnI" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/bag/trash{ - pixel_x = -3 - }, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"gob" = ( -/obj/structure/closet/fireaxecabinet{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) -"gog" = ( -/obj/structure/bed/chair/comfy/beige, -/obj/item/reagent_container/glass/bucket{ - pixel_x = 12; - pixel_y = -5 +"gnB" = ( +/obj/structure/platform_decoration{ + dir = 8 }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) +"gnM" = ( +/obj/structure/surface/rack, +/obj/item/frame/table, +/obj/item/frame/table, +/obj/item/frame/table, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/hull/lower/l_f_p) +"gof" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) "goj" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 2; @@ -33575,6 +30601,19 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/weapon_room) +"goo" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 8; + id = "laddersoutheast"; + name = "\improper South East Ladders Shutters" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/port_midship_hallway) "goy" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -33593,22 +30632,23 @@ icon_state = "test_floor4" }, /area/almayer/living/port_emb) -"goF" = ( -/obj/structure/sign/safety/rad_haz{ - pixel_x = 8; - pixel_y = -32 - }, -/obj/structure/machinery/power/reactor, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/engineering/lower/engine_core) "goL" = ( /turf/open/floor/almayer{ dir = 10; icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"goM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) +"goY" = ( +/turf/closed/wall/almayer, +/area/almayer/shipboard/panic) "gpc" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/engineering{ @@ -33633,21 +30673,28 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"gpO" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/lower/s_bow) "gpY" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/lifeboat_pumps/north1) -"gqy" = ( -/obj/structure/machinery/door_control{ - id = "safe_armory"; - name = "Hangar Armory Lockdown"; - pixel_y = 24; - req_access_txt = "4" +"gqf" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/stern_hallway) +"gqt" = ( +/obj/structure/sign/safety/storage{ + pixel_x = -17 }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) +"gqv" = ( /turf/open/floor/almayer{ dir = 5; - icon_state = "plating" + icon_state = "silver" }, -/area/almayer/shipboard/panic) +/area/almayer/hallways/upper/aft_hallway) "gqP" = ( /obj/structure/largecrate/random/case, /obj/structure/machinery/camera/autoname/almayer{ @@ -33658,16 +30705,34 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) -"grf" = ( -/obj/structure/closet/secure_closet/engineering_electrical, +"gqQ" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21" + }, +/obj/structure/sign/safety/escapepod{ + pixel_x = -17 + }, +/obj/structure/sign/poster/hero/voteno{ + pixel_y = 32 + }, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliaison) +"grd" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, /turf/open/floor/almayer{ icon_state = "plate" }, +/area/almayer/maint/hull/upper/u_a_p) +"grv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/s_bow) -"grF" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) "grG" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17 @@ -33683,6 +30748,22 @@ icon_state = "orangecorner" }, /area/almayer/living/briefing) +"grT" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/wet_sign, +/obj/item/tool/wet_sign{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/tool/wet_sign{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "gsd" = ( /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler{ @@ -33739,14 +30820,28 @@ /obj/effect/landmark/late_join, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) -"gsA" = ( +"gsp" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) +"gsy" = ( /obj/structure/surface/rack, -/obj/item/storage/toolbox/mechanical, -/obj/effect/spawner/random/tool, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/sign/safety/fire_haz{ + pixel_x = 8; + pixel_y = 32 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/s_bow) +/area/almayer/maint/hull/lower/p_bow) "gsC" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -33783,28 +30878,25 @@ icon_state = "silvercorner" }, /area/almayer/command/cichallway) -"gtA" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/transmitter{ - dir = 8; - name = "Medical Telephone"; - phone_category = "Almayer"; - phone_id = "Medical Lower"; - pixel_x = 16 +"gtD" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) +"gtH" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/item/device/helmet_visor/medical/advanced, -/obj/item/device/helmet_visor/medical/advanced, -/obj/item/device/helmet_visor/medical/advanced, -/obj/item/device/helmet_visor/medical/advanced, /turf/open/floor/almayer{ - icon_state = "sterile_green" + icon_state = "test_floor4" }, -/area/almayer/medical/lockerroom) -"gtF" = ( -/turf/open/floor/almayer{ - icon_state = "plate" +/area/almayer/hallways/lower/starboard_aft_hallway) +"gtQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 }, -/area/almayer/maint/hull/lower/l_f_s) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) "gtU" = ( /obj/structure/machinery/power/apc/almayer{ dir = 8 @@ -33818,14 +30910,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/perma) -"guc" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) "guo" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -33835,13 +30919,24 @@ icon_state = "redfull" }, /area/almayer/lifeboat_pumps/south2) -"guv" = ( -/obj/item/reagent_container/glass/bucket/janibucket{ - pixel_x = -1; - pixel_y = 13 +"gur" = ( +/obj/item/tool/mop{ + pixel_x = -6; + pixel_y = 24 }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) +/obj/item/reagent_container/glass/bucket, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_s) +"guK" = ( +/obj/effect/projector{ + name = "Almayer_Up3"; + vector_x = -1; + vector_y = 102 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_fore_hallway) "guS" = ( /obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer{ @@ -33868,21 +30963,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) -"gvj" = ( -/obj/structure/filingcabinet{ - density = 0; - pixel_x = -8; - pixel_y = 18 - }, -/obj/structure/filingcabinet{ - density = 0; - pixel_x = 8; - pixel_y = 18 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_f_p) "gvq" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = -25 @@ -33891,12 +30971,10 @@ icon_state = "silver" }, /area/almayer/command/cic) -"gvt" = ( -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/stern) +"gvK" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "gvU" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -33936,15 +31014,6 @@ icon_state = "plate" }, /area/almayer/living/gym) -"gwD" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/firstaid/regular, -/obj/item/clipboard, -/obj/item/tool/pen, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/req) "gwM" = ( /obj/structure/pipes/vents/pump, /obj/structure/mirror{ @@ -33992,12 +31061,29 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) +"gxm" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/upper/stairs) "gxn" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "red" }, /area/almayer/hallways/upper/starboard) +"gxt" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Warden's Office" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/warden_office) +"gxI" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/maint/hull/upper/s_bow) "gxO" = ( /turf/open/floor/almayer{ dir = 10; @@ -34013,51 +31099,62 @@ dir = 8 }, /area/almayer/medical/containment/cell) -"gxS" = ( +"gxR" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/stern_hallway) +"gxU" = ( +/obj/structure/surface/table/almayer, +/obj/item/toy/deck, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "silver" }, -/area/almayer/maint/upper/u_m_p) -"gxW" = ( -/obj/item/stack/catwalk, -/obj/structure/platform_decoration{ - dir = 4 +/area/almayer/shipboard/brig/cic_hallway) +"gyb" = ( +/obj/structure/sign/safety/medical{ + pixel_x = 8; + pixel_y = 32 }, -/turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_a_p) +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) +"gym" = ( +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/mp_bunks) +"gyn" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) "gyv" = ( /obj/structure/platform_decoration{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"gyy" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 32 +"gyw" = ( +/turf/open/floor/almayer{ + icon_state = "plate" }, +/area/almayer/hallways/lower/port_aft_hallway) +"gyE" = ( /turf/open/floor/almayer{ - dir = 4; + dir = 1; 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/lower/port_aft_hallway) +"gyH" = ( +/obj/item/tool/warning_cone{ + pixel_x = -12; + pixel_y = 16 }, -/area/almayer/hallways/starboard_hallway) +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "gyN" = ( /obj/structure/machinery/prop{ desc = "It's a server box..."; @@ -34077,13 +31174,6 @@ icon_state = "orange" }, /area/almayer/engineering/ce_room) -"gyT" = ( -/obj/structure/largecrate/supply/floodlights, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/maint/hull/upper/u_a_p) "gyU" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -34126,16 +31216,6 @@ /obj/item/reagent_container/hypospray/autoinjector/skillless, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"gzx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) -"gzE" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/lower/s_bow) "gzI" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -34154,6 +31234,23 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) +"gzM" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/sign/safety/stairs{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/port_midship_hallway) +"gzN" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "gzV" = ( /obj/structure/sink{ dir = 1; @@ -34229,21 +31326,40 @@ icon_state = "plate" }, /area/almayer/squads/bravo) +"gBd" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) +"gBg" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/stern_hallway) "gBo" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"gBO" = ( +"gBs" = ( +/obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer{ - icon_state = "orange" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_a_s) -"gBP" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) +/area/almayer/maint/hull/upper/u_m_p) +"gBU" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/bag/trash{ + pixel_x = -3 + }, +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "gBW" = ( /obj/structure/machinery/floodlight/landing{ name = "bolted floodlight" @@ -34252,21 +31368,27 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"gBZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hallways/upper/stern_hallway) "gCf" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) -"gCl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"gCu" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = 16 }, -/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/maint/hull/lower/l_a_s) "gCw" = ( /obj/item/reagent_container/food/drinks/cans/beer{ pixel_x = 10 @@ -34294,6 +31416,12 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) +"gCQ" = ( +/obj/structure/machinery/portable_atmospherics/canister/air, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/upper/u_a_s) "gDp" = ( /obj/structure/machinery/light{ dir = 4 @@ -34323,6 +31451,11 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/engine_core) +"gDQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "gDW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -34335,16 +31468,19 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"gDX" = ( +/obj/structure/sign/safety/nonpress_ag{ + pixel_x = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/p_bow) "gEg" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices/flight) -"gEk" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, +"gEh" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/maint/hull/lower/l_a_p) "gEo" = ( /obj/structure/machinery/cryopod/right, /obj/structure/machinery/light{ @@ -34368,47 +31504,12 @@ icon_state = "plate" }, /area/almayer/engineering/lower) -"gEM" = ( -/obj/structure/surface/table/almayer, -/obj/item/pizzabox/meat, -/obj/item/reagent_container/food/drinks/cans/souto/diet/peach{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/reagent_container/food/drinks/cans/souto/diet/cherry{ - pixel_x = 8; - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) -"gER" = ( -/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/maint/hull/lower/l_a_s) "gFa" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/shipboard/starboard_point_defense) -"gFc" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/maint/hull/lower/l_m_s) "gFd" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/atmospipes{ @@ -34418,6 +31519,24 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"gFL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) +"gFN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "gFP" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/stern_point_defense) @@ -34428,30 +31547,22 @@ icon_state = "cargo" }, /area/almayer/living/commandbunks) -"gGf" = ( -/obj/structure/machinery/light{ +"gGb" = ( +/obj/structure/platform{ dir = 1 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/squads/delta) -"gGp" = ( -/obj/structure/surface/table/almayer, -/obj/item/clothing/mask/cigarette/pipe{ - pixel_x = 8 - }, -/obj/structure/transmitter/rotary{ - name = "Reporter Telephone"; - phone_category = "Almayer"; - phone_id = "Reporter"; - pixel_x = -4; - pixel_y = 6 +/area/almayer/maint/hull/upper/u_a_p) +"gGf" = ( +/obj/structure/machinery/light{ + dir = 1 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/command/combat_correspondent) +/area/almayer/squads/delta) "gGr" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ @@ -34481,6 +31592,14 @@ }, /turf/open/floor/plating, /area/almayer/hallways/hangar) +"gGw" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/vehiclehangar) "gGx" = ( /obj/structure/filingcabinet/chestdrawer{ density = 0; @@ -34511,9 +31630,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"gGX" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) "gHh" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -34521,6 +31637,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/port) +"gHi" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/lower/l_m_s) "gHj" = ( /obj/structure/machinery/light, /obj/structure/closet/secure_closet/fridge/groceries/stock, @@ -34534,12 +31656,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) -"gHm" = ( -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) "gHo" = ( /obj/structure/machinery/door/airlock/almayer/marine/delta/tl, /turf/open/floor/almayer{ @@ -34553,20 +31669,17 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"gHx" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/bed/chair{ - dir = 1 +"gHX" = ( +/obj/effect/projector{ + name = "Almayer_Down2"; + vector_x = 1; + vector_y = -100 }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = -32 +/turf/open/floor/almayer{ + allow_construction = 0; + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/hallways/upper/aft_hallway) "gHZ" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -34584,6 +31697,27 @@ icon_state = "test_floor4" }, /area/almayer/engineering/ce_room) +"gIm" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"gIz" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) "gII" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -34595,6 +31729,19 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/port) +"gIN" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) +"gIO" = ( +/obj/structure/bed/chair/bolted{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/interrogation) "gIU" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/tapes{ @@ -34613,6 +31760,41 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/evidence_storage) +"gJf" = ( +/obj/structure/bed/sofa/south/grey/left{ + pixel_y = 12 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) +"gJp" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/emails{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/repair_bay) +"gJE" = ( +/obj/structure/machinery/door_control{ + id = "Interrogation Shutters"; + name = "\improper Shutters"; + pixel_x = 24; + pixel_y = 12; + req_access_txt = "3" + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/shipboard/brig/interrogation) +"gJF" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/upper/s_stern) "gJO" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/door/window/southleft{ @@ -34632,6 +31814,20 @@ icon_state = "green" }, /area/almayer/living/offices) +"gJY" = ( +/obj/structure/surface/table/almayer, +/obj/item/circuitboard{ + pixel_x = 12; + pixel_y = 7 + }, +/obj/item/tool/crowbar{ + pixel_x = 6; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) "gKd" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -34642,12 +31838,25 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) -"gKl" = ( -/obj/structure/largecrate/random/case/small, +"gKo" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_umbilical) +"gKv" = ( +/obj/effect/landmark/yautja_teleport, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_p) +/area/almayer/maint/hull/upper/p_bow) +"gKw" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) "gKB" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/structure/machinery/firealarm{ @@ -34667,6 +31876,11 @@ icon_state = "redfull" }, /area/almayer/shipboard/port_missiles) +"gKK" = ( +/turf/open/floor/almayer{ + icon_state = "silvercorner" + }, +/area/almayer/hallways/lower/repair_bay) "gKR" = ( /obj/structure/closet/emcloset, /obj/structure/machinery/light{ @@ -34700,10 +31914,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/hydroponics) -"gLo" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_s) +"gLm" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) "gLz" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -34769,18 +31985,6 @@ icon_state = "test_floor4" }, /area/almayer/living/port_emb) -"gMa" = ( -/obj/structure/sign/safety/escapepod{ - pixel_y = -32 - }, -/obj/structure/sign/safety/east{ - pixel_x = 15; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "gMd" = ( /obj/structure/surface/table/almayer, /obj/item/clipboard, @@ -34790,13 +31994,17 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) -"gMj" = ( -/obj/item/tool/weldingtool, -/obj/structure/surface/rack, -/turf/open/floor/almayer{ - icon_state = "red" +"gMk" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/sign/safety/maint{ + pixel_x = -17 }, -/area/almayer/maint/hull/upper/u_a_p) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) +"gMJ" = ( +/obj/structure/largecrate/supply/weapons/pistols, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_s) "gMN" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -34830,6 +32038,18 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"gMS" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_umbilical) "gMU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -34838,19 +32058,18 @@ dir = 4 }, /area/almayer/living/briefing) -"gMX" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 32 +"gNg" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -17 }, +/obj/structure/machinery/power/apc/almayer, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/stern) -"gNj" = ( -/obj/structure/machinery/vending/cola, +/area/almayer/maint/hull/upper/s_bow) +"gNo" = ( /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/s_stern) +/area/almayer/maint/upper/u_m_p) "gNp" = ( /turf/open/floor/almayer{ dir = 9; @@ -34868,6 +32087,22 @@ icon_state = "plate" }, /area/almayer/squads/charlie_delta_shared) +"gNy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/lower/vehiclehangar) +"gNN" = ( +/obj/structure/bed/chair/office/dark, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_p) "gNO" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -34877,13 +32112,22 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"gOf" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" +"gNQ" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) +"gNZ" = ( +/obj/structure/machinery/light/small{ + dir = 1 }, -/area/almayer/maint/hull/upper/u_m_p) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) +"gOk" = ( +/obj/structure/largecrate/guns/merc{ + name = "\improper dodgy crate" + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "gOs" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -34911,15 +32155,6 @@ icon_state = "silver" }, /area/almayer/command/airoom) -"gOu" = ( -/obj/structure/sign/safety/security{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_bow) "gOC" = ( /obj/structure/machinery/recharge_station, /turf/open/floor/almayer{ @@ -34934,6 +32169,12 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) +"gOS" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "emerald" + }, +/area/almayer/hallways/lower/port_midship_hallway) "gPc" = ( /obj/structure/machinery/power/terminal{ dir = 1 @@ -34960,19 +32201,25 @@ dir = 4 }, /area/almayer/command/airoom) -"gPs" = ( -/obj/structure/sign/safety/storage{ - pixel_x = -17 +"gPS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/s_bow) -"gPF" = ( -/obj/structure/machinery/light, /turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) +"gPU" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" }, -/area/almayer/hallways/stern_hallway) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/vehiclehangar) "gQk" = ( /obj/structure/surface/table/almayer, /obj/structure/sign/safety/terminal{ @@ -34981,12 +32228,16 @@ /obj/structure/machinery/faxmachine/corporate/liaison, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"gQz" = ( -/obj/structure/largecrate/random/secure, +"gQu" = ( +/obj/structure/platform{ + dir = 4 + }, +/obj/item/storage/firstaid/rad, +/obj/structure/surface/rack, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_a_s) +/area/almayer/maint/hull/upper/u_a_s) "gQF" = ( /obj/structure/bed/chair/comfy{ buckling_y = 2; @@ -35003,6 +32254,18 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"gQQ" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) +"gRc" = ( +/obj/item/tool/wet_sign, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_p) "gRd" = ( /obj/structure/platform, /obj/structure/target{ @@ -35011,42 +32274,17 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"gRq" = ( -/obj/structure/closet/emcloset, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/maint/hull/upper/u_f_s) -"gRt" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) -"gRz" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - req_one_access = null; - req_one_access_txt = "2;30;34" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +"gRJ" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/upper/mess) -"gRB" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 + dir = 8; + icon_state = "orangecorner" }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/hallways/lower/port_umbilical) "gRP" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -35087,30 +32325,42 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) -"gSq" = ( -/obj/structure/bed/sofa/south/grey/right{ - pixel_y = 12 +"gSy" = ( +/obj/item/frame/rack{ + layer = 3.1; + pixel_y = 19 + }, +/obj/structure/surface/rack, +/obj/item/tool/weldpack{ + pixel_x = 5 + }, +/obj/item/tool/weldpack{ + pixel_x = -2 }, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_s) -"gTi" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/glass/bucket/mopbucket{ - pixel_x = -8 +"gSz" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/obj/item/reagent_container/glass/bucket/mopbucket{ - pixel_y = 12 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/mp_bunks) +"gSH" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/item/clothing/head/militia/bucket{ - pixel_x = 5; - pixel_y = -5 +/area/almayer/maint/hull/lower/l_m_s) +"gTk" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 4 }, -/obj/item/reagent_container/spray/cleaner{ - pixel_x = 8; - pixel_y = -1 +/obj/effect/spawner/random/tool, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) +/area/almayer/hallways/lower/port_umbilical) "gTH" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/skills{ @@ -35128,16 +32378,28 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"gTK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/p_bow) "gTV" = ( -/obj/structure/sign/safety/rad_haz{ - pixel_x = 8; +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/sign/safety/autoopenclose{ + pixel_x = 7; pixel_y = 32 }, -/obj/structure/machinery/power/reactor, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "silver" }, -/area/almayer/engineering/lower/engine_core) +/area/almayer/hallways/upper/aft_hallway) "gUf" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /turf/open/floor/almayer{ @@ -35153,12 +32415,38 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/general_equipment) -"gUo" = ( +"gUi" = ( +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/lower/s_bow) +"gUk" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) +"gUn" = ( /obj/structure/largecrate/random/barrel/red, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"gUu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) +"gUG" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/maint/hull/upper/u_a_s) "gUL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -35244,19 +32532,30 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) -"gVP" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/maint/hull/lower/l_m_s) -"gWj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small{ +"gWm" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_s) +/area/almayer/hallways/lower/starboard_umbilical) +"gWt" = ( +/obj/structure/surface/table/almayer, +/obj/item/pipe{ + dir = 9 + }, +/obj/item/tool/screwdriver{ + layer = 3.6; + pixel_x = 9; + pixel_y = 8 + }, +/obj/item/tool/crowbar/red{ + pixel_x = 17 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" + }, +/area/almayer/hallways/lower/repair_bay) "gWu" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -35275,16 +32574,6 @@ }, /turf/open/floor/plating, /area/almayer/medical/upper_medical) -"gWL" = ( -/obj/structure/ladder{ - height = 2; - id = "ForePortMaint" - }, -/obj/structure/sign/safety/ladder{ - pixel_x = -17 - }, -/turf/open/floor/plating/almayer, -/area/almayer/maint/hull/upper/p_bow) "gXl" = ( /obj/structure/closet/secure_closet/personal/cabinet{ req_access_txt = "5" @@ -35332,6 +32621,34 @@ icon_state = "plating" }, /area/almayer/shipboard/sea_office) +"gYg" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop/almayer/flight_recorder{ + pixel_x = 9 + }, +/obj/item/tool/weldingtool{ + pixel_x = -7; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/lower/repair_bay) +"gYj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "gYl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -35351,12 +32668,32 @@ icon_state = "redfull" }, /area/almayer/living/offices/flight) -"gYL" = ( -/obj/structure/bed/chair{ +"gYx" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) +"gYI" = ( +/obj/structure/platform{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"gYU" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "gZw" = ( /obj/structure/bed/sofa/vert/grey/bot, /turf/open/floor/almayer, @@ -35374,6 +32711,16 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) +"gZW" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/hallways/lower/port_fore_hallway) "had" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -35432,6 +32779,11 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) +"haO" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_stern) "haQ" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -35445,12 +32797,40 @@ icon_state = "plate" }, /area/almayer/living/offices) -"haT" = ( -/obj/structure/machinery/light, +"haR" = ( +/obj/structure/sign/safety/restrictedarea{ + pixel_x = -17 + }, /turf/open/floor/almayer{ - icon_state = "green" + icon_state = "plate" + }, +/area/almayer/maint/lower/s_bow) +"haY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/starboard_hallway) +"hbl" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_m_s) +"hbp" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) +/area/almayer/maint/hull/upper/p_stern) "hbs" = ( /obj/structure/surface/table/almayer, /obj/item/frame/fire_alarm, @@ -35468,6 +32848,26 @@ icon_state = "silver" }, /area/almayer/living/auxiliary_officer_office) +"hbA" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_umbilical) +"hbE" = ( +/obj/structure/largecrate/random, +/obj/item/reagent_container/food/snacks/cheesecakeslice{ + pixel_y = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "hbI" = ( /obj/structure/sign/safety/ammunition{ pixel_x = 32; @@ -35509,15 +32909,6 @@ icon_state = "silver" }, /area/almayer/engineering/port_atmos) -"hcs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) "hcw" = ( /obj/structure/surface/table/reinforced/black, /obj/item/explosive/grenade/high_explosive/training, @@ -35533,16 +32924,6 @@ icon_state = "plate" }, /area/almayer/living/cryo_cells) -"hcx" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "plating_striped" - }, -/area/almayer/squads/req) "hcI" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -35551,27 +32932,21 @@ icon_state = "cargo" }, /area/almayer/squads/delta) -"hdd" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" +"hcX" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 }, -/area/almayer/shipboard/starboard_missiles) -"hdf" = ( -/obj/structure/machinery/door/airlock/almayer/maint, +/obj/structure/machinery/power/reactor, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_m_p) -"hdh" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, +/area/almayer/engineering/lower/engine_core) +"hdd" = ( /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + dir = 9; + icon_state = "red" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/shipboard/starboard_missiles) "hds" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -35581,6 +32956,13 @@ icon_state = "cargo_arrow" }, /area/almayer/living/offices) +"hdy" = ( +/obj/item/storage/firstaid/fire, +/obj/structure/surface/rack, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "hdE" = ( /obj/structure/filingcabinet, /obj/item/reagent_container/food/drinks/coffeecup/uscm{ @@ -35590,31 +32972,34 @@ icon_state = "green" }, /area/almayer/squads/req) -"hdO" = ( -/obj/structure/largecrate/random/secure, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/s_bow) -"heb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"hdQ" = ( +/obj/structure/closet/secure_closet{ + name = "\improper Execution Firearms" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/weapon/gun/rifle/m4ra, +/obj/item/weapon/gun/rifle/m4ra, +/obj/item/weapon/gun/rifle/m4ra, +/obj/item/ammo_box/magazine/m4ra, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/shipboard/brig/execution_storage) +"hdV" = ( +/obj/structure/sign/safety/escapepod{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "greencorner" + }, +/area/almayer/hallways/lower/port_midship_hallway) "hec" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"hee" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "heo" = ( /obj/structure/machinery/power/apc/almayer{ cell_type = /obj/item/cell/hyper; @@ -35636,14 +33021,6 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/armory) -"heI" = ( -/obj/structure/largecrate/random/case{ - layer = 2.98 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "heK" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -35653,6 +33030,10 @@ icon_state = "test_floor4" }, /area/almayer/living/port_emb) +"heO" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) "heS" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -35689,16 +33070,36 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/engine_core) -"hfs" = ( -/obj/item/tool/kitchen/utensil/pfork, +"hfc" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/hallways/upper/stern_hallway) +"hfv" = ( +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/p_stern) -"hfx" = ( -/obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) +/area/almayer/maint/lower/s_bow) +"hfO" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/surface/rack, +/obj/item/storage/belt/utility/full{ + pixel_y = 8 + }, +/obj/item/storage/belt/utility/full, +/obj/item/clothing/suit/storage/hazardvest/black, +/obj/item/tool/crowbar, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) "hfQ" = ( /obj/structure/window/framed/almayer, /turf/open/floor/almayer{ @@ -35714,6 +33115,12 @@ icon_state = "redfull" }, /area/almayer/living/briefing) +"hgk" = ( +/obj/structure/largecrate/random, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "hgo" = ( /obj/structure/machinery/light{ dir = 8 @@ -35723,6 +33130,37 @@ icon_state = "orange" }, /area/almayer/engineering/lower) +"hgp" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/lower/vehiclehangar) +"hgs" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"hgA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "hgB" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/intel, @@ -35756,15 +33194,17 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"hgR" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ +"hgO" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/item/tool/stamp/approved{ + pixel_y = -11; + pixel_x = -3 }, -/area/almayer/maint/hull/lower/l_a_p) +/turf/open/floor/almayer, +/area/almayer/squads/req) "hgZ" = ( /obj/structure/machinery/door_control{ dir = 1; @@ -35777,17 +33217,31 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_three) -"hhe" = ( -/obj/structure/sign/safety/nonpress_0g{ - pixel_y = 32 +"hhd" = ( +/obj/structure/surface/table/almayer, +/obj/item/clothing/head/hardhat/orange{ + pixel_x = -9; + pixel_y = 16 }, -/obj/structure/sign/safety/press_area_ag{ - pixel_y = -32 +/obj/item/clothing/suit/storage/hazardvest/blue{ + pixel_x = -7; + pixel_y = -4 + }, +/obj/item/clothing/head/hardhat{ + pixel_x = 10; + pixel_y = 1 + }, +/obj/item/clothing/suit/storage/hazardvest{ + pixel_x = 1 }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) +"hhg" = ( +/obj/structure/surface/rack, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/hallways/starboard_umbilical) +/area/almayer/maint/hull/lower/l_f_p) "hhn" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -35802,17 +33256,6 @@ /obj/structure/bed/sofa/vert/grey/bot, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"hhW" = ( -/obj/structure/surface/rack, -/obj/item/storage/box/gloves{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/masks, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/shipboard/brig/surgery) "hif" = ( /obj/structure/machinery/floodlight/landing, /turf/open/floor/almayer{ @@ -35827,6 +33270,16 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) +"hiu" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice13"; + pixel_x = 16; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "hiy" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -35842,18 +33295,22 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) -"hiU" = ( -/obj/structure/bed/chair{ - dir = 8 +"hiP" = ( +/obj/structure/sign/safety/escapepod{ + pixel_x = 8; + pixel_y = 32 }, -/obj/effect/decal/cleanable/blood, -/obj/structure/machinery/light/small{ - dir = 4 +/turf/open/floor/almayer{ + dir = 4; + icon_state = "greencorner" }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"hja" = ( +/obj/structure/machinery/light/small, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_p) +/area/almayer/maint/hull/upper/u_a_s) "hji" = ( /obj/structure/bed/chair{ dir = 4 @@ -35907,21 +33364,36 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) +"hjQ" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) +"hjT" = ( +/obj/structure/machinery/light/small{ + dir = 1; + pixel_y = 20 + }, +/obj/structure/largecrate, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "hki" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) -"hko" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ +"hkz" = ( +/obj/structure/machinery/light/small{ dir = 8 }, /turf/open/floor/almayer{ - icon_state = "red" + icon_state = "plate" }, -/area/almayer/living/cryo_cells) +/area/almayer/maint/hull/upper/p_stern) "hkB" = ( /obj/structure/sign/safety/rewire{ pixel_x = 8; @@ -35929,22 +33401,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/port_point_defense) -"hkE" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hallways/port_hallway) -"hkF" = ( -/obj/structure/surface/table/almayer, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = 6 - }, -/obj/item/weapon/gun/rifle/l42a, -/turf/open/floor/almayer{ - icon_state = "plate" +"hkC" = ( +/obj/structure/sign/safety/escapepod{ + pixel_y = -32 }, -/area/almayer/maint/hull/upper/u_m_s) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "hkG" = ( /obj/structure/sign/safety/ammunition{ pixel_y = -32 @@ -35981,14 +33443,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"hkN" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_s) "hkX" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/device/flashlight/lamp/green{ @@ -36008,17 +33462,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"hlm" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/reagent_dispensers/fueltank{ - anchored = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) "hlH" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -36029,6 +33472,23 @@ icon_state = "plate" }, /area/almayer/engineering/lower) +"hlI" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/recharger, +/obj/structure/sign/safety/terminal{ + pixel_y = 32 + }, +/obj/structure/transmitter/rotary{ + name = "Brig Wardens's Office Telephone"; + phone_category = "MP Dept."; + phone_id = "Brig Warden's Office"; + pixel_x = 15 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/shipboard/brig/warden_office) "hlT" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -36067,20 +33527,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) -"hmc" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "laddernorthwest"; - name = "\improper North West Ladders Shutters" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) "hme" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -36103,6 +33549,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/starboard) +"hmv" = ( +/obj/structure/machinery/power/reactor, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/engineering/lower/engine_core) "hmw" = ( /obj/structure/platform{ dir = 1 @@ -36124,6 +33576,19 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"hmA" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/maint/hull/upper/p_bow) +"hmB" = ( +/obj/structure/sign/safety/escapepod{ + pixel_y = -32 + }, +/obj/structure/sign/safety/south{ + pixel_x = 15; + pixel_y = -32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "hmC" = ( /obj/structure/machinery/cm_vending/sorted/marine_food{ density = 0; @@ -36148,32 +33613,36 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha_bravo_shared) -"hmG" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "\improper Brig Breakroom" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - layer = 1.9 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/main_office) -"hmM" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) "hmS" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ icon_state = "blue" }, /area/almayer/command/cichallway) +"hmV" = ( +/obj/structure/bookcase{ + icon_state = "book-5"; + name = "medical manuals bookcase"; + opacity = 0 + }, +/obj/item/book/manual/surgery, +/obj/item/book/manual/medical_diagnostics_manual, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/almayer/living/commandbunks) +"hmZ" = ( +/obj/structure/largecrate/random/barrel/white, +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) "hng" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/accessory/storage/black_vest/acid_harness, @@ -36189,6 +33658,34 @@ icon_state = "sterile_green" }, /area/almayer/medical/hydroponics) +"hnt" = ( +/obj/item/toy/deck{ + pixel_y = 12 + }, +/obj/structure/sign/safety/storage{ + pixel_x = 32 + }, +/obj/structure/surface/table/woodentable/poor, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"hnE" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/box/ids{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/device/flash, +/obj/structure/machinery/light{ + dir = 8; + invisibility = 101 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) "hnI" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -36202,54 +33699,65 @@ icon_state = "test_floor4" }, /area/almayer/living/pilotbunks) -"hnK" = ( -/obj/structure/coatrack, -/obj/structure/sign/poster/clf{ - pixel_x = -28 +"hnP" = ( +/obj/structure/barricade/handrail{ + dir = 1; + pixel_y = 2 }, -/obj/structure/sign/nosmoking_1{ - pixel_y = 30 +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 }, -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/sign/safety/fire_haz{ + pixel_y = -32 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) +"hoc" = ( +/obj/structure/machinery/door/poddoor/railing{ + dir = 2; + id = "vehicle_elevator_railing" }, -/area/almayer/maint/hull/lower/l_m_s) -"hon" = ( -/obj/structure/sign/safety/medical{ - pixel_x = 8; - pixel_y = 32 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "green" + icon_state = "mono" }, -/area/almayer/hallways/aft_hallway) -"hop" = ( +/area/almayer/hallways/lower/vehiclehangar) +"hog" = ( +/obj/structure/machinery/light/small, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"hoC" = ( -/obj/item/storage/firstaid/fire, -/obj/structure/surface/rack, +/area/almayer/maint/hull/upper/u_a_p) +"hoK" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) +"hoT" = ( /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) -"hpa" = ( -/obj/structure/largecrate/random/barrel/yellow, -/obj/structure/machinery/light{ - dir = 1 +/area/almayer/maint/hull/upper/u_m_s) +"hoW" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/toxin{ + pixel_x = 3; + pixel_y = 3 }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) +/obj/item/storage/firstaid/adv, +/obj/item/device/defibrillator, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/shipboard/brig/medical) "hpk" = ( /obj/structure/sign/safety/fire_haz{ pixel_x = 8; @@ -36266,19 +33774,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"hpO" = ( -/obj/structure/prop/almayer/computers/sensor_computer2, -/obj/structure/machinery/door_control{ - id = "Secretroom"; - indestructible = 1; - layer = 2.5; - name = "Shutters"; - use_power = 0 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) "hpS" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "crate_room3"; @@ -36298,6 +33793,10 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) +"hqb" = ( +/obj/effect/step_trigger/clone_cleaner, +/turf/closed/wall/almayer, +/area/almayer/maint/hull/upper/u_m_s) "hqc" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -36316,28 +33815,34 @@ /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer/research/containment/entrance, /area/almayer/medical/containment/cell) -"hqJ" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" +"hqm" = ( +/obj/structure/machinery/light/small{ + dir = 4 }, -/obj/structure/sign/safety/escapepod{ - pixel_x = -17 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/sign/poster/hero/voteno{ - pixel_y = 32 +/area/almayer/maint/hull/upper/u_m_s) +"hqp" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) +"hqu" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliaison) -"hqU" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 +/area/almayer/maint/hull/upper/u_a_p) +"hqx" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/stern_hallway) "hqW" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ name = "\improper Medical Bay"; @@ -36375,6 +33880,15 @@ icon_state = "test_floor4" }, /area/almayer/medical/medical_science) +"hro" = ( +/obj/structure/machinery/vending/coffee{ + density = 0; + pixel_y = 18 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_p) "hrF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -36384,18 +33898,31 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/starboard_point_defense) -"hrO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"hrI" = ( +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) +"hrJ" = ( +/obj/structure/sign/safety/autodoc{ + pixel_x = 20; + pixel_y = -32 }, -/obj/structure/pipes/standard/manifold/hidden/supply{ +/obj/structure/machinery/cm_vending/sorted/medical/bolted, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lower_medical_medbay) +"hsc" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/main_office) -"hsf" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_umbilical) "hsg" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -36406,6 +33933,21 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"hsh" = ( +/obj/structure/coatrack, +/obj/structure/sign/poster/clf{ + pixel_x = -28 + }, +/obj/structure/sign/nosmoking_1{ + pixel_y = 30 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "hsj" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -36423,9 +33965,19 @@ icon_state = "test_floor4" }, /area/almayer/squads/delta) +"hsu" = ( +/obj/structure/bed/sofa/south/grey{ + pixel_y = 12 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "hsy" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/engineering/lower/engine_core) +"hsK" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) "hsW" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -36442,33 +33994,55 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) -"htn" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" +"hte" = ( +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/closed/wall/almayer, +/area/almayer/hallways/lower/starboard_umbilical) +"htg" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 }, +/obj/structure/largecrate/supply/supplies/flares, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/maint/hull/upper/p_bow) -"hts" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 +/area/almayer/maint/hull/lower/l_m_s) +"htk" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 8 }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/lower/cryo_cells) +"htl" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) +"htq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/stern) -"htB" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +/area/almayer/maint/hull/lower/l_f_p) +"htF" = ( +/obj/structure/sign/safety/escapepod{ + pixel_y = 32 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_p) +/obj/structure/sign/safety/north{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "htG" = ( /obj/item/tool/soap, /obj/structure/machinery/light/small{ @@ -36497,9 +34071,25 @@ icon_state = "greenfull" }, /area/almayer/living/offices) +"hux" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/hallways/upper/aft_hallway) "huD" = ( -/obj/structure/window/framed/almayer/hull, -/turf/open/floor/plating, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_s) "huK" = ( /turf/open/floor/almayer{ @@ -36516,6 +34106,12 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"huP" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "huU" = ( /obj/structure/machinery/door/airlock/almayer/security{ access_modified = 1; @@ -36531,11 +34127,18 @@ icon_state = "test_floor4" }, /area/almayer/living/briefing) -"hvp" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +"hvd" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/interrogation) +"hvq" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "hvv" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -36565,13 +34168,26 @@ /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/plating, /area/almayer/powered/agent) +"hvx" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_f_p) +"hvz" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "hvH" = ( /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"hvP" = ( -/obj/item/trash/barcardine, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "hwC" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -36581,13 +34197,19 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"hwQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +"hwH" = ( +/obj/structure/stairs{ dir = 4 }, -/obj/structure/machinery/light, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_p) +/obj/effect/projector{ + name = "Almayer_Up2"; + vector_x = -1; + vector_y = 100 + }, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/starboard_fore_hallway) "hxe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36634,43 +34256,17 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"hyc" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) -"hyj" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/machinery/light{ - dir = 4 +"hyb" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/maint/hull/lower/l_a_s) "hyk" = ( /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/squads/charlie_delta_shared) -"hys" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/obj/effect/landmark/start/nurse, -/obj/effect/landmark/late_join/nurse, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/offices) -"hyt" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 2 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) "hyw" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -36695,17 +34291,30 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) -"hyL" = ( -/obj/structure/closet/firecloset, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_stern) "hyQ" = ( /turf/closed/wall/almayer, /area/almayer/living/synthcloset) +"hyV" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, +/obj/structure/sign/safety/rewire{ + pixel_x = 32; + pixel_y = 24 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/shipboard/brig/interrogation) +"hza" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_aft_hallway) "hzb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4; @@ -36720,6 +34329,16 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) +"hzl" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/snacks/mre_pack/meal5, +/obj/item/device/flashlight/lamp{ + pixel_x = 3; + pixel_y = 12 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_s) "hzs" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -36737,6 +34356,15 @@ icon_state = "cargo" }, /area/almayer/squads/delta) +"hzG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/starboard_hallway) "hzL" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -36755,6 +34383,10 @@ icon_state = "test_floor4" }, /area/almayer/command/cic) +"hzN" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/s_bow) "hAc" = ( /obj/structure/surface/rack, /obj/item/mortar_shell/flare, @@ -36763,13 +34395,16 @@ icon_state = "cargo" }, /area/almayer/squads/req) -"hAd" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/maint/hull/upper/u_f_s) -"hAu" = ( -/obj/structure/machinery/light, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) +"hAf" = ( +/obj/structure/machinery/iv_drip, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/shipboard/brig/medical) +"hAh" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/hallways/lower/port_umbilical) "hAz" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -36778,6 +34413,19 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"hAA" = ( +/obj/structure/machinery/status_display{ + pixel_y = -30 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 8; + id = "laddersoutheast"; + name = "\improper South East Ladders Shutters" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/port_midship_hallway) "hAG" = ( /obj/structure/closet/crate/internals, /obj/item/handcuffs/cable/blue, @@ -36812,6 +34460,14 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"hBa" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/stern_hallway) "hBc" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -36820,6 +34476,30 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) +"hBr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/lower/vehiclehangar) +"hBy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "hBz" = ( /obj/item/mortar_kit, /turf/open/floor/almayer{ @@ -36827,35 +34507,54 @@ icon_state = "plating" }, /area/almayer/squads/req) -"hBC" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/sign/safety/stairs{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/port_hallway) "hBF" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"hBG" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/repair_bay) "hBL" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/command/lifeboat) -"hBR" = ( -/obj/structure/platform{ - dir = 1 +"hBW" = ( +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/largecrate/random/case/double, +/area/almayer/hallways/lower/port_fore_hallway) +"hCf" = ( +/obj/structure/sign/safety/manualopenclose{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/distribution_pipes{ + pixel_y = -32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) +"hCk" = ( +/obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/hull/lower/l_m_s) +"hCq" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) "hCt" = ( /obj/structure/sign/safety/terminal{ pixel_x = 15; @@ -36868,11 +34567,12 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"hCv" = ( +"hCF" = ( +/obj/structure/machinery/light, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "blue" }, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/hallways/upper/aft_hallway) "hCS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin/uscm{ @@ -36907,33 +34607,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"hDA" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/shipboard/panic) -"hDL" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "hDR" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/syringe_case{ @@ -36949,6 +34622,16 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) +"hDU" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/hallways/lower/port_fore_hallway) "hDV" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/map_item, @@ -36971,12 +34654,54 @@ icon_state = "plate" }, /area/almayer/squads/bravo) +"hEg" = ( +/obj/structure/machinery/door_control{ + id = "laddersouthwest"; + name = "South West Ladders Shutters"; + pixel_x = 25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "greencorner" + }, +/area/almayer/hallways/lower/port_fore_hallway) +"hEj" = ( +/obj/structure/machinery/vending/hydronutrients, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "hEl" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) +"hEm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 2 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) +"hEr" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 18 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "hEw" = ( /obj/structure/pipes/standard/simple/visible{ dir = 10 @@ -36986,32 +34711,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"hEy" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/stern) -"hEB" = ( -/obj/structure/ladder{ - height = 2; - id = "AftStarboardMaint" - }, -/turf/open/floor/plating/almayer, -/area/almayer/maint/hull/upper/u_a_s) -"hEQ" = ( -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - dir = 1; - id = "medcryobeds"; - id_tag = "medcryobeds"; - name = "Medical Wheelchair Storage"; - req_access = null; - req_one_access = null - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/medical/lower_medical_medbay) "hEV" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -37041,17 +34740,15 @@ icon_state = "test_floor4" }, /area/almayer/medical/morgue) -"hFR" = ( -/obj/structure/ladder{ - height = 1; - id = "AftStarboardMaint" +"hGo" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1 }, -/obj/structure/sign/safety/ladder{ - pixel_x = 8; - pixel_y = 32 +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" }, -/turf/open/floor/plating/almayer, -/area/almayer/maint/hull/lower/l_a_s) +/area/almayer/hallways/upper/aft_hallway) "hGG" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -37123,48 +34820,15 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"hHJ" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "vehicle1door"; - name = "Vehicle Bay One" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/vehiclehangar) -"hHR" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/starboard_umbilical) -"hIh" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-y" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cic_hallway) -"hIl" = ( +"hIp" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - layer = 2.5 + icon_state = "E"; + pixel_x = 1 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/p_bow) -"hIq" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/maint/hull/lower/l_a_p) "hIs" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -37175,6 +34839,16 @@ icon_state = "dark_sterile" }, /area/almayer/command/corporateliaison) +"hIF" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/vehiclehangar) +"hIG" = ( +/obj/structure/largecrate/random, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) "hII" = ( /obj/structure/machinery/cm_vending/gear/tl{ density = 0; @@ -37189,14 +34863,12 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"hIT" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +"hIX" = ( +/obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/mess) +/area/almayer/maint/hull/upper/u_a_p) "hJg" = ( /obj/structure/pipes/trinary/mixer{ dir = 4; @@ -37216,21 +34888,27 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"hJu" = ( -/obj/structure/sign/safety/stairs{ - pixel_x = -15 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" +"hJD" = ( +/obj/structure/bed/sofa/south/grey/right{ + pixel_y = 12 }, -/area/almayer/hallways/aft_hallway) +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "hJI" = ( /obj/structure/pipes/vents/pump{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) +"hKe" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) "hKl" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/warning_stripes{ @@ -37245,39 +34923,52 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"hKq" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +"hKJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/shipboard/brig/main_office) -"hLq" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sign/safety/water{ +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/upper/aft_hallway) +"hKO" = ( +/obj/structure/largecrate/random/barrel/green, +/obj/structure/sign/safety/maint{ pixel_x = 8; pixel_y = 32 }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) +"hLt" = ( +/obj/structure/sign/poster{ + desc = "It says DRUG."; + icon_state = "poster2"; + pixel_y = 30 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/maint/hull/upper/u_a_p) +"hLu" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/p_bow) "hLC" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"hLD" = ( -/obj/structure/sign/safety/restrictedarea{ - pixel_x = 8; - pixel_y = -32 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) "hLI" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -37295,73 +34986,52 @@ icon_state = "test_floor4" }, /area/almayer/living/briefing) -"hLW" = ( -/obj/structure/sign/safety/restrictedarea{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/lower/s_bow) -"hMc" = ( -/obj/structure/bed/chair/comfy/orange{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) "hMi" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, /area/almayer/living/chapel) -"hMs" = ( -/obj/structure/bed/stool, +"hMk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "green" + icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "hMG" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/engineering/lower) +"hMM" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_bow) "hMN" = ( /obj/structure/machinery/power/apc/almayer, /turf/open/floor/almayer{ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_three) -"hMV" = ( -/obj/item/storage/firstaid, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) "hNh" = ( -/obj/structure/largecrate/random/barrel/red, +/obj/structure/machinery/light/small, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/s_bow) -"hNl" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21"; - pixel_y = 16 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) -"hNn" = ( -/obj/structure/surface/rack, -/obj/item/tool/weldingtool, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/area/almayer/maint/hull/lower/l_f_p) +"hNv" = ( +/obj/structure/sign/safety/escapepod{ + pixel_x = 8; + pixel_y = -32 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "green" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/hallways/lower/port_midship_hallway) "hNw" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -37369,14 +35039,17 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/squads/charlie) -"hNJ" = ( -/obj/structure/surface/rack, -/obj/item/tool/kitchen/rollingpin, -/obj/item/tool/hatchet, +"hNB" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + access_modified = 1; + req_one_access = null; + req_one_access_txt = "7;19" + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/p_bow) +/area/almayer/hallways/lower/vehiclehangar) "hNM" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/sheet/metal{ @@ -37403,21 +35076,25 @@ icon_state = "red" }, /area/almayer/shipboard/brig/chief_mp_office) -"hOc" = ( -/obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/almayer{ - icon_state = "plate" +"hOu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/area/almayer/maint/hull/upper/s_stern) -"hOR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/door_control{ + id = "hangarentrancenorth"; + name = "North Hangar Podlocks"; + pixel_y = -26; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) +"hOV" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/lower/constr) "hPe" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research, @@ -37430,12 +35107,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/medical_science) -"hPf" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/hangar) "hPh" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/almayer{ @@ -37443,16 +35114,34 @@ icon_state = "silver" }, /area/almayer/living/auxiliary_officer_office) -"hPI" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/shipboard/brig/perma) -"hPK" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +"hPr" = ( +/obj/structure/machinery/status_display{ + pixel_y = -30 + }, /turf/open/floor/almayer{ - dir = 1; + dir = 8; + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) +"hPu" = ( +/obj/structure/largecrate/supply, +/obj/item/tool/crowbar, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/upper/u_f_p) +"hPD" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 4; icon_state = "orange" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/lower/starboard_umbilical) +"hPI" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/shipboard/brig/perma) "hPN" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -37477,6 +35166,10 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/charlie_delta_shared) +"hQf" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) "hQw" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -37484,6 +35177,10 @@ icon_state = "orange" }, /area/almayer/engineering/lower/engine_core) +"hQK" = ( +/obj/effect/step_trigger/clone_cleaner, +/turf/closed/wall/almayer, +/area/almayer/maint/hull/upper/u_m_p) "hQP" = ( /obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer{ @@ -37565,6 +35262,20 @@ icon_state = "plate" }, /area/almayer/living/numbertwobunks) +"hRu" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/shipboard/brig/execution_storage) +"hRA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) "hRW" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -37592,6 +35303,26 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"hSb" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) +"hSj" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 1; + name = "\improper Brig"; + closeOtherId = "brigmaint_n" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/s_bow) "hSk" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) @@ -37604,6 +35335,18 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"hSv" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper Starboard Viewing Room" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_f_s) "hSw" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -37625,13 +35368,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/morgue) -"hSL" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/repair_bay) "hTc" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -37647,12 +35383,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"hTj" = ( -/obj/structure/machinery/vending/cigarette, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_f_p) "hTl" = ( /obj/structure/prop/server_equipment/yutani_server{ density = 0; @@ -37717,6 +35447,36 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"hTU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/structure/largecrate/random/secure, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) +"hUb" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) +"hUh" = ( +/obj/structure/machinery/medical_pod/bodyscanner{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/shipboard/brig/medical) "hUk" = ( /turf/open/floor/almayer{ dir = 10; @@ -37740,6 +35500,28 @@ icon_state = "plate" }, /area/almayer/living/port_emb) +"hUU" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/box/bodybags{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/box/bodybags, +/obj/structure/machinery/light/small{ + dir = 4; + pixel_y = -12 + }, +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, +/obj/structure/sign/safety/rewire{ + pixel_x = 32; + pixel_y = 17 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/execution_storage) "hUW" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -37759,15 +35541,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"hVl" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) "hVz" = ( /obj/structure/machinery/light{ dir = 1 @@ -37777,6 +35550,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) +"hVL" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "hWq" = ( /obj/structure/platform{ layer = 3.1 @@ -37825,6 +35604,27 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"hWD" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) +"hWH" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 12; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) "hWJ" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ @@ -37840,14 +35640,11 @@ }, /area/almayer/command/cichallway) "hWV" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/plating/almayer{ + allow_construction = 0 }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/hallways/upper/aft_hallway) "hXb" = ( /turf/open/floor/almayer{ dir = 1; @@ -37885,6 +35682,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) +"hXD" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_p) "hXG" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -37923,12 +35726,12 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"hYj" = ( -/obj/structure/platform_decoration, +"hYf" = ( +/obj/effect/landmark/yautja_teleport, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/hull/lower/l_a_s) "hYn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37941,34 +35744,14 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"hYw" = ( -/obj/item/tool/wet_sign, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) "hYE" = ( -/obj/structure/closet/crate{ - desc = "One of those old special operations crates from back in the day. After a leaked report from a meeting of SOF leadership lambasted the crates as 'waste of operational funds' the crates were removed from service."; - name = "special operations crate" - }, -/obj/item/clothing/mask/gas/swat, -/obj/item/clothing/mask/gas/swat, -/obj/item/clothing/mask/gas/swat, -/obj/item/clothing/mask/gas/swat, -/obj/item/attachable/suppressor, -/obj/item/attachable/suppressor, -/obj/item/attachable/suppressor, -/obj/item/attachable/suppressor, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/obj/item/explosive/grenade/smokebomb, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 }, -/area/almayer/maint/hull/lower/l_m_s) +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "hYG" = ( /obj/structure/bed/chair{ dir = 1 @@ -37997,14 +35780,12 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"hZp" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"hZw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" }, -/area/almayer/maint/hull/upper/p_stern) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) "hZE" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -38037,18 +35818,10 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"hZU" = ( -/obj/structure/transmitter{ - name = "Brig Offices Telephone"; - phone_category = "MP Dept."; - phone_id = "Brig Main Offices"; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) +"hZZ" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) "iaa" = ( /obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap, /turf/open/floor/almayer{ @@ -38087,14 +35860,6 @@ icon_state = "red" }, /area/almayer/squads/alpha) -"iao" = ( -/obj/structure/closet, -/obj/item/clothing/glasses/mgoggles/prescription, -/obj/item/clothing/glasses/mbcg, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "iaq" = ( /obj/structure/machinery/vending/cola, /turf/open/floor/almayer{ @@ -38107,10 +35872,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"iay" = ( -/obj/item/paper/almayer_storage, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) "iaF" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -38137,6 +35898,24 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) +"ibf" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/lower/s_bow) +"ibP" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -19; + pixel_y = -6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = -19; + pixel_y = 6 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "icp" = ( /turf/open/floor/almayer{ dir = 8; @@ -38170,17 +35949,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) -"idf" = ( -/obj/structure/largecrate/random/barrel/white, -/obj/structure/sign/safety/security{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) "idx" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -38193,7 +35961,7 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) -"idV" = ( +"idL" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -38211,6 +35979,28 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"iea" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/stern_hallway) +"ied" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) +"ien" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "ieu" = ( /obj/structure/window/reinforced{ dir = 4; @@ -38281,21 +36071,6 @@ dir = 4 }, /area/almayer/command/airoom) -"ieG" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) "ieX" = ( /obj/structure/surface/table/almayer, /obj/structure/sign/safety/distribution_pipes{ @@ -38320,6 +36095,22 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) +"ifz" = ( +/obj/structure/machinery/keycard_auth{ + pixel_x = 25 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/shipboard/brig/warden_office) +"igb" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "igr" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -38328,17 +36119,51 @@ icon_state = "tcomms" }, /area/almayer/command/airoom) -"igt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"igs" = ( +/obj/structure/surface/table/almayer, +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/obj/structure/machinery/alarm/almayer{ + dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering/lower/engine_core) +"igw" = ( +/obj/structure/sign/poster/ad{ + pixel_x = 30 }, +/obj/structure/closet, +/obj/item/clothing/mask/cigarette/weed, /turf/open/floor/almayer{ - icon_state = "red" + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) +"igS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" }, -/area/almayer/shipboard/brig/main_office) +/obj/structure/closet/emcloset, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) +"iho" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + 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/maint/lower/constr) "ihw" = ( /obj/structure/machinery/cm_vending/sorted/medical, /turf/open/floor/almayer{ @@ -38346,15 +36171,13 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) -"ihF" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) "ihI" = ( -/obj/structure/machinery/portable_atmospherics/powered/scrubber, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/almayer/maint/hull/upper/u_a_s) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) "ihM" = ( /obj/structure/machinery/cm_vending/clothing/marine/delta{ density = 0; @@ -38367,6 +36190,15 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"ihW" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "greencorner" + }, +/area/almayer/hallways/lower/starboard_fore_hallway) "ihX" = ( /obj/structure/machinery/status_display{ pixel_y = -30 @@ -38416,16 +36248,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"iiC" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "iiZ" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer{ @@ -38441,6 +36263,14 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) +"ijn" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "ijr" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -38449,14 +36279,6 @@ icon_state = "redfull" }, /area/almayer/living/briefing) -"ijw" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) "ijQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -38476,6 +36298,11 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) +"ikl" = ( +/turf/open/floor/almayer{ + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/lower/vehiclehangar) "iks" = ( /obj/structure/pipes/binary/pump/high_power/on{ dir = 1 @@ -38496,24 +36323,19 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"ikL" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -14; - pixel_y = 13 +"ikA" = ( +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = 12; - pixel_y = 13 +/area/almayer/maint/hull/lower/s_bow) +"ikC" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/mess) +/area/almayer/maint/hull/upper/u_a_s) "ikQ" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/tool/stamp/hop{ @@ -38535,6 +36357,9 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"ikT" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) "ilq" = ( /turf/open/floor/almayer{ dir = 4; @@ -38580,25 +36405,26 @@ }, /area/almayer/medical/morgue) "imt" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_y = 17 }, -/area/almayer/maint/hull/lower/l_f_p) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_p) "imy" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/offices/flight) -"inq" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/tool, -/turf/open/floor/almayer{ - icon_state = "cargo" +"inh" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/area/almayer/maint/hull/lower/l_m_s) +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-y" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cic_hallway) "ins" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -38612,17 +36438,6 @@ }, /turf/open/floor/plating, /area/almayer/engineering/upper_engineering) -"iny" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 2; - id = "OuterShutter"; - name = "\improper Saferoom Shutters" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/panic) "inL" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -38633,9 +36448,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"iov" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_p) "iow" = ( /obj/structure/machinery/cm_vending/sorted/attachments/squad{ req_access = null; @@ -38656,6 +36468,9 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) +"ioM" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_p) "ioP" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -38669,12 +36484,6 @@ icon_state = "plating" }, /area/almayer/shipboard/stern_point_defense) -"ioT" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/stern) "ioU" = ( /turf/closed/wall/almayer, /area/almayer/command/securestorage) @@ -38685,12 +36494,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/general_equipment) -"ioX" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "ipa" = ( /obj/effect/decal/cleanable/generic, /obj/effect/decal/warning_stripes{ @@ -38706,6 +36509,39 @@ }, /turf/open/floor/plating, /area/almayer/living/port_emb) +"ipk" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/lower/l_f_s) +"ipn" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) +"ipr" = ( +/obj/item/tool/weldpack{ + pixel_y = 15 + }, +/obj/structure/surface/table/almayer, +/obj/item/clothing/head/welding, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) +"ipB" = ( +/obj/structure/surface/rack, +/obj/item/tool/kitchen/rollingpin, +/obj/item/tool/hatchet, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/p_bow) "ipE" = ( /obj/structure/bed/chair{ dir = 8 @@ -38714,16 +36550,6 @@ icon_state = "orangefull" }, /area/almayer/squads/alpha_bravo_shared) -"ipF" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/closet/toolcloset, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/maint/upper/mess) "ipK" = ( /obj/effect/step_trigger/message/memorial, /turf/open/floor/almayer{ @@ -38750,20 +36576,21 @@ icon_state = "sterile_green" }, /area/almayer/medical/hydroponics) -"ipY" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/camera_film{ - pixel_x = 4; - pixel_y = -2 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "iqd" = ( /obj/structure/bed/chair/office/dark{ dir = 8 }, /turf/open/floor/almayer, /area/almayer/command/computerlab) +"iqo" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "green" + }, +/area/almayer/squads/req) "iqp" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -38785,13 +36612,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"iqN" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) "iqR" = ( /obj/structure/sign/safety/cryo{ pixel_x = -16 @@ -38810,19 +36630,17 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) -"irA" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 32 +"irJ" = ( +/obj/item/tool/wirecutters{ + pixel_y = -7 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/p_bow) -"irF" = ( -/obj/structure/closet/emcloset/legacy, -/turf/open/floor/almayer{ - icon_state = "cargo" +/obj/structure/sign/poster{ + desc = "You are becoming hysterical."; + icon_state = "poster11"; + pixel_y = 30 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "irS" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/cable/heavyduty{ @@ -38855,15 +36673,15 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop) -"isz" = ( +"isq" = ( /obj/structure/machinery/light/small{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/s_bow) +/area/almayer/maint/hull/upper/u_m_p) "isC" = ( /obj/effect/projector{ name = "Almayer_AresDown"; @@ -38900,15 +36718,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/morgue) -"isW" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "bluecorner" - }, -/area/almayer/hallways/aft_hallway) "itf" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -38969,6 +36778,17 @@ icon_state = "red" }, /area/almayer/command/lifeboat) +"iuf" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_bow) "iun" = ( /obj/effect/spawner/random/tool, /turf/open/floor/plating/plating_catwalk, @@ -39009,6 +36829,12 @@ /obj/structure/machinery/computer/emails, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) +"iuI" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 32 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "ivf" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/camera, @@ -39029,42 +36855,22 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"ivy" = ( -/turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_m_s) +"ivu" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "ivz" = ( /obj/structure/closet, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/port_emb) -"ivB" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) -"ivG" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = 12; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -16; - pixel_y = 13 +"ivL" = ( +/obj/structure/platform{ + dir = 8 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/hull/upper/u_a_p) "ivM" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -39080,6 +36886,12 @@ icon_state = "plate" }, /area/almayer/engineering/lower) +"ivV" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) "iwf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -39151,14 +36963,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"ixc" = ( -/obj/structure/sign/safety/storage{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/p_bow) "ixj" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/crew/alt, @@ -39166,13 +36970,14 @@ icon_state = "sterile_green" }, /area/almayer/medical/lockerroom) -"ixl" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 +"ixu" = ( +/obj/structure/largecrate/random/case{ + layer = 2.98 }, -/obj/structure/machinery/power/apc/almayer, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "ixv" = ( /obj/structure/bed/chair/comfy/blue{ dir = 4 @@ -39181,26 +36986,6 @@ icon_state = "plate" }, /area/almayer/command/cic) -"ixB" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/upper/u_m_s) -"ixC" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/stern_hallway) "ixD" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -39227,6 +37012,27 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) +"ixT" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/lower/repair_bay) +"iyC" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_aft_hallway) +"iyE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) "iyF" = ( /obj/structure/pipes/standard/simple/visible{ dir = 9 @@ -39284,9 +37090,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha) -"izT" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/maint/hull/upper/u_f_p) "izY" = ( /obj/structure/machinery/autodoc_console, /turf/open/floor/almayer{ @@ -39294,12 +37097,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"iAo" = ( -/obj/structure/sign/safety/storage{ - pixel_x = -17 +"iAg" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "redcorner" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/shipboard/brig/mp_bunks) "iAw" = ( /obj/item/tool/warning_cone{ pixel_x = -12 @@ -39321,14 +37124,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/containment) -"iAB" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -25 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) "iAE" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -39337,16 +37132,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower/engine_core) -"iAT" = ( -/obj/structure/sign/safety/south{ - pixel_x = -17; - pixel_y = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/hallways/port_hallway) "iBl" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -39357,12 +37142,14 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"iBs" = ( -/obj/structure/largecrate/random/barrel/blue, +"iBu" = ( +/obj/structure/sign/safety/storage{ + pixel_x = -17 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_p) +/area/almayer/maint/hull/lower/p_bow) "iBY" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/almayer{ @@ -39390,6 +37177,14 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) +"iCD" = ( +/obj/structure/bed/chair/comfy/orange{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "iCF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -39402,62 +37197,24 @@ icon_state = "green" }, /area/almayer/living/offices) -"iCI" = ( -/obj/structure/largecrate/supply/supplies/mre, +"iDk" = ( +/obj/structure/closet/emcloset, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/maint/hull/upper/u_a_p) -"iDd" = ( -/obj/structure/machinery/door/poddoor/railing{ - id = "vehicle_elevator_railing_aux" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) -"iDe" = ( -/obj/structure/machinery/cm_vending/clothing/senior_officer{ - pixel_y = 0 + icon_state = "plate" }, +/area/almayer/maint/hull/lower/l_m_p) +"iDs" = ( +/obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "plate" }, -/area/almayer/medical/upper_medical) -"iDx" = ( -/obj/structure/surface/rack, -/obj/item/circuitboard/firealarm, -/obj/item/circuitboard, -/obj/item/clipboard, +/area/almayer/maint/hull/upper/u_a_s) +"iEa" = ( +/obj/structure/machinery/light/small, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/s_stern) -"iDD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) -"iDN" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"iEb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/maint/hull/upper/p_bow) "iEg" = ( /turf/open/floor/almayer{ dir = 9; @@ -39501,10 +37258,17 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"iED" = ( -/obj/structure/curtain/red, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) +"iEM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "iFc" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/wood/ship, @@ -39514,6 +37278,29 @@ icon_state = "bluefull" }, /area/almayer/living/pilotbunks) +"iFp" = ( +/obj/effect/projector{ + name = "Almayer_Up1"; + vector_x = -19; + vector_y = 98 + }, +/turf/open/floor/almayer{ + allow_construction = 0; + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"iFA" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Port Railguns and Viewing Room" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_f_p) "iFC" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/map_item, @@ -39541,6 +37328,15 @@ }, /turf/open/floor/almayer, /area/almayer/living/offices) +"iFK" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) "iFM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -39553,6 +37349,29 @@ icon_state = "test_floor4" }, /area/almayer/living/port_emb) +"iFY" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/sign/safety/cryo{ + pixel_x = 36 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/lower/cryo_cells) +"iGc" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) +"iGi" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_fore_hallway) "iGn" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/closet/secure_closet/surgical{ @@ -39563,29 +37382,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) -"iGH" = ( -/obj/structure/platform_decoration, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -14; - pixel_y = 13 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) -"iGO" = ( -/obj/structure/machinery/door/airlock/almayer/security{ - dir = 2; - name = "\improper Dropship Control Bubble"; - req_access = null; - req_one_access_txt = "3;22;2;19" - }, -/obj/structure/pipes/standard/simple/hidden/supply, +"iGE" = ( /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 8; + icon_state = "red" }, -/area/almayer/living/offices/flight) +/area/almayer/hallways/upper/aft_hallway) "iGQ" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 8 @@ -39597,6 +37399,15 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"iGZ" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "iHc" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/notunnel) @@ -39608,10 +37419,6 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cells) -"iIa" = ( -/obj/structure/machinery/light, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) "iIj" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -39633,12 +37440,20 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) -"iIt" = ( -/obj/structure/machinery/light/small, +"iIH" = ( +/obj/structure/largecrate/supply/medicine/medivend{ + pixel_x = 3 + }, +/obj/structure/largecrate/random/mini/med{ + pixel_x = 3; + pixel_y = 11; + density = 1 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "sterile_green_side" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/medical/lower_medical_medbay) "iIP" = ( /obj/structure/toilet{ pixel_y = 16 @@ -39653,6 +37468,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +"iIQ" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/stern_hallway) "iIR" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -39664,21 +37488,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/bravo) -"iJb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/safety/bulkhead_door{ - pixel_y = -34 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_bow) -"iJA" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_s) "iJB" = ( /obj/structure/sign/safety/galley{ pixel_x = 8; @@ -39699,12 +37508,13 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"iJU" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer{ - icon_state = "plate" +"iJT" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = 32 }, -/area/almayer/maint/hull/lower/l_a_s) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_p) "iKb" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ @@ -39734,15 +37544,6 @@ icon_state = "cargo" }, /area/almayer/squads/alpha) -"iKB" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/maint/upper/mess) "iKD" = ( /obj/structure/surface/table/almayer, /obj/item/clipboard, @@ -39770,6 +37571,15 @@ icon_state = "mono" }, /area/almayer/engineering/port_atmos) +"iKV" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "iKZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -39802,17 +37612,15 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) -"iLo" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +"iLm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/surface/table/almayer, -/obj/item/storage/donut_box, -/turf/open/floor/almayer{ - icon_state = "red" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/shipboard/brig/main_office) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "iLq" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -39837,13 +37645,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_lobby) -"iLv" = ( -/obj/item/stool{ - pixel_x = 15; - pixel_y = 6 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "iLG" = ( /obj/structure/disposalpipe/junction{ dir = 1; @@ -39852,15 +37653,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"iLH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) "iLO" = ( /turf/open/floor/almayer{ dir = 4; @@ -39895,6 +37687,46 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"iNh" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + name = "\improper Brig Cells" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/starboard_hallway) +"iNk" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_s) +"iNH" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/sign/safety/maint{ + pixel_x = -17; + pixel_y = -8 + }, +/obj/structure/sign/safety/storage{ + pixel_x = -17; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "redcorner" + }, +/area/almayer/hallways/lower/port_fore_hallway) +"iNR" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "iNY" = ( /obj/structure/machinery/status_display{ pixel_x = 32; @@ -39902,33 +37734,51 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"iOt" = ( -/obj/structure/machinery/vending/cigarette{ - density = 0; - pixel_y = 18 +"iOo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 }, -/area/almayer/maint/hull/upper/u_a_p) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "iOD" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"iPe" = ( +"iOP" = ( /turf/open/floor/almayer{ - dir = 8; + dir = 5; icon_state = "red" }, -/area/almayer/maint/hull/upper/u_a_p) -"iPm" = ( -/obj/structure/largecrate/random/barrel/green, +/area/almayer/hallways/upper/stern_hallway) +"iOX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/maint/hull/lower/l_f_s) +"iPf" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) +"iPq" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_s) +"iPt" = ( +/turf/open/floor/almayer{ + dir = 10; + icon_state = "green" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "iPv" = ( /obj/structure/bed/chair/comfy, /obj/structure/window/reinforced/ultra, @@ -39940,16 +37790,6 @@ icon_state = "silver" }, /area/almayer/living/briefing) -"iPy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/req) "iPD" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -39966,12 +37806,47 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"iPK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) +"iPN" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/station_alert, +/obj/structure/sign/safety/maint{ + pixel_x = 32 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "orange" + }, +/area/almayer/maint/upper/mess) "iPS" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/squads/alpha) +"iPU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "iQd" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -40054,31 +37929,34 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"iQK" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/hull/lower/stern) -"iQR" = ( -/obj/structure/sign/safety/storage{ +"iQJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/distribution_pipes{ pixel_x = 8; - pixel_y = 32 + pixel_y = -32 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) -"iRr" = ( -/obj/structure/machinery/light{ - dir = 1 +/area/almayer/maint/hull/lower/l_f_s) +"iRi" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 32 }, /turf/open/floor/almayer{ - dir = 1; + dir = 4; icon_state = "green" }, -/area/almayer/hallways/port_hallway) -"iRx" = ( -/obj/structure/machinery/light{ - dir = 1 +/area/almayer/hallways/upper/aft_hallway) +"iRp" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 8; + id = "Interrogation Shutters"; + name = "\improper Privacy Shutters" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/interrogation) "iRy" = ( /obj/structure/pipes/vents/pump/on, /turf/open/floor/almayer, @@ -40099,9 +37977,6 @@ dir = 4 }, /area/almayer/medical/containment/cell) -"iSe" = ( -/turf/open/floor/plating, -/area/almayer/maint/upper/u_m_p) "iSm" = ( /obj/structure/pipes/vents/pump, /obj/structure/mirror{ @@ -40148,18 +38023,34 @@ icon_state = "dark_sterile" }, /area/almayer/living/port_emb) -"iSr" = ( -/obj/item/reagent_container/glass/bucket/janibucket{ - pixel_x = -1; - pixel_y = 13 +"iSu" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/obj/structure/sign/safety/water{ - pixel_x = -17 +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/stern_hallway) +"iSB" = ( +/obj/structure/platform_decoration{ + dir = 8 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/hull/upper/u_a_s) +"iSV" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; + dir = 1; + req_one_access = null; + req_one_access_txt = "2;7" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_a_p) "iSZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -40196,6 +38087,10 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"iTq" = ( +/obj/structure/curtain/red, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) "iTw" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -40214,22 +38109,20 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"iTK" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"iTQ" = ( +/obj/structure/machinery/light/small{ + dir = 1 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) +"iUh" = ( +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = -16 }, -/area/almayer/hallways/aft_hallway) -"iTV" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/hull/upper/p_bow) "iUk" = ( /obj/structure/machinery/door/airlock/almayer/marine/charlie{ dir = 1 @@ -40271,18 +38164,24 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"iUD" = ( -/obj/structure/bed/chair, +"iUG" = ( +/obj/structure/closet/secure_closet/surgical{ + pixel_x = -30 + }, +/obj/structure/machinery/power/apc/almayer, +/obj/structure/sign/safety/rewire{ + pixel_y = -38 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "sterile_green_corner" }, -/area/almayer/maint/hull/upper/p_stern) -"iUS" = ( -/obj/structure/machinery/door/airlock/almayer/maint, +/area/almayer/shipboard/brig/medical) +"iUV" = ( /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "bluecorner" }, -/area/almayer/maint/upper/u_m_p) +/area/almayer/hallways/upper/aft_hallway) "iUW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -40293,17 +38192,22 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"iVj" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/prop/almayer/computer/PC{ - dir = 4 +"iUX" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 }, -/obj/item/tool/stamp/approved{ - pixel_y = -11; - pixel_x = -3 +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 18 }, -/turf/open/floor/almayer, -/area/almayer/squads/req) +/obj/item/device/taperecorder, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/interrogation) "iVy" = ( /turf/open/floor/almayer{ dir = 1; @@ -40316,6 +38220,15 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"iVG" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_bow) "iVP" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17; @@ -40327,11 +38240,13 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"iVQ" = ( -/obj/structure/closet/crate/trashcart, -/obj/effect/spawner/random/balaclavas, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) +"iWa" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/stern) "iWc" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -40342,15 +38257,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/delta) -"iWd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) "iWx" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -40361,35 +38267,37 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"iWD" = ( -/obj/structure/platform{ +"iWH" = ( +/obj/structure/machinery/light/small{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) -"iWL" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/item/reagent_container/glass/bucket/mopbucket, +/obj/item/tool/mop{ + pixel_x = -6; + pixel_y = 14 + }, +/obj/structure/janitorialcart, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) -"iWN" = ( +/area/almayer/maint/lower/s_bow) +"iWJ" = ( +/obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" + icon_state = "plate" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/maint/hull/lower/s_bow) +"iWQ" = ( +/obj/effect/landmark/start/researcher, +/obj/effect/landmark/late_join/researcher, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/offices) "iWR" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/prison{ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering) -"iWW" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/s_bow) "iXb" = ( /obj/structure/bed/chair/comfy/delta{ dir = 8 @@ -40398,12 +38306,28 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) +"iXm" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "InnerShutter"; + name = "\improper Saferoom Shutters" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/panic) "iXA" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) +"iXB" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) "iXT" = ( /obj/item/trash/uscm_mre, /turf/open/floor/almayer, @@ -40450,16 +38374,12 @@ icon_state = "cargo_arrow" }, /area/almayer/medical/hydroponics) -"iYj" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +"iYm" = ( +/obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ - dir = 4; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/maint/hull/upper/s_stern) "iYr" = ( /obj/structure/machinery/light{ dir = 4 @@ -40485,20 +38405,12 @@ icon_state = "plate" }, /area/almayer/living/gym) -"iYR" = ( -/obj/structure/largecrate/supply/medicine/medivend{ - pixel_x = 3 - }, -/obj/structure/largecrate/random/mini/med{ - pixel_x = 3; - pixel_y = 11; - density = 1 - }, +"iZd" = ( +/obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" + icon_state = "plate" }, -/area/almayer/medical/lower_medical_medbay) +/area/almayer/maint/hull/lower/l_m_p) "iZg" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -40508,14 +38420,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"iZh" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) "iZw" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_AresUp"; @@ -40546,15 +38450,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop/hangar) -"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 @@ -40588,6 +38483,12 @@ icon_state = "plate" }, /area/almayer/squads/req) +"jae" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/stern_hallway) "jaf" = ( /obj/structure/bed/chair/comfy/bravo{ dir = 4 @@ -40604,16 +38505,51 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"jaF" = ( -/obj/structure/bed/chair, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +"jak" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/vehiclehangar) +"jao" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) +"jas" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) +"jay" = ( +/obj/structure/surface/rack, +/obj/item/tool/shovel/etool{ + pixel_x = 6 }, +/obj/item/tool/shovel/etool, +/obj/item/tool/wirecutters, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/hull/lower/l_a_p) +"jaz" = ( +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/technology_scanner, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_umbilical) "jaH" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/paper_bin/uscm{ @@ -40624,15 +38560,13 @@ icon_state = "plating" }, /area/almayer/command/airoom) -"jaK" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"jaI" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = 32 }, -/area/almayer/hallways/vehiclehangar) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) "jaM" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -40659,15 +38593,10 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) -"jbl" = ( -/obj/structure/largecrate/random/case/small, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) +"jaW" = ( +/obj/effect/landmark/start/reporter, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_p) "jbq" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -40733,37 +38662,36 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"jbS" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) +"jbO" = ( +/obj/structure/machinery/cm_vending/sorted/medical/bolted, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lower_medical_medbay) "jbX" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/weapon_room) -"jca" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) "jcf" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/shipboard/brig/processing) -"jcs" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) +"jcE" = ( +/obj/structure/machinery/vending/coffee{ + density = 0; + pixel_y = 18 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "jcP" = ( /turf/open/floor/almayer{ icon_state = "plating_striped" }, /area/almayer/engineering/upper_engineering/starboard) -"jdk" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 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{ @@ -40778,6 +38706,21 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"jdn" = ( +/obj/structure/surface/rack, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_bow) +"jdu" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) +"jdC" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/vehiclehangar) "jdG" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -40788,9 +38731,20 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_three) +"jdZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "jeb" = ( /turf/closed/wall/almayer, /area/almayer/squads/alpha_bravo_shared) +"jei" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "jeq" = ( /obj/structure/surface/rack, /obj/item/storage/box/pillbottles{ @@ -40806,6 +38760,27 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) +"jer" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/closed/wall/almayer, +/area/almayer/maint/hull/lower/l_a_p) +"jev" = ( +/obj/structure/largecrate/random/case/small, +/obj/item/device/taperecorder{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/reagent_container/glass/bucket/mopbucket{ + pixel_x = -9; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "jew" = ( /obj/structure/surface/table/reinforced/black, /turf/open/floor/almayer{ @@ -40843,25 +38818,15 @@ icon_state = "red" }, /area/almayer/living/cryo_cells) -"jfn" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) -"jfD" = ( -/obj/structure/sign/safety/security{ - pixel_y = -32 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_x = 15; - pixel_y = -32 +"jeR" = ( +/obj/structure/machinery/light{ + dir = 4 }, +/obj/structure/bed/chair/bolted, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/shipboard/brig/perma) "jfK" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -40872,6 +38837,13 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"jfS" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "jfY" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/map_item, @@ -40977,12 +38949,53 @@ icon_state = "blue" }, /area/almayer/command/cichallway) -"jgU" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 +"jgK" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_m_s) +"jgR" = ( +/obj/structure/sign/safety/rewire{ + pixel_y = 32 + }, +/obj/item/bedsheet/brown{ + layer = 3.1 + }, +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/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/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/shipboard/brig/mp_bunks) +"jgS" = ( +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/hallways/upper/stern_hallway) "jhb" = ( /obj/structure/sign/safety/cryo{ pixel_x = -6; @@ -40990,12 +39003,27 @@ }, /turf/closed/wall/almayer, /area/almayer/living/cryo_cells) +"jhc" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_umbilical) +"jhm" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/stern_hallway) "jhn" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) +"jhs" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_aft_hallway) "jht" = ( /obj/structure/machinery/vending/coffee{ density = 0; @@ -41018,6 +39046,10 @@ icon_state = "green" }, /area/almayer/living/offices) +"jhA" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) "jhD" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 @@ -41031,6 +39063,29 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/chief_mp_office) +"jhK" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) +"jhR" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_y = 17 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) +"jhS" = ( +/obj/structure/machinery/door/poddoor/railing{ + id = "vehicle_elevator_railing_aux" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/vehiclehangar) "jhW" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ @@ -41049,23 +39104,17 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/lobby) -"jiq" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/machinery/power/reactor, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/engineering/lower/engine_core) -"jiw" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"jiM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/area/almayer/hallways/port_hallway) +/obj/structure/surface/rack, +/obj/item/frame/table, +/obj/item/frame/table, +/obj/item/frame/table, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "jiU" = ( /obj/structure/sink{ dir = 1; @@ -41085,19 +39134,13 @@ icon_state = "dark_sterile" }, /area/almayer/living/port_emb) -"jjm" = ( -/obj/structure/closet/secure_closet{ - name = "\improper Lethal Injection Locker" - }, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/obj/item/reagent_container/ld50_syringe/choral, -/turf/open/floor/almayer{ - icon_state = "plate" +"jjl" = ( +/obj/structure/machinery/door/poddoor/railing{ + dir = 8; + id = "vehicle_elevator_railing_aux" }, -/area/almayer/shipboard/brig/execution) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/vehiclehangar) "jjn" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/eastright{ @@ -41113,60 +39156,19 @@ icon_state = "sterile_green" }, /area/almayer/medical/lower_medical_medbay) -"jjs" = ( -/obj/structure/machinery/door/poddoor/railing{ - dir = 4; - id = "vehicle_elevator_railing_aux" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) "jjS" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/medical_science) -"jjT" = ( -/obj/structure/machinery/light, -/obj/effect/projector{ - name = "Almayer_Up4"; - vector_x = -19; - vector_y = 104 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"jjZ" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/vehicle/powerloader{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "cargo" - }, -/area/almayer/hallways/vehiclehangar) -"jkb" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) -"jkd" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 32 - }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" + icon_state = "sterile_green_corner" }, -/area/almayer/hallways/port_hallway) +/area/almayer/medical/medical_science) "jkj" = ( /obj/structure/machinery/portable_atmospherics/powered/pump, /obj/structure/machinery/light{ @@ -41183,6 +39185,17 @@ icon_state = "plate" }, /area/almayer/medical/morgue) +"jkq" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = -28 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "jks" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -41242,20 +39255,40 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"jlc" = ( +"jkN" = ( +/obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/hallways/upper/starboard) -"jln" = ( +/area/almayer/maint/hull/lower/l_a_s) +"jkY" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, +/obj/structure/closet/secure_closet/engineering_welding{ + req_one_access_txt = "7;23;27" + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/sign/safety/terminal{ + pixel_y = 32 + }, +/obj/structure/sign/safety/fire_haz{ + pixel_x = 15; + pixel_y = 32 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "silver" }, -/area/almayer/maint/hull/lower/s_bow) +/area/almayer/hallways/lower/repair_bay) +"jlc" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/hallways/upper/starboard) "jlA" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -41267,6 +39300,25 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/containment) +"jlD" = ( +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/port_fore_hallway) +"jlE" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/surface/table/almayer, +/obj/item/toy/deck/uno, +/obj/item/toy/deck{ + pixel_x = -9 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/mp_bunks) "jlG" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -41312,12 +39364,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"jmm" = ( -/obj/structure/machinery/gel_refiller, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lower_medical_medbay) "jmn" = ( /obj/structure/surface/table/almayer, /obj/item/prop/magazine/dirty{ @@ -41331,6 +39377,15 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) +"jmz" = ( +/obj/structure/largecrate/random/case/double, +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) "jmK" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -41357,30 +39412,68 @@ icon_state = "blue" }, /area/almayer/command/cichallway) -"jnl" = ( -/obj/structure/largecrate/supply/floodlights, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) -"jnw" = ( +"jnc" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/sign/safety/bridge{ - pixel_y = 32 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/sign/safety/reception{ - pixel_x = 15; - pixel_y = 32 +/area/almayer/hallways/lower/port_midship_hallway) +"jne" = ( +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/upper/u_f_p) +"jnh" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" + }, +/area/almayer/maint/upper/mess) +"jno" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) +"jnp" = ( +/obj/structure/surface/table/almayer, +/obj/item/cell/high{ + pixel_x = -8; + pixel_y = 8 + }, +/obj/item/ashtray/plastic{ + icon_state = "ashtray_full_bl"; + pixel_x = 5; + pixel_y = 1 + }, +/obj/item/trash/cigbutt{ + pixel_x = -10; + pixel_y = 13 + }, +/obj/item/trash/cigbutt{ + pixel_x = -6; + pixel_y = -9 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/engineering/upper_engineering/port) +"jnx" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orange" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/stern_hallway) "jnD" = ( /turf/open/floor/almayer{ dir = 1; @@ -41403,11 +39496,6 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/command/cic) -"jon" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/stern) "joG" = ( /obj/structure/machinery/washing_machine, /obj/structure/sign/poster{ @@ -41458,25 +39546,12 @@ }, /turf/open/floor/almayer, /area/almayer/living/gym) -"jpu" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_a_s) -"jpX" = ( -/obj/structure/machinery/door/airlock/almayer/maint/reinforced{ - access_modified = 1; - req_one_access = null; - req_one_access_txt = "2;7" - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "CIC Lockdown"; - name = "\improper Combat Information Center Blast Door" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"jpW" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1 }, -/area/almayer/maint/upper/mess) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "jqP" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES Interior"; @@ -41511,6 +39586,10 @@ icon_state = "green" }, /area/almayer/squads/req) +"jri" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) "jrm" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -41521,6 +39600,38 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"jru" = ( +/obj/structure/sign/safety/nonpress_0g{ + pixel_y = 32 + }, +/obj/structure/sign/safety/press_area_ag{ + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_umbilical) +"jrB" = ( +/obj/structure/bed/chair, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_stern) +"jrI" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 18 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_p) "jrM" = ( /obj/structure/machinery/camera/autoname/almayer/containment{ dir = 4 @@ -41530,22 +39641,17 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"jrN" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "plate" +"jsa" = ( +/obj/structure/machinery/light{ + dir = 8 }, -/area/almayer/maint/lower/s_bow) -"jsj" = ( -/obj/structure/largecrate/random/secure, -/turf/open/floor/almayer{ - icon_state = "cargo" +/obj/effect/projector{ + name = "Almayer_Up3"; + vector_x = -1; + vector_y = 102 }, -/area/almayer/maint/hull/lower/l_f_s) -"jsn" = ( -/obj/structure/bed/chair/office/dark, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/hallways/lower/port_fore_hallway) "jss" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -41554,6 +39660,14 @@ icon_state = "bluefull" }, /area/almayer/living/captain_mess) +"jsu" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "jsx" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -41565,6 +39679,17 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"jsA" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_s) +"jsE" = ( +/obj/structure/sign/safety/nonpress_ag{ + pixel_x = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/s_bow) "jsP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -41574,19 +39699,14 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"jta" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/effect/landmark/yautja_teleport, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"jsR" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 }, -/area/almayer/maint/hull/lower/l_m_p) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/vehiclehangar) "jtj" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -41595,27 +39715,37 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"jtv" = ( -/obj/structure/sign/poster/safety, -/turf/closed/wall/almayer, -/area/almayer/maint/lower/s_bow) -"jtG" = ( -/obj/effect/landmark/yautja_teleport, +"jts" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/port_aft_hallway) +"jtU" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) -"jtJ" = ( -/obj/structure/machinery/door_control{ - id = "laddernorthwest"; - name = "North West Ladders Shutters"; - pixel_x = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 +/area/almayer/maint/hull/upper/u_m_p) +"jtZ" = ( +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/almayer{ dir = 4; - icon_state = "greencorner" + icon_state = "emerald" + }, +/area/almayer/hallways/lower/port_midship_hallway) +"juo" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_fore_hallway) +"jux" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "bluecorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/upper/aft_hallway) "juD" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -41623,23 +39753,17 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/port_emb) -"juV" = ( -/obj/item/trash/USCMtray{ - pixel_x = -4; - pixel_y = 10 - }, -/obj/structure/surface/table/almayer, -/obj/item/tool/kitchen/utensil/pfork{ - pixel_x = 9; - pixel_y = 8 +"juS" = ( +/obj/structure/machinery/gear{ + id = "vehicle_elevator_gears" }, -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "mono" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/hallways/lower/vehiclehangar) "juX" = ( /obj/structure/platform_decoration{ dir = 1 @@ -41660,6 +39784,12 @@ icon_state = "plate" }, /area/almayer/medical/lower_medical_medbay) +"jvc" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/mp_bunks) "jvp" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -41685,12 +39815,41 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha) +"jvt" = ( +/obj/item/tool/warning_cone{ + pixel_x = -20; + pixel_y = 18 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = -16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"jvz" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silvercorner" + }, +/area/almayer/hallways/upper/aft_hallway) "jvB" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/no_build{ dir = 4 }, /area/almayer/command/airoom) +"jvD" = ( +/obj/structure/machinery/door_control{ + id = "laddersouthwest"; + name = "South West Ladders Shutters"; + pixel_x = 25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/turf/open/floor/almayer{ + icon_state = "greencorner" + }, +/area/almayer/hallways/lower/port_fore_hallway) "jvM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -41733,20 +39892,41 @@ "jvY" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/command/telecomms) -"jwa" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" +"jwi" = ( +/obj/structure/machinery/door_control{ + id = "InnerShutter"; + name = "Inner Shutter"; + pixel_x = 5; + pixel_y = 10 }, -/obj/structure/sign/safety/hazard{ - pixel_x = 32; - pixel_y = 8 +/obj/item/toy/deck{ + pixel_x = -9 }, -/obj/structure/sign/safety/restrictedarea{ - pixel_x = 32; - pixel_y = -7 +/obj/item/ashtray/plastic, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/sign/safety/intercom{ + pixel_y = -32 }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/lower/l_f_s) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/panic) +"jwq" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_p) +"jwr" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) +"jwJ" = ( +/obj/structure/platform_decoration, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) "jwK" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -41754,6 +39934,19 @@ icon_state = "red" }, /area/almayer/squads/alpha_bravo_shared) +"jwM" = ( +/obj/structure/largecrate/supply/floodlights, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_p) +"jwP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "jxi" = ( /obj/structure/machinery/sleep_console, /turf/open/floor/almayer{ @@ -41761,6 +39954,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"jxu" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -25 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "jxx" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -41776,13 +39975,15 @@ }, /turf/open/floor/plating, /area/almayer/living/bridgebunks) -"jxP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +"jxX" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/vehiclehangar) +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) "jyb" = ( /turf/open/floor/almayer{ dir = 6; @@ -41793,6 +39994,20 @@ /obj/structure/machinery/light, /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) +"jyJ" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/ladder{ + height = 2; + id = "cicladder3" + }, +/obj/structure/sign/safety/ladder{ + pixel_x = 23; + pixel_y = 32 + }, +/turf/open/floor/plating/almayer, +/area/almayer/medical/medical_science) "jyR" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ req_one_access_txt = "7;23;27" @@ -41801,24 +40016,6 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) -"jyU" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/lower/l_f_s) -"jzb" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/hangar) -"jzp" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) "jzD" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ icon_state = "almayer_pdoor"; @@ -41837,6 +40034,13 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) +"jzT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "jzZ" = ( /obj/structure/platform_decoration, /turf/open/floor/almayer{ @@ -41850,15 +40054,18 @@ icon_state = "plate" }, /area/almayer/command/corporateliaison) -"jAi" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/hallways/vehiclehangar) -"jAl" = ( -/obj/structure/machinery/cm_vending/sorted/medical/blood/bolted, +"jAj" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + icon_state = "orangecorner" }, -/area/almayer/medical/lower_medical_medbay) +/area/almayer/hallways/lower/starboard_aft_hallway) "jAz" = ( /obj/structure/platform, /obj/structure/platform{ @@ -41900,12 +40107,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/morgue) -"jBI" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) "jBO" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -41929,6 +40130,10 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) +"jCg" = ( +/obj/docking_port/stationary/escape_pod/south, +/turf/open/floor/plating, +/area/almayer/maint/hull/lower/l_m_s) "jCn" = ( /obj/structure/surface/table/almayer, /obj/item/tool/screwdriver, @@ -41940,13 +40145,18 @@ icon_state = "orange" }, /area/almayer/engineering/lower/engine_core) -"jCu" = ( -/obj/structure/platform{ - dir = 1 +"jCr" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/item/tool/mop, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/hull/lower/s_bow) +"jCx" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "bluecorner" + }, +/area/almayer/hallways/lower/port_midship_hallway) "jCK" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft"; @@ -41957,22 +40167,10 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"jDf" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_stern) -"jDh" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) +"jCX" = ( +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/starboard_hallway) "jDk" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -41990,6 +40188,15 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop/hangar) +"jDz" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/barricade/handrail, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/hallways/lower/port_midship_hallway) "jDO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -42030,34 +40237,48 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"jEj" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comp_storage, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" +"jEA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/almayer/maint/hull/lower/l_m_s) -"jEm" = ( -/obj/structure/bed/sofa/south/white/right{ - pixel_y = 16 +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "silver" +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 }, -/area/almayer/maint/hull/upper/u_m_p) -"jEB" = ( -/obj/structure/bed/chair{ - dir = 4 +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 32 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/hull/lower/l_a_p) +"jEM" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) "jES" = ( /obj/structure/bed/chair/comfy/black{ dir = 8 }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/chief_mp_office) +"jEV" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin{ + pixel_x = -7 + }, +/obj/item/tool/pen, +/obj/item/tool/pen{ + pixel_y = 3 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/shipboard/brig/mp_bunks) "jFf" = ( /obj/structure/machinery/shower{ pixel_y = 16 @@ -42072,18 +40293,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) -"jFg" = ( -/obj/structure/pipes/standard/cap/hidden{ - dir = 4 - }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "mono" +"jFt" = ( +/obj/structure/machinery/light/small, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/area/almayer/hallways/stern_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/s_bow) "jFx" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/bucket{ @@ -42110,6 +40327,16 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop/hangar) +"jFy" = ( +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/toolbox, +/obj/item/clipboard, +/obj/item/tool/pen, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/squads/req) "jFE" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -42117,6 +40344,14 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"jFI" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "jFY" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -42140,16 +40375,18 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) -"jGN" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +"jGQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = -17 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "jGR" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -42168,21 +40405,21 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) +"jHn" = ( +/obj/structure/largecrate/random/case, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/lower/s_bow) +"jHt" = ( +/turf/closed/wall/almayer, +/area/almayer/hallways/lower/repair_bay) "jHC" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "silvercorner" }, /area/almayer/command/computerlab) -"jHG" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "jHL" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -42199,40 +40436,34 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) -"jIo" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +"jHX" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/chief_mp_office) -"jIH" = ( -/obj/structure/surface/rack, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/glasses/sunglasses/blindfold, -/obj/item/clothing/mask/muzzle, -/obj/structure/machinery/camera/autoname/almayer{ +/area/almayer/maint/hull/upper/u_m_p) +"jIC" = ( +/obj/structure/machinery/computer/working_joe{ + dir = 4; + pixel_x = -17 + }, +/turf/open/floor/almayer{ dir = 8; - name = "ship-grade camera" + icon_state = "orange" }, +/area/almayer/maint/upper/mess) +"jIJ" = ( +/obj/structure/largecrate/random/barrel/green, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/maint/hull/lower/l_f_s) "jIT" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/faxmachine/uscm/brig/chief, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) -"jIU" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_bow) "jIV" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -42242,18 +40473,6 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) -"jJe" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) "jJk" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -42263,31 +40482,6 @@ icon_state = "blue" }, /area/almayer/living/port_emb) -"jJl" = ( -/obj/structure/airlock_assembly, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"jJs" = ( -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) -"jJu" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/adv/empty, -/obj/item/storage/firstaid/adv/empty, -/obj/item/storage/firstaid/adv/empty, -/obj/structure/sign/safety/med_life_support{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/lower_medical_medbay) "jKn" = ( /turf/open/floor/almayer{ dir = 5; @@ -42310,14 +40504,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"jKA" = ( -/obj/structure/sign/safety/cryo{ - pixel_y = 26 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) "jKF" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -42343,24 +40529,12 @@ icon_state = "cargo" }, /area/almayer/engineering/port_atmos) -"jKK" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) -"jLa" = ( -/obj/structure/machinery/vending/coffee{ - density = 0; - pixel_y = 18 - }, +"jLg" = ( +/obj/structure/closet/emcloset, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/hallways/lower/port_aft_hallway) "jLj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -42376,47 +40550,12 @@ icon_state = "kitchen" }, /area/almayer/living/captain_mess) -"jLv" = ( -/obj/structure/machinery/firealarm{ - dir = 1; - pixel_y = -28 - }, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) -"jLB" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/sign/safety/east{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/coffee{ - pixel_y = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_p) -"jLK" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" - }, -/area/almayer/hallways/port_hallway) -"jLM" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, +"jLH" = ( +/obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/maint/hull/lower/l_m_p) "jLS" = ( /obj/structure/bed/chair/comfy/charlie, /obj/effect/decal/cleanable/dirt, @@ -42424,16 +40563,18 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"jLY" = ( -/obj/structure/disposalpipe/segment{ +"jMa" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/sign/safety/autoopenclose{ - pixel_x = 8; - pixel_y = -32 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/hallways/lower/port_fore_hallway) "jMm" = ( /obj/structure/closet/secure_closet/personal/cabinet{ req_access = null @@ -42486,19 +40627,19 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) -"jMK" = ( +"jML" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliaison) +"jMP" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 }, /turf/open/floor/almayer{ dir = 1; - icon_state = "orange" + icon_state = "blue" }, -/area/almayer/hallways/stern_hallway) -"jML" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliaison) +/area/almayer/hallways/upper/aft_hallway) "jMQ" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -42547,6 +40688,33 @@ icon_state = "test_floor4" }, /area/almayer/medical/containment/cell) +"jNo" = ( +/obj/structure/surface/rack, +/obj/item/tool/shovel/etool{ + pixel_x = 6 + }, +/obj/item/tool/shovel/etool, +/obj/item/tool/wirecutters, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) +"jNw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/structure/pipes/vents/scrubber{ + dir = 8 + }, +/obj/structure/sign/safety/escapepod{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/hallways/lower/port_fore_hallway) "jND" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -42554,6 +40722,11 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"jNG" = ( +/obj/structure/closet/crate/trashcart, +/obj/effect/spawner/random/balaclavas, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "jNT" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/execution) @@ -42612,6 +40785,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/gym) +"jOq" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) +"jOt" = ( +/obj/item/trash/barcardine, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "jOx" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -42664,6 +40847,24 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) +"jPu" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "Saferoom Channel"; + pixel_x = 27 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/panic) +"jPx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) "jPP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -42676,30 +40877,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/chief_mp_office) -"jQa" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"jPU" = ( +/obj/structure/machinery/light/small{ + dir = 8 }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = -28 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/maint/hull/lower/l_m_p) "jQt" = ( /turf/open/floor/almayer/research/containment/floor2{ - dir = 8 - }, -/area/almayer/medical/containment/cell) -"jQK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) + dir = 8 + }, +/area/almayer/medical/containment/cell) "jRc" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /obj/structure/machinery/status_display{ @@ -42709,6 +40899,27 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) +"jRg" = ( +/obj/effect/landmark/crap_item, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) +"jRm" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) +"jRp" = ( +/obj/structure/largecrate/supply/supplies/water, +/obj/item/toy/deck{ + pixel_y = 12 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "jRz" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -42731,15 +40942,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"jRH" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/bed/chair/bolted, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/brig/perma) "jRK" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -42793,28 +40995,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) -"jSz" = ( -/obj/structure/largecrate/random/secure, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/lower/s_bow) -"jSF" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 2; - id = "CIC Lockdown"; - layer = 2.2; - name = "\improper Combat Information Center Blast Door" - }, -/obj/structure/machinery/door/airlock/almayer/engineering/reinforced{ - dir = 1; - name = "\improper Command Power Substation" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/upper/mess) "jSU" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -42843,20 +41023,6 @@ icon_state = "green" }, /area/almayer/living/offices) -"jTb" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/device/flashlight/lamp{ - pixel_y = 8 - }, -/obj/item/clothing/glasses/science{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/device/flash, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/medical/upper_medical) "jTj" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -42866,12 +41032,41 @@ icon_state = "plating" }, /area/almayer/medical/upper_medical) +"jTt" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door_control{ + id = "laddernortheast"; + name = "North East Ladders Shutters"; + pixel_y = -25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "jTB" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "orangecorner" }, /area/almayer/engineering/lower) +"jTH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/vehiclehangar) "jTI" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -42879,6 +41074,11 @@ icon_state = "emerald" }, /area/almayer/squads/charlie_delta_shared) +"jTU" = ( +/obj/structure/bed, +/obj/item/bedsheet/red, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/warden_office) "jUb" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/toy/deck{ @@ -42896,6 +41096,10 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) +"jUh" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) "jUl" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -42933,18 +41137,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) -"jUK" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Hangar Lockdown"; - name = "\improper Hangar Lockdown Blast Door" - }, -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/lower/l_f_s) "jUM" = ( /obj/structure/machinery/camera/autoname/almayer/containment{ dir = 8 @@ -42954,6 +41146,16 @@ icon_state = "dark_sterile" }, /area/almayer/medical/medical_science) +"jUV" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_s) "jUY" = ( /turf/open/floor/almayer{ icon_state = "silver" @@ -42971,16 +41173,6 @@ }, /turf/open/floor/carpet, /area/almayer/command/corporateliaison) -"jVi" = ( -/obj/structure/surface/table/almayer, -/obj/effect/spawner/random/powercell, -/obj/effect/spawner/random/powercell, -/obj/effect/spawner/random/bomb_supply, -/obj/effect/spawner/random/bomb_supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) "jVr" = ( /obj/structure/machinery/cm_vending/clothing/marine/alpha{ density = 0; @@ -43008,24 +41200,6 @@ icon_state = "test_floor5" }, /area/almayer/command/computerlab) -"jVM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) -"jVP" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/execution) "jWb" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -43038,28 +41212,12 @@ "jWh" = ( /turf/closed/wall/almayer, /area/almayer/engineering/upper_engineering/port) -"jWn" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/secure_data{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/panic) "jWr" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/wood/ship, /area/almayer/living/chapel) -"jWt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) "jWu" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -43069,13 +41227,19 @@ icon_state = "plate" }, /area/almayer/living/offices) -"jWU" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor/plating/almayer{ - allow_construction = 0 +"jXc" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -17 + }, +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/shipboard/brig/starboard_hallway) "jXd" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -43084,31 +41248,26 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"jXk" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/pipes/vents/scrubber{ - dir = 1 +"jXf" = ( +/obj/structure/machinery/door/airlock/almayer/medical{ + id_tag = "or03"; + name = "Lobby" }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "test_floor4" }, -/area/almayer/hallways/vehiclehangar) -"jXC" = ( -/obj/effect/landmark/start/doctor, -/obj/effect/landmark/late_join/doctor, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/offices) -"jXL" = ( -/obj/structure/platform{ - dir = 8 +/area/almayer/medical/lower_medical_medbay) +"jXR" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/blocker/forcefield/multitile_vehicles, +/obj/structure/sign/safety/stairs{ + pixel_x = 8; + pixel_y = 32 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/turf/open/floor/plating/almayer{ + allow_construction = 0 }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/hallways/lower/starboard_fore_hallway) "jYc" = ( /obj/item/bedsheet/blue{ layer = 3.2 @@ -43151,21 +41310,24 @@ icon_state = "blue" }, /area/almayer/living/port_emb) -"jYd" = ( -/obj/structure/machinery/gear{ - id = "vehicle_elevator_gears" - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/vehiclehangar) -"jYh" = ( -/obj/structure/closet, -/obj/item/clothing/glasses/welding, +"jYm" = ( +/obj/item/reagent_container/food/snacks/wrapped/chunk, +/obj/structure/surface/rack, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/hull/upper/p_stern) +"jYM" = ( +/obj/structure/ladder{ + height = 1; + id = "ForePortMaint" + }, +/obj/structure/sign/safety/ladder{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/almayer, +/area/almayer/maint/hull/lower/p_bow) "jYR" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -43191,6 +41353,30 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_four) +"jZe" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_fore_hallway) +"jZj" = ( +/obj/structure/surface/rack, +/obj/item/book/manual/orbital_cannon_manual, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/maint/hull/upper/u_a_p) +"jZo" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_m_p) "jZs" = ( /obj/structure/machinery/light/containment{ dir = 4 @@ -43226,15 +41412,6 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) -"jZz" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/lower/cryo_cells) "jZC" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -43247,46 +41424,36 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) -"jZD" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/u_m_s) -"jZS" = ( -/obj/structure/reagent_dispensers/fueltank/oxygentank, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering/upper_engineering/starboard) "jZU" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 }, /turf/open/floor/almayer, /area/almayer/medical/containment/cell/cl) +"jZW" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "jZY" = ( /obj/structure/closet/l3closet/virology, /turf/open/floor/almayer{ icon_state = "redfull" }, /area/almayer/medical/upper_medical) -"kai" = ( -/obj/structure/largecrate/supply/ammo/shotgun, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) -"kaj" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, +"kac" = ( +/obj/structure/surface/rack, +/obj/item/storage/toolbox/mechanical, +/obj/item/tool/hand_labeler, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/maint/hull/upper/s_bow) "kam" = ( /obj/item/tool/screwdriver{ layer = 2.9; @@ -43300,18 +41467,17 @@ "kan" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/lower_medical_medbay) -"kaA" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +"kaq" = ( +/obj/effect/projector{ + name = "Almayer_Up2"; + vector_x = -1; + vector_y = 100 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" + allow_construction = 0; + icon_state = "plate" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "kaB" = ( /obj/structure/machinery/cm_vending/gear/tl{ density = 0; @@ -43323,17 +41489,6 @@ icon_state = "red" }, /area/almayer/squads/alpha) -"kaF" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/blocker/forcefield/multitile_vehicles, -/obj/structure/sign/safety/stairs{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/starboard_hallway) "kaI" = ( /obj/structure/bed/chair{ dir = 4 @@ -43342,6 +41497,16 @@ icon_state = "bluefull" }, /area/almayer/squads/charlie_delta_shared) +"kaQ" = ( +/obj/structure/disposalpipe/junction, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) "kaS" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -43390,23 +41555,6 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering) -"kbz" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/toolbox/electrical{ - pixel_y = 9 - }, -/obj/item/storage/toolbox/mechanical/green, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) "kbH" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_AresDown"; @@ -43434,6 +41582,16 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/containment) +"kbT" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "kbV" = ( /obj/structure/platform{ dir = 1 @@ -43450,6 +41608,17 @@ /obj/structure/machinery/camera/autoname/almayer, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"kcg" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_midship_hallway) "kcl" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -43460,6 +41629,12 @@ "kcp" = ( /turf/closed/wall/almayer, /area/almayer/living/auxiliary_officer_office) +"kcs" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_p) "kcA" = ( /obj/structure/machinery/light{ dir = 1 @@ -43469,6 +41644,12 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"kcG" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) "kcH" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/living/synthcloset) @@ -43499,6 +41680,12 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) +"kdo" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) "kdv" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -43514,46 +41701,38 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"kdX" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, +"keE" = ( +/obj/structure/largecrate/random/barrel/red, +/obj/structure/machinery/light/small, /turf/open/floor/almayer{ - dir = 10; - icon_state = "silver" + icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_p) -"kel" = ( -/obj/structure/surface/table/almayer, -/obj/item/weapon/gun/revolver/m44{ - desc = "A bulky revolver, occasionally carried by assault troops and officers in the Colonial Marines, as well as civilian law enforcement. Fires .44 Magnum rounds. 'J.P' Is engraved into the barrel." +/area/almayer/maint/hull/upper/u_a_s) +"keG" = ( +/obj/structure/machinery/door/airlock/almayer/security{ + dir = 2; + name = "\improper Interrogation Observation" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_f_p) -"keN" = ( -/obj/structure/machinery/light/small, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 +/area/almayer/shipboard/brig/interrogation) +"keO" = ( +/obj/structure/largecrate/random/secure, +/obj/effect/decal/warning_stripes{ + icon_state = "E" }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/maint/hull/lower/l_a_p) "keR" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) -"kff" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/hallways/stern_hallway) "kfo" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -43571,6 +41750,13 @@ icon_state = "test_floor4" }, /area/almayer/hallways/upper/port) +"kfB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) "kfE" = ( /obj/structure/bed/sofa/south/grey/right, /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ @@ -43589,26 +41775,9 @@ icon_state = "plate" }, /area/almayer/engineering/lower) -"kfP" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) "kfU" = ( /turf/open/floor/plating, /area/almayer/powered/agent) -"kfV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 2; - pixel_y = 2 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_p) "kgp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -43628,14 +41797,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"kgr" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) "kgs" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -43648,17 +41809,29 @@ /obj/structure/machinery/door/poddoor/almayer/biohazard/white, /turf/open/floor/plating, /area/almayer/medical/medical_science) -"kgQ" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/adv{ - pixel_x = 6; - pixel_y = 6 +"kgt" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) +"kgD" = ( +/obj/structure/sign/safety/cryo{ + pixel_x = 35 }, -/obj/item/storage/firstaid/regular, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/maint/hull/lower/l_m_s) +"kgS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/vehiclehangar) "khd" = ( /obj/structure/bed/chair{ dir = 4 @@ -43680,36 +41853,6 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) -"khh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/obj/structure/sign/safety/autoopenclose{ - pixel_y = 32 - }, -/obj/structure/sign/safety/water{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) -"khz" = ( -/obj/structure/machinery/light/small{ - dir = 1; - pixel_y = 20 - }, -/obj/structure/largecrate, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "khD" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -43721,6 +41864,15 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"khI" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "khJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -43737,33 +41889,13 @@ icon_state = "tcomms" }, /area/almayer/command/airoom) -"kij" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "kil" = ( -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_s) -"kin" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" }, -/area/almayer/maint/hull/lower/l_a_s) +/obj/item/storage/belt/utility, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "kio" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -43776,6 +41908,24 @@ icon_state = "plate" }, /area/almayer/living/port_emb) +"kiq" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) +"kiy" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/hallways/lower/port_midship_hallway) "kiG" = ( /obj/structure/machinery/power/smes/buildable, /obj/structure/machinery/status_display{ @@ -43799,6 +41949,14 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"kiR" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_a_s) "kiT" = ( /obj/structure/platform{ dir = 8 @@ -43835,18 +41993,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"kiY" = ( -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/smg/m39{ - pixel_y = 6 - }, -/obj/item/weapon/gun/smg/m39{ - pixel_y = -6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) "kjk" = ( /obj/structure/machinery/cryopod/right, /obj/structure/sign/safety/cryo{ @@ -43856,6 +42002,22 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cryo) +"kjw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/lower/vehiclehangar) "kjD" = ( /obj/structure/machinery/computer/demo_sim{ dir = 4; @@ -43869,48 +42031,24 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) -"kjE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) "kjO" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "orangecorner" }, /area/almayer/engineering/lower/engine_core) -"kjY" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, +"kjW" = ( +/obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) -"kkg" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) -"kkj" = ( -/obj/structure/prop/holidays/string_lights{ - pixel_y = 27 - }, -/obj/structure/largecrate/random/barrel/red, -/obj/item/reagent_container/food/drinks/cans/cola{ - pixel_x = -2; - pixel_y = 16 + icon_state = "cargo" }, +/area/almayer/hallways/lower/port_midship_hallway) +"kjY" = ( +/obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/maint/hull/lower/l_a_s) "kkk" = ( /obj/structure/machinery/power/monitor{ name = "Core Power Monitoring" @@ -43923,13 +42061,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower/engine_core) -"kkm" = ( -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) -"kks" = ( -/turf/open/floor/plating, -/area/almayer/maint/hull/lower/l_m_p) "kkt" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/marine_law, @@ -43957,14 +42088,17 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) -"kkE" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 2; - pixel_y = 3 +"kkI" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) +"kkN" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "kkW" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/atmospipes, @@ -43974,6 +42108,12 @@ icon_state = "orange" }, /area/almayer/engineering/lower) +"klr" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/upper/aft_hallway) "klH" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -43982,6 +42122,10 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) +"klT" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) "kmd" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -43991,12 +42135,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"kmk" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hallways/vehiclehangar) "kmp" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -44010,30 +42148,22 @@ icon_state = "plate" }, /area/almayer/living/offices) -"kmu" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) +"kmx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "kmE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north2) -"kmL" = ( -/obj/structure/sign/safety/storage{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) -"kmZ" = ( -/obj/structure/machinery/cm_vending/sorted/medical/bolted, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lockerroom) "kng" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -44042,6 +42172,19 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"knl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) +"knm" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "knH" = ( /obj/structure/machinery/vending/coffee, /obj/structure/sign/safety/coffee{ @@ -44064,34 +42207,13 @@ icon_state = "cargo" }, /area/almayer/lifeboat_pumps/south2) -"knO" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ +"kow" = ( +/obj/structure/disposalpipe/segment{ dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) -"koa" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) -"koc" = ( -/obj/structure/machinery/status_display{ - pixel_y = -30 - }, -/turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "pipe-c" }, -/area/almayer/hallways/port_hallway) -"kog" = ( -/obj/structure/machinery/power/apc/almayer, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/maint/hull/lower/l_f_p) "koB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -44125,12 +42247,11 @@ icon_state = "test_floor4" }, /area/almayer/engineering/lower/engine_core) -"kpl" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) +"kpj" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "kpo" = ( /obj/structure/machinery/floodlight/landing{ name = "bolted floodlight" @@ -44151,6 +42272,29 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"kqb" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) +"kqd" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/mp_bunks) +"kqm" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "kqt" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -44161,22 +42305,6 @@ icon_state = "test_floor4" }, /area/almayer/living/bridgebunks) -"kqu" = ( -/obj/item/folder/red{ - desc = "A red folder. The previous contents are a mystery, though the number 28 has been written on the inside of each flap numerous times. Smells faintly of cough syrup."; - name = "folder: 28"; - pixel_x = -4; - pixel_y = 5 - }, -/obj/structure/surface/table/almayer, -/obj/item/toy/crayon{ - pixel_x = 9; - pixel_y = -2 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) "kqv" = ( /obj/structure/machinery/light{ dir = 1 @@ -44203,13 +42331,32 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"kqI" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_y = 17 +"kqB" = ( +/obj/structure/prop/holidays/string_lights{ + pixel_y = 27 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_p) +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/surface/table/almayer, +/obj/item/storage/box/drinkingglasses, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) +"kqC" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/largecrate/random/barrel/green, +/obj/structure/sign/safety/maint{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_bow) "kqK" = ( /obj/structure/machinery/conveyor{ dir = 8; @@ -44231,26 +42378,6 @@ icon_state = "bluecorner" }, /area/almayer/living/basketball) -"krm" = ( -/obj/item/paper/prison_station/interrogation_log{ - pixel_x = 10; - pixel_y = 7 - }, -/obj/structure/largecrate/random/barrel/green, -/obj/item/limb/hand/l_hand{ - pixel_x = -5; - pixel_y = 14 - }, -/obj/effect/spawner/random/balaclavas, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) -"kro" = ( -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) "krp" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/cups, @@ -44270,13 +42397,17 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/perma) -"krA" = ( -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = -16 +"krG" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/maint/hull/upper/s_bow) +"krJ" = ( +/obj/item/tool/wet_sign, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "krN" = ( /obj/structure/machinery/conveyor{ id = "req_belt" @@ -44338,6 +42469,10 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) +"ksm" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/starboard_hallway) "ksp" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -44346,22 +42481,49 @@ icon_state = "cargo" }, /area/almayer/squads/bravo) +"ksw" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_stern) "ksN" = ( /turf/open/floor/almayer/uscm/directional{ dir = 6 }, -/area/almayer/living/briefing) -"ktH" = ( +/area/almayer/living/briefing) +"kti" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 2; + pixel_y = 3 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ktl" = ( +/obj/structure/machinery/firealarm{ + dir = 1; + pixel_y = -28 + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ktI" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SE-out" + icon_state = "W" }, -/obj/structure/machinery/camera/autoname/almayer{ +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/almayer{ dir = 4; - name = "ship-grade camera" + icon_state = "silver" }, -/obj/structure/closet/emcloset, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) +/area/almayer/hallways/lower/repair_bay) +"ktR" = ( +/obj/item/trash/crushed_cup, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "ktX" = ( /turf/open/floor/almayer{ dir = 4; @@ -44385,12 +42547,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"kus" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) "kuu" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -44404,9 +42560,6 @@ icon_state = "emeraldcorner" }, /area/almayer/living/briefing) -"kuI" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/p_bow) "kuJ" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer{ @@ -44414,6 +42567,14 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"kuK" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_p) "kvf" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -44438,15 +42599,16 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"kvj" = ( -/obj/structure/machinery/light/small{ +"kvL" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/almayer_network{ dir = 4 }, -/obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "red" }, -/area/almayer/maint/hull/upper/p_bow) +/area/almayer/shipboard/brig/warden_office) "kvU" = ( /obj/structure/surface/table/almayer, /turf/open/floor/plating/plating_catwalk, @@ -44471,6 +42633,21 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering) +"kwg" = ( +/obj/structure/bookcase/manuals/medical, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_s) +"kwi" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) "kwo" = ( /obj/structure/surface/rack, /turf/open/floor/almayer, @@ -44494,13 +42671,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"kwU" = ( -/obj/structure/machinery/photocopier, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "kxd" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -44514,6 +42684,14 @@ icon_state = "dark_sterile" }, /area/almayer/living/port_emb) +"kxe" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/p_bow) "kxo" = ( /obj/structure/machinery/washing_machine, /obj/structure/machinery/washing_machine{ @@ -44536,6 +42714,12 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) +"kxP" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/shipboard/brig/mp_bunks) "kyh" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -44555,13 +42739,9 @@ icon_state = "test_floor4" }, /area/almayer/hallways/upper/starboard) -"kyH" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) +"kyw" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/lower/l_m_s) "kyN" = ( /obj/structure/disposalpipe/segment, /obj/structure/sign/safety/distribution_pipes{ @@ -44572,19 +42752,9 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"kyQ" = ( -/obj/structure/surface/table/almayer, -/obj/item/organ/heart/prosthetic{ - pixel_x = -4 - }, -/obj/item/circuitboard{ - pixel_x = 12; - pixel_y = 7 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) +"kyP" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/lower/l_f_p) "kyR" = ( /obj/structure/safe/co_office, /obj/item/weapon/pole/fancy_cane, @@ -44610,22 +42780,20 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) -"kyZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_umbilical) "kzb" = ( /obj/structure/machinery/vending/walkman, /turf/open/floor/almayer, /area/almayer/living/briefing) -"kzd" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, +"kzc" = ( +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21"; + pixel_y = 11 + }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/maint/hull/upper/u_f_p) "kzk" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -44644,6 +42812,13 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/execution) +"kzs" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) "kzy" = ( /obj/structure/bed/chair, /turf/open/floor/almayer{ @@ -44702,12 +42877,15 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) -"kzP" = ( +"kzR" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/almayer{ - dir = 9; - icon_state = "red" + dir = 4; + icon_state = "orange" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/upper/stern_hallway) "kzT" = ( /obj/structure/machinery/door_control{ id = "ARES StairsLower"; @@ -44730,43 +42908,80 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) -"kAk" = ( -/obj/structure/machinery/light/small{ - dir = 4 +"kAj" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 }, -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = -16 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) +/area/almayer/hallways/lower/port_aft_hallway) "kAm" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) -"kAL" = ( -/obj/structure/closet/secure_closet/brig, -/turf/open/floor/almayer{ - icon_state = "red" +"kAp" = ( +/obj/structure/surface/rack{ + desc = "A bunch of metal shelves stacked on top of eachother. Excellent for storage purposes, less so as cover. One of the shelf legs is damaged, resulting in the rack being propped up by what appears to be circuit boards." }, -/area/almayer/shipboard/brig/processing) -"kAN" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 +/obj/structure/machinery/light/small{ + dir = 4; + status = 3; + icon_state = "bulb-burned" + }, +/obj/effect/decal/cleanable/blood, +/obj/item/prop{ + icon = 'icons/obj/items/bloodpack.dmi'; + icon_state = "bloodpack"; + name = "blood bag"; + desc = "A blood bag with a hole in it. The rats must have gotten to it first." + }, +/obj/item/prop{ + icon = 'icons/obj/items/bloodpack.dmi'; + icon_state = "bloodpack"; + name = "blood bag"; + desc = "A blood bag with a hole in it. The rats must have gotten to it first." + }, +/obj/item/prop{ + icon = 'icons/obj/items/bloodpack.dmi'; + icon_state = "bloodpack"; + name = "blood bag"; + desc = "A blood bag with a hole in it. The rats must have gotten to it first." }, +/obj/item/prop{ + icon = 'icons/obj/items/circuitboards.dmi'; + icon_state = "id_mod"; + name = "circuit board"; + desc = "The words \"Cloning Pod\" are scrawled onto it. It appears to be heavily damaged."; + layer = 2.78; + pixel_y = 10; + pixel_x = 8 + }, +/obj/item/prop{ + icon = 'icons/obj/items/circuitboards.dmi'; + icon_state = "id_mod"; + name = "circuit board"; + desc = "The words \"Cloning Scanner\" are scrawled onto it. It appears to be heavily damaged."; + layer = 2.79; + pixel_y = 7; + pixel_x = 8 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/lower_medical_medbay) +"kAv" = ( +/obj/structure/largecrate/supply/ammo/shotgun, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_s) -"kAO" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +"kAL" = ( +/obj/structure/closet/secure_closet/brig, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "red" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/shipboard/brig/processing) "kAU" = ( /obj/structure/platform{ dir = 4 @@ -44776,21 +42991,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) -"kBh" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/almayer/security/reinforced{ - dir = 2; - name = "\improper Execution Equipment" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/execution) "kBo" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -44808,13 +43008,6 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) -"kBK" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 2 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "kBP" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -44831,6 +43024,14 @@ icon_state = "cargo" }, /area/almayer/living/tankerbunks) +"kCd" = ( +/obj/structure/machinery/gear{ + id = "vehicle_elevator_gears" + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/lower/vehiclehangar) "kCi" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/port_missiles) @@ -44853,11 +43054,14 @@ }, /area/almayer/hallways/hangar) "kCo" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 +/turf/open/floor/almayer, +/area/almayer/hallways/upper/stern_hallway) +"kCu" = ( +/obj/structure/machinery/portable_atmospherics/powered/scrubber, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/maint/hull/upper/u_a_s) "kCE" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -44873,23 +43077,21 @@ icon_state = "dark_sterile" }, /area/almayer/medical/containment) -"kCN" = ( -/obj/structure/bed/chair{ +"kCY" = ( +/obj/structure/machinery/sleep_console{ dir = 8 }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"kCS" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) -"kDj" = ( -/obj/structure/bed, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" + icon_state = "dark_sterile" }, -/area/almayer/medical/lower_medical_medbay) +/area/almayer/shipboard/brig/medical) +"kDd" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) "kDk" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -44912,13 +43114,6 @@ /obj/structure/pipes/vents/scrubber, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"kDP" = ( -/obj/effect/decal/cleanable/blood, -/obj/structure/prop/broken_arcade, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) "kDR" = ( /obj/structure/disposalpipe/junction{ dir = 1; @@ -44932,24 +43127,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"kDT" = ( -/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/maint/lower/cryo_cells) -"kEb" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "kEc" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -45003,16 +43180,15 @@ icon_state = "redfull" }, /area/almayer/living/briefing) -"kEJ" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/emails{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_s) +"kEE" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_aft_hallway) +"kEW" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/vehiclehangar) "kFe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/firealarm{ @@ -45023,12 +43199,6 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) -"kFi" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) "kFs" = ( /obj/structure/machinery/light{ dir = 4 @@ -45043,19 +43213,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"kFL" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) -"kFM" = ( -/obj/structure/sign/safety/storage{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) "kFO" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -45067,22 +43224,22 @@ icon_state = "plating" }, /area/almayer/squads/req) +"kFU" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) "kFY" = ( /obj/structure/sign/safety/cryo{ pixel_x = 7 }, /turf/closed/wall/almayer, /area/almayer/living/cryo_cells) -"kGh" = ( -/obj/structure/machinery/cm_vending/sorted/medical/marinemed, -/obj/structure/sign/safety/medical{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/panic) +"kGi" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) "kGu" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -45095,6 +43252,12 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cryo) +"kGw" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_fore_hallway) "kGF" = ( /obj/structure/reagent_dispensers/water_cooler/stacks{ density = 0; @@ -45105,21 +43268,6 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) -"kGI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) -"kGL" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/aft_hallway) "kGQ" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 @@ -45128,20 +43276,11 @@ icon_state = "containment_corner_variant_2" }, /area/almayer/medical/containment/cell) -"kGZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 4 - }, +"kGS" = ( /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "mono" }, -/area/almayer/maint/hull/lower/l_f_s) -"kHa" = ( -/turf/closed/wall/almayer, -/area/almayer/shipboard/brig/surgery) +/area/almayer/hallways/upper/aft_hallway) "kHd" = ( /obj/structure/machinery/computer/arcade, /obj/item/prop/helmetgarb/spacejam_tickets{ @@ -45153,39 +43292,22 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"kHj" = ( -/obj/effect/projector{ - name = "Almayer_Up2"; - vector_x = -1; - vector_y = 100 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"kHq" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/lower/l_a_s) -"kHv" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) -"kHx" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 +"kHo" = ( +/obj/item/device/camera{ + pixel_x = 4; + pixel_y = 8 }, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice1"; - pixel_x = 16; - pixel_y = -8 +/obj/structure/surface/table/almayer, +/obj/item/device/camera_film{ + pixel_x = 4; + pixel_y = -2 }, +/obj/item/device/camera_film, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "red" }, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/shipboard/brig/starboard_hallway) "kHS" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -45195,12 +43317,6 @@ 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 @@ -45210,35 +43326,25 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"kIj" = ( -/obj/structure/surface/table/almayer, -/obj/item/fuel_cell, -/obj/item/fuel_cell, -/obj/item/fuel_cell, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering/lower/engine_core) -"kIm" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hallways/starboard_umbilical) -"kIr" = ( +"kIf" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) +"kIk" = ( /obj/structure/prop/invuln/lattice_prop{ dir = 1; icon_state = "lattice-simple"; - pixel_x = -16; - pixel_y = 17 + pixel_x = 16; + pixel_y = -16 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"kIl" = ( +/obj/structure/machinery/light/small{ + dir = 4 }, -/area/almayer/maint/hull/lower/l_m_p) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) "kIP" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -45247,6 +43353,25 @@ icon_state = "cargo" }, /area/almayer/squads/charlie) +"kJc" = ( +/obj/structure/ladder{ + height = 1; + id = "ForeStarboardMaint" + }, +/obj/structure/sign/safety/ladder{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/almayer, +/area/almayer/maint/hull/lower/s_bow) +"kJh" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) "kJi" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -45259,22 +43384,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"kJr" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) -"kJD" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) "kJH" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -45296,13 +43405,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) -"kJV" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) "kJW" = ( /obj/structure/machinery/door/window/westright, /obj/structure/machinery/shower{ @@ -45316,15 +43418,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/commandbunks) -"kKb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +"kJZ" = ( +/obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer{ - dir = 4; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/maint/hull/lower/l_a_s) "kKk" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -45353,12 +43452,24 @@ icon_state = "silver" }, /area/almayer/command/airoom) +"kKB" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/port_aft_hallway) "kKR" = ( /obj/structure/pipes/vents/pump{ dir = 1 }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) +"kKY" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) "kLc" = ( /obj/structure/machinery/door/airlock/almayer/maint{ req_one_access = null; @@ -45377,20 +43488,57 @@ icon_state = "orange" }, /area/almayer/squads/bravo) -"kLp" = ( -/obj/structure/sign/safety/stairs{ - pixel_x = -17; - pixel_y = 7 +"kLm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/sign/safety/escapepod{ - pixel_x = -17; - pixel_y = -8 +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) +"kLB" = ( +/obj/docking_port/stationary/escape_pod/east, +/turf/open/floor/plating, +/area/almayer/maint/hull/upper/u_m_s) +"kLE" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/almayer{ + dir = 4; + id = "hangarentrancenorth"; + name = "\improper North Hangar Podlock" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_fore_hallway) +"kLP" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/open/floor/almayer{ dir = 8; - icon_state = "red" + icon_state = "greencorner" + }, +/area/almayer/squads/req) +"kLZ" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) +"kMa" = ( +/obj/structure/platform_decoration, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/maint/hull/upper/u_a_s) "kMp" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -45403,6 +43551,17 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) +"kMr" = ( +/obj/item/trash/uscm_mre, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_x = 16; + pixel_y = -16 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "kMH" = ( /obj/structure/machinery/door/window/brigdoor/southright{ id = "Cell 1"; @@ -45426,14 +43585,37 @@ icon_state = "outerhull_dir" }, /area/almayer/engineering/upper_engineering/port) +"kMR" = ( +/obj/effect/spawner/random/toolbox, +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) "kMW" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/structure/closet/secure_closet/personal/cabinet{ + req_access = null }, +/obj/item/clothing/suit/chef/classic, +/obj/item/tool/kitchen/knife/butcher, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/hull/lower/s_bow) +"kNf" = ( +/obj/structure/bed/chair/office/dark, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/panic) "kNk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -45446,6 +43628,9 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) +"kNq" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/hull/upper/u_a_p) "kNx" = ( /obj/structure/sign/safety/ref_bio_storage{ pixel_x = -17; @@ -45533,6 +43718,40 @@ icon_state = "dark_sterile" }, /area/almayer/command/corporateliaison) +"kOJ" = ( +/obj/item/storage/backpack/marine/satchel{ + desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; + icon = 'icons/obj/janitor.dmi'; + icon_state = "trashbag3"; + name = "trash bag"; + pixel_x = -4; + pixel_y = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) +"kOR" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/p_bow) +"kOW" = ( +/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/req) "kPx" = ( /obj/structure/surface/table/almayer, /obj/item/device/mass_spectrometer, @@ -45611,6 +43830,14 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"kQr" = ( +/obj/structure/surface/table/almayer, +/obj/item/trash/pistachios, +/obj/item/tool/lighter/random{ + pixel_x = 13 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "kQu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -45622,17 +43849,6 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/processing) -"kQZ" = ( -/obj/structure/largecrate/random/barrel/red, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) "kRd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -45648,6 +43864,21 @@ icon_state = "cargo" }, /area/almayer/command/lifeboat) +"kRk" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/screwdriver, +/obj/item/prop/helmetgarb/gunoil{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/item/weapon/gun/rifle/l42a{ + pixel_x = 17; + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "kRD" = ( /obj/item/reagent_container/glass/bucket/janibucket, /obj/structure/machinery/light{ @@ -45665,6 +43896,13 @@ icon_state = "cargo" }, /area/almayer/engineering/lower/workshop/hangar) +"kRN" = ( +/obj/structure/surface/rack, +/obj/item/clothing/glasses/meson, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/maint/hull/upper/u_a_p) "kRP" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/item/prop/magazine/dirty/torn, @@ -45674,6 +43912,28 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"kRU" = ( +/obj/vehicle/powerloader, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/lower/repair_bay) +"kSn" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_bow) "kSv" = ( /obj/item/reagent_container/glass/bucket/janibucket, /turf/open/floor/almayer{ @@ -45697,11 +43957,16 @@ }, /area/almayer/command/airoom) "kSA" = ( -/obj/effect/spawner/random/toolbox, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/almayer{ + dir = 4; + id = "hangarentrancesouth"; + name = "\improper South Hangar Podlock" + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_a_s) +/area/almayer/hallways/lower/port_fore_hallway) "kSH" = ( /obj/structure/sign/prop1{ pixel_y = 32 @@ -45714,23 +43979,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"kSJ" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) -"kSN" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/aft_hallway) "kSU" = ( /obj/structure/transmitter/no_dnd{ name = "Requisition Telephone"; @@ -45743,14 +43991,13 @@ icon_state = "plating" }, /area/almayer/squads/req) -"kTt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"kTp" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/area/almayer/maint/hull/lower/l_a_p) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/medical) "kTv" = ( /obj/structure/machinery/light{ dir = 4 @@ -45776,6 +44023,16 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"kUg" = ( +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 21 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/shipboard/brig/warden_office) "kUh" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ @@ -45788,33 +44045,37 @@ icon_state = "test_floor4" }, /area/almayer/living/pilotbunks) -"kUr" = ( -/obj/structure/sign/poster{ - pixel_y = -32 +"kUs" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) -"kUw" = ( -/obj/structure/surface/rack, -/obj/item/storage/bag/trash{ - pixel_x = 2; - pixel_y = 2 +/area/almayer/hallways/upper/aft_hallway) +"kUA" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_umbilical) +"kUI" = ( +/obj/structure/machinery/light{ + dir = 1 }, -/obj/item/storage/bag/trash{ - pixel_x = -8; - pixel_y = 4 +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" }, -/obj/item/storage/bag/trash{ - pixel_x = -3; - pixel_y = -2 +/area/almayer/hallways/lower/starboard_midship_hallway) +"kUL" = ( +/obj/structure/machinery/light/small{ + dir = 1 }, +/obj/structure/closet/emcloset, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, -/area/almayer/engineering/upper_engineering/port) +/area/almayer/maint/hull/upper/u_m_p) "kUQ" = ( /obj/effect/decal/cleanable/blood/oil/streak, /obj/structure/machinery/constructable_frame, @@ -45853,13 +44114,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) "kWc" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/area/almayer/maint/hull/upper/u_a_s) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/stern_hallway) "kWk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -45882,15 +44143,14 @@ icon_state = "silvercorner" }, /area/almayer/command/cichallway) -"kWA" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/maint/hull/upper/p_bow) -"kWG" = ( -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +"kWI" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, /turf/open/floor/almayer{ - icon_state = "redfull" + icon_state = "test_floor4" }, -/area/almayer/shipboard/panic) +/area/almayer/maint/hull/lower/l_f_s) "kWN" = ( /obj/structure/sign/poster{ desc = "It says DRUG."; @@ -45935,17 +44195,6 @@ icon_state = "plate" }, /area/almayer/squads/bravo) -"kXe" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_s) "kXf" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -45975,12 +44224,15 @@ icon_state = "plating" }, /area/almayer/shipboard/stern_point_defense) -"kXq" = ( -/obj/item/tool/warning_cone{ - pixel_y = 13 +"kXt" = ( +/obj/structure/closet/fireaxecabinet{ + pixel_y = 32 }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) "kXu" = ( /turf/open/floor/almayer{ dir = 8; @@ -46002,38 +44254,12 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) -"kXV" = ( +"kYl" = ( /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Port Railguns and Viewing Room" - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/u_f_p) -"kYb" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/door_control{ - id = "Under Construction Shutters"; - name = "shutter-control"; - pixel_x = -25 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"kYj" = ( -/obj/structure/sign/safety/cryo{ - pixel_x = 35 - }, -/turf/open/floor/almayer{ - icon_state = "plate" + dir = 9 }, -/area/almayer/maint/hull/lower/l_m_s) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) "kYt" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/storage/bible{ @@ -46070,28 +44296,15 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) -"kYP" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/hallways/stern_hallway) "kYU" = ( -/obj/structure/sign/safety/escapepod{ - pixel_y = 32 - }, -/obj/structure/sign/safety/east{ - pixel_x = 15; - pixel_y = 32 +/obj/structure/machinery/firealarm{ + pixel_y = 28 }, /turf/open/floor/almayer{ dir = 1; - icon_state = "green" + icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/shipboard/brig/starboard_hallway) "kYV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -46104,12 +44317,6 @@ icon_state = "plate" }, /area/almayer/living/offices) -"kZA" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/port_umbilical) "kZN" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -46147,12 +44354,6 @@ icon_state = "emerald" }, /area/almayer/living/gym) -"laB" = ( -/obj/structure/surface/rack, -/obj/item/tool/weldingtool, -/obj/item/tool/wrench, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/p_bow) "laM" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -46174,6 +44375,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) +"laP" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) "laQ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -46208,6 +44416,23 @@ }, /turf/open/floor/plating, /area/almayer/command/cic) +"lbc" = ( +/obj/structure/stairs{ + dir = 8; + icon_state = "ramptop" + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/projector{ + name = "Almayer_Down2"; + vector_x = 1; + vector_y = -100 + }, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/upper/aft_hallway) "lbf" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -46264,20 +44489,6 @@ icon_state = "bluefull" }, /area/almayer/living/bridgebunks) -"lcL" = ( -/obj/structure/largecrate/random/barrel, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) -"lcM" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) "lcV" = ( /obj/structure/bed/chair{ dir = 4 @@ -46293,9 +44504,23 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) +"ldb" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_fore_hallway) "ldc" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/engineering/lower/workshop) +"lde" = ( +/obj/structure/machinery/conveyor{ + id = "req_belt" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "ldl" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -46304,6 +44529,16 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) +"ldq" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "ldt" = ( /obj/structure/machinery/conveyor{ dir = 8; @@ -46314,18 +44549,22 @@ icon_state = "plate" }, /area/almayer/living/gym) -"ldu" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "ldC" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/captain_mess) +"ldF" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/s_bow) +"ldW" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) "lea" = ( /obj/structure/sink{ dir = 4; @@ -46372,27 +44611,12 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"leL" = ( -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice-simple"; - pixel_x = -16; - pixel_y = 17 - }, +"leM" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_m_p) -"leQ" = ( -/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ - name = "\improper Armourer's Workshop"; - req_access = null - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/hull/upper/s_stern) "leY" = ( /obj/structure/bed/sofa/south/white/left, /turf/open/floor/almayer{ @@ -46400,32 +44624,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"leZ" = ( -/obj/structure/machinery/door_control/cl/quarter/backdoor{ - pixel_x = -25; - pixel_y = 23 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) -"lfa" = ( -/obj/structure/surface/table/almayer, -/obj/item/toy/deck, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/shipboard/brig/cic_hallway) -"lfs" = ( -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) "lft" = ( /obj/structure/surface/table/almayer, /obj/item/storage/firstaid/fire, @@ -46434,6 +44632,13 @@ icon_state = "orange" }, /area/almayer/engineering/lower) +"lfx" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"lfz" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) "lfH" = ( /obj/structure/machinery/light{ dir = 4 @@ -46443,6 +44648,12 @@ icon_state = "blue" }, /area/almayer/living/basketball) +"lgk" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_bow) "lgt" = ( /obj/structure/sink{ dir = 4; @@ -46492,26 +44703,20 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"lgI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" +"lhj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/bulkhead_door{ + pixel_y = -34 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) -"lgM" = ( -/obj/structure/machinery/light/small, -/obj/structure/largecrate/random/case/double, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) -"lgX" = ( -/obj/structure/sign/safety/storage{ - pixel_y = 32 +/turf/open/floor/almayer{ + icon_state = "plate" }, +/area/almayer/maint/hull/upper/p_bow) +"lhs" = ( /turf/open/floor/almayer{ - dir = 1; - icon_state = "green" + icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/starboard_aft_hallway) "lht" = ( /turf/open/floor/almayer{ dir = 6; @@ -46553,12 +44758,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"lhS" = ( -/obj/structure/machinery/vending/hydroseeds, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "lhX" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -46567,15 +44766,23 @@ /turf/open/floor/wood/ship, /area/almayer/living/basketball) "lia" = ( -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/surface/rack, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/tool, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) +"lib" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 }, -/obj/structure/machinery/cm_vending/sorted/medical/bolted, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" + icon_state = "plate" }, -/area/almayer/medical/lower_medical_medbay) +/area/almayer/maint/hull/lower/stern) "lid" = ( /obj/structure/machinery/chem_master{ vial_maker = 1 @@ -46584,34 +44791,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"lij" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/hull/lower/l_a_p) -"lim" = ( -/obj/structure/surface/table/almayer, -/obj/item/ashtray/bronze{ - pixel_x = 3; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/ash, -/obj/item/trash/cigbutt/ucigbutt{ - pixel_x = 4; - pixel_y = 13 - }, -/obj/item/trash/cigbutt/ucigbutt{ - pixel_x = -7; - pixel_y = 14 - }, -/obj/item/trash/cigbutt/ucigbutt{ - pixel_x = -13; - pixel_y = 8 - }, -/obj/item/trash/cigbutt/ucigbutt{ - pixel_x = -6; - pixel_y = 9 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "lin" = ( /obj/effect/projector{ name = "Almayer_AresDown"; @@ -46630,9 +44809,17 @@ }, /area/almayer/command/airoom) "liF" = ( -/obj/structure/closet/firecloset, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/closet, +/obj/item/clothing/under/marine, +/obj/item/clothing/suit/storage/marine, +/obj/item/clothing/head/helmet/marine, +/obj/item/clothing/head/cmcap, +/obj/item/clothing/head/cmcap, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/stern) +/area/almayer/maint/hull/upper/u_a_s) "liJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -46675,43 +44862,29 @@ icon_state = "plate" }, /area/almayer/living/gym) -"ljl" = ( -/obj/structure/prop/invuln/pipe_water, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -12; - pixel_y = 13 +"ljm" = ( +/obj/item/clothing/gloves/botanic_leather{ + name = "leather gloves" }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -12; - pixel_y = 13 +/obj/item/clothing/gloves/botanic_leather{ + name = "leather gloves" + }, +/obj/item/clothing/gloves/botanic_leather{ + name = "leather gloves" }, +/obj/structure/closet/crate, +/obj/item/clothing/suit/storage/hazardvest/black, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/hull/lower/l_f_p) "ljs" = ( /obj/effect/landmark/start/marine/spec/bravo, /obj/effect/landmark/late_join/bravo, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/bravo) -"lju" = ( -/obj/structure/surface/table/almayer, -/obj/item/stack/sheet/cardboard{ - amount = 50; - pixel_x = 4 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"ljD" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +"ljv" = ( +/turf/closed/wall/almayer, /area/almayer/maint/hull/lower/l_a_p) "ljG" = ( /obj/structure/closet/crate/freezer, @@ -46756,6 +44929,16 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"lka" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "lkd" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -46782,14 +44965,6 @@ icon_state = "red" }, /area/almayer/living/offices/flight) -"lkg" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) "lkm" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -46822,14 +44997,6 @@ icon_state = "plate" }, /area/almayer/squads/charlie) -"lkN" = ( -/obj/item/cell/high/empty, -/obj/item/cell/high/empty, -/obj/structure/surface/rack, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/s_stern) "lkV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -46848,28 +45015,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"lln" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"lls" = ( -/obj/item/trash/crushed_cup, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) -"llF" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) "llK" = ( /obj/structure/platform_decoration{ dir = 4 @@ -46885,6 +45030,19 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) +"lma" = ( +/obj/structure/sign/safety/security{ + pixel_x = 15 + }, +/turf/closed/wall/almayer, +/area/almayer/hallways/lower/starboard_umbilical) +"lmi" = ( +/obj/structure/bed, +/obj/item/bedsheet/green, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/upper_medical) "lml" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -46892,6 +45050,13 @@ }, /turf/open/floor/almayer, /area/almayer/squads/bravo) +"lmq" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) "lmw" = ( /obj/structure/closet/l3closet/general, /obj/structure/machinery/light{ @@ -46903,13 +45068,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) -"lmy" = ( -/obj/structure/sign/safety/restrictedarea, -/obj/structure/sign/safety/security{ - pixel_x = 15 - }, -/turf/closed/wall/almayer, -/area/almayer/shipboard/panic) "lmz" = ( /turf/closed/wall/almayer/white/hull, /area/space) @@ -46924,21 +45082,6 @@ "lmK" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/command/securestorage) -"lmW" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/lights/bulbs{ - pixel_x = 3; - pixel_y = 7 - }, -/obj/item/storage/box/lights/mixed, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) -"lnb" = ( -/obj/structure/machinery/portable_atmospherics/canister/air, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/maint/hull/upper/u_a_s) "lne" = ( /obj/structure/bed/chair, /turf/open/floor/almayer{ @@ -46968,15 +45111,10 @@ icon_state = "silvercorner" }, /area/almayer/shipboard/brig/cic_hallway) -"lnG" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "InnerShutter"; - name = "\improper Saferoom Shutters" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/panic) +"lnD" = ( +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/maint/hull/upper/u_a_s) "lnP" = ( /obj/structure/machinery/vending/cola, /obj/structure/window/reinforced, @@ -47077,6 +45215,9 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/starboard) +"loE" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_s) "loK" = ( /obj/structure/closet/crate/medical, /obj/item/storage/firstaid/adv, @@ -47091,19 +45232,6 @@ "loP" = ( /turf/closed/wall/almayer, /area/almayer/engineering/laundry) -"loQ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - dir = 1; - req_access = null; - req_one_access = null; - req_one_access_txt = "3;22;19" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/lower/l_f_s) "loS" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -47149,12 +45277,15 @@ icon_state = "cargo" }, /area/almayer/living/commandbunks) -"lpj" = ( -/obj/structure/machinery/light/small{ - dir = 8 +"lpl" = ( +/obj/structure/machinery/door/airlock/almayer/security{ + dir = 2; + name = "\improper Security Checkpoint" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/panic) "lpt" = ( /turf/open/floor/almayer{ icon_state = "blue" @@ -47168,52 +45299,17 @@ icon_state = "test_floor4" }, /area/almayer/powered/agent) -"lpD" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/step_trigger/clone_cleaner, +"lql" = ( /turf/open/floor/almayer{ - dir = 1; - icon_state = "greencorner" - }, -/area/almayer/hallways/starboard_hallway) -"lpH" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) -"lqd" = ( -/obj/structure/sign/safety/nonpress_ag{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/west{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/hallways/lower/starboard_umbilical) "lqF" = ( /turf/open/floor/almayer{ dir = 9; icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"lqJ" = ( -/obj/structure/sign/safety/escapepod{ - pixel_y = -32 - }, -/obj/structure/sign/safety/south{ - pixel_x = 15; - pixel_y = -32 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) "lqK" = ( /obj/effect/decal/cleanable/ash, /obj/item/trash/cigbutt/ucigbutt{ @@ -47225,10 +45321,6 @@ icon_state = "emerald" }, /area/almayer/hallways/hangar) -"lqL" = ( -/obj/effect/step_trigger/clone_cleaner, -/turf/closed/wall/almayer, -/area/almayer/maint/hull/upper/u_m_p) "lqN" = ( /obj/item/device/assembly/mousetrap/armed, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -47239,21 +45331,31 @@ icon_state = "orange" }, /area/almayer/living/port_emb) +"lrd" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/hallways/upper/aft_hallway) "lrq" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/armory) -"lrD" = ( -/obj/structure/surface/table/almayer, -/obj/item/weapon/gun/rifle/m41a, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) +"lrE" = ( +/obj/structure/window/framed/almayer/hull, +/turf/open/floor/plating, +/area/almayer/maint/hull/upper/s_bow) "lrF" = ( /obj/structure/machinery/light, /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"lrH" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) "lrT" = ( /obj/structure/bed/chair, /turf/open/floor/almayer, @@ -47277,6 +45379,15 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"lsh" = ( +/obj/structure/machinery/light/small{ + dir = 1; + pixel_y = 20 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "lsn" = ( /obj/structure/surface/table/almayer, /obj/item/paper{ @@ -47288,6 +45399,12 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) +"lso" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_s) "lsp" = ( /obj/structure/machinery/door/airlock/almayer/command{ name = "\improper Conference Room" @@ -47315,12 +45432,6 @@ icon_state = "red" }, /area/almayer/living/offices/flight) -"lsQ" = ( -/obj/structure/machinery/power/reactor, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/engineering/lower/engine_core) "lsV" = ( /obj/structure/largecrate/random/barrel/red, /obj/structure/sign/safety/fire_haz{ @@ -47346,20 +45457,47 @@ /obj/effect/landmark/start/working_joe, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/airoom) +"ltm" = ( +/obj/structure/bed/chair/comfy/orange, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "lto" = ( /obj/structure/machinery/iv_drip, /turf/open/floor/almayer{ icon_state = "sterile_green" }, /area/almayer/medical/containment) -"ltw" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 +"ltt" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_f_p) +/area/almayer/hallways/upper/aft_hallway) +"ltv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_fore_hallway) +"ltw" = ( +/obj/structure/largecrate/supply, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) +"lty" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) "ltA" = ( /obj/item/tool/weldingtool, /turf/open/floor/almayer, @@ -47373,6 +45511,19 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) +"ltO" = ( +/obj/structure/closet/secure_closet{ + name = "\improper Lethal Injection Locker" + }, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/obj/item/reagent_container/ld50_syringe/choral, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/execution_storage) "ltU" = ( /obj/structure/bed/chair{ dir = 8 @@ -47392,19 +45543,12 @@ icon_state = "test_floor4" }, /area/almayer/living/commandbunks) -"luz" = ( -/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" +"luE" = ( +/obj/structure/sign/poster{ + pixel_y = 32 }, -/area/almayer/hallways/starboard_hallway) -"luJ" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/lower/s_bow) +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) "luS" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/cardboard{ @@ -47478,13 +45622,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"lwm" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) "lwp" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -47507,6 +45644,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"lwG" = ( +/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_umbilical) "lwJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -47515,20 +45658,20 @@ icon_state = "emeraldfull" }, /area/almayer/squads/charlie) -"lwK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +"lwY" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Port Viewing Room" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/main_office) -"lxm" = ( -/obj/structure/surface/table/almayer, -/obj/item/fuel_cell, -/obj/item/fuel_cell, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "test_floor4" }, -/area/almayer/engineering/lower/engine_core) +/area/almayer/maint/hull/upper/u_f_p) +"lxd" = ( +/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_umbilical) "lxo" = ( /obj/structure/sign/safety/hazard{ pixel_x = -17; @@ -47542,14 +45685,6 @@ icon_state = "plate" }, /area/almayer/living/auxiliary_officer_office) -"lxy" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/main_office) "lxE" = ( /obj/structure/machinery/cm_vending/clothing/commanding_officer, /turf/open/floor/almayer{ @@ -47579,12 +45714,37 @@ icon_state = "green" }, /area/almayer/squads/req) +"lym" = ( +/obj/structure/machinery/vending/cigarette, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_p) +"lyq" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "emerald" + }, +/area/almayer/hallways/lower/port_midship_hallway) "lyw" = ( /obj/structure/bed/chair/comfy{ dir = 8 }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) +"lyz" = ( +/obj/structure/surface/table/almayer, +/obj/item/organ/heart/prosthetic{ + pixel_x = -4 + }, +/obj/item/circuitboard{ + pixel_x = 12; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_p) "lyE" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ @@ -47592,17 +45752,14 @@ icon_state = "silvercorner" }, /area/almayer/command/computerlab) -"lyL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) -"lyV" = ( -/obj/structure/machinery/light/small, +"lyP" = ( +/obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ icon_state = "plate" }, +/area/almayer/maint/hull/lower/s_bow) +"lyW" = ( +/turf/closed/wall/almayer/outer, /area/almayer/maint/hull/lower/l_m_p) "lyX" = ( /obj/structure/machinery/cm_vending/clothing/senior_officer{ @@ -47630,16 +45787,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"lzj" = ( -/obj/structure/sign/safety/storage{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "lzq" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -47655,12 +45802,26 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"lzY" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -25 +"lzF" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/hallways/upper/aft_hallway) +"lAa" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/lightreplacer{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/toolbox/emergency, +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "lAl" = ( /turf/open/floor/almayer{ dir = 4; @@ -47685,13 +45846,6 @@ }, /turf/open/floor/carpet, /area/almayer/command/cichallway) -"lAO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) "lAQ" = ( /obj/structure/machinery/cm_vending/gear/tl{ density = 0; @@ -47704,22 +45858,25 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) -"lAX" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"lBf" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/hallways/upper/stern_hallway) "lBg" = ( /obj/structure/bedsheetbin, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) -"lBj" = ( -/obj/effect/landmark/yautja_teleport, +"lBl" = ( +/obj/structure/sink{ + pixel_y = 24 + }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/maint/lower/s_bow) "lBv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -47732,29 +45889,46 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) -"lBz" = ( +"lBw" = ( +/obj/structure/machinery/cryopod{ + pixel_y = 6 + }, +/obj/structure/sign/safety/cryo{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/upper/u_m_p) +"lBB" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_s) +"lCc" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 4; + icon_state = "pipe-c" }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) -"lBF" = ( -/obj/structure/surface/table/almayer, -/obj/effect/spawner/random/toolbox, -/obj/item/clipboard, -/obj/item/tool/pen, /turf/open/floor/almayer{ - dir = 8; - icon_state = "green" + icon_state = "orange" }, -/area/almayer/squads/req) -"lCp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/area/almayer/hallways/upper/stern_hallway) +"lCm" = ( +/obj/structure/machinery/light/small{ + dir = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/main_office) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_bow) "lCr" = ( /turf/open/floor/almayer{ icon_state = "redfull" @@ -47783,28 +45957,28 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"lCT" = ( -/obj/structure/machinery/conveyor_switch{ - id = "lower_garbage" - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"lDa" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_29" }, -/area/almayer/maint/hull/lower/l_a_p) -"lDg" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "laddernorthwest"; - name = "\improper North West Ladders Shutters" +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliaison) +"lDk" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/machinery/door_control{ + id = "laddersoutheast"; + name = "South East Ladders Shutters"; + pixel_y = 25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "green" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "lDn" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -47812,15 +45986,26 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"lDJ" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = -17 +"lDA" = ( +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) +"lDL" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ dir = 8; - icon_state = "orange" + icon_state = "plating_striped" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/squads/req) "lDN" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -47839,6 +46024,15 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) +"lDT" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_bow) "lDV" = ( /obj/effect/landmark/start/marine/medic/bravo, /obj/effect/landmark/late_join/bravo, @@ -47874,18 +46068,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/lobby) -"lEz" = ( -/obj/item/coin/silver{ - desc = "A small coin, bearing the falling falcons insignia."; - name = "falling falcons challenge coin" - }, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) "lEF" = ( /obj/structure/stairs{ icon_state = "ramptop" @@ -47903,6 +46085,11 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) +"lEV" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/vehiclehangar) "lFe" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -47939,6 +46126,16 @@ "lFp" = ( /turf/closed/wall/almayer, /area/almayer/engineering/lower/workshop/hangar) +"lFr" = ( +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orange" + }, +/area/almayer/maint/upper/mess) "lFt" = ( /obj/structure/machinery/portable_atmospherics/powered/pump, /obj/structure/sign/safety/maint{ @@ -47950,10 +46147,17 @@ icon_state = "cargo" }, /area/almayer/engineering/starboard_atmos) -"lFv" = ( -/obj/effect/landmark/yautja_teleport, +"lFw" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/projector{ + name = "Almayer_Up1"; + vector_x = -19; + vector_y = 98 + }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) +/area/almayer/hallways/lower/starboard_midship_hallway) "lFA" = ( /obj/structure/surface/table/almayer, /obj/item/storage/pouch/tools/tank, @@ -47995,80 +46199,44 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) "lFL" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/upper/p_bow) -"lGg" = ( -/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/lower/workshop/hangar) -"lGh" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"lGi" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/largecrate/random/case, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) -"lGo" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) -"lGH" = ( -/obj/structure/machinery/power/apc/almayer{ +/obj/structure/machinery/light{ dir = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_s) -"lGV" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) -"lGW" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 + dir = 4; + icon_state = "green" }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"lGg" = ( +/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "orange" }, -/area/almayer/maint/hull/upper/u_f_p) -"lGZ" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 +/area/almayer/engineering/lower/workshop/hangar) +"lHk" = ( +/obj/structure/closet/firecloset, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/p_bow) +/area/almayer/maint/hull/upper/s_bow) "lHu" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "greencorner" }, /area/almayer/living/grunt_rnr) -"lHE" = ( -/obj/structure/machinery/light/small, -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) +"lHB" = ( +/obj/structure/prop/almayer/computers/sensor_computer3, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "lHG" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -48083,18 +46251,9 @@ icon_state = "test_floor4" }, /area/almayer/living/grunt_rnr) -"lHU" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) -"lHV" = ( -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/p_bow) +"lIj" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/upper/mess) "lIp" = ( /obj/structure/bed/chair/comfy/beige{ dir = 1 @@ -48104,15 +46263,20 @@ }, /turf/open/floor/carpet, /area/almayer/command/cichallway) -"lIw" = ( +"lIu" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/structure/machinery/door/poddoor/almayer{ + dir = 4; + id = "hangarentrancenorth"; + name = "\improper North Hangar Podlock" + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/lower/starboard_fore_hallway) "lII" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -48121,21 +46285,18 @@ icon_state = "mono" }, /area/almayer/engineering/port_atmos) +"lIQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_p) "lIU" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/port) -"lJb" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) "lJu" = ( /obj/structure/barricade/metal{ dir = 1 @@ -48199,6 +46360,12 @@ icon_state = "dark_sterile" }, /area/almayer/shipboard/brig/cells) +"lJM" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/s_bow) "lJO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48234,15 +46401,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha_bravo_shared) -"lKk" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/hallways/stern_hallway) "lKM" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer, @@ -48254,22 +46412,29 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"lLx" = ( -/obj/structure/machinery/light/small{ - dir = 8 +"lLl" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door_control{ + id = "laddersouthwest"; + name = "South West Ladders Shutters"; + pixel_x = 25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 }, -/obj/structure/closet, -/obj/item/clothing/under/marine, -/obj/item/clothing/suit/storage/marine, -/obj/item/clothing/head/helmet/marine, -/obj/item/clothing/head/cmcap, -/obj/item/clothing/head/cmcap, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/turf/open/floor/almayer{ + icon_state = "greencorner" + }, +/area/almayer/hallways/lower/port_fore_hallway) "lLC" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/squads/charlie) +"lLO" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_fore_hallway) "lLS" = ( /obj/structure/sign/safety/galley{ pixel_x = 32 @@ -48303,12 +46468,33 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"lMw" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "plating_striped" + }, +/area/almayer/squads/req) "lMx" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/starboard) +"lMO" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/tool, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "lMY" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -48318,12 +46504,12 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) -"lNl" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" +"lNk" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 }, -/area/almayer/hallways/stern_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "lNw" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -48339,24 +46525,20 @@ icon_state = "plate" }, /area/almayer/squads/charlie) -"lNN" = ( -/obj/structure/closet/secure_closet/medical2, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/shipboard/brig/surgery) "lNR" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/engineering/lower/workshop) -"lOa" = ( -/obj/structure/machinery/light/small{ - dir = 1; - pixel_y = 20 +"lOn" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/hallways/upper/aft_hallway) "lOr" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -48367,10 +46549,6 @@ }, /turf/open/floor/plating, /area/almayer/squads/req) -"lOt" = ( -/obj/effect/landmark/start/liaison, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) "lOH" = ( /obj/structure/sink{ pixel_y = 32 @@ -48380,16 +46558,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_two) -"lOI" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "lON" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -48446,14 +46614,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) -"lPE" = ( -/obj/structure/surface/table/almayer, -/obj/item/clipboard, -/obj/item/paper, -/obj/item/clothing/glasses/mgoggles, -/obj/item/clothing/glasses/mgoggles, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) "lPO" = ( /obj/structure/surface/rack, /turf/open/floor/almayer{ @@ -48461,10 +46621,10 @@ icon_state = "silver" }, /area/almayer/command/securestorage) -"lPP" = ( -/obj/structure/largecrate/random/barrel/green, +"lPW" = ( +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) +/area/almayer/maint/hull/upper/u_m_p) "lQa" = ( /obj/structure/machinery/light{ dir = 8 @@ -48477,18 +46637,32 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) -"lQk" = ( -/obj/structure/largecrate/supply/supplies/water, +"lQf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = 32 + }, /turf/open/floor/almayer{ - icon_state = "red" + icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/hull/lower/l_f_p) "lQz" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/squads/bravo) +"lQB" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/vehiclehangar) "lQG" = ( /obj/structure/machinery/computer/tech_control, /turf/open/floor/plating/plating_catwalk, @@ -48507,24 +46681,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/operating_room_three) -"lQQ" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) -"lRe" = ( -/obj/structure/pipes/vents/pump, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/shipboard/brig/surgery) "lRs" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -48538,6 +46694,10 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) +"lRt" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) "lRE" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -48552,17 +46712,6 @@ /obj/item/prop/helmetgarb/chaplain_patch, /turf/open/floor/wood/ship, /area/almayer/living/chapel) -"lRU" = ( -/obj/structure/sign/safety/conference_room{ - pixel_x = 14; - pixel_y = 32 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) -"lRV" = ( -/obj/structure/largecrate/supply/supplies/mre, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "lRX" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, @@ -48595,23 +46744,21 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cells) -"lSF" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +"lSJ" = ( +/obj/structure/machinery/light/small, +/obj/effect/decal/warning_stripes{ + icon_state = "N" }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "plating_striped" + icon_state = "plate" }, -/area/almayer/squads/req) -"lSH" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) +/area/almayer/maint/hull/upper/s_bow) +"lSX" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "lTt" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -48631,10 +46778,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/chapel) -"lTL" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) "lUm" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ name = "\improper Brig Cells"; @@ -48647,12 +46790,24 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/processing) -"lUr" = ( -/obj/structure/largecrate/random/case/double, +"lUA" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 5; + icon_state = "red" }, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/hallways/lower/port_fore_hallway) +"lUQ" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "lVl" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/almayer, @@ -48661,28 +46816,17 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) -"lVv" = ( +"lVR" = ( +/obj/structure/stairs{ + icon_state = "ramptop" + }, /obj/structure/platform{ - dir = 1 + dir = 8 }, -/obj/structure/reagent_dispensers/watertank, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) -"lVK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "greencorner" - }, -/area/almayer/squads/req) +/area/almayer/maint/hull/upper/u_a_p) "lVS" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; @@ -48693,6 +46837,17 @@ icon_state = "redfull" }, /area/almayer/living/briefing) +"lVW" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 2; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_p) "lVX" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/overwatch/almayer{ @@ -48714,6 +46869,12 @@ icon_state = "plate" }, /area/almayer/command/cic) +"lVZ" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "lWr" = ( /obj/structure/largecrate/random/case, /turf/open/floor/almayer{ @@ -48721,6 +46882,25 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"lWt" = ( +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) +"lWO" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/mess) +"lWY" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) "lXb" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -48754,11 +46934,10 @@ icon_state = "green" }, /area/almayer/living/offices) -"lYi" = ( +"lYg" = ( /obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/maint/hull/lower/l_a_p) "lYk" = ( /obj/item/trash/c_tube{ pixel_x = 16; @@ -48768,9 +46947,14 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"lYm" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/hull/upper/u_m_p) +"lYt" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "lYL" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -48788,16 +46972,18 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"lYS" = ( -/obj/docking_port/stationary/escape_pod/east, -/turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_m_s) -"lYZ" = ( -/obj/structure/largecrate/random, -/turf/open/floor/almayer{ - icon_state = "plate" +"lZb" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/powercell, +/obj/effect/spawner/random/powercell, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 }, -/area/almayer/maint/hull/upper/s_bow) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) "lZs" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/radio/intercom{ @@ -48820,25 +47006,52 @@ icon_state = "plate" }, /area/almayer/command/cic) -"lZD" = ( -/obj/effect/landmark/crap_item, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +"lZI" = ( +/obj/structure/prop/invuln/lattice_prop{ + dir = 1; + icon_state = "lattice-simple"; + pixel_x = -16; + pixel_y = 17 }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) +"lZM" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/lower/cryo_cells) "lZZ" = ( /obj/structure/machinery/autolathe/medilathe/full, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/medical/hydroponics) -"maG" = ( -/obj/structure/largecrate/random/case, +"may" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21"; + pixel_y = 16 + }, +/obj/structure/surface/table/almayer, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 9; + icon_state = "red" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/shipboard/brig/starboard_hallway) +"maF" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "maI" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -48847,6 +47060,10 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) +"maK" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "maL" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/snacks/protein_pack, @@ -48876,32 +47093,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"maU" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/janitorialcart, -/obj/item/tool/mop, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_p) -"mbp" = ( -/obj/structure/platform, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -14; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = 12; - pixel_y = 13 +"mbu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/maint/hull/upper/u_a_s) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/stern_hallway) "mbx" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -48911,40 +47111,16 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) -"mce" = ( -/turf/open/floor/almayer{ - icon_state = "greencorner" - }, -/area/almayer/hallways/aft_hallway) -"mch" = ( -/obj/structure/machinery/door/airlock/almayer/security{ - dir = 2; - name = "\improper Security Checkpoint" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 2; - id = "safe_armory"; - name = "\improper Hangar Armory Shutters" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/panic) -"mcs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = -32 - }, +"mbR" = ( +/obj/docking_port/stationary/escape_pod/north, +/turf/open/floor/plating, +/area/almayer/maint/hull/lower/l_m_p) +"mcp" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "redcorner" }, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/shipboard/brig/starboard_hallway) "mcL" = ( /obj/structure/machinery/vending/snack, /obj/structure/sign/safety/maint{ @@ -48962,48 +47138,28 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) +"mdk" = ( +/obj/structure/machinery/door/poddoor/railing{ + dir = 4; + id = "vehicle_elevator_railing_aux" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/vehiclehangar) "mdo" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/squads/alpha) -"mdF" = ( -/obj/structure/sign/safety/hazard{ - pixel_x = 32; - pixel_y = 7 - }, -/obj/structure/sign/safety/airlock{ - pixel_x = 32; - pixel_y = -8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/stern) -"mdG" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) -"mdT" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/item/ammo_magazine/pistol{ - current_rounds = 0 - }, -/obj/item/weapon/gun/pistol/m4a3{ - current_mag = null +"mdC" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = -17 }, /turf/open/floor/almayer{ - dir = 9; - icon_state = "red" + dir = 8; + icon_state = "emerald" }, -/area/almayer/living/offices/flight) +/area/almayer/hallways/lower/port_midship_hallway) "mdW" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/effect/decal/warning_stripes{ @@ -49020,6 +47176,28 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"mea" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21" + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/shipboard/brig/mp_bunks) +"mem" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/stern) "meu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -49034,69 +47212,50 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"meC" = ( -/obj/structure/surface/rack, -/obj/item/storage/backpack/marine/satchel{ - desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; - icon = 'icons/obj/janitor.dmi'; - icon_state = "trashbag3"; - name = "trash bag"; - pixel_x = -4; - pixel_y = 6 - }, -/obj/item/storage/backpack/marine/satchel{ - desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; - icon = 'icons/obj/janitor.dmi'; - icon_state = "trashbag3"; - name = "trash bag"; - pixel_x = 3; - pixel_y = -2 +"meE" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 32 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_m_p) -"meJ" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = 32 - }, +/area/almayer/hallways/lower/vehiclehangar) +"meQ" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) +"meS" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" + icon_state = "mono" }, -/area/almayer/hallways/aft_hallway) -"meM" = ( -/obj/structure/sign/safety/airlock{ - pixel_y = -32 +/area/almayer/hallways/upper/aft_hallway) +"meT" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) -"meQ" = ( -/obj/structure/bed/chair{ - dir = 8 + icon_state = "test_floor4" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/maint/hull/lower/l_f_s) "meY" = ( /turf/closed/wall/almayer{ damage_cap = 15000 }, /area/almayer/squads/alpha) -"mfc" = ( +"mfH" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/maint/hull/upper/u_a_s) "mfM" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/map_item, @@ -49116,6 +47275,19 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"mfR" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/tool/pen, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_s) +"mgb" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "mgd" = ( /obj/structure/machinery/autolathe/armylathe/full, /turf/open/floor/almayer{ @@ -49161,15 +47333,14 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/charlie_delta_shared) -"mgZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 +"mgX" = ( +/obj/structure/platform{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/maint/lower/cryo_cells) +/area/almayer/maint/hull/upper/u_a_p) "mha" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -49230,6 +47401,17 @@ icon_state = "plate" }, /area/almayer/squads/alpha) +"miy" = ( +/obj/structure/machinery/optable, +/obj/structure/sign/safety/medical{ + pixel_x = 8; + pixel_y = 29 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_corner" + }, +/area/almayer/shipboard/brig/medical) "miE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -49254,21 +47436,29 @@ icon_state = "redfull" }, /area/almayer/command/cic) +"mjs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_bow) "mjt" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ allow_construction = 0 }, /area/almayer/shipboard/brig/processing) -"mjC" = ( -/obj/structure/machinery/light/small, -/obj/effect/decal/warning_stripes{ - icon_state = "N" +"mjy" = ( +/obj/structure/machinery/conveyor_switch{ + id = "lower_garbage" }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/s_bow) +/area/almayer/maint/hull/lower/l_a_p) "mjS" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -49278,12 +47468,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie) -"mkb" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/maint/upper/mess) "mkc" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -49340,14 +47524,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"mkk" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) "mkl" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -49367,19 +47543,30 @@ icon_state = "test_floor4" }, /area/almayer/engineering/lower/workshop/hangar) -"mkq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" +"mkw" = ( +/obj/structure/sign/safety/security{ + pixel_y = -32 }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 +/obj/structure/sign/safety/restrictedarea{ + pixel_x = 15; + pixel_y = -32 }, -/obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/hallways/lower/starboard_fore_hallway) +"mkx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) +"mkF" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_bow) "mkG" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -49436,16 +47623,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/lower/workshop) -"mkW" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/weldpack, -/obj/item/storage/toolbox/mechanical, -/obj/item/reagent_container/spray/cleaner, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/maint/hull/upper/u_a_s) "mlb" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -49507,6 +47684,12 @@ /obj/structure/machinery/door/poddoor/almayer/biohazard/white, /turf/open/floor/plating, /area/almayer/medical/medical_science) +"mnc" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_umbilical) "mng" = ( /turf/open/floor/almayer{ icon_state = "redcorner" @@ -49518,20 +47701,33 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"mnG" = ( -/obj/structure/machinery/status_display{ - pixel_y = -30 - }, +"mnC" = ( /turf/open/floor/almayer{ dir = 8; - icon_state = "orange" + icon_state = "greencorner" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/aft_hallway) "mnI" = ( /turf/open/floor/almayer{ icon_state = "blue" }, /area/almayer/living/briefing) +"mnV" = ( +/obj/structure/sign/safety/refridgeration{ + pixel_y = -32 + }, +/obj/structure/sign/safety/medical{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "mnW" = ( /obj/structure/surface/table/almayer, /obj/item/device/reagent_scanner{ @@ -49557,15 +47753,21 @@ icon_state = "sterile_green" }, /area/almayer/medical/containment) -"mod" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 +"moc" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/upper/u_f_p) +"moq" = ( +/obj/structure/largecrate/random/case/double, +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_p) +/area/almayer/maint/upper/u_m_p) "mor" = ( /obj/structure/machinery/light{ dir = 8 @@ -49576,17 +47778,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"mot" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/bed/chair{ - dir = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/panic) "mov" = ( /obj/structure/bed/chair{ dir = 1 @@ -49602,6 +47793,27 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha_bravo_shared) +"moK" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_m_s) +"moL" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/emails{ + dir = 1; + pixel_x = 1; + pixel_y = 4 + }, +/obj/item/tool/kitchen/utensil/fork{ + pixel_x = -9; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "moM" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -49613,18 +47825,18 @@ icon_state = "silver" }, /area/almayer/living/briefing) -"moT" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 80 +"mph" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" }, -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/maint/hull/upper/s_bow) "mpn" = ( /obj/structure/pipes/vents/pump, /obj/structure/surface/table/almayer, @@ -49638,12 +47850,27 @@ icon_state = "test_floor4" }, /area/almayer/engineering/lower) +"mpV" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_umbilical) "mqb" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"mqd" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/upper/aft_hallway) "mqg" = ( /obj/structure/bed/chair{ dir = 4 @@ -49657,15 +47884,18 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"mqo" = ( -/obj/structure/bed/chair/bolted{ - dir = 1 +"mqt" = ( +/turf/open/floor/almayer{ + icon_state = "bluecorner" }, +/area/almayer/hallways/lower/port_midship_hallway) +"mqB" = ( +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ dir = 8; - icon_state = "red" + icon_state = "orange" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/hallways/lower/port_umbilical) "mqK" = ( /obj/structure/machinery/cm_vending/gear/spec, /obj/structure/sign/safety/hazard{ @@ -49679,6 +47909,18 @@ icon_state = "plate" }, /area/almayer/squads/bravo) +"mqR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "mqU" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -49688,25 +47930,12 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_two) -"mre" = ( -/obj/effect/decal/cleanable/cobweb{ - pixel_x = -9; - pixel_y = 19 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) -"mrm" = ( -/obj/effect/landmark/start/professor, -/obj/effect/landmark/late_join/cmo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/offices) -"mru" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 +"mqZ" = ( +/obj/structure/platform{ + dir = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "mrD" = ( /obj/structure/machinery/light{ dir = 1 @@ -49779,6 +48008,16 @@ icon_state = "orange" }, /area/almayer/squads/bravo) +"msC" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; + dir = 8; + req_one_access = list(2,34,30) + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_m_s) "msP" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -49793,14 +48032,6 @@ icon_state = "plate" }, /area/almayer/living/gym) -"mtj" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "mtl" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/execution) @@ -49841,32 +48072,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"mtQ" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/stern) -"mtR" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/crushed_cup, -/obj/item/reagent_container/food/drinks/cup{ - pixel_x = -5; - pixel_y = 9 - }, -/obj/item/spacecash/c10{ - pixel_x = 5; - pixel_y = 10 - }, -/obj/item/ashtray/plastic{ - pixel_x = 5; - pixel_y = -10 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) "mtZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -49876,6 +48081,12 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) +"mua" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/lower/vehiclehangar) "mub" = ( /obj/structure/barricade/handrail{ dir = 4 @@ -49910,14 +48121,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha) -"muJ" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/lower/cryo_cells) "muQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -49938,6 +48141,19 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"mvg" = ( +/obj/docking_port/stationary/escape_pod/west, +/turf/open/floor/plating, +/area/almayer/maint/hull/lower/l_m_p) +"mvi" = ( +/obj/structure/surface/table/almayer, +/obj/item/weapon/gun/revolver/m44{ + desc = "A bulky revolver, occasionally carried by assault troops and officers in the Colonial Marines, as well as civilian law enforcement. Fires .44 Magnum rounds. 'J.P' Is engraved into the barrel." + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "mvl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49951,44 +48167,6 @@ icon_state = "bluecorner" }, /area/almayer/squads/delta) -"mvu" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) -"mvE" = ( -/obj/item/bedsheet/brown{ - pixel_y = 13 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - 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 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "mvI" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -50002,15 +48180,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"mvR" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" +"mww" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/shipboard/brig/surgery) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) "mwA" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -50032,6 +48207,11 @@ icon_state = "test_floor4" }, /area/almayer/medical/lower_medical_medbay) +"mwP" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_stern) "mwQ" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 4 @@ -50052,6 +48232,15 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/stair_clone/upper) +"mxg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "mxT" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, @@ -50059,6 +48248,13 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) +"mxV" = ( +/obj/structure/sign/safety/autoopenclose{ + pixel_x = 7; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/stern) "myl" = ( /obj/structure/machinery/power/apc/almayer/hardened{ cell_type = /obj/item/cell/hyper; @@ -50080,30 +48276,6 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) -"myy" = ( -/obj/structure/surface/rack, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/s_bow) -"myA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) "myJ" = ( /obj/structure/machinery/light{ dir = 4 @@ -50125,17 +48297,53 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"mza" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 2; + id = "bot_armory"; + name = "\improper Armory Shutters" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 2; + name = "\improper Armory" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 2; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -2; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/armory) +"mze" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Brig"; + closeOtherId = "brigmaint_n" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/starboard_hallway) "mzg" = ( /turf/open/floor/almayer{ icon_state = "emerald" }, /area/almayer/squads/charlie) -"mzk" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/s_bow) "mzq" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -50160,6 +48368,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/port) +"mzv" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "mzz" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -50168,13 +48380,15 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) -"mzR" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = -32 +"mzI" = ( +/obj/structure/largecrate/random/barrel/white, +/obj/structure/sign/safety/storage{ + pixel_x = -17 }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "mzS" = ( /turf/open/floor/almayer{ dir = 9; @@ -50206,21 +48420,30 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) -"mAO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) "mAV" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/squads/delta) +"mAY" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) +"mBa" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "mBc" = ( /obj/structure/bed/chair{ dir = 8 @@ -50241,9 +48464,6 @@ icon_state = "dark_sterile" }, /area/almayer/living/pilotbunks) -"mBf" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/hull/upper/u_a_s) "mBp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50289,30 +48509,6 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) -"mBT" = ( -/obj/structure/surface/table/almayer, -/obj/item/fuel_cell, -/obj/item/fuel_cell, -/obj/item/fuel_cell, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering/lower/engine_core) -"mBZ" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) "mCo" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -50320,6 +48516,15 @@ }, /turf/open/floor/plating, /area/almayer/squads/req) +"mCE" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) "mCL" = ( /obj/structure/sign/safety/fire_haz{ pixel_x = 8; @@ -50343,6 +48548,13 @@ icon_state = "green" }, /area/almayer/squads/req) +"mDz" = ( +/obj/structure/machinery/shower{ + pixel_y = 16 + }, +/obj/item/tool/soap, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) "mDJ" = ( /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) @@ -50391,22 +48603,13 @@ icon_state = "test_floor4" }, /area/almayer/living/commandbunks) -"mEb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +"mDZ" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/machinery/door_control{ - id = "laddersoutheast"; - name = "South East Ladders Shutters"; - pixel_y = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_fore_hallway) "mEE" = ( /obj/structure/platform{ dir = 4; @@ -50418,40 +48621,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"mEL" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/screwdriver, -/obj/item/prop/helmetgarb/gunoil{ - pixel_x = -7; - pixel_y = 12 - }, -/obj/item/weapon/gun/rifle/l42a{ - pixel_x = 17; - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) -"mEN" = ( -/obj/structure/sign/safety/storage{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) -"mFa" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) "mFc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50477,6 +48646,16 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"mFL" = ( +/obj/effect/projector{ + name = "Almayer_Up1"; + vector_x = -19; + vector_y = 98 + }, +/turf/open/floor/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "mFN" = ( /obj/effect/step_trigger/ares_alert/mainframe, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -50522,27 +48701,26 @@ icon_state = "orange" }, /area/almayer/engineering/lower) +"mFQ" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/maint/hull/lower/s_bow) "mGe" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/command/cichallway) +"mGk" = ( +/obj/structure/disposalpipe/junction, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "mGu" = ( /turf/open/floor/almayer{ dir = 4; icon_state = "silver" }, /area/almayer/command/securestorage) -"mGE" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -19; - pixel_y = -6 - }, -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = -19; - pixel_y = 6 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) "mGT" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -50567,24 +48745,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"mHj" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) -"mHm" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_y = -32 - }, -/obj/structure/sign/safety/manualopenclose{ - pixel_x = 15; - pixel_y = -32 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "mHo" = ( /obj/structure/machinery/washing_machine, /obj/structure/machinery/washing_machine{ @@ -50598,14 +48758,6 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) -"mHv" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/medical/upper_medical) "mHx" = ( /obj/structure/bed/chair{ dir = 4 @@ -50624,19 +48776,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/chief_mp_office) -"mHA" = ( -/obj/structure/closet/secure_closet/surgical{ - pixel_x = -30 - }, -/obj/structure/machinery/power/apc/almayer, -/obj/structure/sign/safety/rewire{ - pixel_y = -38 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_corner" - }, -/area/almayer/shipboard/brig/surgery) "mHD" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -50655,6 +48794,17 @@ icon_state = "silver" }, /area/almayer/command/airoom) +"mHF" = ( +/obj/structure/surface/rack, +/obj/item/clothing/head/headband/red{ + pixel_x = 4; + pixel_y = 8 + }, +/obj/item/clothing/glasses/regular/hipster, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "mHO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light, @@ -50662,6 +48812,17 @@ icon_state = "mono" }, /area/almayer/living/pilotbunks) +"mId" = ( +/obj/structure/closet, +/obj/item/clothing/suit/armor/riot/marine/vintage_riot, +/obj/item/clothing/head/helmet/riot/vintage_riot, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "mIy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -50685,16 +48846,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"mIJ" = ( -/obj/structure/sign/safety/ladder{ - pixel_x = -16 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/vehiclehangar) "mIP" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/warning_stripes{ @@ -50705,33 +48856,6 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/upper_engineering/port) -"mIQ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) -"mIW" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) -"mIX" = ( -/obj/item/trash/cigbutt{ - pixel_x = -10; - pixel_y = 13 - }, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice10"; - pixel_x = -16; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) "mJa" = ( /obj/structure/closet/crate/trashcart, /obj/item/trash/boonie, @@ -50769,6 +48893,15 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/squads/alpha) +"mJp" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/hallways/upper/aft_hallway) "mJu" = ( /turf/open/floor/almayer/uscm/directional, /area/almayer/command/cic) @@ -50785,6 +48918,9 @@ icon_state = "blue" }, /area/almayer/living/pilotbunks) +"mJO" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/hull/lower/l_m_p) "mJP" = ( /obj/structure/machinery/cm_vending/gear/tl{ density = 0; @@ -50826,6 +48962,17 @@ "mKq" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/living/bridgebunks) +"mKs" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) "mKw" = ( /obj/structure/disposalpipe/junction{ dir = 1 @@ -50891,14 +49038,6 @@ icon_state = "plate" }, /area/almayer/living/port_emb) -"mKY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/manifold/fourway/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) "mLe" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -50912,20 +49051,9 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"mLr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, +"mLg" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) -"mLu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/port_umbilical) +/area/almayer/hallways/lower/port_umbilical) "mLz" = ( /obj/structure/machinery/door_control{ id = "pobunk1"; @@ -50952,12 +49080,17 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) -"mLJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ +"mLN" = ( +/obj/structure/machinery/light/small, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) "mLR" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -50967,12 +49100,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/req) -"mLU" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) "mMP" = ( /obj/effect/landmark/start/intel, /turf/open/floor/plating/plating_catwalk, @@ -50988,22 +49115,31 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"mMZ" = ( -/obj/structure/disposalpipe/junction, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "mNm" = ( /obj/structure/platform{ dir = 8 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"mNG" = ( +/obj/structure/sign/safety/stairs{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/west{ + pixel_y = 32 + }, +/obj/structure/machinery/door_control{ + id = "laddernorthwest"; + name = "North West Ladders Shutters"; + pixel_y = 24; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_fore_hallway) "mNI" = ( /obj/structure/machinery/door/window/westleft{ dir = 2 @@ -51021,6 +49157,20 @@ icon_state = "red" }, /area/almayer/shipboard/brig/perma) +"mNS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/supply/weapons/m39{ + pixel_x = 2 + }, +/obj/structure/largecrate/supply/weapons/m41a{ + layer = 3.1; + pixel_x = 6; + pixel_y = 17 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "mNX" = ( /turf/open/floor/almayer_hull{ dir = 4; @@ -51051,21 +49201,35 @@ /turf/closed/wall/almayer/outer, /area/almayer/command/airoom) "mOw" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "green" }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) -"mOL" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = 32 +/area/almayer/hallways/upper/aft_hallway) +"mOE" = ( +/obj/structure/sign/safety/water{ + pixel_x = -17 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "green" + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) +"mOR" = ( +/obj/structure/surface/rack, +/obj/item/roller, +/obj/item/roller, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_s) +"mPc" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 }, -/area/almayer/hallways/aft_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) "mPf" = ( /turf/open/floor/almayer/uscm/directional{ dir = 6 @@ -51098,15 +49262,32 @@ }, /turf/open/floor/almayer, /area/almayer/command/cic) -"mPB" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) -"mPQ" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/toolbox, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) +"mPw" = ( +/obj/structure/machinery/vending/snack, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) +"mPK" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/obj/structure/sign/safety/storage{ + pixel_y = 7; + pixel_x = -17 + }, +/obj/structure/sign/safety/commline_connection{ + pixel_x = -17; + pixel_y = -7 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/squads/req) +"mPM" = ( +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/port_midship_hallway) "mPR" = ( /obj/structure/machinery/light{ dir = 8 @@ -51116,19 +49297,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"mPW" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) -"mPX" = ( -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) "mQc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -51138,6 +49306,14 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"mQd" = ( +/obj/structure/surface/rack, +/obj/item/device/radio, +/obj/item/tool/weldpack, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/vehiclehangar) "mQn" = ( /obj/structure/sign/safety/rad_shield{ pixel_x = 32 @@ -51147,29 +49323,35 @@ icon_state = "orange" }, /area/almayer/engineering/lower/engine_core) +"mQx" = ( +/obj/effect/projector{ + name = "Almayer_Up3"; + vector_x = -1; + vector_y = 102 + }, +/turf/open/floor/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/port_fore_hallway) "mQC" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/port_atmos) -"mQH" = ( +"mQF" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" + icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) -"mQQ" = ( -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) -"mRl" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" +/area/almayer/hallways/upper/stern_hallway) +"mQY" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 4; - icon_state = "green" + icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/maint/hull/lower/l_m_s) "mRn" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES Interior"; @@ -51217,6 +49399,26 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"mRH" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ + req_access = null; + req_one_access = null; + req_one_access_txt = "7;23;27;102" + }, +/obj/item/reagent_container/food/drinks/coffee{ + pixel_x = -3; + pixel_y = 18 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/lower/repair_bay) +"mRI" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_a_s) "mRQ" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -51233,43 +49435,22 @@ icon_state = "red" }, /area/almayer/command/lifeboat) -"mRS" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) +"mRU" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/hull/upper/u_m_p) "mRW" = ( /turf/open/floor/almayer/research/containment/corner1, /area/almayer/medical/containment/cell/cl) -"mSc" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "Secretroom"; - indestructible = 1; - unacidable = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/lower/l_m_s) "mSi" = ( /obj/structure/bed/sofa/vert/grey/top{ pixel_y = 11 }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"mSm" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) +"mSr" = ( +/obj/effect/landmark/crap_item, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) "mSs" = ( /obj/structure/machinery/light{ dir = 8 @@ -51279,9 +49460,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"mSu" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/upper/mess) "mSz" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/crew/alt, @@ -51289,12 +49467,6 @@ icon_state = "silverfull" }, /area/almayer/command/securestorage) -"mSG" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_p) "mSK" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/structure/window/reinforced{ @@ -51305,21 +49477,19 @@ icon_state = "test_floor5" }, /area/almayer/medical/hydroponics) +"mSM" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_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 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "mTc" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/emails{ @@ -51347,12 +49517,16 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"mTn" = ( -/obj/structure/closet/firecloset, +"mTo" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 4; + icon_state = "silver" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/upper/aft_hallway) "mTp" = ( /obj/structure/window/reinforced{ dir = 4; @@ -51367,19 +49541,20 @@ icon_state = "cargo_arrow" }, /area/almayer/medical/hydroponics) +"mTL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "mTN" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"mUa" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) "mUq" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -51416,6 +49591,35 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"mUE" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) +"mUL" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) +"mUY" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/powercell, +/obj/effect/spawner/random/powercell, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/lower/l_m_s) +"mVh" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/p_bow) "mVr" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -51426,6 +49630,17 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) +"mVA" = ( +/obj/item/reagent_container/glass/bucket, +/obj/item/tool/mop{ + pixel_x = -6; + pixel_y = 24 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_s) "mVE" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -51448,18 +49663,21 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"mVY" = ( -/obj/structure/platform_decoration{ - dir = 8 +"mVF" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "officers_mess"; + name = "\improper Privacy Shutters" + }, +/obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + access_modified = 1; + req_one_access = null; + req_one_access_txt = "19;30" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) -"mWh" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/p_bow) +/area/almayer/maint/upper/mess) "mWs" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -51471,14 +49689,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"mWw" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/sign/safety/restrictedarea{ - pixel_x = 32 - }, -/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{ @@ -51530,37 +49740,64 @@ "mXj" = ( /turf/closed/wall/almayer, /area/almayer/living/commandbunks) -"mYv" = ( -/obj/structure/disposalpipe/sortjunction{ +"mXm" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldingtool, +/obj/item/tool/wrench, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/p_bow) +"mXy" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/obj/structure/sign/safety/rewire{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ dir = 4; - negdir = 4; - posdir = 1 + icon_state = "orange" }, -/turf/closed/wall/almayer, -/area/almayer/squads/req) -"mYw" = ( +/area/almayer/hallways/lower/port_aft_hallway) +"mXP" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) +"mYd" = ( /obj/structure/sign/safety/escapepod{ - pixel_x = -17; - pixel_y = -8 + pixel_y = 32 }, -/obj/structure/sign/safety/stairs{ - pixel_x = -17; - pixel_y = 7 +/obj/structure/sign/safety/east{ + pixel_x = 15; + pixel_y = 32 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" + dir = 1; + icon_state = "green" }, -/area/almayer/hallways/port_hallway) -"mYY" = ( +/area/almayer/hallways/upper/aft_hallway) +"mYt" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SW-out" + icon_state = "W"; + pixel_x = -1 }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/vehiclehangar) +"mYv" = ( +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + negdir = 4; + posdir = 1 }, -/area/almayer/hallways/vehiclehangar) +/turf/closed/wall/almayer, +/area/almayer/squads/req) "mZb" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -51575,6 +49812,24 @@ icon_state = "blue" }, /area/almayer/command/cichallway) +"mZc" = ( +/obj/structure/sign/poster/blacklight{ + pixel_y = 35 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/reagent_dispensers/beerkeg/alt_dark{ + anchored = 1; + chemical = null; + density = 0; + pixel_x = -7; + pixel_y = 10 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "mZf" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -51628,6 +49883,18 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) +"mZP" = ( +/obj/structure/surface/rack, +/obj/item/tool/crowbar, +/obj/item/tool/weldingtool, +/obj/item/tool/wrench, +/obj/structure/sign/safety/restrictedarea{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/vehiclehangar) "mZQ" = ( /obj/structure/machinery/vending/security, /obj/structure/machinery/light, @@ -51639,6 +49906,15 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/general_equipment) +"naa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "nac" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -51649,6 +49925,12 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) +"naj" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/upper/aft_hallway) "nar" = ( /obj/structure/toilet{ dir = 4 @@ -51686,15 +49968,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"naN" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/s_bow) "naR" = ( /obj/structure/machinery/iv_drip, /obj/effect/decal/warning_stripes{ @@ -51722,17 +49995,24 @@ icon_state = "test_floor4" }, /area/almayer/living/gym) -"naW" = ( -/obj/structure/surface/rack, -/obj/item/storage/box/cups{ - pixel_x = 4; - pixel_y = 9 +"nbu" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) +"nbW" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/item/storage/box/cups, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/s_bow) +/area/almayer/hallways/upper/stern_hallway) "ncf" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -51745,6 +50025,9 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cryo) +"nci" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) "ncl" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -51759,15 +50042,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"ncw" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) "ncE" = ( /obj/structure/machinery/light{ dir = 8 @@ -51795,57 +50069,31 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"nda" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -12; - pixel_y = 13 - }, +"ncV" = ( +/obj/structure/closet, +/obj/item/clothing/glasses/welding, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_a_p) -"ndc" = ( -/obj/structure/machinery/door_control{ - id = "InnerShutter"; - name = "Inner Shutter"; - pixel_x = 5; - pixel_y = 10 - }, -/obj/item/toy/deck{ - pixel_x = -9 - }, -/obj/item/ashtray/plastic, -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/sign/safety/intercom{ - pixel_y = -32 +/area/almayer/maint/hull/upper/u_a_s) +"ndl" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/panic) -"ndd" = ( -/obj/structure/disposalpipe/segment{ +/area/almayer/maint/hull/lower/l_m_p) +"ndm" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/maint/hull/upper/u_a_s) -"ndJ" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" + icon_state = "plate" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/maint/lower/cryo_cells) "ndZ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/flashlight/lamp, @@ -51866,9 +50114,15 @@ icon_state = "test_floor4" }, /area/almayer/powered) -"nel" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_s) +"nef" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/vehiclehangar) "new" = ( /obj/item/reagent_container/glass/bucket/janibucket, /obj/item/reagent_container/glass/bucket/janibucket{ @@ -51900,6 +50154,12 @@ icon_state = "red" }, /area/almayer/command/lifeboat) +"neH" = ( +/obj/item/trash/cigbutt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "neO" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -51924,13 +50184,6 @@ /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/carpet, /area/almayer/command/corporateliaison) -"neX" = ( -/obj/structure/sign/safety/restrictedarea{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/s_bow) "nff" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -51941,27 +50194,6 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) -"nfp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) -"ngc" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - req_access = null; - req_one_access = null - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "panicroomback"; - name = "\improper Safe Room Shutters" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/lower/l_f_s) "ngf" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -52055,6 +50287,20 @@ icon_state = "redcorner" }, /area/almayer/living/briefing) +"ngK" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "DeployWorkR"; + name = "\improper Workshop Shutters" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/repair_bay) "ngU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -52101,6 +50347,10 @@ icon_state = "plating" }, /area/almayer/engineering/lower/workshop) +"nhw" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "nhx" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/toy/deck{ @@ -52117,6 +50367,16 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) +"nhE" = ( +/obj/structure/sign/safety/maint{ + pixel_y = 32 + }, +/obj/structure/sign/safety/storage{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "nhG" = ( /obj/item/newspaper{ name = "character sheet" @@ -52144,23 +50404,22 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"nhJ" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/lower/l_a_p) -"nhU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 2 +"nhT" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" }, +/area/almayer/hallways/upper/stern_hallway) +"nhV" = ( +/obj/structure/machinery/light/small, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "plate" }, -/area/almayer/shipboard/panic) +/area/almayer/maint/hull/lower/p_bow) +"nic" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/lower/stern) "nig" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -52208,23 +50467,15 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"niy" = ( -/obj/structure/sign/poster/pinup{ - pixel_x = -30 - }, -/obj/structure/sign/poster/hunk{ - pixel_x = -25; - pixel_y = 10 - }, -/obj/item/trash/buritto, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = 16 +"niF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/medical/medical_science) "niL" = ( /obj/structure/machinery/light{ dir = 1 @@ -52282,25 +50533,9 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"njr" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/storage/box/lights/tubes{ - pixel_x = -4; - pixel_y = 3 - }, -/obj/effect/decal/cleanable/ash{ - pixel_y = 19 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) -"njy" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +"njn" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/upper/u_m_s) "njD" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -52320,25 +50555,29 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"njL" = ( +"njO" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ - dir = 8; - icon_state = "emerald" - }, -/area/almayer/hallways/port_hallway) -"nka" = ( -/obj/structure/machinery/door/poddoor/railing{ - dir = 2; - id = "vehicle_elevator_railing" + icon_state = "redfull" }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/area/almayer/shipboard/panic) +"njS" = ( +/obj/structure/sign/safety/rad_haz{ + pixel_x = 8; + pixel_y = -32 }, +/obj/structure/machinery/power/reactor, /turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" + icon_state = "test_floor4" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/engineering/lower/engine_core) +"nkj" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) "nkn" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -52356,16 +50595,6 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) -"nkE" = ( -/obj/structure/ladder{ - height = 2; - id = "ForeStarboardMaint" - }, -/obj/structure/sign/safety/ladder{ - pixel_x = -17 - }, -/turf/open/floor/plating/almayer, -/area/almayer/maint/hull/upper/s_bow) "nkF" = ( /obj/structure/bed/chair/bolted{ dir = 4 @@ -52389,10 +50618,6 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) -"nkR" = ( -/obj/structure/machinery/power/apc/almayer, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/lower/s_bow) "nkX" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/almayer_network{ @@ -52409,6 +50634,12 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"nlh" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/s_bow) "nlz" = ( /obj/structure/machinery/brig_cell/cell_3{ pixel_x = 32; @@ -52449,41 +50680,27 @@ }, /area/almayer/command/cichallway) "nmp" = ( -/obj/structure/surface/rack, -/obj/item/book/manual/orbital_cannon_manual, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" +/obj/structure/sign/safety/nonpress_ag{ + pixel_x = 15; + pixel_y = 32 }, -/area/almayer/maint/hull/upper/u_a_p) -"nmq" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/drinks/cans/souto/diet/lime{ - pixel_x = 7; - pixel_y = 4 +/obj/structure/sign/safety/west{ + pixel_y = 32 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) -"nmx" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) +"nmH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 + dir = 9 }, -/obj/structure/disposalpipe/junction{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) -"nmD" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_aft_hallway) "nmK" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -52496,12 +50713,6 @@ icon_state = "cargo" }, /area/almayer/squads/req) -"nmS" = ( -/obj/item/tool/pen, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) "nmV" = ( /turf/open/floor/almayer{ dir = 1; @@ -52520,9 +50731,18 @@ icon_state = "plate" }, /area/almayer/command/cichallway) -"nnw" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/lower/l_m_s) +"nnr" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/lower/port_aft_hallway) "nny" = ( /obj/structure/sign/safety/rewire{ pixel_x = -17; @@ -52541,25 +50761,24 @@ icon_state = "plate" }, /area/almayer/stair_clone/upper) +"nnH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/largecrate/random/secure{ + pixel_x = -5 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "nnL" = ( /obj/structure/toilet{ dir = 8 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/corporateliaison) -"nnT" = ( -/obj/structure/machinery/power/smes/buildable, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/high_voltage{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/maint/upper/mess) "nnX" = ( /obj/structure/machinery/sentry_holder/almayer, /turf/open/floor/almayer{ @@ -52601,6 +50820,27 @@ icon_state = "orange" }, /area/almayer/engineering/lower) +"noy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) +"noE" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) +"noI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) "noP" = ( /obj/structure/machinery/light{ dir = 1 @@ -52633,6 +50873,12 @@ icon_state = "dark_sterile" }, /area/almayer/medical/containment) +"npw" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "npA" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -52667,9 +50913,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) -"nqC" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/hull/lower/l_f_s) "nqG" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -52681,12 +50924,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"nqL" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) "nqO" = ( /obj/structure/closet/secure_closet/fridge/fish/stock, /turf/open/floor/almayer{ @@ -52711,27 +50948,17 @@ icon_state = "plate" }, /area/almayer/engineering/lower) -"nrg" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/binoculars{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/item/device/binoculars, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_f_p) -"nrh" = ( -/obj/structure/machinery/light/small{ - dir = 4 +"nrb" = ( +/obj/item/robot_parts/arm/l_arm, +/obj/item/robot_parts/leg/l_leg, +/obj/item/robot_parts/arm/r_arm, +/obj/item/robot_parts/leg/r_leg, +/obj/structure/surface/rack, +/obj/effect/decal/cleanable/cobweb{ + dir = 8 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/lower/s_bow) +/area/almayer/living/synthcloset) "nri" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/working_joe{ @@ -52741,22 +50968,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) -"nrt" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/hallways/vehiclehangar) "nrw" = ( /obj/structure/bed/chair{ dir = 4 @@ -52766,18 +50977,6 @@ icon_state = "emeraldcorner" }, /area/almayer/squads/charlie) -"nrD" = ( -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"nrG" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - req_access = null - }, -/obj/item/clothing/mask/rebreather/scarf/tacticalmask/red, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/p_bow) "nrN" = ( /obj/structure/machinery/sleep_console, /turf/open/floor/almayer{ @@ -52799,14 +50998,22 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) -"nsh" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" +"nsd" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/box/lights/bulbs{ + pixel_x = 3; + pixel_y = 7 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/item/storage/box/lights/mixed, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) +"nso" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = 32 }, -/area/almayer/maint/hull/lower/l_m_s) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "nsQ" = ( /obj/structure/sink{ dir = 4; @@ -52853,17 +51060,6 @@ "ntj" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/command/computerlab) -"ntt" = ( -/obj/item/stool, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/hallways/vehiclehangar) "ntx" = ( /obj/structure/machinery/door/airlock/almayer/generic{ id = "Alpha_2"; @@ -52908,13 +51104,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha) -"nuH" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/toolbox, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) "nuK" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/franks{ @@ -52936,22 +51125,33 @@ /obj/effect/landmark/late_join/alpha, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) -"nvA" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - req_access = null; - req_one_access = null; - req_one_access_txt = "3;22;19" +"nuZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "Hangar Lockdown"; - name = "\improper Hangar Lockdown Blast Door" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "red" }, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/shipboard/brig/starboard_hallway) +"nvd" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/maint/hull/upper/u_m_p) +"nve" = ( +/obj/structure/janitorialcart, +/obj/item/tool/mop, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_p) "nvG" = ( /obj/structure/machinery/light{ dir = 8 @@ -52970,6 +51170,14 @@ icon_state = "dark_sterile" }, /area/almayer/living/numbertwobunks) +"nvI" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) "nvM" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -52989,6 +51197,18 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"nvX" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/screwdriver{ + pixel_x = -1; + pixel_y = 2 + }, +/obj/item/stack/cable_coil{ + pixel_x = 8; + pixel_y = -4 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "nwb" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -53006,18 +51226,56 @@ dir = 4 }, /area/almayer/medical/containment/cell) +"nwu" = ( +/obj/structure/sign/safety/escapepod{ + pixel_y = -32 + }, +/obj/structure/sign/safety/east{ + pixel_x = 15; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) +"nww" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/hallways/upper/aft_hallway) "nwx" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "red" }, /area/almayer/shipboard/port_missiles) +"nwA" = ( +/obj/structure/largecrate/supply/generator, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/maint/hull/upper/u_a_p) "nwD" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "orange" }, /area/almayer/command/cic) +"nwG" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "plating_striped" + }, +/area/almayer/squads/req) "nwL" = ( /obj/structure/bed, /obj/item/bedsheet/brown, @@ -53025,6 +51283,10 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"nwT" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) "nwU" = ( /obj/structure/machinery/light{ dir = 4 @@ -53062,33 +51324,28 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop) +"nxe" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/effect/spawner/random/toolbox, +/obj/item/stack/sheet/metal{ + desc = "Semiotic Standard denoting the nearby presence of coffee: the lifeblood of any starship crew."; + icon = 'icons/obj/structures/props/semiotic_standard.dmi'; + icon_state = "coffee"; + name = "coffee semiotic"; + pixel_x = 20; + pixel_y = 12; + singular_name = "coffee semiotic" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "nxx" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ icon_state = "orange" }, /area/almayer/engineering/lower) -"nxJ" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_s) -"nxK" = ( -/obj/structure/sign/safety/high_voltage{ - pixel_y = -32 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) -"nxM" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) "nyj" = ( /obj/effect/decal/medical_decals{ icon_state = "docdecal2" @@ -53111,12 +51368,6 @@ icon_state = "test_floor4" }, /area/almayer/living/briefing) -"nyG" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) "nyQ" = ( /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) @@ -53127,6 +51378,12 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) +"nzt" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_aft_hallway) "nzv" = ( /obj/structure/filingcabinet/filingcabinet, /obj/item/clipboard, @@ -53138,18 +51395,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"nzA" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) -"nzC" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/upper/p_stern) "nzD" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer, @@ -53171,18 +51416,10 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/engine_core) -"nAC" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-y" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/req) +"nAm" = ( +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) "nAY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53221,6 +51458,15 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) +"nBo" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "bluecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "nBw" = ( /turf/open/floor/almayer{ dir = 1; @@ -53233,21 +51479,36 @@ icon_state = "mono" }, /area/almayer/living/pilotbunks) +"nBF" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) +"nBJ" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/lower/s_bow) "nBK" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "red" }, /area/almayer/lifeboat_pumps/north2) -"nBW" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 +"nBV" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/firstaid/o2, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_umbilical) +"nCe" = ( +/obj/structure/machinery/prop/almayer/computer{ + pixel_y = 20 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/lower/repair_bay) "nCf" = ( /obj/effect/landmark/start/marine/tl/charlie, /obj/effect/landmark/late_join/charlie, @@ -53296,6 +51557,17 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"nCD" = ( +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/mp_bunks) +"nCM" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_s) "nCR" = ( /obj/structure/sink{ dir = 4; @@ -53331,6 +51603,13 @@ icon_state = "tcomms" }, /area/almayer/engineering/lower/engine_core) +"nDb" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_umbilical) "nDo" = ( /obj/structure/closet/l3closet/general, /obj/structure/window/reinforced{ @@ -53343,24 +51622,23 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) -"nDL" = ( -/obj/structure/barricade/handrail{ - dir = 4 - }, -/obj/structure/surface/rack, -/obj/item/stack/tile/carpet{ - amount = 20 - }, -/obj/item/stack/sheet/wood/large_stack, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering/upper_engineering/port) "nDM" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) +"nEc" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_bow) +"nEl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "nEo" = ( /obj/structure/surface/table/almayer, /obj/item/storage/donut_box{ @@ -53369,12 +51647,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie) -"nEs" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_umbilical) "nEF" = ( /obj/structure/machinery/conveyor_switch{ id = "gym_1"; @@ -53405,6 +51677,16 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"nEO" = ( +/mob/living/simple_animal/mouse/brown, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/lower/s_bow) +"nEZ" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/lower/s_bow) "nFm" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/surgery/scalpel, @@ -53412,12 +51694,6 @@ icon_state = "plate" }, /area/almayer/command/cichallway) -"nFr" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "greencorner" - }, -/area/almayer/hallways/aft_hallway) "nFs" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -53438,16 +51714,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"nFG" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) "nFI" = ( /obj/structure/surface/table/almayer, /obj/structure/disposalpipe/segment{ @@ -53477,16 +51743,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) -"nFV" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) "nFX" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; @@ -53519,35 +51775,48 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) -"nGp" = ( -/obj/structure/platform{ - dir = 8 +"nGk" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) +"nGM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/item/stack/sheet/metal, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) -"nGz" = ( -/obj/item/tool/warning_cone{ - pixel_x = -12; - pixel_y = 16 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"nGH" = ( -/obj/structure/machinery/power/apc/almayer, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_p) +/area/almayer/maint/hull/lower/l_a_p) "nGY" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/lifeboat_pumps/north2) -"nHf" = ( +"nGZ" = ( +/obj/structure/largecrate/supply/supplies/water, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/maint/hull/upper/u_a_p) +"nHu" = ( +/obj/structure/largecrate/random/barrel/yellow, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) +"nHG" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/hull/lower/l_m_p) "nHJ" = ( /obj/structure/machinery/light{ dir = 8 @@ -53571,14 +51840,16 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) -"nHN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" +"nHX" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 }, -/area/almayer/maint/hull/lower/p_bow) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) "nIj" = ( /turf/open/floor/almayer{ icon_state = "green" @@ -53624,6 +51895,13 @@ icon_state = "plating" }, /area/almayer/shipboard/port_missiles) +"nIF" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/aft_hallway) "nIG" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -53633,6 +51911,9 @@ icon_state = "silver" }, /area/almayer/command/securestorage) +"nIN" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/upper/u_m_p) "nIS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53647,13 +51928,6 @@ icon_state = "orangecorner" }, /area/almayer/engineering/lower/engine_core) -"nJm" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/stern) "nJs" = ( /obj/structure/largecrate/random/case, /turf/open/floor/almayer{ @@ -53664,12 +51938,6 @@ /obj/item/newspaper, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"nJz" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "redcorner" - }, -/area/almayer/shipboard/brig/main_office) "nJH" = ( /obj/structure/machinery/computer/cameras/almayer{ dir = 8; @@ -53699,17 +51967,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) -"nLg" = ( -/obj/effect/projector{ - name = "Almayer_Up2"; - vector_x = -1; - vector_y = 100 - }, -/turf/open/floor/almayer{ - allow_construction = 0; - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) "nLk" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/power/apc/almayer{ @@ -53720,6 +51977,9 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"nLp" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/upper/u_f_p) "nLt" = ( /turf/open/floor/almayer{ dir = 1; @@ -53750,35 +52010,15 @@ icon_state = "plating" }, /area/almayer/engineering/upper_engineering) -"nLN" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/s_stern) -"nLT" = ( -/obj/structure/bed/chair/comfy/orange{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) -"nLZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door_control{ - id = "laddernortheast"; - name = "North East Ladders Shutters"; - pixel_y = -25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 +"nLM" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 }, /turf/open/floor/almayer{ - icon_state = "green" + dir = 1; + icon_state = "blue" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/upper/aft_hallway) "nMe" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -53798,17 +52038,6 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) -"nMN" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/wrench{ - pixel_y = 2 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"nMT" = ( -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) "nMV" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -53860,6 +52089,16 @@ icon_state = "emeraldcorner" }, /area/almayer/living/briefing) +"nNI" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_s) +"nNT" = ( +/obj/item/tool/weldingtool, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) "nNV" = ( /obj/structure/bed/chair{ dir = 8; @@ -53906,9 +52145,22 @@ icon_state = "plate" }, /area/almayer/command/corporateliaison) +"nOx" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) "nOC" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/execution) +"nOX" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/secure_data{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/panic) "nPa" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -53948,9 +52200,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/containment) -"nPh" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/maint/upper/mess) "nPs" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -53987,12 +52236,13 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"nPF" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"nPO" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "orange" }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/maint/hull/lower/l_m_s) "nPT" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ desc = "These shutters seem to be pretty poorly mantained and almost wedged into the room.. you're not sure if these are official."; @@ -54016,6 +52266,18 @@ icon_state = "red" }, /area/almayer/command/lifeboat) +"nQn" = ( +/obj/structure/surface/rack, +/obj/item/storage/toolbox/mechanical, +/obj/effect/spawner/random/tool, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/s_bow) +"nQo" = ( +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "nQv" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -54025,21 +52287,30 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) -"nQx" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +"nQw" = ( +/obj/structure/closet, +/obj/item/clothing/glasses/mgoggles/prescription, +/obj/item/clothing/glasses/mbcg, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "nQA" = ( /turf/open/floor/carpet, /area/almayer/command/corporateliaison) -"nRC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"nRA" = ( +/obj/effect/projector{ + name = "Almayer_Up4"; + vector_x = -19; + vector_y = 104 }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 +/turf/open/floor/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/port_midship_hallway) +"nRE" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_s) @@ -54051,6 +52322,12 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"nRN" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "nRR" = ( /turf/open/floor/almayer{ dir = 1; @@ -54061,14 +52338,29 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) -"nSm" = ( -/obj/structure/machinery/light/small{ - dir = 8 +"nSk" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/obj/item/stack/tile/carpet{ + amount = 20 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/hull/upper/u_a_p) +"nSq" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) "nSu" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -54089,26 +52381,39 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/telecomms) -"nSI" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) "nSS" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 }, /turf/open/floor/almayer, /area/almayer/command/computerlab) +"nTc" = ( +/obj/docking_port/stationary/escape_pod/south, +/turf/open/floor/plating, +/area/almayer/maint/upper/u_m_p) "nTl" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "red" }, /area/almayer/squads/alpha) +"nTo" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/transmitter{ + dir = 8; + name = "Medical Telephone"; + phone_category = "Almayer"; + phone_id = "Medical Lower"; + pixel_x = 16 + }, +/obj/item/device/helmet_visor/medical/advanced, +/obj/item/device/helmet_visor/medical/advanced, +/obj/item/device/helmet_visor/medical/advanced, +/obj/item/device/helmet_visor/medical/advanced, +/turf/open/floor/almayer{ + icon_state = "sterile_green" + }, +/area/almayer/medical/lockerroom) "nTs" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -54186,6 +52491,16 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cells) +"nUm" = ( +/obj/structure/bed/chair/comfy/beige, +/obj/item/reagent_container/glass/bucket{ + pixel_x = 12; + pixel_y = -5 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "nUn" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -54194,14 +52509,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"nUs" = ( -/obj/structure/surface/rack, -/obj/item/tool/wet_sign, -/obj/item/tool/wet_sign, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) "nUv" = ( /obj/structure/machinery/light{ dir = 1 @@ -54210,32 +52517,45 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) -"nUS" = ( -/obj/structure/machinery/light/small{ - dir = 1 +"nUT" = ( +/obj/structure/platform{ + dir = 8 }, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_s) -"nVe" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/sign/safety/bridge{ - pixel_x = 15; +"nVi" = ( +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/briefing) +"nVm" = ( +/obj/structure/machinery/door_control{ + id = "firearm_storage_armory"; + name = "Armory Lockdown"; + pixel_y = 24; + req_access_txt = "4" + }, +/obj/structure/sign/safety/ammunition{ pixel_y = 32 }, -/obj/structure/sign/safety/west{ +/obj/structure/sign/safety/restrictedarea{ + pixel_x = 15; pixel_y = 32 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "red" }, -/area/almayer/hallways/aft_hallway) -"nVi" = ( -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/area/almayer/shipboard/brig/starboard_hallway) +"nVn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 2 }, -/area/almayer/living/briefing) +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) "nVq" = ( /obj/structure/sign/safety/security{ pixel_x = -17; @@ -54250,24 +52570,29 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"nVz" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"nVA" = ( +/obj/structure/stairs{ + dir = 8; + icon_state = "ramptop" }, -/area/almayer/maint/hull/upper/u_a_p) +/obj/effect/projector{ + name = "Almayer_Down3"; + vector_x = 1; + vector_y = -102 + }, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/upper/aft_hallway) "nVB" = ( /turf/open/floor/almayer, /area/almayer/command/securestorage) -"nVC" = ( -/obj/structure/largecrate/random/case/double, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 32 - }, +"nVE" = ( +/obj/structure/closet/emcloset, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/maint/hull/upper/u_m_p) "nVF" = ( /obj/structure/disposalpipe/junction{ dir = 8 @@ -54276,6 +52601,17 @@ icon_state = "cargo_arrow" }, /area/almayer/living/offices) +"nVQ" = ( +/obj/structure/machinery/light, +/obj/structure/sign/safety/security{ + pixel_y = -32 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_x = 15; + pixel_y = -32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "nVR" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/perma) @@ -54289,33 +52625,21 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) -"nVY" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/u_a_s) -"nWt" = ( -/obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_bow) -"nWx" = ( -/obj/structure/machinery/vending/snack, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) "nWN" = ( /obj/structure/surface/table/almayer, /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) -"nXv" = ( -/obj/structure/closet, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/glasses/regular/hipster, +"nWS" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/shipboard/brig/medical) +"nXo" = ( +/obj/item/storage/box/donkpockets, +/obj/structure/surface/rack, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -54382,6 +52706,12 @@ icon_state = "silverfull" }, /area/almayer/command/securestorage) +"nYi" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_bow) "nYn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -54400,23 +52730,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"nYu" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/spray/cleaner{ - pixel_x = 7; - pixel_y = 14 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_f_s) -"nYv" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) "nYD" = ( /obj/structure/closet/secure_closet/medical2, /turf/open/floor/almayer{ @@ -54428,18 +52741,14 @@ dir = 8 }, /area/almayer/command/lifeboat) -"nZp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"nYR" = ( +/obj/structure/sign/safety/cryo{ + pixel_y = 26 }, -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice-simple"; - pixel_x = -16; - pixel_y = 17 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/hallways/lower/starboard_aft_hallway) "nZy" = ( /obj/structure/surface/table/almayer, /obj/structure/disposalpipe/segment{ @@ -54448,18 +52757,29 @@ /obj/item/facepaint/black, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) -"oac" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 +"nZG" = ( +/obj/structure/platform{ + dir = 4 }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) +"nZR" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/maint/hull/lower/p_bow) +/area/almayer/shipboard/panic) +"nZW" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/drinks/cans/souto/blue{ + pixel_x = 2; + pixel_y = 3 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) "oap" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -54467,10 +52787,28 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) +"oaw" = ( +/obj/structure/closet/firecloset, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_stern) "oaK" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"oaO" = ( +/obj/structure/machinery/conveyor{ + id = "lower_garbage" + }, +/obj/structure/machinery/recycler, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "plating_striped" + }, +/area/almayer/maint/hull/lower/l_a_p) "oaW" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ @@ -54484,17 +52822,6 @@ }, /turf/closed/wall/almayer, /area/almayer/squads/req) -"obx" = ( -/obj/structure/ladder{ - height = 1; - id = "ForePortMaint" - }, -/obj/structure/sign/safety/ladder{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/plating/almayer, -/area/almayer/maint/hull/lower/p_bow) "oby" = ( /obj/structure/surface/table/almayer, /obj/item/trash/plate{ @@ -54520,23 +52847,20 @@ icon_state = "plate" }, /area/almayer/squads/alpha_bravo_shared) +"obJ" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "obQ" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"occ" = ( -/obj/structure/surface/table/almayer, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser{ - pixel_y = 8 - }, -/obj/structure/machinery/recharger, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "ocf" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -54587,22 +52911,53 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"ocS" = ( -/obj/structure/window/framed/almayer/hull, -/turf/open/floor/plating, -/area/almayer/maint/hull/upper/s_bow) +"ocI" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) +"ocX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "odb" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"ode" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/s_bow) "odl" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/starboard) +"odt" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/lower/vehiclehangar) "odu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -54631,6 +52986,22 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"odG" = ( +/obj/structure/platform, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -14; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 12; + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "odN" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -54641,14 +53012,6 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/sea_office) -"odT" = ( -/obj/structure/surface/table/almayer, -/obj/item/trash/pistachios, -/obj/item/tool/lighter/random{ - pixel_x = 13 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "odV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -54676,17 +53039,17 @@ icon_state = "cargo" }, /area/almayer/squads/alpha_bravo_shared) -"oeq" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/s_stern) "oer" = ( /turf/closed/wall/almayer{ damage_cap = 15000 }, /area/almayer/squads/delta) +"oes" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) "oex" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /obj/structure/machinery/light, @@ -54700,31 +53063,23 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) +"oeH" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "oeM" = ( /obj/structure/surface/rack, /turf/open/floor/almayer{ icon_state = "silver" }, /area/almayer/command/computerlab) -"oeY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) -"ofp" = ( -/obj/structure/bookcase{ - icon_state = "book-5"; - name = "medical manuals bookcase"; - opacity = 0 - }, -/obj/item/book/manual/surgery, -/obj/item/book/manual/medical_diagnostics_manual, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/wood/ship, -/area/almayer/living/commandbunks) +"oeZ" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/medical) "ofH" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -54742,12 +53097,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"ofP" = ( -/obj/structure/largecrate/random/secure, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) "ofU" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -54762,23 +53111,18 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"ogi" = ( -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) -"ogj" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza, -/obj/item/reagent_container/food/snacks/sliceable/pizza/mushroompizza, -/obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) -"ogI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" +"ogd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) +/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/hallways/upper/stern_hallway) "ogK" = ( /obj/structure/bed/bedroll{ desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on."; @@ -54793,28 +53137,25 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"ogM" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) "ohj" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/squads/charlie) -"ohw" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 +"ohu" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 1; + name = "\improper Brig Maintenance" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/maint/hull/upper/p_bow) "ohA" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -54852,6 +53193,19 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) +"ohI" = ( +/obj/structure/surface/table/almayer, +/obj/item/circuitboard/airlock, +/obj/item/circuitboard/airlock{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/stack/cable_coil{ + pixel_x = -7; + pixel_y = 11 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "ohJ" = ( /obj/structure/machinery/computer/arcade, /turf/open/floor/wood/ship, @@ -54874,6 +53228,17 @@ icon_state = "test_floor4" }, /area/almayer/living/captain_mess) +"oif" = ( +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"oig" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) "oih" = ( /obj/structure/bed{ icon_state = "abed" @@ -54903,18 +53268,16 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"oin" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = -17 +"oiq" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; + dir = 8; + req_one_access = list(2,34,30) }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_f_p) +/area/almayer/maint/hull/upper/u_m_p) "oir" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -54924,12 +53287,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"ois" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) "oit" = ( /obj/effect/landmark/railgun_computer{ dir = 1 @@ -54939,6 +53296,19 @@ icon_state = "redfull" }, /area/almayer/shipboard/port_missiles) +"oix" = ( +/obj/structure/machinery/power/apc/almayer, +/obj/structure/sign/safety/rewire{ + pixel_y = -38 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/warden_office) +"oiB" = ( +/turf/open/floor/almayer{ + dir = 10; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "oiL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -54957,14 +53327,10 @@ }, /turf/open/floor/almayer, /area/almayer/squads/bravo) -"oiR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_s) +"oiX" = ( +/obj/docking_port/stationary/vehicle_elevator/almayer, +/turf/open/floor/almayer/empty, +/area/almayer/hallways/lower/vehiclehangar) "oiY" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -54981,21 +53347,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"ojg" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "ojh" = ( /obj/structure/disposalpipe/junction{ dir = 8 @@ -55031,22 +53382,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"ojR" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/machinery/door_control{ - id = "laddersoutheast"; - name = "South East Ladders Shutters"; - pixel_y = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) "ojZ" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -55059,6 +53394,16 @@ icon_state = "plate" }, /area/almayer/squads/charlie) +"okd" = ( +/obj/structure/machinery/door/poddoor/almayer{ + id = "n_umbilical"; + name = "\improper Umbillical Airlock"; + unacidable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_umbilical) "okg" = ( /obj/structure/sign/safety/reception{ pixel_x = 8; @@ -55068,6 +53413,19 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"oko" = ( +/obj/structure/largecrate/supply/supplies/tables_racks, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/maint/hull/upper/u_a_p) +"okx" = ( +/turf/open/floor/almayer{ + dir = 9; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "okD" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer6" @@ -55076,26 +53434,26 @@ icon_state = "outerhull_dir" }, /area/space) -"olk" = ( -/obj/structure/machinery/light/small{ - dir = 4 +"okO" = ( +/obj/structure/machinery/cm_vending/clothing/senior_officer, +/turf/open/floor/almayer{ + icon_state = "mono" }, +/area/almayer/medical/upper_medical) +"old" = ( +/obj/structure/machinery/light/small, +/obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/stern) -"olv" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/ashtray/plastic, -/obj/item/trash/cigbutt{ - pixel_x = 4 - }, -/obj/item/trash/cigbutt{ - pixel_x = -10; - pixel_y = 13 +/area/almayer/maint/hull/upper/s_bow) +"olC" = ( +/obj/structure/largecrate/random/barrel/red, +/obj/structure/machinery/light/small{ + dir = 8 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/upper/u_m_s) "olM" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -55132,6 +53490,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) +"olQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "olU" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -55139,6 +53503,12 @@ icon_state = "blue" }, /area/almayer/command/cichallway) +"olW" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/lower/s_bow) "omb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -55148,21 +53518,47 @@ icon_state = "silvercorner" }, /area/almayer/command/cichallway) -"omi" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 +"ome" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) +/area/almayer/maint/hull/upper/p_bow) "omo" = ( /obj/structure/window/framed/almayer/white, /turf/open/floor/plating, /area/almayer/medical/lockerroom) +"omp" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/aft_hallway) "omt" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) +"omx" = ( +/obj/structure/largecrate/random/barrel/white, +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = 32 + }, +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/lower/l_f_s) "omy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -55173,10 +53569,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) -"omL" = ( -/obj/docking_port/stationary/escape_pod/north, -/turf/open/floor/plating, -/area/almayer/maint/upper/u_m_s) "omP" = ( /obj/item/tool/mop, /obj/structure/surface/rack, @@ -55185,28 +53577,36 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) -"omW" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +"onh" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"ond" = ( -/obj/structure/machinery/sleep_console{ - dir = 8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + dir = 8; + icon_state = "orange" }, -/area/almayer/shipboard/brig/surgery) -"onr" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/area/almayer/hallways/upper/stern_hallway) +"onn" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) +"onv" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/maint/hull/lower/l_f_s) "onN" = ( /obj/structure/surface/table/almayer, /obj/structure/disposalpipe/segment{ @@ -55270,9 +53670,19 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"opf" = ( +"ooA" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_stern) +/area/almayer/maint/hull/lower/l_m_s) +"opd" = ( +/obj/structure/barricade/handrail, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/hallways/lower/port_midship_hallway) "opC" = ( /obj/structure/machinery/door/airlock/almayer/command/reinforced{ name = "\improper Combat Information Center" @@ -55300,43 +53710,51 @@ icon_state = "plate" }, /area/almayer/engineering/lower/engine_core) -"opI" = ( -/obj/structure/closet/secure_closet, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/storage/box/tapes, -/obj/item/clothing/head/fedora, -/obj/item/clothing/suit/storage/marine/light/reporter, -/obj/item/clothing/head/helmet/marine/reporter, -/obj/item/clothing/head/cmcap/reporter, -/obj/item/device/flashlight, -/obj/item/device/toner, -/obj/item/device/toner, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/command/combat_correspondent) "opJ" = ( /obj/docking_port/stationary/emergency_response/external/port4, /turf/open/space/basic, /area/space) -"opU" = ( -/obj/structure/machinery/portable_atmospherics/canister/air, -/obj/structure/machinery/light/small{ - dir = 1 +"opN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/sign/safety/bridge{ + pixel_y = 32 + }, +/obj/structure/sign/safety/reception{ + pixel_x = 15; + pixel_y = 32 }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_a_s) -"oqn" = ( -/obj/item/stool{ - pixel_x = -15; - pixel_y = 6 +/area/almayer/hallways/upper/aft_hallway) +"opV" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) +/obj/structure/machinery/door_control{ + id = "laddersoutheast"; + name = "South East Ladders Shutters"; + pixel_y = 25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) +"oqc" = ( +/obj/structure/surface/rack, +/obj/item/storage/firstaid/toxin, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "oqt" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -55375,6 +53793,10 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"oqI" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "oqS" = ( /obj/structure/toilet{ dir = 1 @@ -55389,20 +53811,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"oqW" = ( -/obj/structure/largecrate/random/barrel/white, -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = 32 - }, -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = 32 - }, -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/maint/hull/lower/l_f_s) "oqY" = ( /obj/structure/machinery/conveyor{ id = "req_belt" @@ -55449,16 +53857,14 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"ory" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/snacks/mre_pack/meal5, -/obj/item/device/flashlight/lamp{ - pixel_x = 3; - pixel_y = 12 +"orq" = ( +/obj/item/storage/toolbox/mechanical{ + pixel_y = 13 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_s) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "orH" = ( /turf/open/floor/almayer/uscm/directional{ dir = 10 @@ -55481,16 +53887,23 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) -"osd" = ( -/obj/item/fuel_cell, -/obj/item/fuel_cell, -/obj/item/fuel_cell, +"osn" = ( +/obj/item/trash/USCMtray{ + pixel_x = -4; + pixel_y = 10 + }, /obj/structure/surface/table/almayer, -/obj/item/fuel_cell, +/obj/item/tool/kitchen/utensil/pfork{ + pixel_x = 9; + pixel_y = 8 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, -/area/almayer/engineering/lower/engine_core) +/area/almayer/maint/upper/u_m_s) "osx" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -55553,15 +53966,12 @@ }, /area/almayer/engineering/lower/workshop) "osQ" = ( -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" + icon_state = "plate" }, -/area/almayer/maint/upper/mess) +/area/almayer/hallways/lower/starboard_midship_hallway) "osT" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/prop/ice_colony/hula_girl{ @@ -55580,9 +53990,64 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"osX" = ( +/obj/structure/sign/safety/north{ + pixel_x = -17; + pixel_y = -8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"otp" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/shipboard/brig/medical) +"otq" = ( +/obj/structure/machinery/line_nexter{ + dir = 1; + id = "MTline"; + pixel_y = 3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "otu" = ( /turf/closed/wall/almayer/research/containment/wall/connect_w, /area/almayer/medical/containment/cell) +"otC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) +"otE" = ( +/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/hallways/upper/stern_hallway) +"otW" = ( +/obj/structure/machinery/light/small, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) "ouf" = ( /obj/structure/stairs{ dir = 1; @@ -55631,16 +54096,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop/hangar) -"ouy" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 2 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) "ouB" = ( /obj/structure/bed/sofa/vert/grey/bot, /turf/open/floor/almayer, @@ -55654,6 +54109,18 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"ouU" = ( +/obj/structure/surface/table/almayer, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/technology_scanner, +/obj/effect/spawner/random/technology_scanner, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "ouW" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -55668,6 +54135,10 @@ icon_state = "silvercorner" }, /area/almayer/command/cichallway) +"ove" = ( +/obj/structure/airlock_assembly, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "ovi" = ( /turf/open/floor/almayer{ dir = 4; @@ -55685,16 +54156,6 @@ icon_state = "silver" }, /area/almayer/living/briefing) -"ovx" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1; - name = "\improper Emergency Air Storage" - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/u_a_s) "ovG" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -55708,39 +54169,26 @@ dir = 4 }, /area/almayer/medical/containment/cell) -"ovP" = ( -/obj/structure/sign/safety/security{ - pixel_x = 15 +"ovQ" = ( +/obj/structure/machinery/light{ + dir = 1 }, -/turf/closed/wall/almayer, -/area/almayer/hallways/starboard_umbilical) +/obj/structure/sign/safety/maint{ + pixel_x = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) "owg" = ( /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/starboard) -"owD" = ( -/obj/effect/spawner/random/toolbox, -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) -"owH" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/almayer{ - dir = 4; - id = "hangarentrancenorth"; - name = "\improper North Hangar Podlock" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"owU" = ( +/obj/structure/machinery/light/small{ + dir = 8 }, -/area/almayer/hallways/starboard_hallway) -"owS" = ( -/obj/docking_port/stationary/escape_pod/west, -/turf/open/floor/plating, -/area/almayer/maint/hull/lower/l_m_p) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) "owW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -55764,59 +54212,75 @@ /obj/item/bedsheet/orange, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) +"oxe" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) +"oxg" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "oxi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, /turf/open/floor/almayer, /area/almayer/living/cafeteria_officer) -"oxo" = ( -/obj/structure/closet/crate, -/obj/item/ammo_box/magazine/l42a, -/obj/item/ammo_box/magazine/l42a, -/turf/open/floor/almayer{ - icon_state = "plate" +"oxl" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 80 }, -/area/almayer/maint/hull/upper/u_m_s) -"oxt" = ( /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) +"oxn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - dir = 8; - icon_state = "plating_striped" + icon_state = "plate" }, -/area/almayer/squads/req) +/area/almayer/maint/hull/lower/l_m_s) "oxu" = ( /obj/structure/sign/safety/galley{ pixel_x = -17 }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"oxy" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) +"oxz" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "oxU" = ( /obj/structure/machinery/photocopier, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"oyg" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_f_s) -"oyy" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 +"oyC" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/starboard_hallway) "oyE" = ( /obj/effect/landmark/start/intel, /obj/structure/sign/poster{ @@ -55829,15 +54293,25 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/port_atmos) -"oyJ" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/hull/lower/l_f_p) +"oyO" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/structure/sign/safety/water{ + pixel_x = -17 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_p) "oyR" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ icon_state = "orange" }, /area/almayer/engineering/lower) +"oyX" = ( +/obj/structure/bookcase/manuals/engineering, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_s) "ozq" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -55847,22 +54321,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha) -"ozt" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) -"ozw" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/toxin, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "ozz" = ( /obj/structure/surface/table/almayer, /obj/item/tank/emergency_oxygen/double, @@ -55870,6 +54328,18 @@ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/starboard) +"ozH" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/p_bow) "ozN" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ id_tag = "Boat2-D2"; @@ -55880,15 +54350,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) -"ozP" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) "ozT" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -55907,14 +54368,15 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) -"oAr" = ( -/obj/structure/surface/rack, -/obj/item/storage/toolbox/mechanical, -/obj/item/tool/hand_labeler, +"oAa" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/s_bow) +/area/almayer/hallways/lower/port_umbilical) "oAB" = ( /obj/structure/platform{ dir = 8; @@ -55924,12 +54386,43 @@ dir = 10 }, /area/almayer/living/briefing) +"oAK" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) "oAO" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) +"oAT" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/device/radio{ + pixel_x = 8; + pixel_y = 7 + }, +/obj/item/clothing/head/soft/ferret{ + pixel_x = -7 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"oAY" = ( +/obj/effect/projector{ + name = "Almayer_Down3"; + vector_x = 1; + vector_y = -102 + }, +/turf/open/floor/almayer{ + allow_construction = 0; + icon_state = "plate" + }, +/area/almayer/hallways/upper/aft_hallway) "oBq" = ( /obj/structure/bed, /obj/structure/machinery/flasher{ @@ -55941,6 +54434,9 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cells) +"oBr" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/hull/lower/l_a_s) "oBA" = ( /obj/structure/sign/safety/conference_room{ pixel_x = -17; @@ -55955,29 +54451,30 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"oBM" = ( -/obj/item/tool/wirecutters/clippers, -/turf/open/floor/almayer{ - icon_state = "plate" +"oCa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/almayer/maint/hull/upper/u_a_s) -"oBQ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 32 +/obj/structure/sign/safety/airlock{ + pixel_y = -32 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_m_s) -"oBS" = ( +/area/almayer/hallways/lower/port_umbilical) +"oCb" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; pixel_y = 32 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_midship_hallway) "oCf" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -56005,19 +54502,13 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) -"oCV" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) +"oCK" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "oDh" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/pouch/tools/full, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) "oDi" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -56070,14 +54561,23 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"oDI" = ( -/obj/structure/machinery/constructable_frame{ - icon_state = "box_2" +"oDJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/spiderling_remains{ + pixel_x = 18; + pixel_y = -5 + }, +/obj/effect/decal/cleanable/ash{ + pixel_x = 11; + pixel_y = 25 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "sterile_green_corner" }, -/area/almayer/maint/hull/upper/p_stern) +/area/almayer/medical/lower_medical_medbay) "oDL" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -56098,6 +54598,15 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/medical_science) +"oDU" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/obj/structure/barricade/handrail, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/hallways/lower/port_midship_hallway) "oDY" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger, @@ -56175,25 +54684,6 @@ icon_state = "red" }, /area/almayer/living/port_emb) -"oFb" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/p_bow) -"oFg" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/u_m_s) "oFm" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -56202,21 +54692,20 @@ }, /area/almayer/engineering/lower/workshop) "oFn" = ( -/obj/structure/platform, -/obj/structure/largecrate/random/case/double{ - layer = 2.98 - }, -/obj/structure/sign/safety/life_support{ - pixel_x = 32 +/obj/structure/surface/table/almayer, +/obj/item/tool/wirecutters/clippers, +/obj/item/handcuffs/zip, +/turf/open/floor/almayer{ + icon_state = "plate" }, +/area/almayer/maint/hull/lower/l_f_p) +"oFr" = ( +/obj/item/storage/firstaid/regular, +/obj/structure/surface/rack, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_s) -"oFv" = ( -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) "oFV" = ( /obj/structure/sign/poster{ pixel_x = -32; @@ -56227,6 +54716,40 @@ "oFY" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/lobby) +"oGf" = ( +/obj/structure/surface/rack, +/obj/item/storage/firstaid/regular, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) +"oGh" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/hallways/lower/port_aft_hallway) +"oGi" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"oGj" = ( +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = -16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/s_bow) +"oGm" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/hallways/lower/starboard_umbilical) "oGx" = ( /obj/structure/closet/secure_closet/surgical{ pixel_x = 30 @@ -56251,10 +54774,28 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"oGF" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "oGJ" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower/engine_core) +"oGL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_fore_hallway) "oGP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -56304,6 +54845,21 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/charlie) +"oHf" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_bow) +"oHg" = ( +/obj/structure/largecrate/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_stern) "oHl" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/electrical, @@ -56312,6 +54868,23 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"oHs" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"oHt" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/cryo{ + pixel_x = 8; + pixel_y = -26 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) "oHx" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -56320,10 +54893,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) -"oHy" = ( -/obj/structure/machinery/cm_vending/sorted/marine_food, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) "oIa" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -56374,9 +54943,24 @@ "oIB" = ( /turf/closed/wall/almayer, /area/almayer/command/combat_correspondent) +"oJj" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "oJk" = ( /turf/closed/wall/almayer, /area/almayer/engineering/lower/workshop) +"oJm" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) "oJp" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -56388,6 +54972,22 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"oJL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/door_control{ + id = "hangarentrancesouth"; + name = "South Hangar Shutters"; + pixel_y = 30; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_fore_hallway) "oJR" = ( /obj/effect/projector{ name = "Almayer_AresDown"; @@ -56411,18 +55011,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"oJX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/largecrate/random/secure{ - pixel_x = -5 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) "oKb" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -56431,15 +55019,6 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) -"oKi" = ( -/obj/structure/machinery/conveyor{ - id = "lower_garbage" - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "plating_striped" - }, -/area/almayer/maint/hull/lower/l_a_p) "oKv" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ layer = 1.9 @@ -56456,24 +55035,31 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"oKB" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) -"oLa" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 +"oLf" = ( +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = 32 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/p_bow) +/area/almayer/maint/hull/upper/p_bow) "oLi" = ( /obj/effect/landmark/start/marine/medic/bravo, /obj/effect/landmark/late_join/bravo, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) +"oLj" = ( +/obj/effect/projector{ + name = "Almayer_Up2"; + vector_x = -1; + vector_y = 100 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) "oLm" = ( /obj/structure/machinery/door_control{ id = "ARES StairsLower"; @@ -56492,13 +55078,6 @@ icon_state = "silver" }, /area/almayer/command/airoom) -"oLv" = ( -/obj/structure/sign/safety/medical{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "oLF" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -56530,15 +55109,6 @@ icon_state = "plating" }, /area/almayer/shipboard/stern_point_defense) -"oLT" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "oLU" = ( /turf/open/floor/almayer{ dir = 1; @@ -56564,12 +55134,6 @@ icon_state = "plate" }, /area/almayer/living/auxiliary_officer_office) -"oMp" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "oMs" = ( /obj/structure/machinery/computer/cameras/almayer{ dir = 1 @@ -56591,6 +55155,10 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"oNa" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "oNb" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -56627,6 +55195,12 @@ icon_state = "plating" }, /area/almayer/medical/upper_medical) +"oNM" = ( +/obj/structure/largecrate/random/barrel, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_p) "oNP" = ( /obj/structure/machinery/vending/cola{ density = 0; @@ -56647,16 +55221,22 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"oOh" = ( -/obj/item/tool/mop{ - pixel_x = -6; - pixel_y = 24 +"oOi" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 }, -/obj/item/reagent_container/glass/bucket, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/stern_hallway) +"oOp" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/wirecutters, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/hull/upper/u_m_p) "oOw" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -56693,57 +55273,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/lifeboat) -"oPk" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/door_control{ - id = "Interrogation Shutters"; - name = "\improper Shutters"; - pixel_x = -6; - pixel_y = -6; - req_access_txt = "3" - }, -/obj/item/device/taperecorder{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) -"oPp" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) -"oPs" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/lower/l_m_s) -"oPu" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) -"oPv" = ( -/obj/structure/sign/safety/water{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) -"oPx" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) "oPy" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -56782,32 +55311,26 @@ icon_state = "red" }, /area/almayer/command/cic) -"oPS" = ( -/obj/structure/platform_decoration{ - dir = 8 +"oPF" = ( +/obj/structure/machinery/light/small{ + dir = 1 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) -"oPY" = ( -/turf/open/floor/almayer, -/area/almayer/maint/hull/lower/l_m_s) -"oQj" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/machinery/door_control{ - id = "laddernortheast"; - name = "North East Ladders Shutters"; - pixel_y = -25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 +/area/almayer/maint/hull/lower/l_a_s) +"oPT" = ( +/obj/structure/machinery/light{ + dir = 1 }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) +"oQn" = ( /turf/open/floor/almayer{ - icon_state = "green" + dir = 1; + icon_state = "greencorner" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "oQs" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/book/manual/surgery{ @@ -56817,11 +55340,30 @@ icon_state = "plate" }, /area/almayer/command/cichallway) +"oQw" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orangecorner" + }, +/area/almayer/hallways/lower/port_umbilical) "oQH" = ( /turf/open/floor/almayer{ icon_state = "cargo_arrow" }, /area/almayer/living/briefing) +"oQJ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) +"oQL" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "oQM" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -56851,6 +55393,14 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"oRm" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Port Viewing Room" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_f_s) "oRJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -56922,15 +55472,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) -"oSy" = ( -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice-simple"; - pixel_x = 16; - pixel_y = -16 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) "oSC" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -56940,6 +55481,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) +"oSG" = ( +/obj/structure/surface/table/almayer, +/obj/item/card/id/visa, +/obj/item/tool/crew_monitor, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "oSL" = ( /obj/structure/window/reinforced{ dir = 8 @@ -56963,6 +55512,26 @@ icon_state = "plate" }, /area/almayer/squads/alpha_bravo_shared) +"oSM" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) +"oSR" = ( +/obj/structure/stairs{ + icon_state = "ramptop" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"oTc" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "oTe" = ( /obj/item/prop/almayer/box, /obj/item/prop{ @@ -56992,12 +55561,6 @@ icon_state = "test_floor5" }, /area/almayer/squads/req) -"oTn" = ( -/mob/living/simple_animal/mouse/brown, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/lower/s_bow) "oTA" = ( /obj/structure/machinery/cryopod, /obj/structure/machinery/light{ @@ -57007,17 +55570,15 @@ icon_state = "cargo" }, /area/almayer/squads/alpha) -"oTN" = ( -/obj/structure/surface/rack, -/obj/item/device/radio{ - pixel_x = 5; - pixel_y = 4 +"oTH" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/item/device/radio, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/hallways/lower/port_umbilical) "oTO" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -57031,16 +55592,35 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) -"oTR" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/airlock/almayer/maint{ +"oUi" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) +"oUt" = ( +/obj/structure/sign/safety/restrictedarea{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) +"oUx" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"oUz" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/machinery/power/apc/almayer{ dir = 1 }, -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "silver" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/hallways/lower/repair_bay) "oUG" = ( /obj/structure/machinery/light{ dir = 8 @@ -57050,13 +55630,21 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"oUM" = ( -/obj/structure/sign/safety/storage{ - pixel_x = 8; - pixel_y = 32 +"oUO" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) +/turf/open/floor/almayer, +/area/almayer/hallways/upper/stern_hallway) +"oUZ" = ( +/obj/structure/surface/rack, +/obj/item/tool/crowbar, +/obj/item/tool/weldingtool, +/obj/item/tool/wrench, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) "oVf" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/evidence{ @@ -57074,12 +55662,28 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/general_equipment) -"oVn" = ( -/obj/structure/closet/secure_closet/engineering_welding{ - req_one_access_txt = "7;23;27" +"oVk" = ( +/obj/structure/stairs{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/s_bow) +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/projector{ + name = "Almayer_Up3"; + vector_x = -1; + vector_y = 102 + }, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/port_fore_hallway) +"oVY" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "oWf" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger, @@ -57108,6 +55712,10 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"oWq" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "oWx" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -57124,19 +55732,50 @@ icon_state = "plate" }, /area/almayer/living/starboard_garden) +"oWE" = ( +/obj/structure/stairs, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/projector{ + name = "Almayer_Up1"; + vector_x = -19; + vector_y = 98 + }, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"oWF" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) +"oWK" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) +"oWN" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) "oXb" = ( /obj/effect/landmark/start/marine/charlie, /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) -"oXd" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "oXp" = ( /obj/effect/decal/cleanable/ash, /turf/open/floor/wood/ship, @@ -57177,6 +55816,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"oYi" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) "oYp" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -57186,16 +55831,55 @@ icon_state = "red" }, /area/almayer/living/offices/flight) -"oYP" = ( +"oYr" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_a_p) +"oYs" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - layer = 2.5; + icon_state = "N"; pixel_y = 1 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_p) +/area/almayer/maint/hull/upper/u_a_s) +"oYA" = ( +/obj/structure/surface/table/almayer, +/obj/structure/dropship_equipment/fuel/cooling_system{ + layer = 3.5 + }, +/obj/item/clothing/glasses/welding{ + layer = 3.6; + pixel_x = 2; + pixel_y = 7 + }, +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/computer/working_joe{ + dir = 4; + pixel_x = -17 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/lower/repair_bay) +"oZn" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_p) "oZp" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light, @@ -57247,9 +55931,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"oZF" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/lower/s_bow) "oZV" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/roller, @@ -57290,10 +55971,6 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cryo) -"pau" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) "paI" = ( /obj/structure/sign/safety/debark_lounge{ pixel_x = 15; @@ -57303,23 +55980,56 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) +"paJ" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_bow) "paL" = ( /turf/open/floor/almayer/uscm/directional{ dir = 1 }, /area/almayer/command/cic) -"paN" = ( -/obj/structure/surface/rack, -/obj/structure/machinery/camera/autoname/almayer{ +"pbm" = ( +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ dir = 4; - name = "ship-grade camera" + pixel_x = -2; + pixel_y = 4 }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) -"pbd" = ( -/obj/structure/largecrate/supply, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) +/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 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/shipboard/brig/mp_bunks) +"pbo" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_stern) "pbp" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -57347,6 +56057,22 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) +"pcc" = ( +/obj/structure/surface/rack, +/obj/item/paper{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/folder/yellow, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_s) +"pcf" = ( +/obj/item/tool/wet_sign, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_s) "pcj" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -57401,31 +56127,18 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"pcR" = ( -/obj/item/frame/rack{ - layer = 3.1; - pixel_y = 19 - }, -/obj/structure/surface/rack, -/obj/item/tool/weldpack{ - pixel_x = 5 - }, -/obj/item/tool/weldpack{ - pixel_x = -2 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) "pcY" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = -32 +/obj/structure/disposalpipe/segment, +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = -17 }, -/obj/structure/machinery/power/apc/almayer, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/s_bow) +/area/almayer/maint/upper/mess) +"pdp" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_bow) "pdy" = ( /obj/structure/machinery/door_control{ id = "OTStore"; @@ -57451,12 +56164,38 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) -"pep" = ( +"pdT" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/shipboard/brig/medical) +"pek" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/hull/upper/s_bow) +"peu" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/upper/aft_hallway) +"peM" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/upper/u_f_s) "peO" = ( /obj/structure/sign/safety/medical{ pixel_x = -17; @@ -57489,6 +56228,17 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) +"pfd" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/plating, +/area/almayer/shipboard/brig/starboard_hallway) "pfp" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Up4"; @@ -57499,20 +56249,27 @@ allow_construction = 0 }, /area/almayer/stair_clone) -"pfy" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/s_bow) +"pfD" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) "pfH" = ( /obj/structure/platform_decoration, /turf/open/floor/almayer{ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) +"pfL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_s) "pfM" = ( /obj/structure/machinery/light{ dir = 4 @@ -57528,16 +56285,6 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) -"pga" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/tool, -/obj/effect/spawner/random/tool, -/obj/effect/spawner/random/powercell, -/obj/effect/spawner/random/powercell, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) "pgw" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -57567,6 +56314,13 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"pgJ" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "pgM" = ( /obj/structure/reagent_dispensers/water_cooler/walk_past{ pixel_x = 10; @@ -57625,21 +56379,15 @@ icon_state = "plate" }, /area/almayer/command/combat_correspondent) -"phn" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/s_bow) -"phx" = ( -/obj/structure/machinery/door/airlock/almayer/medical{ - id_tag = "or03"; - name = "Lobby" +"phw" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/card{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/medical/lower_medical_medbay) +/area/almayer/shipboard/panic) "phN" = ( /obj/structure/disposalpipe/junction{ dir = 4; @@ -57650,6 +56398,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/processing) +"pij" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) +"piJ" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/stern) "piK" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/locked{ @@ -57664,9 +56425,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/command/computerlab) -"pji" = ( -/turf/closed/wall/almayer, -/area/almayer/hallways/stern_hallway) +"pjh" = ( +/obj/structure/machinery/vending/snack, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/panic) "pjj" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -57676,15 +56440,15 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) -"pjr" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) "pjw" = ( /turf/open/floor/almayer{ dir = 10; icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) +"pjz" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/hull/upper/p_bow) "pjF" = ( /obj/structure/surface/table/almayer, /obj/item/paper, @@ -57704,18 +56468,18 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) -"pjM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"pjP" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) +"pjQ" = ( /turf/open/floor/almayer{ - dir = 4; - icon_state = "green" + dir = 10; + icon_state = "silver" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "pjR" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -57726,25 +56490,15 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"pkv" = ( -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_s) -"pkx" = ( -/obj/structure/largecrate/random/secure, -/turf/open/floor/almayer{ - icon_state = "plate" +"pjY" = ( +/obj/structure/machinery/light{ + dir = 4 }, -/area/almayer/maint/hull/lower/l_f_s) -"pky" = ( -/obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ - dir = 4; - icon_state = "green" + dir = 10; + icon_state = "red" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/upper/aft_hallway) "pkz" = ( /turf/open/floor/almayer{ icon_state = "redfull" @@ -57760,13 +56514,18 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"plI" = ( -/obj/structure/machinery/cm_vending/sorted/medical/blood, +"plv" = ( +/turf/open/floor/plating, +/area/almayer/maint/hull/lower/l_m_p) +"pmd" = ( +/obj/structure/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" + icon_state = "plate" }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/hallways/lower/port_aft_hallway) "pmq" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -57797,14 +56556,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"pmS" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/u_m_p) "pmV" = ( /obj/structure/prop/server_equipment/yutani_server/broken{ density = 0; @@ -57817,12 +56568,16 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"pno" = ( -/obj/structure/sign/safety/escapepod{ - pixel_y = 32 +"pnh" = ( +/obj/structure/ladder{ + height = 2; + id = "ForePortMaint" }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/obj/structure/sign/safety/ladder{ + pixel_x = -17 + }, +/turf/open/floor/plating/almayer, +/area/almayer/maint/hull/upper/p_bow) "pns" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -57833,16 +56588,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"pnI" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/obj/structure/largecrate/random/case/small, +"pnC" = ( +/obj/structure/machinery/cm_vending/sorted/medical/blood/bolted, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "sterile_green_side" }, -/area/almayer/maint/hull/upper/s_bow) +/area/almayer/medical/lower_medical_medbay) "pnL" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_2" @@ -57860,6 +56611,21 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"pok" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 18 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_p) "poA" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/bucket/mopbucket, @@ -57898,6 +56664,21 @@ /obj/item/device/camera, /turf/open/floor/almayer, /area/almayer/command/corporateliaison) +"ppG" = ( +/obj/structure/bed/sofa/south/grey, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_p) +"ppM" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/stern) +"ppV" = ( +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "pqc" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -57922,6 +56703,19 @@ /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, /area/almayer/engineering/upper_engineering/port) +"pqv" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/stern_hallway) +"pqw" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) "pqD" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -57939,16 +56733,22 @@ /obj/item/trash/cigbutt, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) -"pqG" = ( -/obj/structure/window/framed/almayer/hull, -/turf/open/floor/plating, -/area/almayer/maint/hull/upper/p_bow) "pqK" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/squads/bravo) +"pqM" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper Workshop Vendors" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/repair_bay) "pqP" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /obj/structure/machinery/light{ @@ -57958,31 +56758,39 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) -"pqQ" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/hallways/vehiclehangar) -"pqU" = ( -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = 6 - }, -/obj/item/weapon/gun/rifle/l42a, -/obj/item/weapon/gun/rifle/l42a{ - pixel_y = -6 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) "pqX" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/living/gym) +"prf" = ( +/obj/structure/sign/safety/storage{ + pixel_x = -17 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_p) +"pri" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -25 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) +"prl" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/lower/vehiclehangar) "prx" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -58007,22 +56815,19 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) -"prS" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/wet_sign, -/obj/item/tool/wet_sign{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/tool/wet_sign{ - pixel_x = -8; - pixel_y = 6 +"prV" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/machinery/light{ - dir = 1 +/area/almayer/hallways/upper/stern_hallway) +"prX" = ( +/obj/structure/ladder{ + height = 2; + id = "AftStarboardMaint" }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) +/turf/open/floor/plating/almayer, +/area/almayer/maint/hull/upper/u_a_s) "prY" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray, @@ -58038,12 +56843,6 @@ icon_state = "bluefull" }, /area/almayer/living/bridgebunks) -"psl" = ( -/obj/structure/bed/sofa/south/grey, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_f_p) "psK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -58104,18 +56903,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"ptr" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_s) "ptv" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/platform{ @@ -58143,6 +56930,14 @@ "ptK" = ( /turf/closed/wall/almayer, /area/almayer/engineering/upper_engineering/starboard) +"ptQ" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/s_stern) "ptZ" = ( /obj/structure/platform{ dir = 4; @@ -58156,6 +56951,16 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) +"pum" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) "pun" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -58169,48 +56974,40 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) -"puv" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) -"puE" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger, -/obj/structure/sign/safety/terminal{ - pixel_y = 32 - }, -/obj/structure/transmitter/rotary{ - name = "Brig Wardens's Office Telephone"; - phone_category = "MP Dept."; - phone_id = "Brig Warden's Office"; - pixel_x = 15 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/shipboard/brig/chief_mp_office) "puI" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"puJ" = ( +/obj/structure/prop/invuln/pipe_water, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_s) "puO" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) +"puT" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/stern) "pvh" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/item/tool/warning_cone{ @@ -58220,38 +57017,31 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/port_emb) -"pvt" = ( -/obj/structure/sign/safety/refridgeration{ - pixel_y = -32 - }, -/obj/structure/sign/safety/medical{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, +"pvi" = ( /turf/open/floor/almayer{ - icon_state = "green" + dir = 6; + icon_state = "red" }, -/area/almayer/hallways/aft_hallway) -"pvv" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 +/area/almayer/hallways/upper/aft_hallway) +"pvE" = ( +/obj/structure/machinery/light{ + dir = 1 }, -/obj/structure/bed/chair{ - dir = 4 +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" }, -/obj/structure/sign/safety/water{ +/area/almayer/hallways/upper/stern_hallway) +"pvI" = ( +/obj/structure/sign/safety/rad_haz{ pixel_x = 8; - pixel_y = -32 + pixel_y = 32 }, -/obj/structure/machinery/light/small, +/obj/structure/machinery/power/reactor, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/engineering/lower/engine_core) "pvJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -58291,27 +57081,29 @@ icon_state = "redcorner" }, /area/almayer/shipboard/starboard_missiles) +"pwd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/aft_hallway) "pwx" = ( -/obj/structure/largecrate/random/case/small, +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = -17 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "orange" }, -/area/almayer/maint/hull/upper/p_bow) +/area/almayer/hallways/lower/starboard_midship_hallway) "pwG" = ( /obj/structure/bed/chair/office/dark{ dir = 1 }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) -"pwJ" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/obj/item/stack/tile/carpet{ - amount = 20 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) "pxj" = ( /obj/structure/bed, /obj/item/bedsheet/brown, @@ -58354,12 +57146,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) -"pxO" = ( -/obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_s) "pyc" = ( /obj/structure/bed/stool, /turf/open/floor/almayer{ @@ -58401,6 +57187,12 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/bravo) +"pym" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/stern_hallway) "pyx" = ( /obj/structure/machinery/door_display/research_cell{ dir = 4; @@ -58457,6 +57249,15 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) +"pzc" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_bow) "pzd" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -58467,19 +57268,16 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"pzi" = ( -/obj/structure/sign/safety/storage{ - pixel_x = 8; - pixel_y = -32 +"pzj" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "northcheckpoint"; + name = "\improper Checkpoint Shutters" }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "redfull" }, -/area/almayer/maint/hull/lower/l_m_s) -"pzA" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/hallways/lower/starboard_midship_hallway) "pzG" = ( /obj/docking_port/stationary/emergency_response/port1, /turf/open/floor/almayer{ @@ -58505,43 +57303,30 @@ icon_state = "bluecorner" }, /area/almayer/living/briefing) +"pzW" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/hallways/lower/vehiclehangar) "pAm" = ( /turf/open/floor/almayer, /area/almayer/engineering/lower/engine_core) -"pAH" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/hull/lower/l_m_s) -"pAR" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/starboard_umbilical) -"pBn" = ( -/obj/structure/sign/safety/escapepod{ - pixel_x = 8; - pixel_y = -32 +"pAV" = ( +/obj/structure/platform{ + dir = 1 }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "greencorner" +/obj/item/tool/mop, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) +"pBg" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 }, -/area/almayer/hallways/port_hallway) -"pBE" = ( -/obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/hallways/upper/stern_hallway) "pBG" = ( /turf/closed/wall/almayer, /area/almayer/command/corporateliaison) -"pCe" = ( -/turf/open/floor/plating, -/area/almayer/maint/hull/lower/l_m_s) "pCq" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -58559,18 +57344,17 @@ icon_state = "plate" }, /area/almayer/squads/req) -"pCD" = ( -/obj/structure/pipes/standard/cap/hidden{ - dir = 4 - }, -/obj/structure/sign/safety/life_support{ - pixel_x = 14; - pixel_y = -25 +"pCQ" = ( +/obj/structure/surface/table/almayer, +/obj/item/attachable/lasersight, +/obj/item/reagent_container/food/drinks/cans/souto/vanilla{ + pixel_x = 10; + pixel_y = 11 }, /turf/open/floor/almayer{ - icon_state = "mono" + icon_state = "plate" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/maint/hull/upper/u_m_s) "pDh" = ( /obj/structure/machinery/power/monitor{ name = "Core Power Monitoring" @@ -58589,14 +57373,6 @@ icon_state = "tcomms" }, /area/almayer/engineering/upper_engineering/starboard) -"pDk" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "Brig" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/lower/s_bow) "pDo" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -58610,18 +57386,6 @@ icon_state = "plating" }, /area/almayer/shipboard/starboard_point_defense) -"pDq" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) "pDr" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -58669,15 +57433,12 @@ icon_state = "red" }, /area/almayer/shipboard/brig/chief_mp_office) -"pDZ" = ( -/obj/structure/surface/rack, -/obj/item/tool/crowbar, -/obj/item/tool/weldingtool, -/obj/item/tool/wrench, +"pEd" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "orangecorner" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/hallways/upper/stern_hallway) "pEl" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -58696,14 +57457,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"pEp" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_bow) "pEB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -58737,31 +57490,55 @@ icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/south1) -"pFx" = ( -/obj/item/clothing/gloves/botanic_leather{ - name = "leather gloves" +"pFf" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/item/clothing/gloves/botanic_leather{ - name = "leather gloves" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/item/clothing/gloves/botanic_leather{ - name = "leather gloves" +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) +"pFq" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/binoculars, +/obj/item/device/whistle{ + pixel_y = 5 }, -/obj/structure/closet/crate, -/obj/item/clothing/suit/storage/hazardvest/black, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_p) -"pGD" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, +/area/almayer/maint/hull/upper/u_f_s) +"pFr" = ( +/obj/structure/machinery/light/small, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_p) +"pGh" = ( +/obj/effect/decal/cleanable/cobweb{ + pixel_x = -9; + pixel_y = 19 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_p) +"pGj" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) +"pGG" = ( +/obj/effect/landmark/start/doctor, +/obj/structure/sign/safety/maint{ + pixel_y = 26 + }, +/obj/effect/landmark/late_join/doctor, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/offices) "pGK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -58773,12 +57550,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"pGM" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "pGT" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -58789,6 +57560,20 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) +"pHh" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) "pHp" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/perma) @@ -58798,6 +57583,23 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) +"pHD" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"pHF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/vehiclehangar) "pHG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -58816,6 +57618,40 @@ /obj/structure/surface/table/almayer, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) +"pIf" = ( +/obj/structure/mirror{ + pixel_x = 28 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/maint/hull/upper/u_a_s) +"pIo" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) +"pIC" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/lower/constr) "pIU" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -58839,10 +57675,16 @@ icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/north1) -"pJa" = ( -/obj/docking_port/stationary/escape_pod/south, -/turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_m_s) +"pJq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/lower/vehiclehangar) "pJr" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -58851,19 +57693,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower/engine_core) -"pJv" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "redcorner" - }, -/area/almayer/shipboard/brig/main_office) "pJD" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -58883,23 +57712,6 @@ icon_state = "dark_sterile" }, /area/almayer/living/port_emb) -"pJE" = ( -/obj/item/trash/uscm_mre, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice1"; - pixel_x = 16; - pixel_y = -16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) -"pJJ" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) "pJR" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_AresUp"; @@ -58913,6 +57725,45 @@ dir = 4 }, /area/almayer/command/airoom) +"pKh" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/obj/effect/landmark/start/nurse, +/obj/effect/landmark/late_join/nurse, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/offices) +"pKB" = ( +/obj/structure/surface/rack, +/obj/item/circuitboard/firealarm, +/obj/item/circuitboard, +/obj/item/clipboard, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_stern) +"pKU" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/mp_bunks) +"pKW" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "DeployWorkR"; + name = "\improper Workshop Shutters" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/repair_bay) "pKZ" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -58945,13 +57796,6 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) -"pLB" = ( -/obj/item/reagent_container/food/snacks/wrapped/chunk, -/obj/structure/surface/rack, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_stern) "pLO" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -59002,15 +57846,13 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"pMI" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"pMH" = ( +/obj/item/tool/wet_sign, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/maint/hull/lower/l_a_s) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_s) "pMJ" = ( /obj/structure/bed/chair{ dir = 1 @@ -59038,33 +57880,6 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) -"pNk" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/bodybags{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/storage/box/bodybags, -/obj/structure/machinery/light/small{ - dir = 4; - pixel_y = -12 - }, -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = 32; - pixel_y = 17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/brig/execution) -"pNu" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) "pNM" = ( /obj/structure/platform{ dir = 4 @@ -59087,18 +57902,32 @@ icon_state = "sterile_green" }, /area/almayer/medical/hydroponics) -"pOa" = ( -/obj/item/book/manual/medical_diagnostics_manual, -/obj/structure/surface/rack, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/maint/hull/upper/u_a_p) "pOi" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/offices) +"pOp" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/obj/structure/largecrate/random/case/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_bow) +"pOC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/hallways/upper/aft_hallway) "pOD" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -59109,25 +57938,27 @@ icon_state = "mono" }, /area/almayer/living/pilotbunks) +"pOH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/panic) "pON" = ( /turf/open/floor/almayer/uscm/directional{ dir = 8 }, /area/almayer/command/cic) -"pOR" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/ladder{ - height = 2; - id = "cicladder3" - }, -/obj/structure/sign/safety/ladder{ - pixel_x = 23; - pixel_y = 32 +"pOW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/plating/almayer, -/area/almayer/medical/medical_science) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) "pOY" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/microwave{ @@ -59138,14 +57969,16 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"pPq" = ( -/obj/structure/bed/chair{ - dir = 8 +"pPd" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 2; + id = "OuterShutter"; + name = "\improper Saferoom Shutters" }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/shipboard/panic) "pPv" = ( /obj/structure/closet/cabinet, /obj/item/reagent_container/food/drinks/bottle/wine, @@ -59170,16 +58003,14 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) -"pPw" = ( -/obj/structure/largecrate/supply/generator, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +"pPy" = ( +/obj/structure/sign/safety/restrictedarea{ + pixel_x = 8; + pixel_y = -32 }, -/area/almayer/maint/hull/upper/u_a_p) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) "pPA" = ( /obj/structure/sign/poster{ desc = "One of those hot, tanned babes back the beaches of good ol' Earth."; @@ -59196,6 +58027,15 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"pPG" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) "pPM" = ( /obj/structure/surface/rack, /turf/open/floor/almayer{ @@ -59210,6 +58050,21 @@ icon_state = "red" }, /area/almayer/shipboard/port_missiles) +"pPQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/lower/vehiclehangar) +"pPU" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/upper/aft_hallway) "pQr" = ( /obj/structure/bed, /turf/open/floor/almayer{ @@ -59233,6 +58088,16 @@ icon_state = "plate" }, /area/almayer/squads/charlie_delta_shared) +"pQI" = ( +/obj/structure/machinery/power/apc/almayer{ + cell_type = /obj/item/cell/hyper; + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/mp_bunks) "pQN" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/franks, @@ -59275,19 +58140,15 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) +"pRs" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) "pRy" = ( /turf/open/floor/almayer/research/containment/corner_var1{ dir = 4 }, /area/almayer/medical/containment/cell/cl) -"pRL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/aft_hallway) "pRO" = ( /obj/structure/bed/chair{ dir = 4 @@ -59326,29 +58187,24 @@ }, /turf/open/floor/plating, /area/almayer/engineering/lower/workshop) -"pSK" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +"pSF" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) -"pSL" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" + icon_state = "plate" }, -/area/almayer/hallways/aft_hallway) -"pSP" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 +/area/almayer/hallways/lower/starboard_fore_hallway) +"pSN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "pSQ" = ( /obj/structure/reagent_dispensers/fueltank{ anchored = 1 @@ -59382,24 +58238,16 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) -"pTD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/distribution_pipes{ +"pTX" = ( +/obj/structure/largecrate/random/barrel/red, +/obj/structure/sign/safety/fire_haz{ pixel_x = 8; pixel_y = -32 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) -"pTQ" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/tool, -/obj/effect/spawner/random/toolbox, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/s_bow) +/area/almayer/maint/hull/lower/l_f_p) "pUd" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ @@ -59468,12 +58316,23 @@ icon_state = "redfull" }, /area/almayer/shipboard/brig/processing) -"pVg" = ( -/obj/structure/machinery/light/small{ +"pUL" = ( +/obj/structure/surface/table/almayer, +/obj/item/weapon/gun/rifle/m41a, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) +"pVr" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) +/area/almayer/hallways/lower/starboard_midship_hallway) "pVx" = ( /obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, /turf/open/floor/almayer{ @@ -59511,29 +58370,27 @@ icon_state = "silver" }, /area/almayer/living/briefing) -"pVG" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orangecorner" +"pVF" = ( +/obj/structure/surface/table/almayer, +/obj/item/spacecash/c1000/counterfeit, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/fancy/cigar, +/obj/structure/machinery/atm{ + pixel_y = 32 }, -/area/almayer/maint/hull/upper/u_a_s) -"pVK" = ( /turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/command/corporateliaison) "pWb" = ( /obj/effect/landmark/start/marine/tl/delta, /obj/effect/landmark/late_join/delta, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) -"pWg" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply, +"pWd" = ( +/obj/structure/surface/table/almayer, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/maint/hull/upper/u_f_s) "pWr" = ( /obj/structure/surface/rack, /obj/item/tool/minihoe{ @@ -59561,17 +58418,16 @@ icon_state = "green" }, /area/almayer/shipboard/brig/cells) -"pWA" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/obj/structure/machinery/light{ - dir = 8 +"pWw" = ( +/obj/structure/bed/chair, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "green" + icon_state = "plate" }, -/area/almayer/squads/req) +/area/almayer/maint/hull/upper/u_a_s) "pWN" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -59613,6 +58469,24 @@ /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) +"pYh" = ( +/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/lower/starboard_midship_hallway) "pYi" = ( /obj/structure/machinery/light{ dir = 4 @@ -59644,6 +58518,24 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"pYN" = ( +/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/hallways/lower/port_fore_hallway) +"pYQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) "pYS" = ( /obj/structure/pipes/binary/pump/on{ dir = 4 @@ -59659,12 +58551,18 @@ icon_state = "silvercorner" }, /area/almayer/shipboard/brig/cic_hallway) -"pZo" = ( +"pZq" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_umbilical) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/stern_hallway) "pZH" = ( /obj/structure/machinery/shower{ dir = 8 @@ -59706,6 +58604,28 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"qan" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) +"qas" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) +"qax" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/vehiclehangar) "qaV" = ( /turf/open/floor/almayer{ dir = 10; @@ -59720,9 +58640,6 @@ icon_state = "red" }, /area/almayer/living/briefing) -"qbs" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/lower/l_m_p) "qbx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -59773,12 +58690,6 @@ }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) -"qcl" = ( -/obj/structure/sign/safety/conference_room{ - pixel_y = 32 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "qcy" = ( /obj/structure/sign/safety/bathunisex{ pixel_x = 8; @@ -59788,12 +58699,13 @@ icon_state = "plate" }, /area/almayer/living/auxiliary_officer_office) -"qcM" = ( -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/almayer{ - icon_state = "plate" +"qcL" = ( +/obj/structure/sign/safety/intercom{ + pixel_x = 8; + pixel_y = 32 }, -/area/almayer/maint/upper/u_m_p) +/turf/open/floor/almayer, +/area/almayer/hallways/upper/stern_hallway) "qdk" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -59844,9 +58756,6 @@ icon_state = "emerald" }, /area/almayer/living/port_emb) -"qdy" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/upper/u_m_s) "qdz" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -59870,6 +58779,12 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"qdV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "qec" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -59912,16 +58827,6 @@ icon_state = "cargo" }, /area/almayer/squads/charlie) -"qev" = ( -/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/maint/hull/lower/l_a_s) "qeF" = ( /obj/structure/sign/safety/reception{ pixel_x = 8; @@ -59947,13 +58852,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) -"qeO" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/device/radio/headset/almayer/mt, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) "qeY" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/toy/beach_ball/holoball, @@ -59975,6 +58873,12 @@ icon_state = "plate" }, /area/almayer/squads/alpha_bravo_shared) +"qfq" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/hallways/lower/port_umbilical) "qfy" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -60010,6 +58914,21 @@ }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) +"qfI" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) +"qfQ" = ( +/obj/structure/surface/rack, +/obj/item/stack/folding_barricade/three, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/panic) "qga" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ dir = 1 @@ -60035,24 +58954,16 @@ }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) -"qgG" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) -"qgM" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 8 +"qgK" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/airlock/almayer/generic/press{ + dir = 1; + name = "\improper Combat Correspondent Room" }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/lower/cryo_cells) +/area/almayer/command/combat_correspondent) "qgN" = ( /obj/structure/bed/chair{ dir = 4 @@ -60082,12 +58993,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"qhc" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/stern_hallway) "qhx" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -60117,6 +59022,31 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop/hangar) +"qhG" = ( +/obj/structure/surface/table/almayer, +/obj/item/ashtray/bronze{ + pixel_x = 3; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/ash, +/obj/item/trash/cigbutt/ucigbutt{ + pixel_x = 4; + pixel_y = 13 + }, +/obj/item/trash/cigbutt/ucigbutt{ + pixel_x = -7; + pixel_y = 14 + }, +/obj/item/trash/cigbutt/ucigbutt{ + pixel_x = -13; + pixel_y = 8 + }, +/obj/item/trash/cigbutt/ucigbutt{ + pixel_x = -6; + pixel_y = 9 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "qhU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -60132,6 +59062,22 @@ icon_state = "orange" }, /area/almayer/squads/bravo) +"qid" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"qig" = ( +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) "qih" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; @@ -60151,16 +59097,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"qip" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) "qit" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/light{ @@ -60178,14 +59114,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) -"qiD" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/lower/s_bow) "qjz" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/clipboard, @@ -60202,11 +59130,34 @@ icon_state = "silvercorner" }, /area/almayer/command/computerlab) +"qjK" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/mp_bunks) +"qjL" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "qjN" = ( /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"qjT" = ( +/obj/structure/surface/table/almayer, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = 6 + }, +/obj/item/weapon/gun/rifle/l42a, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "qjV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -60218,28 +59169,11 @@ "qjZ" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/stern_point_defense) -"qkc" = ( -/obj/structure/sign/safety/storage{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) "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/machinery/power/apc/almayer{ - cell_type = /obj/item/cell/hyper; - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "qkP" = ( /obj/item/frame/light_fixture{ anchored = 1; @@ -60276,19 +59210,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"qld" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_umbilical) -"qll" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "qlm" = ( /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/warning_stripes{ @@ -60306,18 +59227,12 @@ }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) -"qlt" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - dir = 1; - req_access = null; - req_one_access = null; - req_one_access_txt = "3;22;19" - }, +"qlu" = ( +/obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/maint/hull/upper/u_a_s) "qlz" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -60335,43 +59250,16 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"qlS" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_x = -7; - pixel_y = 17 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = 12; - pixel_y = 28 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) -"qmb" = ( -/obj/structure/machinery/door/airlock/almayer/marine/requisitions{ - access_modified = 1; - name = "\improper Requisition's Office"; - req_one_access = null; - req_one_access_txt = "1;26" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, +"qlL" = ( +/obj/item/reagent_container/food/drinks/cans/souto, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "cargo_arrow" }, -/area/almayer/squads/req) +/area/almayer/hallways/lower/repair_bay) +"qmh" = ( +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/hallways/lower/repair_bay) "qmk" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -60386,6 +59274,27 @@ icon_state = "bluecorner" }, /area/almayer/squads/delta) +"qmq" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 12; + pixel_y = 13 + }, +/obj/structure/sign/safety/bathunisex{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "qmy" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -60421,21 +59330,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/medical_science) -"qmC" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - name = "\improper Brig"; - closeOtherId = "brigmaint_n" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/main_office) "qmD" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -60448,12 +59342,19 @@ icon_state = "dark_sterile" }, /area/almayer/medical/medical_science) -"qmL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +"qmM" = ( +/obj/structure/bed/chair{ + dir = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/obj/item/device/radio/intercom{ + freerange = 1; + name = "Saferoom Channel"; + pixel_y = -28 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/panic) "qmP" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/faxmachine/uscm, @@ -60491,6 +59392,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"qnf" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/stern_hallway) "qnh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60515,15 +59425,14 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) -"qny" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "Under Construction Shutters"; - name = "\improper Construction Site" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"qnA" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/item/tool/crowbar{ + pixel_x = 6; + pixel_y = 1 }, -/area/almayer/maint/lower/constr) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_p) "qnC" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ @@ -60539,22 +59448,6 @@ icon_state = "test_floor4" }, /area/almayer/living/pilotbunks) -"qnN" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) -"qoj" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/s_bow) "qom" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/chem_dispenser/soda{ @@ -60600,6 +59493,11 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop/hangar) +"qoN" = ( +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_f_p) "qoR" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -60626,6 +59524,13 @@ icon_state = "dark_sterile" }, /area/almayer/medical/chemistry) +"qpH" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/stern_hallway) "qpQ" = ( /obj/item/reagent_container/glass/beaker/bluespace, /obj/structure/machinery/chem_dispenser/medbay, @@ -60633,15 +59538,29 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/chemistry) -"qqi" = ( -/obj/structure/sign/safety/hvac_old{ +"qpV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/distribution_pipes{ pixel_x = 8; pixel_y = 32 }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) +"qqb" = ( +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 9; + icon_state = "blue" }, -/area/almayer/maint/hull/lower/s_bow) +/area/almayer/hallways/upper/aft_hallway) +"qqf" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) "qqn" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -60664,17 +59583,6 @@ icon_state = "redcorner" }, /area/almayer/command/lifeboat) -"qqC" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/main_office) "qqK" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -60699,10 +59607,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"qqV" = ( -/obj/structure/machinery/cm_vending/clothing/military_police_warden, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +"qqS" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_stern) "qra" = ( /obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer{ @@ -60727,27 +59637,10 @@ icon_state = "silver" }, /area/almayer/command/computerlab) -"qrS" = ( -/obj/item/clothing/head/welding{ - pixel_y = 6 - }, -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) -"qsr" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) +"qsp" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/s_bow) "qsC" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/junction, @@ -60775,32 +59668,12 @@ icon_state = "test_floor4" }, /area/almayer/hallways/upper/port) -"qtn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "qtv" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/gym) -"qtO" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/lower/cryo_cells) -"qtZ" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/p_stern) "quj" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -60842,25 +59715,6 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) -"quI" = ( -/obj/structure/machinery/door_control{ - id = "laddersouthwest"; - name = "South West Ladders Shutters"; - pixel_y = -21; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/obj/structure/sign/safety/stairs{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/west{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) "quJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -60899,33 +59753,30 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"qvd" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/req) -"qvl" = ( -/obj/item/stack/folding_barricade/three, -/obj/item/stack/folding_barricade/three, -/obj/structure/surface/rack, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/shipboard/panic) "qvC" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 }, /turf/open/floor/plating, /area/almayer/living/port_emb) -"qvG" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) +"qvE" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) "qvI" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -60947,6 +59798,13 @@ icon_state = "test_floor4" }, /area/almayer/command/corporateliaison) +"qwf" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "qwo" = ( /obj/structure/machinery/washing_machine, /obj/structure/machinery/washing_machine{ @@ -60980,9 +59838,6 @@ icon_state = "plate" }, /area/almayer/living/offices) -"qwE" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/hull/lower/l_a_s) "qwJ" = ( /obj/structure/machinery/door_control{ id = "ARES Operations Left"; @@ -60996,22 +59851,12 @@ icon_state = "silver" }, /area/almayer/command/airoom) -"qwT" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/lower/cryo_cells) -"qxb" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/lightreplacer{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/storage/toolbox/emergency, -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 32 +"qwY" = ( +/obj/structure/machinery/vending/coffee, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/maint/hull/upper/u_f_s) "qxe" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1 @@ -61092,6 +59937,21 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"qxI" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/panic) +"qxJ" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"qxK" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "qxL" = ( /obj/structure/machinery/medical_pod/autodoc, /turf/open/floor/almayer{ @@ -61123,12 +59983,6 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"qyj" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) "qyo" = ( /turf/open/floor/almayer{ dir = 1; @@ -61141,21 +59995,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"qyu" = ( -/obj/structure/machinery/vending/coffee{ - density = 0; - pixel_y = 18 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) -"qyw" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_p) "qyD" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger, @@ -61163,21 +60002,13 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"qyF" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" +"qyG" = ( +/obj/structure/sign/safety/hazard{ + desc = "A sign that warns of a hazardous environment nearby"; + name = "\improper Warning: Hazardous Environment" }, -/area/almayer/hallways/vehiclehangar) +/turf/closed/wall/almayer, +/area/almayer/maint/hull/lower/l_f_p) "qyK" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -61185,6 +60016,21 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) +"qyP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_fore_hallway) "qyW" = ( /obj/structure/bed/chair{ dir = 4 @@ -61193,6 +60039,13 @@ icon_state = "emeraldfull" }, /area/almayer/squads/charlie_delta_shared) +"qyX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) "qyZ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/view_objectives, @@ -61216,26 +60069,12 @@ icon_state = "plating" }, /area/almayer/shipboard/port_point_defense) -"qzm" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/med_data/laptop{ - dir = 8 - }, -/obj/item/device/flashlight/lamp{ - pixel_x = -5; - pixel_y = 16 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = -32 - }, -/obj/structure/machinery/light/small{ - dir = 4 - }, +"qzA" = ( +/obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/hull/lower/p_bow) "qAs" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -61245,6 +60084,16 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop) +"qAy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/lower/vehiclehangar) "qAA" = ( /obj/structure/machinery/power/monitor{ name = "Main Power Grid Monitoring" @@ -61265,6 +60114,29 @@ icon_state = "orange" }, /area/almayer/engineering/lower) +"qAG" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) +"qAK" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/ashtray/plastic, +/obj/item/trash/cigbutt{ + pixel_x = 4 + }, +/obj/item/trash/cigbutt{ + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "qAT" = ( /obj/structure/machinery/light, /obj/structure/surface/table/almayer, @@ -61287,6 +60159,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"qBl" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "qBq" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -61299,12 +60177,6 @@ icon_state = "test_floor4" }, /area/almayer/living/commandbunks) -"qBE" = ( -/obj/structure/closet, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_s) "qBM" = ( /obj/item/storage/fancy/crayons{ layer = 3.1; @@ -61316,6 +60188,18 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"qBS" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/stern) "qCc" = ( /obj/structure/sign/safety/security{ pixel_x = 15; @@ -61336,6 +60220,16 @@ /obj/effect/landmark/start/captain, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/bridgebunks) +"qCA" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/obj/structure/sign/safety/rewire{ + pixel_y = -38 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/execution) "qCG" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -61343,6 +60237,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"qCH" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Secretroom"; + indestructible = 1; + unacidable = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_m_s) "qCU" = ( /obj/structure/machinery/light{ dir = 4 @@ -61377,6 +60281,12 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) +"qDB" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_a_p) "qDN" = ( /obj/structure/machinery/light{ dir = 8 @@ -61395,10 +60305,19 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_four) -"qEa" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) +"qDS" = ( +/obj/item/stack/tile/carpet{ + amount = 20 + }, +/obj/structure/surface/rack, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"qEc" = ( +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "qEk" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -61412,6 +60331,15 @@ icon_state = "plating" }, /area/almayer/command/cic) +"qEl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/lower/vehiclehangar) "qEn" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -61433,6 +60361,25 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/processing) +"qEz" = ( +/obj/structure/machinery/door_control{ + id = "laddersouthwest"; + name = "South West Ladders Shutters"; + pixel_y = -21; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/obj/structure/sign/safety/stairs{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/west{ + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_fore_hallway) "qEA" = ( /obj/structure/bed, /obj/structure/machinery/flasher{ @@ -61457,53 +60404,34 @@ icon_state = "plate" }, /area/almayer/engineering/lower) -"qEP" = ( -/obj/structure/largecrate/random/case/small, +"qEM" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "laddersouthwest"; + name = "\improper South West Ladders Shutters" + }, +/obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/stern) -"qFb" = ( -/obj/structure/sign/safety/storage{ - pixel_y = -32 +/area/almayer/hallways/lower/port_fore_hallway) +"qEZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, /turf/open/floor/almayer{ - icon_state = "green" + icon_state = "dark_sterile" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/maint/hull/upper/u_a_s) "qFi" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/chief_mp_office) -"qFm" = ( -/obj/structure/machinery/door/airlock/almayer/medical{ - dir = 1; - name = "Medical Storage" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/medical/lower_medical_medbay) -"qFp" = ( -/obj/structure/surface/table/almayer, -/obj/item/attachable/lasersight, -/obj/item/reagent_container/food/drinks/cans/souto/vanilla{ - pixel_x = 10; - pixel_y = 11 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) -"qFr" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 2 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) "qFu" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -61541,6 +60469,19 @@ icon_state = "bluefull" }, /area/almayer/squads/delta) +"qFS" = ( +/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/maint/hull/lower/l_a_s) +"qFX" = ( +/turf/closed/wall/almayer, +/area/almayer/shipboard/brig/mp_bunks) "qGc" = ( /turf/open/floor/almayer{ dir = 1; @@ -61564,46 +60505,45 @@ icon_state = "cargo" }, /area/almayer/engineering/lower/workshop/hangar) +"qGC" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) "qGF" = ( /obj/structure/machinery/optable, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_two) -"qGS" = ( +"qGP" = ( /obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "red" +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 }, -/area/almayer/living/cryo_cells) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/stern_hallway) "qGU" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/lifeboat_pumps/south2) +"qGZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "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; - name = "General Listening Channel"; - pixel_y = -28 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) "qHq" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; @@ -61614,30 +60554,20 @@ icon_state = "test_floor4" }, /area/almayer/powered) -"qHK" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = 12; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_y = 13 +"qHu" = ( +/obj/structure/machinery/light{ + dir = 1 }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -16; - pixel_y = 13 +/turf/open/floor/almayer, +/area/almayer/hallways/upper/stern_hallway) +"qHG" = ( +/obj/structure/machinery/light/small{ + dir = 1 }, -/obj/structure/sign/safety/water{ - pixel_x = -17 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/maint/hull/upper/p_stern) "qHM" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -61648,16 +60578,23 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"qHZ" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 2; - id = "OuterShutter"; - name = "\improper Saferoom Shutters" +"qIa" = ( +/obj/structure/platform{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/shipboard/panic) +/area/almayer/maint/hull/upper/u_a_s) +"qIf" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) "qIx" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -61669,18 +60606,6 @@ icon_state = "test_floor4" }, /area/almayer/command/corporateliaison) -"qIB" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/machinery/cm_vending/sorted/medical/bolted, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/medical_science) "qIL" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/camera/autoname/almayer{ @@ -61730,18 +60655,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/perma) -"qJr" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/item/reagent_container/glass/bucket/mopbucket{ - pixel_x = 7; - pixel_y = -3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) "qJx" = ( /obj/structure/machinery/vending/cola, /turf/open/floor/almayer{ @@ -61762,14 +60675,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/hydroponics) -"qJN" = ( -/obj/structure/surface/rack, -/obj/item/device/radio, -/obj/item/tool/weldpack, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/vehiclehangar) "qJS" = ( /obj/structure/reagent_dispensers/water_cooler/stacks{ density = 0; @@ -61813,6 +60718,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +"qKb" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/box/lights/tubes{ + pixel_x = -8 + }, +/obj/item/storage/box/lights/tubes{ + pixel_x = 5 + }, +/obj/item/storage/box/lights/tubes{ + pixel_y = 10 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "qKi" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -61825,6 +60743,15 @@ icon_state = "plating" }, /area/almayer/engineering/upper_engineering) +"qKl" = ( +/obj/structure/sign/safety/intercom{ + pixel_x = 32; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/panic) "qKz" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -61832,29 +60759,15 @@ icon_state = "silver" }, /area/almayer/command/securestorage) -"qKM" = ( -/obj/structure/machinery/door_control{ - id = "laddersouthwest"; - name = "South West Ladders Shutters"; - pixel_x = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "greencorner" +"qKK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/almayer/hallways/port_hallway) -"qKT" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/camera, -/obj/item/device/camera_film, -/obj/item/device/camera_film, +/obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/maint/hull/lower/l_a_p) "qKY" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -61887,23 +60800,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/containment) -"qLj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) -"qLo" = ( -/obj/structure/machinery/light, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"qLp" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "qLs" = ( /obj/effect/landmark/start/maint, /turf/open/floor/plating/plating_catwalk, @@ -61937,26 +60833,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"qLK" = ( -/obj/structure/sign/safety/medical{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) -"qLO" = ( -/obj/structure/machinery/conveyor{ - id = "lower_garbage" - }, -/obj/structure/machinery/recycler, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "plating_striped" - }, -/area/almayer/maint/hull/lower/l_a_p) "qLS" = ( /obj/structure/pipes/standard/manifold/hidden/supply/no_boom, /turf/open/floor/almayer/no_build{ @@ -61971,6 +60847,13 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"qLY" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "qMD" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/flashbangs, @@ -62021,6 +60904,20 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/port) +"qNK" = ( +/obj/structure/largecrate/random/barrel/red, +/obj/structure/sign/safety/high_voltage{ + pixel_x = 32; + pixel_y = 7 + }, +/obj/structure/sign/safety/fire_haz{ + pixel_x = 32; + pixel_y = -8 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/lower/l_f_s) "qNR" = ( /obj/structure/disposalpipe/junction, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -62055,17 +60952,43 @@ /obj/structure/disposalpipe/junction, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/gym) -"qPC" = ( -/obj/structure/largecrate/random/barrel/blue, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = -32 +"qOS" = ( +/obj/structure/machinery/door_control{ + id = "laddernorthwest"; + name = "North West Ladders Shutters"; + pixel_x = 25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 }, -/obj/structure/sign/safety/security{ - pixel_x = 15; - pixel_y = -32 +/turf/open/floor/almayer{ + dir = 4; + icon_state = "greencorner" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) +/area/almayer/hallways/lower/starboard_fore_hallway) +"qOY" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_f_p) +"qPk" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) +"qPn" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_a_s) +"qPv" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/upper/aft_hallway) "qPD" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) @@ -62082,9 +61005,6 @@ icon_state = "silverfull" }, /area/almayer/command/securestorage) -"qPO" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/shipboard/brig/surgery) "qPS" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -62094,6 +61014,10 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"qPU" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "qPX" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -62127,6 +61051,13 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) +"qQG" = ( +/obj/structure/largecrate/supply/floodlights, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/maint/hull/upper/u_a_p) "qQS" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -62139,6 +61070,19 @@ icon_state = "tcomms" }, /area/almayer/command/airoom) +"qRb" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) +"qRd" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) "qRj" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -62168,12 +61112,24 @@ icon_state = "test_floor4" }, /area/almayer/command/corporateliaison) +"qRx" = ( +/obj/structure/sign/safety/stairs{ + pixel_x = -15 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "qSm" = ( /obj/structure/pipes/vents/pump{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/shipboard/port_point_defense) +"qSw" = ( +/turf/open/floor/plating, +/area/almayer/maint/hull/upper/u_m_p) "qSE" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/cholula, @@ -62181,6 +61137,14 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) +"qSI" = ( +/obj/structure/surface/table/almayer, +/obj/item/tank/oxygen/red, +/obj/item/tool/screwdriver, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_umbilical) "qSK" = ( /obj/item/stack/sheet/metal{ layer = 2.9; @@ -62202,17 +61166,14 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"qTv" = ( -/obj/structure/closet, -/obj/item/device/flashlight/pen, -/obj/item/attachable/reddot, -/obj/structure/machinery/light/small{ +"qTu" = ( +/obj/structure/machinery/power/apc/almayer{ dir = 1 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/hallways/lower/port_umbilical) "qTQ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -62225,12 +61186,6 @@ /obj/structure/machinery/gibber, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) -"qTZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_umbilical) "qUh" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = -17 @@ -62278,6 +61233,26 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"qUG" = ( +/obj/structure/surface/table/almayer, +/obj/item/clothing/mask/cigarette/pipe{ + pixel_x = 8 + }, +/obj/structure/transmitter/rotary{ + name = "Reporter Telephone"; + phone_category = "Almayer"; + phone_id = "Reporter"; + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/device/toner{ + pixel_y = -11; + pixel_x = -2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "qUL" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 4 @@ -62289,15 +61264,11 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"qUT" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/largecrate/random/secure, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) +"qUO" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) "qUZ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -62320,6 +61291,12 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) +"qVE" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "qVF" = ( /turf/open/floor/almayer{ icon_state = "cargo" @@ -62357,12 +61334,34 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"qWx" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_midship_hallway) "qWI" = ( /obj/structure/machinery/status_display{ pixel_y = -30 }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"qWK" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "emerald" + }, +/area/almayer/hallways/lower/port_midship_hallway) +"qWL" = ( +/obj/structure/prop/holidays/string_lights{ + pixel_y = 27 + }, +/obj/item/frame/rack, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "qWQ" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -62377,32 +61376,43 @@ dir = 4 }, /area/almayer/medical/containment/cell/cl) -"qXe" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "plate" +"qWS" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/pill/happy{ + pixel_x = 6; + pixel_y = -4 }, -/area/almayer/maint/hull/upper/u_m_s) -"qXg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/prop/helmetgarb/prescription_bottle{ + pixel_x = 9 }, -/obj/structure/bed/chair{ - dir = 1 +/obj/item/tool/surgery/bonegel/empty{ + pixel_y = 15; + pixel_x = 4 + }, +/obj/item/tool/surgery/bonegel/empty{ + pixel_y = 13; + pixel_x = -8 + }, +/obj/item/tool/surgery/bonegel/empty{ + pixel_y = 19; + pixel_x = -5; + layer = 3.01 + }, +/obj/item/storage/box/gloves{ + layer = 3.2; + pixel_x = -5; + pixel_y = 2 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) -"qXk" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "sterile_green_corner" }, -/area/almayer/engineering/lower/workshop) -"qXm" = ( -/obj/structure/largecrate/random/barrel/green, +/area/almayer/medical/lower_medical_medbay) +"qXk" = ( /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_a_s) +/area/almayer/engineering/lower/workshop) "qXo" = ( /obj/structure/machinery/seed_extractor, /obj/structure/machinery/light{ @@ -62498,15 +61508,6 @@ allow_construction = 0 }, /area/almayer/stair_clone/upper) -"qYt" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/port_hallway) "qYu" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ @@ -62525,6 +61526,17 @@ icon_state = "mono" }, /area/almayer/command/lifeboat) +"qYN" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/item/toy/deck, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/living/offices/flight) "qYQ" = ( /obj/structure/window/reinforced{ dir = 4; @@ -62548,9 +61560,20 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"qZx" = ( -/turf/open/floor/plating, -/area/almayer/maint/upper/u_m_s) +"qZy" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice2"; + pixel_x = 16; + pixel_y = 16 + }, +/obj/structure/largecrate/supply/supplies/flares, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) "qZA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -62588,6 +61611,21 @@ icon_state = "greenfull" }, /area/almayer/living/offices) +"qZK" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"qZT" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_fore_hallway) "qZX" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -62602,6 +61640,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower/engine_core) +"raE" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/port_fore_hallway) "raK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -62614,30 +61658,31 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) -"raT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +"raO" = ( +/obj/structure/bed/sofa/south/grey/right, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_p) -"rbi" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/ids{ - pixel_x = -6; - pixel_y = 8 +/area/almayer/maint/hull/upper/u_f_p) +"rbd" = ( +/obj/structure/barricade/handrail{ + dir = 8 }, -/obj/item/device/flash, -/obj/structure/machinery/light{ - dir = 8; - invisibility = 101 +/obj/structure/barricade/handrail{ + dir = 1; + pixel_y = 2 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "test_floor5" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/hallways/lower/starboard_midship_hallway) +"rbp" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_s) "rby" = ( /obj/structure/machinery/door_control{ id = "ARES Mainframe Left"; @@ -62655,18 +61700,6 @@ icon_state = "silvercorner" }, /area/almayer/command/computerlab) -"rbE" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/item/reagent_container/glass/rag, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) "rbF" = ( /obj/effect/landmark/late_join, /obj/effect/landmark/ert_spawns/distress_cryo, @@ -62700,16 +61733,6 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/execution) -"rbX" = ( -/obj/structure/sign/safety/manualopenclose{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_y = -32 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "rbY" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -62721,14 +61744,6 @@ }, /turf/open/floor/plating, /area/almayer/squads/req) -"rcw" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "rcx" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -62742,6 +61757,13 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) +"rcG" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) "rcS" = ( /obj/structure/machinery/computer/cryopod/eng{ dir = 8 @@ -62762,6 +61784,18 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) +"rdo" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/upper/aft_hallway) "rdt" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -62801,6 +61835,12 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/general_equipment) +"rdN" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/s_bow) "rdS" = ( /obj/structure/machinery/light{ dir = 8 @@ -62815,15 +61855,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"rdY" = ( -/obj/structure/machinery/light{ - dir = 8 - }, +"rdT" = ( +/obj/structure/machinery/power/apc/almayer, /turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" + icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "rec" = ( /obj/structure/bed/chair/comfy/bravo{ dir = 1 @@ -62844,17 +61881,21 @@ icon_state = "plate" }, /area/almayer/living/gym) -"reF" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/firstaid/adv{ - pixel_x = 6; - pixel_y = 6 +"reu" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) +"reH" = ( +/obj/structure/noticeboard{ + pixel_x = -10; + pixel_y = 31 }, -/obj/item/storage/firstaid/regular, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/squads/req) "reL" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/snacks/sliceable/bread{ @@ -62868,6 +61909,24 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"reM" = ( +/obj/structure/machinery/power/smes/buildable, +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/high_voltage{ + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/maint/upper/mess) +"reN" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/lower/cryo_cells) "rfa" = ( /obj/effect/landmark/start/marine/medic/alpha, /obj/effect/landmark/late_join/alpha, @@ -62881,6 +61940,11 @@ icon_state = "containment_window_h" }, /area/almayer/medical/containment/cell/cl) +"rfB" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) "rfI" = ( /obj/structure/sign/safety/airlock{ pixel_y = -32 @@ -62893,6 +61957,10 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) +"rfQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/stern_hallway) "rfT" = ( /obj/item/frame/camera{ desc = "The Staff Officer insisted he needed to monitor everyone at all times."; @@ -62923,18 +61991,23 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cryo) +"rgk" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) +"rgt" = ( +/turf/closed/wall/almayer, +/area/almayer/hallways/lower/port_umbilical) "rgy" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"rgC" = ( -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_s) "rgK" = ( /obj/structure/pipes/vents/scrubber{ dir = 8 @@ -62955,33 +62028,25 @@ }, /area/almayer/living/auxiliary_officer_office) "rgL" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/maint/hull/upper/u_f_p) +/turf/open/floor/plating, +/area/almayer/maint/upper/u_m_p) "rgW" = ( /turf/open/floor/almayer{ icon_state = "emeraldcorner" }, /area/almayer/living/briefing) -"rhf" = ( -/obj/structure/largecrate/random/secure, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) -"rhl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ +"rhm" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_s) +"rht" = ( +/obj/structure/machinery/vending/cola, /turf/open/floor/almayer{ - icon_state = "redcorner" + icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/maint/hull/upper/s_stern) "rhy" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -62996,6 +62061,12 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) +"rhD" = ( +/obj/structure/surface/rack, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) "rhO" = ( /obj/structure/machinery/vending/cola/research{ pixel_x = 4 @@ -63010,16 +62081,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"rhW" = ( +"rhX" = ( /obj/structure/sign/safety/maint{ + pixel_x = 8; pixel_y = 32 }, -/obj/structure/sign/safety/storage{ - pixel_x = 15; - pixel_y = 32 +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/upper/stern_hallway) "rib" = ( /obj/structure/sink{ dir = 8; @@ -63030,26 +62101,41 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/perma) -"riv" = ( -/obj/structure/machinery/door/airlock/almayer/maint, +"rir" = ( +/obj/structure/machinery/door/airlock/almayer/maint/reinforced, /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; - id = "Hangar Lockdown"; - name = "\improper Hangar Lockdown Blast Door" + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_f_p) -"riw" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 +/area/almayer/maint/hull/upper/s_bow) +"riB" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) +"riC" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/shipboard/panic) "riE" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -63062,20 +62148,18 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"riI" = ( -/obj/structure/surface/table/almayer, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) "riJ" = ( /turf/open/floor/almayer{ dir = 5; icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"riK" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silvercorner" + }, +/area/almayer/hallways/upper/aft_hallway) "riP" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/rewire{ @@ -63094,12 +62178,6 @@ icon_state = "plating" }, /area/almayer/shipboard/stern_point_defense) -"rji" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) "rjn" = ( /obj/structure/machinery/light, /obj/structure/reagent_dispensers/water_cooler/stacks, @@ -63107,6 +62185,17 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"rjF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) "rjG" = ( /obj/structure/pipes/standard/tank/oxygen, /turf/open/floor/almayer{ @@ -63177,26 +62266,23 @@ /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, /area/almayer/living/gym) -"rkF" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/flashlight/lamp{ - layer = 3.1; - pixel_x = 7; - pixel_y = 10 +"rkV" = ( +/obj/structure/window/framed/almayer/hull/hijack_bustable, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "Warden Office Shutters"; + name = "\improper Privacy Shutters" }, -/obj/item/paper_bin/uscm, -/obj/item/tool/pen, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 }, -/area/almayer/maint/hull/upper/u_f_p) -"rkS" = ( -/obj/structure/sign/safety/storage{ - pixel_x = -17 +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +/turf/open/floor/plating, +/area/almayer/shipboard/brig/warden_office) "rlc" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -63233,24 +62319,21 @@ icon_state = "plate" }, /area/almayer/squads/delta) -"rlO" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 +"rlD" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 4; + icon_state = "silver" }, -/area/almayer/maint/hull/upper/s_stern) +/area/almayer/hallways/lower/repair_bay) "rlQ" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "green" }, /area/almayer/living/grunt_rnr) -"rlY" = ( -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) "rlZ" = ( /turf/open/floor/almayer{ icon_state = "dark_sterile" @@ -63276,18 +62359,15 @@ icon_state = "orangecorner" }, /area/almayer/engineering/upper_engineering/starboard) -"rmv" = ( -/obj/structure/machinery/door/airlock/almayer/security{ - dir = 2; - name = "\improper Interrogation Observation" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 +"rmk" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = 26 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/shipboard/brig/starboard_hallway) "rmx" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger, @@ -63296,38 +62376,18 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/general_equipment) -"rmB" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/pill/happy{ - pixel_x = 6; - pixel_y = -4 - }, -/obj/item/prop/helmetgarb/prescription_bottle{ - pixel_x = 9 - }, -/obj/item/tool/surgery/bonegel/empty{ - pixel_y = 15; - pixel_x = 4 - }, -/obj/item/tool/surgery/bonegel/empty{ - pixel_y = 13; - pixel_x = -8 - }, -/obj/item/tool/surgery/bonegel/empty{ - pixel_y = 19; - pixel_x = -5; - layer = 3.01 - }, -/obj/item/storage/box/gloves{ - layer = 3.2; - pixel_x = -5; - pixel_y = 2 +"rmz" = ( +/obj/structure/sign/safety/conference_room{ + pixel_x = 14; + pixel_y = 32 }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) +"rmB" = ( /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_corner" + icon_state = "blue" }, -/area/almayer/medical/lower_medical_medbay) +/area/almayer/hallways/upper/aft_hallway) "rmD" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -63348,9 +62408,18 @@ "rna" = ( /turf/closed/wall/almayer/white, /area/almayer/command/airoom) -"rng" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/hull/lower/l_m_p) +"rnd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "rnF" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -63387,10 +62456,25 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) +"rnO" = ( +/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/hallways/upper/stern_hallway) "rob" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/starboard) +"roj" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/p_bow) "rou" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -63402,10 +62486,6 @@ icon_state = "cargo" }, /area/almayer/squads/bravo) -"row" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/lower/cryo_cells) "roG" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -63435,36 +62515,27 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) -"rpd" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) -"rph" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +"roY" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -17 }, /turf/open/floor/almayer{ - icon_state = "redfull" + dir = 9; + icon_state = "red" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/upper/stern_hallway) "rpp" = ( /obj/effect/landmark/start/executive, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/bridgebunks) -"rpF" = ( -/obj/structure/machinery/body_scanconsole{ - dir = 8 +"rpG" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_side" + icon_state = "test_floor4" }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/maint/hull/upper/u_m_s) "rpK" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -63490,15 +62561,38 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"rqw" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 +"rqv" = ( +/obj/structure/sign/poster/safety, +/turf/closed/wall/almayer, +/area/almayer/maint/lower/s_bow) +"rqz" = ( +/obj/structure/sign/safety/autoopenclose{ + pixel_y = 32 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" +/obj/structure/sign/safety/water{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"rqD" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 12; + pixel_y = 13 }, -/area/almayer/hallways/port_hallway) +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -14; + pixel_y = 13 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/mess) "rqE" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -63510,6 +62604,13 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"rqQ" = ( +/obj/structure/machinery/door/poddoor/railing{ + id = "vehicle_elevator_railing_aux" + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/vehiclehangar) "rqS" = ( /obj/structure/surface/table/almayer, /obj/item/folder/red{ @@ -63525,12 +62626,15 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/evidence_storage) -"rrp" = ( -/obj/structure/largecrate/supply/supplies/mre, +"rrh" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Under Construction Shutters"; + name = "\improper Construction Site" + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/maint/lower/constr) "rrq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -63561,6 +62665,13 @@ icon_state = "test_floor4" }, /area/almayer/living/bridgebunks) +"rrG" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/hallways/upper/stern_hallway) "rrK" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -63586,30 +62697,25 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices) -"rrV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) -"rsr" = ( -/obj/structure/surface/rack, -/obj/item/tool/wirecutters, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/open/floor/almayer{ - icon_state = "plate" +"rrU" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 }, -/area/almayer/maint/hull/upper/u_a_s) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "rsK" = ( /obj/structure/sign/safety/hvac_old, /turf/closed/wall/almayer, /area/almayer/squads/req) +"rsL" = ( +/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/hallways/lower/port_aft_hallway) "rsM" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -63623,6 +62729,48 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, /area/almayer/command/computerlab) +"rsP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/autoopenclose{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) +"rsS" = ( +/obj/structure/machinery/door_control{ + id = "panicroomback"; + name = "\improper Safe Room"; + pixel_x = -25; + req_one_access_txt = "3" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) +"rsV" = ( +/obj/structure/machinery/light, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) +"rtc" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/photo_album{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/folder/black{ + pixel_x = 7; + pixel_y = -3 + }, +/obj/item/device/camera_film{ + pixel_x = -5 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "rtd" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -63632,6 +62780,12 @@ "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 = "test_floor4" + }, +/area/almayer/squads/req) "rtA" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/pen{ @@ -63719,37 +62873,57 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) -"ruD" = ( -/obj/structure/machinery/vending/coffee, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_f_s) "ruL" = ( /obj/structure/window/framed/almayer/hull/hijack_bustable, /turf/open/floor/plating, /area/almayer/engineering/lower/workshop/hangar) -"ruS" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/s_stern) "rvA" = ( /turf/open/floor/almayer, /area/almayer/living/numbertwobunks) +"rvI" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/obj/structure/largecrate/random, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_bow) "rvT" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer{ icon_state = "emerald" }, /area/almayer/squads/charlie) -"rwh" = ( -/obj/structure/largecrate/random/barrel/white, +"rwe" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = -16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) +"rwf" = ( +/obj/structure/sign/safety/analysis_lab{ + pixel_y = 26 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = 15; + pixel_y = 26 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "silver" }, -/area/almayer/maint/hull/lower/l_f_p) +/area/almayer/hallways/upper/aft_hallway) +"rwj" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "rwq" = ( /obj/structure/sign/safety/cryo{ pixel_x = 7; @@ -63785,24 +62959,26 @@ }, /turf/open/floor/plating, /area/almayer/living/pilotbunks) -"rxm" = ( -/obj/structure/largecrate/random/case/double, -/obj/structure/machinery/light{ - dir = 4 - }, +"rwZ" = ( +/obj/structure/window/framed/almayer/hull, +/turf/open/floor/plating, +/area/almayer/maint/hull/upper/u_f_p) +"rxe" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/toolbox, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_p) -"rxG" = ( -/obj/structure/sign/safety/medical{ - pixel_x = 8; - pixel_y = -32 +/area/almayer/maint/hull/lower/l_m_p) +"rxq" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/open/floor/almayer{ - icon_state = "green" + icon_state = "plate" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/maint/hull/lower/l_m_p) "rxK" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -63813,22 +62989,6 @@ icon_state = "silverfull" }, /area/almayer/command/computerlab) -"rxV" = ( -/obj/structure/barricade/handrail, -/obj/structure/largecrate/supply/generator, -/turf/open/floor/almayer, -/area/almayer/engineering/upper_engineering/port) -"rye" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) -"ryg" = ( -/obj/structure/closet/firecloset, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) "ryt" = ( /obj/structure/pipes/standard/manifold/visible, /turf/open/floor/almayer{ @@ -63855,35 +63015,52 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/port) -"rzK" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 +"rzk" = ( +/obj/item/tool/screwdriver, +/obj/structure/platform_decoration{ + dir = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"rzy" = ( +/obj/structure/disposalpipe/junction, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) "rzN" = ( /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/almayer/medical/containment) -"rzY" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "rAb" = ( /turf/open/floor/almayer{ icon_state = "bluecorner" }, /area/almayer/living/briefing) -"rAk" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/maint/hull/lower/p_bow) +"rAo" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"rAw" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 32; + pixel_y = 8 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_x = 32; + pixel_y = -7 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/lower/l_f_s) "rAx" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -63926,20 +63103,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"rAX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "rBa" = ( /obj/structure/machinery/cm_vending/clothing/synth, /obj/structure/prop/invuln/overhead_pipe{ @@ -63963,16 +63126,6 @@ /obj/structure/machinery/processor, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) -"rBk" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" - }, -/area/almayer/hallways/port_umbilical) "rBv" = ( /obj/structure/closet/toolcloset, /turf/open/floor/almayer{ @@ -63990,6 +63143,12 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) +"rBD" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_m_p) "rBH" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_2" @@ -63998,13 +63157,15 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) -"rBV" = ( -/obj/structure/bed/chair/bolted, +"rCh" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/open/floor/almayer{ - dir = 9; - icon_state = "red" + icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/maint/hull/lower/l_m_p) "rCi" = ( /obj/structure/machinery/camera/autoname/almayer/containment/ares{ dir = 8 @@ -64061,22 +63222,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) -"rCU" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 2; - id = "Warden Office Shutters"; - name = "\improper Privacy Shutters" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 1; - name = "\improper Warden's Office"; - closeOtherId = "brigwarden" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/chief_mp_office) "rDb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -64109,20 +63254,15 @@ icon_state = "green" }, /area/almayer/squads/req) -"rDk" = ( +"rDf" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) -"rDp" = ( -/obj/structure/surface/table/almayer, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21"; - pixel_y = 11 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/hallways/lower/starboard_umbilical) +"rDm" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "rDr" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ @@ -64159,45 +63299,52 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) -"rDC" = ( -/obj/structure/largecrate/random/secure, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) +"rDH" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) +"rDO" = ( +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_fore_hallway) "rDQ" = ( /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/shipboard/brig/cryo) +"rDR" = ( +/obj/structure/machinery/vending/coffee, +/obj/item/toy/bikehorn/rubberducky{ + desc = "You feel as though this rubber duck has been here for a long time. It's Mr. Quackers! He loves you!"; + name = "Quackers"; + pixel_x = 5; + pixel_y = 17 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "rDV" = ( /obj/structure/bed/chair/comfy{ dir = 8 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) -"rDY" = ( -/obj/item/stack/sheet/glass/reinforced{ - amount = 50 - }, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/powercell, -/obj/effect/spawner/random/powercell, -/obj/structure/surface/rack, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/chief_mp_office) "rEd" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -12; - pixel_y = 13 +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "laddersouthwest"; + name = "\improper South West Ladders Shutters" }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/hallways/lower/port_fore_hallway) "rEf" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -64223,19 +63370,16 @@ }, /area/space) "rEs" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "orange" }, /area/almayer/maint/hull/upper/u_a_s) -"rEu" = ( -/obj/structure/largecrate/random/case/double, +"rEt" = ( +/obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, -/area/almayer/hallways/vehiclehangar) +/area/almayer/maint/hull/lower/l_f_s) "rEv" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -64249,35 +63393,25 @@ icon_state = "plate" }, /area/almayer/squads/delta) -"rEF" = ( +"rEK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12; pixel_y = 12 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/maint/hull/lower/l_f_p) "rEL" = ( /obj/structure/machinery/cm_vending/gear/intelligence_officer, /turf/open/floor/almayer{ icon_state = "silverfull" }, /area/almayer/command/computerlab) -"rEO" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) -"rEQ" = ( -/obj/structure/machinery/iv_drip, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/shipboard/brig/surgery) "rEY" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -64314,15 +63448,6 @@ icon_state = "orangecorner" }, /area/almayer/engineering/upper_engineering/starboard) -"rFB" = ( -/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_umbilical) "rFH" = ( /obj/structure/machinery/body_scanconsole, /obj/structure/disposalpipe/segment{ @@ -64336,32 +63461,32 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"rFS" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/u_a_s) -"rFY" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/hallways/stern_hallway) -"rGg" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +"rGc" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -17 }, /turf/open/floor/almayer{ - dir = 9; - icon_state = "green" + dir = 10; + icon_state = "red" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/upper/stern_hallway) "rGj" = ( /turf/open/floor/almayer{ icon_state = "red" }, /area/almayer/squads/alpha) +"rGr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/s_bow) +"rGz" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "rGE" = ( /obj/structure/machinery/door/airlock/almayer/command{ name = "\improper Conference Room" @@ -64386,6 +63511,15 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) +"rGL" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/maint/upper/mess) "rGU" = ( /obj/structure/machinery/computer/skills{ req_one_access_txt = "200" @@ -64393,13 +63527,6 @@ /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/carpet, /area/almayer/command/corporateliaison) -"rGZ" = ( -/obj/structure/machinery/computer/arcade, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "green" - }, -/area/almayer/squads/req) "rHc" = ( /turf/open/floor/carpet, /area/almayer/command/cichallway) @@ -64410,6 +63537,13 @@ icon_state = "plate" }, /area/almayer/squads/alpha_bravo_shared) +"rHn" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "rHo" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ layer = 1.9 @@ -64429,6 +63563,19 @@ icon_state = "test_floor4" }, /area/almayer/medical/lower_medical_medbay) +"rHq" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"rHr" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) "rHw" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -64440,17 +63587,17 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"rHA" = ( -/obj/item/storage/backpack/marine/satchel{ - desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; - icon = 'icons/obj/janitor.dmi'; - icon_state = "trashbag3"; - name = "trash bag"; - pixel_x = -4; - pixel_y = 6 +"rHB" = ( +/obj/item/ammo_box/magazine/misc/mre/empty{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/reagent_container/food/drinks/cans/aspen{ + pixel_x = 11; + pixel_y = -3 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/maint/hull/upper/p_stern) "rHN" = ( /obj/structure/pipes/vents/pump/on, /turf/open/floor/plating/plating_catwalk, @@ -64483,26 +63630,27 @@ icon_state = "test_floor4" }, /area/almayer/medical/lower_medical_lobby) +"rIw" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/lower/s_bow) "rID" = ( /turf/open/floor/almayer{ dir = 6; icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"rIG" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, -/obj/structure/sign/safety/storage{ - pixel_x = 8; - pixel_y = -32 +"rIE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/rifle/l42a, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = 6 }, -/obj/structure/machinery/light/small, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/maint/hull/upper/u_m_s) "rIH" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -64520,6 +63668,27 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"rIP" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orange" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"rIV" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) "rIW" = ( /obj/structure/machinery/cm_vending/gear/synth, /obj/effect/decal/cleanable/cobweb2, @@ -64528,11 +63697,11 @@ }, /area/almayer/living/synthcloset) "rJf" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/maint/hull/lower/l_a_p) "rJh" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -64587,49 +63756,18 @@ /obj/structure/machinery/cm_vending/own_points/experimental_tools, /turf/open/floor/almayer, /area/almayer/living/synthcloset) -"rJF" = ( -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) "rJK" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/living/briefing) -"rJN" = ( -/obj/structure/sign/safety/rewire{ - pixel_y = 32 - }, -/obj/item/bedsheet/brown{ - layer = 3.1 - }, -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/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/brown{ - pixel_y = 13 - }, +"rJY" = ( +/obj/item/book/manual/medical_diagnostics_manual, +/obj/structure/surface/rack, /turf/open/floor/almayer{ dir = 5; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/maint/hull/upper/u_a_p) "rKd" = ( /turf/open/floor/almayer/uscm/directional{ dir = 5 @@ -64648,13 +63786,6 @@ icon_state = "rasputin15" }, /area/almayer/powered/agent) -"rKy" = ( -/obj/structure/machinery/firealarm{ - dir = 1; - pixel_y = -28 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "rKA" = ( /obj/structure/bed{ can_buckle = 0 @@ -64681,25 +63812,11 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"rLi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light/small, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) "rLk" = ( /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) -"rLl" = ( -/obj/structure/closet/fireaxecabinet{ - pixel_y = -32 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) "rLp" = ( /obj/structure/machinery/chem_dispenser/soda{ pixel_y = 20 @@ -64709,9 +63826,33 @@ "rLv" = ( /turf/closed/wall/almayer/research/containment/wall/purple{ dir = 4; - icon_state = "containment_window_h" + icon_state = "containment_window_h" + }, +/area/almayer/medical/containment/cell/cl) +"rLH" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/binoculars{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/device/binoculars, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" }, -/area/almayer/medical/containment/cell/cl) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_p) +"rLK" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/sign/safety/hvac_old{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/lower/cryo_cells) "rLP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -64724,35 +63865,25 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"rLQ" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) "rLU" = ( /turf/open/floor/almayer/research/containment/floor2{ dir = 8 }, /area/almayer/medical/containment/cell/cl) -"rMk" = ( -/obj/structure/sign/poster/ad{ - pixel_x = 30 - }, -/obj/structure/closet, -/obj/item/clothing/mask/cigarette/weed, +"rMj" = ( +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_m_s) -"rMG" = ( -/obj/structure/largecrate/random/secure, +/area/almayer/hallways/lower/vehiclehangar) +"rMO" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/lower/s_bow) "rMT" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -64832,15 +63963,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"rOj" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/hallways/port_hallway) "rOs" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/clipboard, @@ -64850,6 +63972,14 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) +"rOv" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/lower/repair_bay) "rOC" = ( /obj/structure/machinery/light{ dir = 1 @@ -64858,15 +63988,6 @@ icon_state = "plate" }, /area/almayer/command/cic) -"rOD" = ( -/obj/structure/surface/rack, -/obj/item/frame/table, -/obj/item/frame/table, -/obj/item/frame/table, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) "rOI" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -64881,9 +64002,14 @@ icon_state = "plate" }, /area/almayer/living/gym) -"rOR" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/hull/upper/u_m_s) +"rPq" = ( +/obj/structure/machinery/constructable_frame{ + icon_state = "box_2" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_stern) "rPt" = ( /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) @@ -64896,6 +64022,11 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"rPF" = ( +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) "rPO" = ( /turf/open/floor/almayer{ dir = 10; @@ -64923,6 +64054,14 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) +"rQs" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "rQt" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -64930,6 +64069,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) +"rQw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 2 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/panic) "rQy" = ( /turf/closed/wall/almayer/white/reinforced, /area/almayer/medical/hydroponics) @@ -64964,35 +64117,24 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"rRg" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 +"rRb" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Starboard Railguns and Viewing Room" +/area/almayer/maint/hull/upper/u_m_s) +"rRf" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -17 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 4; + icon_state = "red" }, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/hallways/upper/aft_hallway) "rRq" = ( /turf/closed/wall/almayer, /area/almayer/lifeboat_pumps/south2) -"rRr" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/surface/table/almayer, -/obj/item/toy/deck/uno, -/obj/item/toy/deck{ - pixel_x = -9 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "rRz" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -65000,25 +64142,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"rRP" = ( -/obj/structure/surface/table/almayer, -/obj/item/clothing/head/hardhat/orange{ - pixel_x = -9; - pixel_y = 16 - }, -/obj/item/clothing/suit/storage/hazardvest/blue{ - pixel_x = -7; - pixel_y = -4 - }, -/obj/item/clothing/head/hardhat{ - pixel_x = 10; - pixel_y = 1 - }, -/obj/item/clothing/suit/storage/hazardvest{ - pixel_x = 1 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "rRU" = ( /obj/structure/machinery/light{ dir = 8 @@ -65057,6 +64180,30 @@ icon_state = "orangefull" }, /area/almayer/squads/alpha_bravo_shared) +"rSx" = ( +/obj/structure/surface/table/almayer, +/obj/item/stack/rods/plasteel{ + amount = 36 + }, +/obj/item/stack/catwalk{ + amount = 60; + pixel_x = 5; + pixel_y = 4 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) +"rSA" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "laddersouthwest"; + name = "\improper South West Ladders Shutters" + }, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/port_fore_hallway) "rSG" = ( /obj/structure/toilet{ pixel_y = 16 @@ -65071,18 +64218,37 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"rTj" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +"rSR" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/sign/safety/cryo{ + pixel_x = 36 }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/lower/cryo_cells) +"rTe" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/janitorialcart, +/obj/item/tool/mop, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) "rTk" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) +"rTA" = ( +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "rTJ" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/almayer{ @@ -65104,12 +64270,25 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) +"rUi" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/s_bow) "rUk" = ( /obj/structure/bed/chair/wood/normal{ dir = 1 }, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) +"rUq" = ( +/obj/effect/landmark/start/nurse, +/obj/effect/landmark/late_join/nurse, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/offices) "rUy" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -65118,22 +64297,52 @@ icon_state = "silver" }, /area/almayer/command/computerlab) -"rVm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, +"rUN" = ( /obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) +"rVc" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, /turf/open/floor/almayer{ - icon_state = "redcorner" + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) +"rVt" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/obj/structure/machinery/part_fabricator/dropship, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/repair_bay) +"rVC" = ( +/obj/structure/pipes/vents/pump/on, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/hallways/lower/starboard_aft_hallway) "rVN" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "red" }, /area/almayer/shipboard/port_missiles) +"rWb" = ( +/obj/item/tool/minihoe{ + pixel_x = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "rWn" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -65153,22 +64362,27 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) -"rWF" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 21 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" +"rWv" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 }, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) +"rWz" = ( +/turf/open/floor/plating, +/area/almayer/maint/upper/u_m_s) "rWL" = ( /obj/structure/barricade/metal, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/living/cryo_cells) +"rWP" = ( +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "rWT" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -65182,15 +64396,6 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/general_equipment) -"rXg" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/sign/safety/hvac_old{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/lower/cryo_cells) "rXj" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -65208,21 +64413,6 @@ icon_state = "cargo" }, /area/almayer/living/cryo_cells) -"rXs" = ( -/obj/structure/surface/rack, -/obj/item/roller, -/obj/item/roller, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/item/clothing/glasses/disco_fever{ - pixel_x = 5; - pixel_y = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_f_s) "rXv" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/structure/disposalpipe/segment{ @@ -65232,18 +64422,47 @@ icon_state = "test_floor4" }, /area/almayer/living/gym) -"rXM" = ( -/obj/structure/surface/rack, -/obj/item/paper{ - pixel_x = 3; - pixel_y = 3 +"rXE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out" }, -/obj/item/folder/yellow, -/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = -32 + }, +/obj/structure/machinery/power/apc/almayer{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/execution) +"rXF" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_m_p) +"rXH" = ( +/obj/structure/closet/firecloset, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/maint/hull/lower/stern) +"rXQ" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_bow) "rXS" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -65256,6 +64475,23 @@ icon_state = "test_floor4" }, /area/almayer/squads/delta) +"rXU" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/lower/l_f_s) +"rXV" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/stern_hallway) "rYh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -65271,13 +64507,6 @@ icon_state = "plate" }, /area/almayer/living/gym) -"rYj" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) "rYp" = ( /obj/effect/landmark/start/marine/medic/delta, /obj/effect/landmark/late_join/delta, @@ -65297,46 +64526,52 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) -"rYJ" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/taperecorder, +"rYG" = ( +/obj/structure/machinery/light{ + dir = 4 + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "green" }, -/area/almayer/living/offices/flight) -"rYK" = ( -/obj/structure/machinery/light/small{ - dir = 8 +/area/almayer/hallways/upper/aft_hallway) +"rYI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_f_p) -"rYM" = ( -/obj/item/storage/box/donkpockets, -/obj/structure/surface/rack, +/area/almayer/hallways/lower/starboard_fore_hallway) +"rYJ" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/taperecorder, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) -"rYT" = ( -/obj/structure/largecrate/supply/supplies/flares, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" +/area/almayer/living/offices/flight) +"rZt" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/area/almayer/maint/hull/upper/u_a_p) -"rZz" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/obj/structure/machinery/door_control{ + id = "hangarentrancesouth"; + name = "South Hangar Shutters"; + pixel_y = 30; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 }, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -30 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, /turf/open/floor/almayer{ - icon_state = "green" + icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "rZB" = ( /obj/structure/pipes/standard/simple/visible{ dir = 9 @@ -65345,6 +64580,15 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) +"rZC" = ( +/obj/structure/sign/safety/ladder{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "rZP" = ( /obj/structure/surface/table/almayer, /obj/item/tool/weldpack, @@ -65353,12 +64597,18 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) -"saa" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"sab" = ( +/obj/effect/landmark/start/doctor, +/obj/effect/landmark/late_join/doctor, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/offices) +"sai" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor/plating/almayer{ + allow_construction = 0 }, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/hallways/lower/port_fore_hallway) "saL" = ( /obj/structure/machinery/door/airlock/almayer/generic/corporate{ name = "Corporate Liaison's Closet" @@ -65367,15 +64617,13 @@ icon_state = "test_floor4" }, /area/almayer/command/corporateliaison) -"sbb" = ( -/obj/structure/machinery/door/airlock/almayer/security{ - dir = 2; - name = "\improper Security Checkpoint" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"saT" = ( +/obj/structure/disposalpipe/junction, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 }, -/area/almayer/shipboard/panic) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "sbq" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ icon_state = "almayer_pdoor"; @@ -65385,33 +64633,30 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/notunnel) -"sbA" = ( -/obj/structure/janitorialcart, -/obj/item/tool/mop, +"sbt" = ( +/obj/structure/machinery/door/airlock/almayer/security{ + dir = 2; + name = "\improper Security Checkpoint" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 2; + id = "safe_armory"; + name = "\improper Hangar Armory Shutters" + }, /turf/open/floor/almayer{ - icon_state = "orange" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/shipboard/panic) +"sbE" = ( +/obj/structure/sign/safety/medical{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "sbJ" = ( /turf/closed/wall/almayer/white/hull, /area/almayer/powered/agent) -"sbM" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 4 - }, -/obj/structure/sign/safety/storage{ - pixel_y = 7; - pixel_x = -17 - }, -/obj/structure/sign/safety/commline_connection{ - pixel_x = -17; - pixel_y = -7 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/squads/req) "sbP" = ( /obj/effect/landmark/start/police, /obj/effect/decal/warning_stripes{ @@ -65420,30 +64665,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cryo) -"sbU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/structure/bed/sofa/south/white/left{ - pixel_y = 16 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "silver" - }, -/area/almayer/maint/hull/upper/u_m_p) -"sce" = ( -/obj/structure/surface/rack, -/obj/item/tool/shovel/etool{ - pixel_x = 6 - }, -/obj/item/tool/shovel/etool, -/obj/item/tool/wirecutters, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) "sco" = ( /obj/structure/sign/prop1{ layer = 3.1 @@ -65454,6 +64675,19 @@ /obj/structure/surface/table/reinforced/black, /turf/open/floor/carpet, /area/almayer/command/cichallway) +"sct" = ( +/obj/structure/surface/table/almayer, +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering/lower/engine_core) "scu" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -65523,6 +64757,15 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"scX" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/kitchen/tray, +/obj/item/reagent_container/food/drinks/bottle/whiskey, +/obj/item/toy/deck{ + pixel_x = -9 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "sdf" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -65589,24 +64832,13 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"sdP" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"seL" = ( +/obj/structure/pipes/vents/pump{ + dir = 8; + id_tag = "mining_outpost_pump" }, -/area/almayer/maint/hull/upper/p_bow) -"sen" = ( -/obj/structure/largecrate/random/case/small, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_s) -"sep" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/s_bow) +/area/almayer/hallways/lower/port_fore_hallway) "sfT" = ( /turf/open/floor/almayer, /area/almayer/hallways/upper/port) @@ -65690,23 +64922,10 @@ pixel_y = -8 }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/shipboard/stern_point_defense) -"sgw" = ( -/obj/structure/surface/table/almayer, -/obj/item/prop/almayer/flight_recorder{ - pixel_x = 9 - }, -/obj/item/tool/weldingtool{ - pixel_x = -7; - pixel_y = 3 - }, -/turf/open/floor/almayer{ - icon_state = "silver" + dir = 5; + icon_state = "plating" }, -/area/almayer/hallways/repair_bay) +/area/almayer/shipboard/stern_point_defense) "sgD" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -65726,6 +64945,16 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cells) +"sgL" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "southcheckpoint"; + name = "\improper Checkpoint Shutters" + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/hallways/lower/port_midship_hallway) "sgR" = ( /obj/structure/surface/table/almayer, /obj/item/toy/deck{ @@ -65742,6 +64971,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) +"she" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_s) "shh" = ( /obj/structure/machinery/autolathe, /turf/open/floor/almayer, @@ -65781,14 +65016,6 @@ "sht" = ( /turf/open/floor/almayer, /area/almayer/living/pilotbunks) -"shJ" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "shL" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/electrical, @@ -65800,12 +65027,36 @@ icon_state = "cargo" }, /area/almayer/engineering/lower/engine_core) -"sic" = ( -/obj/structure/sign/safety/nonpress_ag{ - pixel_x = 32 +"sir" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + req_access = null; + req_one_access = null + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "panicroomback"; + name = "\improper Safe Room Shutters" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_f_s) +"sit" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/s_bow) +/area/almayer/maint/hull/upper/u_f_s) +"siy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) "siz" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/hangar{ @@ -65822,6 +65073,12 @@ icon_state = "redfull" }, /area/almayer/living/offices/flight) +"siC" = ( +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/hallways/lower/port_fore_hallway) "siN" = ( /obj/structure/machinery/light{ dir = 1 @@ -65837,21 +65094,23 @@ icon_state = "plate" }, /area/almayer/engineering/lower) -"siP" = ( -/obj/structure/filingcabinet{ - density = 0; - pixel_x = -8; - pixel_y = 18 +"siS" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 32 }, -/obj/structure/filingcabinet{ - density = 0; - pixel_x = 8; - pixel_y = 18 +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/hallways/upper/stern_hallway) +"siT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/maint/hull/lower/l_f_p) "siW" = ( /obj/structure/machinery/body_scanconsole, /obj/structure/disposalpipe/segment{ @@ -65864,10 +65123,9 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"sjc" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) +"sje" = ( +/turf/open/floor/almayer/empty, +/area/almayer/hallways/lower/vehiclehangar) "sjj" = ( /obj/structure/machinery/keycard_auth{ pixel_x = -7; @@ -65897,6 +65155,16 @@ icon_state = "test_floor4" }, /area/almayer/command/lifeboat) +"sjw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/maint/hull/upper/u_m_p) "sjz" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -65906,19 +65174,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) -"sjC" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/s_bow) -"sjZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/p_bow) "skj" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -65939,13 +65194,6 @@ icon_state = "plating_striped" }, /area/almayer/shipboard/sea_office) -"skq" = ( -/obj/structure/machinery/cm_vending/sorted/medical, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/shipboard/brig/surgery) "skC" = ( /obj/structure/pipes/standard/simple/visible{ dir = 6 @@ -65966,13 +65214,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower/workshop) -"skO" = ( -/obj/structure/sign/safety/restrictedarea{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) "skR" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_10" @@ -66010,48 +65251,91 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"slu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +"slo" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"slx" = ( -/obj/structure/sign/safety/hvac_old{ +/obj/structure/sign/safety/maint{ pixel_x = 8; - pixel_y = 32 + pixel_y = -32 }, -/obj/structure/largecrate/supply/supplies/flares, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) +"slv" = ( +/obj/structure/surface/table/almayer, +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/obj/item/fuel_cell, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/engineering/lower/engine_core) "slF" = ( /turf/open/floor/almayer{ dir = 9; icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"slG" = ( +"smi" = ( +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/living/grunt_rnr) +"smw" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/med_data/laptop{ + dir = 8 + }, +/obj/item/device/flashlight/lamp{ + pixel_x = -5; + pixel_y = 16 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = 8; + pixel_y = -32 + }, /obj/structure/machinery/light/small{ - dir = 1 + dir = 4 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_a_s) -"smi" = ( +/area/almayer/maint/hull/upper/u_a_s) +"smA" = ( +/obj/item/trash/cigbutt{ + pixel_x = -10; + pixel_y = 13 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice10"; + pixel_x = -16; + pixel_y = 16 + }, /turf/open/floor/almayer{ - icon_state = "green" + icon_state = "plate" }, -/area/almayer/living/grunt_rnr) -"smn" = ( -/obj/structure/sign/safety/escapepod{ - pixel_y = -32 +/area/almayer/maint/hull/lower/l_m_s) +"smH" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; + dir = 1; + req_access = null; + req_one_access = null; + req_one_access_txt = "3;22;19" }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_f_s) +"smU" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/shipboard/panic) "smW" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -66061,23 +65345,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) -"smZ" = ( -/obj/structure/window/framed/almayer/hull/hijack_bustable, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Warden Office Shutters"; - name = "\improper Privacy Shutters" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter" - }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/chief_mp_office) "snb" = ( /obj/structure/ladder{ height = 1; @@ -66091,18 +65358,6 @@ icon_state = "orange" }, /area/almayer/command/cic) -"snm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) "snt" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/almayer{ @@ -66121,6 +65376,10 @@ icon_state = "plate" }, /area/almayer/squads/req) +"snx" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_s) "snE" = ( /obj/structure/machinery/cryopod/right, /obj/effect/decal/warning_stripes{ @@ -66156,6 +65415,25 @@ icon_state = "plate" }, /area/almayer/command/cic) +"snM" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/squads/req) +"snN" = ( +/obj/structure/curtain/red, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) "snR" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ @@ -66181,27 +65459,6 @@ icon_state = "cargo" }, /area/almayer/living/synthcloset) -"sos" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/obj/structure/sign/safety/stairs{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/port_hallway) -"sou" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "sov" = ( /turf/open/floor/almayer{ dir = 1; @@ -66214,9 +65471,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/gym) -"soC" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/hull/upper/s_bow) "soK" = ( /obj/item/storage/firstaid/fire/empty, /obj/item/storage/firstaid/o2/empty, @@ -66232,16 +65486,34 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) +"soT" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_x = 16; + pixel_y = -8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) "soX" = ( /obj/structure/window/reinforced/toughened, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/command/cic) -"spn" = ( -/obj/structure/largecrate/random/case, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) +"spd" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "spF" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -66276,6 +65548,39 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) +"spT" = ( +/obj/structure/closet/crate{ + desc = "One of those old special operations crates from back in the day. After a leaked report from a meeting of SOF leadership lambasted the crates as 'waste of operational funds' the crates were removed from service."; + name = "special operations crate" + }, +/obj/item/clothing/mask/gas/swat, +/obj/item/clothing/mask/gas/swat, +/obj/item/clothing/mask/gas/swat, +/obj/item/clothing/mask/gas/swat, +/obj/item/attachable/suppressor, +/obj/item/attachable/suppressor, +/obj/item/attachable/suppressor, +/obj/item/attachable/suppressor, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/obj/item/explosive/grenade/smokebomb, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) +"spW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/upper/aft_hallway) "sqa" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -66311,6 +65616,16 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) +"sqP" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/emails{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_s) "sqW" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/tomatoseed, @@ -66319,12 +65634,39 @@ icon_state = "green" }, /area/almayer/shipboard/brig/cells) -"sro" = ( -/obj/structure/machinery/light/small, +"srh" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/port_umbilical) +"srl" = ( +/obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/maint/hull/lower/l_a_p) +"srO" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/mess) +"srR" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/effect/projector{ + name = "Almayer_Up2"; + vector_x = -1; + vector_y = 100 + }, +/obj/structure/machinery/light, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/starboard_fore_hallway) "srT" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 8 @@ -66336,69 +65678,42 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/evidence_storage) -"ssa" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Hangar Lockdown"; - name = "\improper Hangar Lockdown Blast Door" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "DeployWorkR"; - name = "\improper Workshop Shutters" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"ssk" = ( +/obj/structure/surface/rack, +/obj/item/storage/backpack/marine/satchel{ + desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; + icon = 'icons/obj/janitor.dmi'; + icon_state = "trashbag3"; + name = "trash bag"; + pixel_x = -4; + pixel_y = 6 }, -/area/almayer/hallways/repair_bay) -"ssx" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 +/obj/item/storage/backpack/marine/satchel{ + desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; + icon = 'icons/obj/janitor.dmi'; + icon_state = "trashbag3"; + name = "trash bag"; + pixel_x = 3; + pixel_y = -2 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/p_bow) -"ssD" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) -"ssE" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/door_control{ - id = "laddersouthwest"; - name = "South West Ladders Shutters"; - pixel_x = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer{ - icon_state = "greencorner" - }, -/area/almayer/hallways/port_hallway) +/area/almayer/maint/hull/lower/l_m_p) "ssF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/weapon/gun/rifle/l42a, -/obj/item/weapon/gun/rifle/l42a{ +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 32; pixel_y = 6 }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) -"ssH" = ( -/obj/structure/machinery/light/small{ - dir = 4 +/obj/structure/sign/safety/reduction{ + pixel_x = 32; + pixel_y = -8 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "red" }, -/area/almayer/maint/hull/lower/stern) +/area/almayer/hallways/upper/aft_hallway) "ssU" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/almayer{ @@ -66430,6 +65745,15 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/shipboard/navigation) +"stk" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "str" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down3"; @@ -66449,6 +65773,12 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) +"stA" = ( +/obj/structure/machinery/portable_atmospherics/hydroponics, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "stO" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/faxmachine/uscm/brig, @@ -66460,52 +65790,43 @@ icon_state = "red" }, /area/almayer/shipboard/brig/perma) -"stY" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/almayer{ - dir = 4; - id = "hangarentrancenorth"; - name = "\improper North Hangar Podlock" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) -"sub" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, +"stP" = ( +/obj/structure/machinery/light/small, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) -"suc" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, +/area/almayer/maint/hull/lower/l_f_s) +"stR" = ( /obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - dir = 2; - name = "\improper Brig Armoury"; - req_access = null; - req_one_access_txt = "1;3"; - closeOtherId = "brignorth" + dir = 8; + icon_state = "pipe-c" }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) +"sub" = ( +/obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "cargo" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/hallways/lower/vehiclehangar) "suy" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 }, /turf/open/floor/almayer, /area/almayer/command/computerlab) +"suH" = ( +/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" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "suJ" = ( /obj/structure/machinery/door/airlock/almayer/maint{ name = "\improper Core Hatch" @@ -66518,10 +65839,18 @@ icon_state = "test_floor4" }, /area/almayer/engineering/lower/engine_core) -"suV" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +"suU" = ( +/obj/structure/stairs, +/obj/effect/projector{ + name = "Almayer_Up1"; + vector_x = -19; + vector_y = 98 + }, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "suY" = ( /obj/structure/platform_decoration, /turf/open/floor/almayer{ @@ -66543,13 +65872,43 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"swn" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +"svt" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "green" }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/surgery) +/area/almayer/hallways/lower/port_midship_hallway) +"svw" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) +"svF" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/effect/landmark/yautja_teleport, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) +"svV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = 6 + }, +/obj/item/weapon/gun/rifle/l42a, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "swt" = ( /turf/open/floor/almayer{ icon_state = "greencorner" @@ -66565,6 +65924,12 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"swG" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "swH" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/radio/intercom{ @@ -66600,21 +65965,15 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering) -"sxu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +"sxD" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 2; + name = "\improper Officer's Bunk" }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/living/bridgebunks) "sxE" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -66628,6 +65987,10 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) +"sxS" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/s_bow) "sxW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66639,6 +66002,12 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"syj" = ( +/obj/structure/sign/safety/escapepod{ + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) "syH" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 @@ -66648,13 +66017,13 @@ }, /turf/open/floor/almayer, /area/almayer/squads/delta) -"syP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +"szb" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/upper/stern_hallway) "szf" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -66669,12 +66038,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"szs" = ( -/obj/structure/bed/sofa/south/grey/left{ - pixel_y = 12 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) "szE" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -66685,6 +66048,20 @@ icon_state = "test_floor4" }, /area/almayer/living/offices) +"szG" = ( +/obj/item/stack/sheet/glass/reinforced{ + amount = 50 + }, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/powercell, +/obj/effect/spawner/random/powercell, +/obj/structure/surface/rack, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/warden_office) "szM" = ( /obj/structure/flora/pottedplant{ desc = "It is made of Fiberbush(tm). It contains asbestos."; @@ -66706,20 +66083,6 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) -"szR" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) -"szS" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "Brig" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/lower/p_bow) "szU" = ( /obj/structure/toilet{ dir = 8 @@ -66749,18 +66112,32 @@ icon_state = "orange" }, /area/almayer/engineering/ce_room) +"sAD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_fore_hallway) +"sAS" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "sBg" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/general_equipment) -"sBD" = ( -/obj/structure/largecrate/random/barrel/white, +"sBK" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "redfull" }, -/area/almayer/maint/hull/upper/s_bow) +/area/almayer/hallways/upper/stern_hallway) "sBL" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/structure/machinery/light, @@ -66768,30 +66145,20 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"sBP" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/structure/surface/table/almayer, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"sCi" = ( -/obj/structure/machinery/pipedispenser/orderable, +"sBY" = ( +/obj/item/tool/wet_sign, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) -"sCs" = ( -/obj/structure/surface/table/almayer, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21"; - pixel_y = 11 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" +/area/almayer/maint/hull/lower/l_m_s) +"sCg" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/hallways/lower/starboard_midship_hallway) "sCA" = ( /obj/structure/bed/chair/comfy/delta{ dir = 4 @@ -66829,6 +66196,12 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"sCT" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/lower/l_f_s) "sCV" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -66842,12 +66215,47 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) +"sCW" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/structure/surface/table/almayer, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) +"sDe" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + layer = 3.33; + pixel_x = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + layer = 3.33; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/upper/stern_hallway) "sDu" = ( /obj/item/clothing/under/marine/dress, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"sDx" = ( +/turf/closed/wall/almayer, +/area/almayer/hallways/lower/vehiclehangar) "sDA" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/bed/chair/comfy/charlie{ @@ -66857,19 +66265,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"sDC" = ( -/obj/structure/sign/safety/analysis_lab{ - pixel_y = 26 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 15; - pixel_y = 26 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" - }, -/area/almayer/hallways/aft_hallway) "sDD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -66883,17 +66278,6 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"sDV" = ( -/obj/structure/machinery/firealarm{ - pixel_y = -28 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "sEd" = ( /obj/structure/machinery/cryopod/right, /obj/structure/machinery/light{ @@ -66903,6 +66287,15 @@ icon_state = "cargo" }, /area/almayer/squads/bravo) +"sEg" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) "sEi" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -66956,19 +66349,18 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) -"sEC" = ( -/obj/structure/sign/safety/storage{ - pixel_x = 8; - pixel_y = -32 +"sEu" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"sEz" = ( /turf/open/floor/almayer{ - icon_state = "plate" + allow_construction = 0 }, -/area/almayer/maint/hull/upper/u_a_s) -"sEE" = ( -/obj/structure/prop/invuln/joey, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/shipboard/brig/starboard_hallway) "sEK" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -66996,6 +66388,15 @@ icon_state = "plate" }, /area/almayer/command/cic) +"sER" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/stern) "sEZ" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_y = 26 @@ -67017,54 +66418,26 @@ icon_state = "cargo" }, /area/almayer/shipboard/starboard_missiles) -"sFh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"sFC" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 8; - id = "Interrogation Shutters"; - name = "\improper Privacy Shutters" - }, -/turf/open/floor/plating, -/area/almayer/shipboard/brig/main_office) -"sFO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 32 +"sFu" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/uscm{ + pixel_y = 7 }, +/obj/item/tool/pen, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "red" }, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/shipboard/brig/starboard_hallway) "sGh" = ( /turf/open/floor/almayer/uscm/directional, /area/almayer/command/lifeboat) -"sGm" = ( -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"sGD" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/item/storage/firstaid/rad, -/obj/structure/surface/rack, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) +"sGw" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/lower/l_f_s) +"sGK" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/p_bow) "sGL" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -67081,6 +66454,12 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/port) +"sGQ" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/lower/s_bow) "sGU" = ( /obj/structure/mirror, /turf/closed/wall/almayer, @@ -67091,6 +66470,10 @@ icon_state = "silverfull" }, /area/almayer/command/airoom) +"sHe" = ( +/obj/structure/largecrate/supply/supplies/tables_racks, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "sHm" = ( /obj/structure/disposalpipe/up/almayer{ id = "almayerlink_OT_req" @@ -67156,11 +66539,10 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/engine_core) -"sIw" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/panic) +"sIu" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/p_bow) "sIA" = ( /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."; @@ -67179,21 +66561,26 @@ icon_state = "silver" }, /area/almayer/engineering/port_atmos) +"sIR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_midship_hallway) "sIU" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hallways/hangar) -"sJm" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) -"sJo" = ( -/turf/open/floor/almayer{ - icon_state = "plate" +"sJa" = ( +/obj/structure/sign/safety/cryo{ + pixel_y = -26 }, -/area/almayer/maint/hull/upper/u_a_s) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "sJC" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -67263,6 +66650,13 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"sLk" = ( +/obj/structure/ladder{ + height = 2; + id = "cicladder4" + }, +/turf/open/floor/plating/almayer, +/area/almayer/medical/medical_science) "sLo" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -67273,15 +66667,15 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"sLs" = ( -/obj/structure/largecrate/supply, -/obj/structure/sign/safety/bulkhead_door{ - pixel_y = 32 +"sLx" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/s_bow) +/area/almayer/maint/hull/upper/u_f_p) "sLA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -67289,25 +66683,12 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"sLE" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"sLJ" = ( -/obj/docking_port/stationary/escape_pod/cl, -/turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_m_p) -"sMe" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, +"sLX" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "emeraldcorner" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/hallways/lower/port_midship_hallway) "sMu" = ( /obj/item/trash/uscm_mre, /obj/structure/bed/chair/comfy/charlie{ @@ -67317,15 +66698,6 @@ icon_state = "emeraldfull" }, /area/almayer/living/briefing) -"sMC" = ( -/obj/structure/machinery/light/small{ - dir = 1; - pixel_y = 20 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "sMM" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -67352,19 +66724,22 @@ dir = 1 }, /area/almayer/medical/containment/cell) -"sNC" = ( -/obj/structure/largecrate/random/secure, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) -"sNF" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/lower/l_f_p) "sNI" = ( /obj/structure/bed/chair/comfy/delta, /turf/open/floor/almayer{ icon_state = "bluefull" }, /area/almayer/living/briefing) +"sNL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "sNO" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3" @@ -67375,6 +66750,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"sNP" = ( +/obj/structure/largecrate/supply/floodlights, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "sNR" = ( /turf/closed/wall/almayer/research/containment/wall/corner, /area/almayer/medical/containment/cell/cl) @@ -67388,9 +66769,22 @@ icon_state = "test_floor4" }, /area/almayer/command/cic) -"sOq" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/upper/s_bow) +"sOr" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; + req_access = null; + req_one_access = null; + req_one_access_txt = "3;22;19" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_f_s) "sOt" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/structure/machinery/status_display{ @@ -67434,17 +66828,22 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"sOH" = ( -/obj/structure/ladder{ - height = 1; - id = "ForeStarboardMaint" +"sOD" = ( +/obj/structure/machinery/light/small{ + dir = 4 }, -/obj/structure/sign/safety/ladder{ - pixel_x = 8; - pixel_y = 32 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"sOL" = ( +/obj/structure/machinery/light/small{ + dir = 1 }, -/turf/open/floor/plating/almayer, -/area/almayer/maint/hull/lower/s_bow) +/obj/structure/closet/toolcloset, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "orange" + }, +/area/almayer/maint/upper/mess) "sOZ" = ( /obj/structure/sign/safety/ammunition{ pixel_y = 32 @@ -67483,6 +66882,23 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"sPY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_fore_hallway) +"sQu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "sQF" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -67494,14 +66910,20 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"sRk" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/drinks/cans/souto/blue{ - pixel_x = 2; - pixel_y = 3 +"sRM" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_s) +"sRP" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/maint/hull/upper/u_a_p) "sSa" = ( /obj/structure/machinery/door/airlock/almayer/marine/requisitions{ dir = 2; @@ -67559,21 +66981,6 @@ icon_state = "plate" }, /area/almayer/command/cic) -"sSP" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_29" - }, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliaison) -"sSY" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/port_umbilical) "sTd" = ( /turf/open/floor/almayer{ dir = 4; @@ -67599,9 +67006,13 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"sTT" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/upper/u_a_s) +"sTU" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) "sTV" = ( /obj/structure/machinery/power/apc/almayer/hardened{ cell_type = /obj/item/cell/hyper; @@ -67619,6 +67030,12 @@ icon_state = "silverfull" }, /area/almayer/shipboard/brig/cic_hallway) +"sUi" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_a_p) "sUj" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -67629,15 +67046,15 @@ icon_state = "bluefull" }, /area/almayer/squads/delta) -"sUq" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 32 +"sUk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 }, -/area/almayer/maint/hull/lower/stern) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) "sUs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -67654,28 +67071,6 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) -"sUF" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/stern_hallway) -"sUI" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -19; - pixel_y = -6 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = -19; - pixel_y = 6 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) "sUO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -67699,27 +67094,15 @@ icon_state = "green" }, /area/almayer/shipboard/brig/cells) -"sVf" = ( -/obj/structure/sign/safety/escapepod{ - pixel_x = 8; - pixel_y = -32 +"sVA" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -17 }, /turf/open/floor/almayer{ + dir = 8; icon_state = "green" }, -/area/almayer/hallways/port_hallway) -"sVv" = ( -/obj/structure/surface/table/almayer, -/obj/effect/spawner/random/toolbox, -/obj/effect/spawner/random/technology_scanner, -/obj/effect/spawner/random/technology_scanner, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/hallways/upper/aft_hallway) "sVT" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/mechanical, @@ -67740,22 +67123,23 @@ "sVV" = ( /turf/open/floor/almayer, /area/almayer/hallways/upper/starboard) -"sWb" = ( -/obj/structure/machinery/door/airlock/almayer/maint/reinforced{ - dir = 1 +"sWp" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) -"sWy" = ( +/area/almayer/maint/hull/upper/u_a_s) +"sWw" = ( /obj/structure/largecrate/random/case/double, -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "sWC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -67795,20 +67179,12 @@ icon_state = "dark_sterile" }, /area/almayer/medical/containment) -"sXg" = ( -/obj/structure/surface/table/almayer, -/obj/item/frame/table, -/obj/item/storage/toolbox/electrical, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) -"sXh" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 32 +"sXq" = ( +/obj/structure/sign/safety/storage{ + pixel_x = -17 }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/s_bow) "sXt" = ( /obj/structure/machinery/cm_vending/clothing/tl/alpha{ density = 0; @@ -67824,22 +67200,6 @@ /obj/effect/landmark/late_join/bravo, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/bravo) -"sXy" = ( -/obj/item/device/camera{ - pixel_x = 4; - pixel_y = 8 - }, -/obj/structure/surface/table/almayer, -/obj/item/device/camera_film{ - pixel_x = 4; - pixel_y = -2 - }, -/obj/item/device/camera_film, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "sXB" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -67853,6 +67213,15 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"sXC" = ( +/obj/structure/sign/safety/storage{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) "sXE" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Auxiliary Support Officer's Room" @@ -67872,42 +67241,43 @@ icon_state = "green" }, /area/almayer/shipboard/brig/cells) -"sYe" = ( -/obj/structure/surface/rack, -/obj/item/stack/cable_coil, -/obj/item/attachable/flashlight/grip, -/obj/item/ammo_box/magazine/l42a{ - pixel_y = 14 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) "sYh" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"sYi" = ( -/obj/structure/machinery/door_control{ - id = "firearm_storage_armory"; - name = "Armory Lockdown"; - pixel_y = 24; - req_access_txt = "4" +"sYj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/obj/structure/sign/safety/ammunition{ - pixel_y = 32 +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "green" }, -/obj/structure/sign/safety/restrictedarea{ - pixel_x = 15; - pixel_y = 32 +/area/almayer/hallways/upper/aft_hallway) +"sYl" = ( +/obj/structure/machinery/body_scanconsole{ + dir = 8 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + dir = 8; + icon_state = "sterile_green_side" + }, +/area/almayer/shipboard/brig/medical) +"sYr" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" }, -/area/almayer/shipboard/brig/main_office) +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/port_umbilical) "sYw" = ( /obj/structure/platform{ dir = 8 @@ -67934,20 +67304,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"sYE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/status_display{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "sYP" = ( /obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer{ @@ -67964,6 +67320,18 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/medical/upper_medical) +"sZc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) +"sZe" = ( +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) "sZq" = ( /obj/structure/machinery/cm_vending/sorted/marine_food{ density = 0; @@ -68024,12 +67392,6 @@ icon_state = "blue" }, /area/almayer/living/port_emb) -"sZQ" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) "tab" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/box/flashbangs{ @@ -68048,21 +67410,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"tak" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) -"tal" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/aft_hallway) "tan" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -68095,15 +67442,9 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/perma) -"taA" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/hallways/starboard_hallway) +"taw" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/hull/upper/u_a_s) "taH" = ( /obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ id = "Containment Cell 2"; @@ -68132,11 +67473,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/containment/cell) -"taM" = ( -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/maint/hull/upper/u_f_p) "taV" = ( /obj/effect/projector{ name = "Almayer_Down1"; @@ -68148,51 +67484,43 @@ icon_state = "plate" }, /area/almayer/hallways/upper/starboard) -"tbd" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 +"tbD" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/machinery/cm_vending/sorted/medical/blood/bolted, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/stern_hallway) +"tbF" = ( /turf/open/floor/almayer{ - icon_state = "sterile_green_side" + icon_state = "silvercorner" }, -/area/almayer/medical/lockerroom) -"tbz" = ( -/obj/structure/largecrate/random/barrel/yellow, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" +/area/almayer/hallways/upper/aft_hallway) +"tcd" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/radio{ + pixel_x = -6; + pixel_y = 3 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) +"tcm" = ( +/obj/structure/machinery/light/small{ + dir = 1 }, -/area/almayer/maint/hull/lower/l_a_p) -"tcn" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) -"tcP" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) -"tcY" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, +/area/almayer/maint/hull/lower/l_a_s) +"tcO" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/lower/l_a_p) +"tcS" = ( /obj/structure/disposalpipe/segment{ - layer = 5.1; - name = "water pipe" - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Hangar Lockdown"; - name = "\improper Hangar Lockdown Blast Door" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 4 }, -/area/almayer/maint/lower/constr) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) "tcZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -68229,6 +67557,14 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"tdi" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "tdv" = ( /obj/structure/surface/table/almayer, /obj/structure/sign/safety/terminal{ @@ -68269,33 +67605,21 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha_bravo_shared) +"tdH" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/obj/item/bedsheet/yellow, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "tdI" = ( /turf/open/floor/almayer{ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) -"tdK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/airlock{ - pixel_y = -32 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_umbilical) -"tdN" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) "tdT" = ( /obj/structure/bed/chair/comfy/beige{ dir = 1 @@ -68319,13 +67643,14 @@ }, /area/almayer/lifeboat_pumps/north1) "ter" = ( -/obj/structure/surface/rack, -/obj/item/tool/weldpack, -/obj/effect/spawner/random/tool, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/almayer/maint/hull/lower/l_f_p) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) "teu" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/gun/shotgun/pump{ @@ -68333,6 +67658,10 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) +"tey" = ( +/obj/item/tool/wet_sign, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_s) "tez" = ( /obj/effect/landmark/ert_spawns/distress_cryo, /obj/effect/landmark/late_join, @@ -68347,9 +67676,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"teI" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/upper/u_f_p) "teY" = ( /obj/structure/machinery/light{ dir = 1 @@ -68371,39 +67697,17 @@ icon_state = "red" }, /area/almayer/shipboard/brig/lobby) -"tfj" = ( -/obj/structure/machinery/conveyor{ - id = "lower_garbage" - }, -/obj/structure/plasticflaps, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "plating_striped" - }, -/area/almayer/maint/hull/lower/l_a_p) -"tfl" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/sign/safety/maint{ - pixel_x = 32 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) -"tfw" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"tfE" = ( +/obj/structure/surface/rack, +/obj/item/storage/firstaid/adv{ + pixel_x = 6; + pixel_y = 6 }, +/obj/item/storage/firstaid/regular, /turf/open/floor/almayer{ - dir = 1; - icon_state = "green" + icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/shipboard/brig/execution_storage) "tfH" = ( /obj/structure/machinery/light/containment, /obj/effect/decal/warning_stripes{ @@ -68413,6 +67717,25 @@ dir = 1 }, /area/almayer/medical/containment/cell) +"tfQ" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"tfZ" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_x = -7; + pixel_y = 17 + }, +/obj/structure/sign/safety/cryo{ + pixel_x = 12; + pixel_y = 28 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) "tge" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -68424,16 +67747,40 @@ icon_state = "emeraldfull" }, /area/almayer/living/briefing) -"tgh" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 +"tgm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"tgy" = ( +/obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 2 + icon_state = "SW-out" + }, +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage{ + req_one_access = null; + req_one_access_txt = "7;23;27;102" + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" + }, +/area/almayer/hallways/lower/repair_bay) +"tgz" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_y = -32 + }, +/obj/structure/sign/safety/manualopenclose{ + pixel_x = 15; + pixel_y = -32 }, /turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/hallways/lower/port_midship_hallway) +"tgJ" = ( +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/warden_office) "tgK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -68476,12 +67823,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"tht" = ( -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_bow) "thv" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -68504,12 +67845,6 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha_bravo_shared) -"thK" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) "thL" = ( /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) @@ -68538,6 +67873,12 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha) +"tih" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_p) "tii" = ( /obj/structure/machinery/firealarm{ pixel_x = 6; @@ -68568,13 +67909,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"tit" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) "tiE" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -68626,6 +67960,32 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"tiX" = ( +/obj/item/reagent_container/glass/bucket/janibucket{ + pixel_x = -1; + pixel_y = 13 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) +"tiY" = ( +/obj/structure/closet, +/obj/item/reagent_container/food/drinks/bottle/sake, +/obj/item/newspaper, +/obj/item/clothing/gloves/yellow, +/obj/item/stack/tile/carpet{ + amount = 20 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"tiZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "tjj" = ( /turf/open/floor/almayer{ dir = 5; @@ -68650,13 +68010,40 @@ }, /turf/open/floor/almayer, /area/almayer/living/tankerbunks) -"tki" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 +"tjz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 4; + pixel_y = -3 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) +"tjH" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/device/radio/headset/almayer/mt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"tjO" = ( +/obj/structure/janitorialcart, +/obj/item/tool/mop, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/maint/hull/lower/l_m_s) +"tkg" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) "tkn" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/mechanical, @@ -68693,16 +68080,6 @@ icon_state = "redfull" }, /area/almayer/hallways/upper/starboard) -"tkX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) -"tla" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/maint/hull/upper/s_bow) "tld" = ( /obj/structure/machinery/prop/almayer/computer{ dir = 8; @@ -68758,13 +68135,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"tlX" = ( -/obj/structure/largecrate/random/barrel/red, -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "tmg" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/hypospray, @@ -68776,27 +68146,22 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"tms" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "officers_mess"; - name = "\improper Privacy Shutters" - }, -/obj/structure/machinery/door/airlock/almayer/maint/reinforced{ - access_modified = 1; - req_one_access = null; - req_one_access_txt = "19;30" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/upper/mess) +"tml" = ( +/obj/structure/largecrate/supply/supplies/mre, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "tmB" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"tmE" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "tmH" = ( /obj/structure/pipes/vents/pump, /obj/structure/machinery/camera/autoname/almayer{ @@ -68830,34 +68195,38 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) +"tmQ" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/stern) +"tmX" = ( +/obj/effect/landmark/start/professor, +/obj/effect/landmark/late_join/cmo, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/offices) "tnb" = ( /obj/structure/bed/chair/comfy/black, /turf/open/floor/almayer{ icon_state = "redfull" }, /area/almayer/shipboard/port_missiles) +"tne" = ( +/obj/structure/machinery/door_control/cl/quarter/backdoor{ + pixel_x = -25; + pixel_y = 23 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_p) "tni" = ( /turf/open/floor/almayer{ dir = 1; icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_three) -"tnl" = ( -/obj/structure/sign/safety/escapepod{ - pixel_y = 32 - }, -/obj/structure/sign/safety/north{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) -"tnD" = ( -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/s_bow) "tnY" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -68869,10 +68238,9 @@ icon_state = "cargo" }, /area/almayer/squads/alpha) -"toh" = ( -/obj/structure/machinery/light/small, +"tob" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/maint/hull/upper/u_m_s) "tos" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -68884,6 +68252,12 @@ icon_state = "plate" }, /area/almayer/engineering/lower/engine_core) +"tot" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_stern) "tou" = ( /obj/structure/bed/chair{ dir = 4 @@ -68899,6 +68273,17 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) +"toD" = ( +/obj/structure/largecrate/supply/generator, +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + layer = 2.9; + pixel_x = -10; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "toO" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/engineering_construction, @@ -68919,6 +68304,20 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) +"toQ" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "laddernorthwest"; + name = "\improper North West Ladders Shutters" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_fore_hallway) "tpa" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/structure/window/reinforced{ @@ -68935,15 +68334,37 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"tpk" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/almayer{ - icon_state = "plate" +"tpj" = ( +/obj/structure/stairs{ + dir = 8; + icon_state = "ramptop" }, -/area/almayer/maint/hull/upper/p_stern) +/obj/effect/projector{ + name = "Almayer_Down2"; + vector_x = 1; + vector_y = -100 + }, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/upper/aft_hallway) "tpn" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/evidence_storage) +"tpB" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/almayer{ + dir = 4; + id = "hangarentrancesouth"; + name = "\improper South Hangar Podlock" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/port_fore_hallway) "tpD" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -68954,70 +68375,29 @@ icon_state = "silver" }, /area/almayer/living/bridgebunks) -"tpQ" = ( -/obj/structure/closet/crate/trashcart, -/obj/item/clothing/gloves/yellow, -/obj/item/device/multitool, -/obj/item/tool/screwdriver{ - icon_state = "screwdriver7" +"tpG" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/obj/item/tool/crowbar/red, -/obj/item/book/manual/engineering_hacking, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/upper/u_a_p) -"tqg" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" +/area/almayer/hallways/lower/port_umbilical) +"tpR" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) +"tqf" = ( +/obj/structure/sign/safety/ladder{ + pixel_x = -16 }, /obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/machinery/door_control{ - id = "DeployWorkR"; - name = "Workshop Shutters"; - pixel_x = -7; - pixel_y = -26; - req_one_access_txt = "3;22;2;19;7" - }, -/obj/structure/surface/rack, -/obj/item/rappel_harness{ - pixel_y = 8 - }, -/obj/item/rappel_harness, -/obj/item/rappel_harness{ - pixel_y = -6 - }, -/obj/structure/sign/safety/bulkhead_door{ - pixel_x = 15; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "silverfull" - }, -/area/almayer/hallways/repair_bay) -"tqs" = ( -/obj/structure/surface/table/almayer, -/obj/item/clothing/head/hardhat{ - pixel_x = 10; - pixel_y = 1 - }, -/obj/item/clothing/suit/storage/hazardvest{ - pixel_x = -8; - pixel_y = 6 - }, -/obj/item/clothing/suit/storage/hazardvest/yellow, -/obj/item/clothing/suit/storage/hazardvest{ - pixel_x = 8; - pixel_y = 7 + icon_state = "N"; + pixel_y = 2 }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"tqt" = ( -/obj/item/tool/wet_sign, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_s) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/vehiclehangar) "tqE" = ( /obj/structure/machinery/light{ dir = 8 @@ -69028,9 +68408,6 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) -"tqG" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_p) "tqO" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -69043,6 +68420,47 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) +"tqQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/lower/vehiclehangar) +"tqV" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/electrical{ + pixel_y = 9 + }, +/obj/item/storage/toolbox/mechanical/green, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) +"tra" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; + dir = 2; + req_one_access = null; + req_one_access_txt = "19;34;30" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_m_p) "trb" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -69119,6 +68537,9 @@ /obj/item/clothing/suit/chef/classic, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) +"tsr" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/maint/upper/mess) "tst" = ( /obj/structure/machinery/cryopod/right, /obj/effect/decal/warning_stripes{ @@ -69159,12 +68580,10 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/upper_medical) -"tsI" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) +"tsE" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) "tsM" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -69197,31 +68616,24 @@ }, /turf/open/floor/plating, /area/almayer/powered/agent) -"ttE" = ( +"tty" = ( /obj/structure/surface/table/almayer, -/obj/item/paper_bin{ - pixel_x = -7 - }, -/obj/item/tool/pen, -/obj/item/tool/pen{ - pixel_y = 3 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) -"ttM" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, +/obj/item/clipboard, +/obj/item/paper, +/obj/item/clothing/glasses/mgoggles, +/obj/item/clothing/glasses/mgoggles, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) +"ttB" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) +"ttD" = ( +/obj/structure/largecrate/random/barrel/green, /turf/open/floor/almayer{ - dir = 1; - icon_state = "green" + icon_state = "plate" }, -/area/almayer/hallways/port_hallway) +/area/almayer/maint/hull/lower/l_m_p) "ttS" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -69288,9 +68700,45 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"tup" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -30 + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "tuA" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/port_missiles) +"tuC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_fore_hallway) +"tuJ" = ( +/obj/item/reagent_container/glass/bucket{ + pixel_x = 4; + pixel_y = 9 + }, +/obj/item/tool/shovel/spade{ + pixel_x = -3; + pixel_y = -3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "tuN" = ( /turf/open/floor/almayer{ icon_state = "orange" @@ -69303,12 +68751,26 @@ icon_state = "redcorner" }, /area/almayer/shipboard/weapon_room) -"tvm" = ( -/obj/structure/closet/emcloset, +"tvl" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) +"tvr" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/hull/upper/u_a_s) +"tvt" = ( +/obj/structure/window/framed/almayer/hull, +/turf/open/floor/plating, +/area/almayer/maint/hull/upper/u_f_s) "tvw" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -69317,6 +68779,23 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"tvA" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) +"tvJ" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) "tvM" = ( /obj/structure/bed/chair{ dir = 1 @@ -69348,16 +68827,21 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"twi" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 +"tvS" = ( +/obj/docking_port/stationary/escape_pod/south, +/turf/open/floor/plating, +/area/almayer/maint/hull/upper/u_m_s) +"twp" = ( +/obj/structure/ladder{ + height = 1; + id = "AftStarboardMaint" }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 +/obj/structure/sign/safety/ladder{ + pixel_x = 8; + pixel_y = 32 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) +/turf/open/floor/plating/almayer, +/area/almayer/maint/hull/lower/l_a_s) "twq" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/tool/hand_labeler{ @@ -69402,20 +68886,13 @@ icon_state = "cargo" }, /area/almayer/command/cic) -"twO" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) -"twT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/cryo{ - pixel_x = 8; - pixel_y = -26 +"twQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_p) "twW" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -69430,26 +68907,47 @@ }, /turf/open/floor/almayer, /area/almayer/living/port_emb) -"txe" = ( +"txd" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 1; + icon_state = "pipe-c" }, /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 + dir = 5 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"txi" = ( -/obj/structure/machinery/light{ - dir = 8 +/turf/open/floor/almayer{ + dir = 10; + icon_state = "orange" }, -/obj/effect/projector{ - name = "Almayer_Up3"; - vector_x = -1; - vector_y = 102 +/area/almayer/hallways/upper/stern_hallway) +"txp" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"txy" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/area/almayer/maint/hull/upper/u_f_s) +"txE" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/sign/safety/stairs{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"txH" = ( +/obj/structure/bed/stool, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "txO" = ( /obj/structure/machinery/landinglight/ds1{ dir = 4 @@ -69464,6 +68962,17 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"txS" = ( +/obj/structure/surface/table/almayer, +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering/lower/engine_core) "tyb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -69478,9 +68987,6 @@ dir = 4 }, /area/almayer/medical/containment/cell) -"tyH" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) "tyK" = ( /obj/effect/spawner/random/toolbox, /obj/structure/machinery/light{ @@ -69491,13 +68997,6 @@ icon_state = "cargo_arrow" }, /area/almayer/shipboard/starboard_missiles) -"tyY" = ( -/obj/structure/sign/safety/autoopenclose{ - pixel_x = 7; - pixel_y = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/stern) "tzd" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -69505,30 +69004,28 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/processing) -"tzf" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "tzw" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 +/obj/structure/machinery/light{ + dir = 1 }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) +"tzx" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/s_bow) -"tzC" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/structure/machinery/cm_vending/sorted/medical/blood/bolted, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" }, +/area/almayer/medical/lockerroom) +"tzF" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "mono" }, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/hallways/upper/aft_hallway) "tzL" = ( /obj/structure/sign/safety/waterhazard{ pixel_x = 8; @@ -69545,10 +69042,14 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"tzZ" = ( -/obj/effect/landmark/start/reporter, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +"tAb" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/safety/restrictedarea{ + pixel_x = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "tAq" = ( /obj/structure/surface/table/reinforced/black, /obj/item/clothing/mask/breath{ @@ -69592,6 +69093,13 @@ icon_state = "cargo" }, /area/almayer/medical/lower_medical_medbay) +"tAW" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "tBq" = ( /obj/item/tool/crowbar, /turf/open/floor/plating/plating_catwalk, @@ -69603,32 +69111,54 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) -"tBz" = ( +"tBP" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/fancy/cigarettes/lucky_strikes, +/obj/item/tool/lighter, +/obj/item/clothing/glasses/sunglasses/blindfold, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/brig/execution_storage) +"tBU" = ( +/obj/structure/platform, +/obj/structure/largecrate/random/case/double{ + layer = 2.98 + }, +/obj/structure/sign/safety/life_support{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) +"tBY" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "plate" + }, +/area/almayer/maint/upper/mess) +"tCd" = ( +/obj/item/folder/red{ + desc = "A red folder. The previous contents are a mystery, though the number 28 has been written on the inside of each flap numerous times. Smells faintly of cough syrup."; + name = "folder: 28"; + pixel_x = -4; + pixel_y = 5 + }, +/obj/structure/surface/table/almayer, +/obj/item/toy/crayon{ + pixel_x = 9; + pixel_y = -2 }, -/area/almayer/hallways/vehiclehangar) -"tBF" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) -"tBL" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"tCi" = ( /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/maint/hull/upper/u_m_p) "tCx" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/maint{ @@ -69647,12 +69177,25 @@ icon_state = "test_floor4" }, /area/almayer/hallways/upper/port) -"tCN" = ( +"tCC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 8; icon_state = "orange" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/maint/hull/upper/u_a_s) +"tCD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/upper/aft_hallway) "tCT" = ( /obj/structure/bed/chair/comfy/blue{ dir = 8 @@ -69661,17 +69204,6 @@ icon_state = "plate" }, /area/almayer/command/cic) -"tDq" = ( -/obj/structure/largecrate/random, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) -"tDw" = ( -/obj/structure/largecrate/supply/ammo/m41a/half, -/obj/structure/largecrate/supply/ammo/pistol/half{ - pixel_y = 12 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/p_bow) "tDZ" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -69705,27 +69237,15 @@ icon_state = "plating" }, /area/almayer/medical/upper_medical) -"tEk" = ( -/obj/structure/surface/table/almayer, -/obj/item/circuitboard{ - pixel_x = 12; - pixel_y = 7 - }, -/obj/item/tool/crowbar{ - pixel_x = 6; - pixel_y = 1 +"tEu" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_p) -"tEo" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/mess) +/area/almayer/maint/hull/lower/l_m_s) "tEB" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -69767,6 +69287,11 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) +"tFQ" = ( +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) "tFS" = ( /obj/structure/machinery/computer/supplycomp, /obj/structure/sign/safety/terminal{ @@ -69823,14 +69348,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) -"tGq" = ( -/obj/effect/projector{ - name = "Almayer_Up4"; - vector_x = -19; - vector_y = 104 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) "tGG" = ( /obj/structure/bed/chair/comfy/alpha{ dir = 1 @@ -69839,23 +69356,47 @@ icon_state = "redfull" }, /area/almayer/living/briefing) -"tGO" = ( -/obj/effect/projector{ - name = "Almayer_Up3"; - vector_x = -1; - vector_y = 102 +"tGH" = ( +/obj/structure/sign/safety/restrictedarea, +/obj/structure/sign/safety/security{ + pixel_x = 15 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"tHh" = ( -/obj/structure/sign/safety/ladder{ - pixel_x = 8; - pixel_y = -32 +/turf/closed/wall/almayer, +/area/almayer/shipboard/panic) +"tGS" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, /turf/open/floor/almayer{ - icon_state = "blue" + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) +"tGT" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/photocopier{ + anchored = 0 + }, +/obj/structure/sign/poster/art{ + pixel_y = 32 + }, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliaison) +"tGW" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/stern_hallway) +"tHk" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/tool, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) "tHr" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/status_display{ @@ -69882,27 +69423,12 @@ icon_state = "orangecorner" }, /area/almayer/living/briefing) -"tHw" = ( -/obj/structure/largecrate/random/case/double, +"tHF" = ( +/obj/structure/machinery/light, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/stern) -"tHA" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/station_alert, -/obj/structure/sign/safety/maint{ - pixel_x = 32 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/maint/upper/mess) +/area/almayer/hallways/lower/starboard_aft_hallway) "tHQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -69930,6 +69456,15 @@ icon_state = "orange" }, /area/almayer/engineering/lower/engine_core) +"tIl" = ( +/obj/structure/pipes/vents/pump/on, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_aft_hallway) "tIp" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Dorms" @@ -69945,12 +69480,12 @@ icon_state = "test_floor4" }, /area/almayer/living/port_emb) -"tIE" = ( -/obj/structure/girder/displaced, +"tIF" = ( +/obj/structure/largecrate/random/barrel/green, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/hull/lower/l_a_s) "tIK" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -69963,15 +69498,13 @@ /turf/open/floor/wood/ship, /area/almayer/living/basketball) "tIN" = ( -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice13"; - pixel_x = 16; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -14; + pixel_y = 13 }, -/area/almayer/maint/hull/lower/l_m_s) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) "tIQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -69987,10 +69520,17 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"tJa" = ( -/obj/docking_port/stationary/escape_pod/east, -/turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_m_p) +"tIX" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/firstaid/adv{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/firstaid/regular, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_p) "tJi" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/paper_bin/uscm, @@ -69999,27 +69539,24 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) +"tJq" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_s) "tJz" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"tJM" = ( -/obj/structure/toilet{ - pixel_y = 13 - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/structure/machinery/light/small{ - dir = 8 - }, +"tJH" = ( +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "mono" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/hallways/upper/stern_hallway) "tJN" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -70066,16 +69603,6 @@ icon_state = "cargo" }, /area/almayer/living/bridgebunks) -"tKu" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/cm_vending/sorted/medical/blood/bolted, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lockerroom) "tLa" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -70127,50 +69654,33 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"tLA" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "greencorner" - }, -/area/almayer/squads/req) -"tLD" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/obj/item/bedsheet/yellow, +"tLZ" = ( /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "green" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/hallways/lower/starboard_midship_hallway) "tMc" = ( /obj/structure/machinery/chem_master/industry_mixer, /turf/open/floor/almayer{ icon_state = "orange" }, /area/almayer/engineering/lower/workshop/hangar) -"tMH" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - name = "\improper Warden's Office"; - closeOtherId = "brigwarden" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Warden Office Shutters"; - name = "\improper Privacy Shutters" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 +"tMT" = ( +/obj/item/tool/weldingtool, +/obj/structure/surface/rack, +/turf/open/floor/almayer{ + icon_state = "red" }, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "courtyard_cells"; - name = "\improper Courtyard Lockdown Shutter" +/area/almayer/maint/hull/upper/u_a_p) +"tMU" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/shipboard/brig/chief_mp_office) +/area/almayer/maint/hull/upper/u_m_p) "tMW" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -70180,15 +69690,19 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"tNf" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/lower/s_bow) -"tNy" = ( -/obj/structure/machinery/light/small{ - dir = 4 +"tNw" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/pouch/tools/full, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/maint/hull/upper/u_m_p) +"tNB" = ( +/obj/structure/bed/sofa/south/grey/left, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_p) "tNP" = ( /obj/structure/sign/safety/debark_lounge{ pixel_x = 15; @@ -70235,12 +69749,52 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"tON" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) "tOW" = ( /turf/open/floor/almayer{ dir = 10; icon_state = "green" }, /area/almayer/living/grunt_rnr) +"tPc" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) +"tPj" = ( +/obj/structure/machinery/door/airlock/almayer/marine/requisitions{ + access_modified = 1; + name = "\improper Requisition's Office"; + req_one_access = null; + req_one_access_txt = "1;26" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/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/squads/req) "tPm" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -70254,6 +69808,20 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) +"tPz" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) +"tPB" = ( +/obj/effect/projector{ + name = "Almayer_Down2"; + vector_x = 1; + vector_y = -100 + }, +/turf/open/floor/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/upper/aft_hallway) "tPI" = ( /obj/structure/bed/chair{ dir = 4 @@ -70269,6 +69837,16 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"tQe" = ( +/obj/structure/sign/safety/escapepod{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "greencorner" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "tQi" = ( /obj/effect/landmark/start/warrant, /obj/effect/decal/warning_stripes{ @@ -70277,67 +69855,30 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cryo) -"tQm" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "sterile_green_side" - }, -/area/almayer/shipboard/brig/surgery) -"tQo" = ( -/obj/structure/machinery/status_display{ - pixel_y = -30 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 8; - id = "laddersoutheast"; - name = "\improper South East Ladders Shutters" +"tQA" = ( +/obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + dir = 1 }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) -"tQw" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/maint/upper/u_m_s) "tQL" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"tQM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/sign/poster/pinup{ - pixel_x = -30 +"tQO" = ( +/obj/structure/sign/safety/restrictedarea{ + pixel_y = -32 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "green" }, -/area/almayer/command/corporateliaison) -"tQN" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/lower/p_bow) +/area/almayer/hallways/upper/aft_hallway) "tQV" = ( /turf/closed/wall/almayer/outer, /area/almayer/lifeboat_pumps/south1) -"tRd" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) "tRs" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/spray/cleaner, @@ -70357,6 +69898,15 @@ icon_state = "bluecorner" }, /area/almayer/living/basketball) +"tSm" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/weldingtool{ + pixel_x = 6; + pixel_y = -16 + }, +/obj/item/clothing/head/welding, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "tSp" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -70367,12 +69917,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) -"tSw" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/hallways/stern_hallway) "tSB" = ( /turf/open/floor/almayer{ dir = 1; @@ -70385,6 +69929,15 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"tSY" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/stern_hallway) "tTk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -70407,6 +69960,9 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"tTC" = ( +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "tTD" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/box/uscm_mre, @@ -70420,6 +69976,20 @@ icon_state = "kitchen" }, /area/almayer/living/captain_mess) +"tTG" = ( +/obj/structure/sign/safety/terminal{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) +"tTO" = ( +/obj/structure/machinery/photocopier, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) "tUh" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -70436,6 +70006,17 @@ "tUx" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +"tUK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) "tUN" = ( /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ access_modified = 1; @@ -70472,13 +70053,12 @@ icon_state = "bluefull" }, /area/almayer/living/bridgebunks) -"tVl" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" +"tVn" = ( +/obj/structure/platform{ + dir = 1 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) +/area/almayer/maint/hull/upper/u_a_p) "tVq" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -70488,38 +70068,84 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha) -"tVJ" = ( -/obj/structure/surface/rack, -/obj/item/tool/weldpack, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 1; - pixel_y = 7 +"tVs" = ( +/obj/structure/closet, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/item/storage/toolbox/mechanical/green{ - pixel_x = 1; - pixel_y = -1 +/area/almayer/maint/upper/u_m_s) +"tVx" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_p) +"tVZ" = ( /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo_arrow" }, -/area/almayer/maint/hull/lower/l_f_p) +/area/almayer/hallways/lower/repair_bay) +"tWd" = ( +/obj/structure/largecrate/random/case, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) +"tWf" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "tWi" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"tWL" = ( -/obj/structure/sign/poster{ - desc = "It says DRUG."; - icon_state = "poster2"; - pixel_y = 30 +"tWl" = ( +/obj/structure/machinery/door/airlock/almayer/engineering{ + name = "\improper Disposals" }, -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_a_p) +"tWp" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) +"tWF" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + req_one_access = null; + req_one_access_txt = "2;30;34" + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/mess) +"tWL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/lower/repair_bay) +"tWM" = ( +/obj/docking_port/stationary/escape_pod/north, +/turf/open/floor/plating, +/area/almayer/maint/upper/u_m_s) "tWY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -70576,20 +70202,11 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) -"tXA" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = -32 +"tXo" = ( +/turf/open/floor/almayer{ + icon_state = "redcorner" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/hallways/lower/starboard_midship_hallway) "tXM" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -70633,22 +70250,6 @@ icon_state = "plate" }, /area/almayer/living/port_emb) -"tXX" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/firstaid/o2, -/obj/effect/spawner/random/tool, -/obj/effect/spawner/random/technology_scanner, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) -"tYh" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) "tYi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -70660,6 +70261,15 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"tYr" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) "tYw" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft"; @@ -70681,6 +70291,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"tYV" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_p) "tYX" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -70709,27 +70325,12 @@ icon_state = "test_floor4" }, /area/almayer/hallways/upper/port) -"tZO" = ( -/obj/structure/sign/safety/autodoc{ - pixel_x = 20; - pixel_y = -32 - }, -/obj/structure/machinery/cm_vending/sorted/medical/bolted, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lower_medical_medbay) -"tZP" = ( -/obj/structure/surface/rack, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" +"tZM" = ( +/obj/structure/sink{ + pixel_y = 24 }, -/area/almayer/engineering/upper_engineering/port) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) "tZZ" = ( /obj/structure/machinery/cryopod, /obj/effect/decal/warning_stripes{ @@ -70752,6 +70353,12 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"uag" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/mess) "uah" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -70762,13 +70369,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"uai" = ( -/obj/structure/window/framed/almayer, -/obj/structure/curtain/open/shower{ - name = "hypersleep curtain" - }, -/turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_m_p) "ual" = ( /obj/structure/sink{ pixel_y = 24 @@ -70792,6 +70392,15 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) +"uaA" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_f_s) +"uaG" = ( +/turf/closed/wall/almayer, +/area/almayer/hallways/lower/starboard_umbilical) "uaI" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/processor{ @@ -70827,19 +70436,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"ubB" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 1; - name = "\improper Brig Maintenance" - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/p_bow) "ubI" = ( /obj/structure/surface/table/almayer, /obj/item/folder/black_random{ @@ -70853,6 +70449,27 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) +"ubQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) +"uch" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/aft_hallway) "ucp" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -70863,6 +70480,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) +"ucy" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -16; + pixel_y = 13 + }, +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/lower/l_a_p) "ucz" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/overwatch/almayer{ @@ -70885,12 +70510,23 @@ icon_state = "plate" }, /area/almayer/command/cic) -"ucU" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" +"udf" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, -/area/almayer/maint/hull/lower/p_bow) +/obj/structure/sign/safety/maint{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/storage{ + pixel_y = 32 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) "udi" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -70914,15 +70550,6 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) -"udF" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/starboard_hallway) "udG" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes{ @@ -70933,13 +70560,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha) -"udH" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/power/apc/almayer, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) "udK" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -70995,6 +70615,12 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) +"uew" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_p) "ueG" = ( /obj/item/bedsheet/orange, /obj/structure/bed{ @@ -71008,12 +70634,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) -"ueH" = ( -/obj/structure/sink{ - pixel_y = 24 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/lower/s_bow) "ueJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -71065,19 +70685,27 @@ icon_state = "test_floor4" }, /area/almayer/command/cic) -"ugt" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, +"ugj" = ( /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 4; + icon_state = "orange" }, -/area/almayer/maint/hull/upper/s_bow) +/area/almayer/maint/hull/lower/l_m_s) "ugu" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer, /area/almayer/living/briefing) +"ugw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/starboard_hallway) "ugJ" = ( /obj/structure/largecrate/random/case/small, /obj/structure/largecrate/random/mini/small_case{ @@ -71089,11 +70717,21 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"ugT" = ( +"ugZ" = ( +/obj/structure/closet/emcloset, /turf/open/floor/almayer{ - icon_state = "red" + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) +"uhh" = ( +/obj/structure/machinery/vending/cola{ + density = 0; + pixel_y = 18 + }, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/maint/hull/upper/u_f_p) "uhl" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -71104,14 +70742,28 @@ icon_state = "cargo_arrow" }, /area/almayer/living/offices) -"uhn" = ( -/obj/structure/platform{ +"uhq" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "northcheckpoint"; + name = "\improper Checkpoint Shutters" + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "redfull" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/hallways/lower/starboard_midship_hallway) +"uhA" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/starboard_hallway) "uhE" = ( /obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, /turf/open/floor/plating/plating_catwalk, @@ -71130,25 +70782,6 @@ icon_state = "cargo_arrow" }, /area/almayer/living/offices) -"uhS" = ( -/obj/structure/sign/safety/hazard{ - desc = "A sign that warns of a hazardous environment nearby"; - name = "\improper Warning: Hazardous Environment" - }, -/turf/closed/wall/almayer, -/area/almayer/maint/hull/lower/l_f_p) -"uhW" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "redcorner" - }, -/area/almayer/shipboard/brig/main_office) -"uif" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "uiC" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -71164,6 +70797,12 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"uiK" = ( +/obj/item/ammo_box/magazine/misc/mre, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_stern) "uiR" = ( /obj/structure/prop/invuln{ desc = "An inflated membrane. This one is puncture proof. Wow!"; @@ -71192,23 +70831,12 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) -"ujc" = ( -/obj/structure/largecrate/random/case/double, +"ujf" = ( +/obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) -"ujr" = ( -/obj/structure/surface/table/almayer, -/obj/item/fuel_cell, -/obj/item/fuel_cell, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering/lower/engine_core) +/area/almayer/maint/upper/u_m_s) "ujz" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -71227,25 +70855,19 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"ukh" = ( -/obj/structure/sign/safety/rewire{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) -"ukk" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - req_one_access = null; - req_one_access_txt = "2;30;34" +"uky" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_umbilical) +"ukC" = ( +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/hull/upper/u_m_p) "ukP" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ @@ -71292,27 +70914,16 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) -"ulG" = ( -/obj/item/tool/weldpack{ - pixel_y = 15 - }, -/obj/structure/surface/table/almayer, -/obj/item/clothing/head/welding, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) -"ulI" = ( -/obj/structure/ladder{ - height = 1; - id = "AftPortMaint" +"ulH" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 }, -/obj/structure/sign/safety/ladder{ - pixel_x = 8; - pixel_y = -32 +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" }, -/turf/open/floor/plating/almayer, -/area/almayer/maint/hull/lower/l_a_p) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_aft_hallway) "ulZ" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -71328,6 +70939,15 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) +"umk" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/tool, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) "umm" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light/small, @@ -71344,6 +70964,22 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"umD" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) +"umI" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/aft_hallway) "umS" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -71396,18 +71032,13 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"unI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, +"unQ" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/effect/spawner/random/tool, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/s_bow) +/area/almayer/maint/hull/upper/u_a_p) "unT" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/tool/crowbar, @@ -71419,6 +71050,16 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"unU" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/machinery/cm_vending/sorted/medical/bolted, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lower_medical_medbay) "unZ" = ( /obj/structure/platform{ dir = 1 @@ -71440,19 +71081,18 @@ icon_state = "sterile_green" }, /area/almayer/medical/containment) +"uoj" = ( +/obj/item/tool/pen, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) "uoA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/starboard_point_defense) -"uoF" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) "uoH" = ( /obj/structure/machinery/firealarm{ dir = 1; @@ -71462,15 +71102,13 @@ icon_state = "silver" }, /area/almayer/command/computerlab) -"upv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"uoO" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 32 }, -/area/almayer/maint/upper/mess) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/p_bow) "upM" = ( /obj/structure/machinery/light{ dir = 4 @@ -71498,6 +71136,10 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"upS" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_p) "uqd" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/warning_stripes{ @@ -71528,6 +71170,13 @@ icon_state = "sterile_green" }, /area/almayer/medical/containment) +"uqg" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) "uqh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -71540,17 +71189,6 @@ "uqo" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) -"uqy" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - name = "\improper Brig Cells" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/main_office) "uqA" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -71567,23 +71205,60 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"uqW" = ( -/obj/item/tool/wet_sign, -/obj/effect/decal/cleanable/blood, +"uqJ" = ( +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/maint/hull/upper/u_a_s) +"urg" = ( +/obj/docking_port/stationary/escape_pod/east, /turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"urD" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/tool, -/obj/effect/spawner/random/tool, -/obj/effect/spawner/random/powercell, -/obj/effect/spawner/random/powercell, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = -32 +/area/almayer/maint/hull/upper/u_m_p) +"urk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orangecorner" + }, +/area/almayer/hallways/lower/starboard_umbilical) +"urs" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) +"ury" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_p) +"urL" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -16; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 12; + pixel_y = 13 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_s) "urM" = ( /obj/structure/machinery/light{ dir = 8 @@ -71598,14 +71273,6 @@ /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) -"urZ" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -16; - pixel_y = 13 - }, -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/lower/l_a_p) "usm" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/waterhazard{ @@ -71616,6 +71283,19 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"usq" = ( +/obj/structure/sign/safety/ammunition{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/shipboard/panic) "usy" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -71677,6 +71357,15 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering) +"utC" = ( +/obj/structure/machinery/portable_atmospherics/canister/air, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/upper/u_a_s) "utK" = ( /obj/structure/machinery/light{ dir = 4 @@ -71707,6 +71396,14 @@ }, /turf/open/floor/almayer, /area/almayer/squads/bravo) +"uun" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/starboard_hallway) "uuu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -71751,6 +71448,12 @@ icon_state = "test_floor4" }, /area/almayer/engineering/lower) +"uuI" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "greencorner" + }, +/area/almayer/hallways/lower/port_midship_hallway) "uuR" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal8"; @@ -71774,13 +71477,15 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"uvt" = ( -/obj/structure/machinery/light, +"uuT" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/bridgebunks) -"uvu" = ( +/area/almayer/hallways/lower/port_aft_hallway) +"uvh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, @@ -71788,27 +71493,48 @@ dir = 4 }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "orangecorner" + icon_state = "plate" }, -/area/almayer/squads/bravo) -"uvB" = ( -/obj/structure/machinery/light/small{ +/area/almayer/hallways/lower/starboard_aft_hallway) +"uvp" = ( +/obj/structure/largecrate/supply, +/obj/structure/sign/safety/bulkhead_door{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_bow) +"uvq" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = 12; - pixel_y = 13 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/prop/invuln/overhead_pipe{ +/turf/open/floor/almayer{ dir = 4; - pixel_y = 13 + icon_state = "orange" }, +/area/almayer/hallways/upper/stern_hallway) +"uvt" = ( +/obj/structure/machinery/light, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_a_p) +/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) "uvP" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -71843,19 +71569,10 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cells) -"uwi" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) -"uwk" = ( -/obj/structure/machinery/power/terminal, -/turf/open/floor/almayer, -/area/almayer/maint/upper/mess) +"uwf" = ( +/obj/structure/machinery/light, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) "uws" = ( /obj/structure/machinery/light{ dir = 4 @@ -71876,12 +71593,6 @@ "uwv" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/weapon_room/notunnel) -"uwJ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) "uwN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -71891,24 +71602,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) -"uwS" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - dir = 2; - name = "\improper Brig Armoury"; - req_access = null; - req_one_access_txt = "1;3" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/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/shipboard/brig/main_office) "uwZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -71926,6 +71619,18 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) +"uxb" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) +"uxl" = ( +/obj/item/cell/high/empty, +/obj/item/cell/high/empty, +/obj/structure/surface/rack, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_stern) "uxp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -71942,12 +71647,12 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) -"uxx" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 +"uxs" = ( +/obj/structure/machinery/pipedispenser/orderable, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/maint/hull/upper/u_a_s) "uxC" = ( /obj/structure/machinery/light{ dir = 4 @@ -71981,27 +71686,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) -"uxZ" = ( -/obj/structure/machinery/door_control{ - id = "laddersouthwest"; - name = "South West Ladders Shutters"; - pixel_x = 25; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer{ - icon_state = "greencorner" - }, -/area/almayer/hallways/port_hallway) -"uyb" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) "uyd" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -72031,19 +71715,13 @@ icon_state = "dark_sterile" }, /area/almayer/medical/chemistry) -"uyK" = ( -/obj/structure/machinery/vending/cola{ - density = 0; - pixel_y = 18 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"uzv" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 }, -/area/almayer/maint/hull/upper/u_f_p) -"uyV" = ( -/obj/item/stack/sheet/metal, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/hull/lower/l_a_s) "uzy" = ( /obj/item/reagent_container/glass/bucket, /obj/effect/decal/cleanable/blood/oil, @@ -72058,12 +71736,37 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/ce_room) +"uzH" = ( +/obj/structure/machinery/door/airlock/almayer/medical/glass{ + name = "\improper Brig Medbay"; + req_access = null; + req_one_access = null; + req_one_access_txt = "20;3"; + closeOtherId = "brigmed" + }, +/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/shipboard/brig/medical) "uAb" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"uAi" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "uAj" = ( /obj/structure/bed/chair, /obj/effect/decal/cleanable/dirt, @@ -72082,12 +71785,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"uAx" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) "uAC" = ( /obj/item/bedsheet/purple{ layer = 3.2 @@ -72132,10 +71829,6 @@ /obj/item/toy/plush/farwa, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) -"uAN" = ( -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/s_bow) "uAW" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -72154,36 +71847,37 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"uBn" = ( -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" +"uBj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 3 }, -/area/almayer/hallways/vehiclehangar) -"uBw" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "green" +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) +"uBx" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 }, -/area/almayer/hallways/starboard_hallway) -"uBz" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = 32 +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 12; + pixel_y = 13 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 }, -/area/almayer/hallways/stern_hallway) -"uBE" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -16; + pixel_y = 13 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/sign/safety/water{ + pixel_x = -17 }, -/area/almayer/maint/hull/lower/l_a_s) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_p) "uBM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -72212,15 +71906,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) -"uBS" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) "uCh" = ( /obj/structure/reagent_dispensers/watertank, /obj/structure/sign/safety/water{ @@ -72232,6 +71917,27 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"uCt" = ( +/obj/structure/sign/safety/stairs{ + pixel_x = -17; + pixel_y = 7 + }, +/obj/structure/sign/safety/escapepod{ + pixel_x = -17; + pixel_y = -8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"uCw" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_container/food/snacks/tomatomeat, +/obj/item/reagent_container/food/snacks/tomatomeat, +/obj/item/reagent_container/food/snacks/tomatomeat, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "uCM" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -72250,13 +71956,12 @@ icon_state = "test_floor4" }, /area/almayer/squads/charlie) -"uCU" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 +"uCR" = ( +/obj/item/tool/warning_cone{ + pixel_y = 13 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "uCW" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -72264,20 +71969,9 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cichallway) -"uDl" = ( -/obj/structure/closet, -/obj/item/stack/sheet/glass/large_stack, -/obj/item/device/lightreplacer, -/obj/item/reagent_container/spray/cleaner, -/obj/item/stack/rods{ - amount = 40 - }, -/obj/item/tool/weldingtool, -/obj/item/clothing/glasses/welding, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/lower/s_bow) +"uDg" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/upper/s_bow) "uDn" = ( /obj/structure/ladder{ height = 1; @@ -72295,19 +71989,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lockerroom) -"uDT" = ( -/obj/structure/surface/table/almayer, -/obj/item/circuitboard/airlock, -/obj/item/circuitboard/airlock{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/stack/cable_coil{ - pixel_x = -7; - pixel_y = 11 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "uDW" = ( /obj/structure/machinery/cm_vending/clothing/tl/delta{ density = 0; @@ -72317,15 +71998,36 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"uFb" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper Port Viewing Room" +"uEO" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 3 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) +"uES" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/machinery/recharge_station{ + layer = 2.9 + }, +/obj/structure/sign/safety/high_voltage{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "silver" }, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/hallways/lower/repair_bay) "uFd" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -72356,6 +72058,12 @@ icon_state = "sterile_green" }, /area/almayer/medical/lockerroom) +"uFp" = ( +/obj/structure/closet/secure_closet/engineering_electrical, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/s_bow) "uFq" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -72366,36 +72074,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) -"uFE" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/item/clothing/head/helmet/marine/tech/tanker, -/obj/structure/largecrate/random/secure, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) "uFH" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/map_item, /turf/open/floor/almayer, /area/almayer/living/briefing) -"uFL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/repair_bay) -"uFP" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) "uGc" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /obj/structure/sign/safety/hazard{ @@ -72413,19 +72096,18 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) -"uGt" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" +"uGf" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) -"uGy" = ( -/obj/structure/ladder{ - height = 2; - id = "AftPortMaint" +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 }, -/turf/open/floor/plating/almayer, -/area/almayer/maint/hull/upper/u_a_p) +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) "uGN" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -72436,52 +72118,54 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) +"uGU" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) +"uHk" = ( +/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/maint/lower/cryo_cells) "uHr" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) -"uHZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/airlock/almayer/generic/press{ - dir = 1; - name = "\improper Combat Correspondent Room" - }, +"uHT" = ( /turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/command/combat_correspondent) -"uId" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" + icon_state = "plate" }, -/obj/effect/step_trigger/clone_cleaner, +/area/almayer/maint/lower/s_bow) +"uIa" = ( /turf/open/floor/almayer{ - dir = 9; - icon_state = "green" + icon_state = "greencorner" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "uIv" = ( /turf/open/floor/almayer{ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"uIw" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/upper/u_m_s) "uIA" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) -"uIF" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) "uII" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -72502,20 +72186,19 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha_bravo_shared) -"uIZ" = ( -/obj/structure/largecrate/random/barrel/red, -/obj/structure/sign/safety/high_voltage{ - pixel_x = 32; - pixel_y = 7 +"uJb" = ( +/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, +/obj/structure/sign/safety/airlock{ + pixel_y = -32 }, -/obj/structure/sign/safety/fire_haz{ - pixel_x = 32; - pixel_y = -8 +/obj/structure/sign/safety/hazard{ + pixel_x = 15; + pixel_y = -32 }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/hallways/lower/port_umbilical) "uJk" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer4" @@ -72524,27 +72207,13 @@ icon_state = "outerhull_dir" }, /area/space) -"uJs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"uJM" = ( +/obj/structure/sign/safety/medical{ + pixel_x = 8; + pixel_y = -32 }, /turf/open/floor/almayer, -/area/almayer/shipboard/brig/main_office) -"uJP" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/medical/upper_medical) -"uJT" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/hallways/lower/starboard_fore_hallway) "uJU" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -72579,13 +72248,11 @@ }, /area/almayer/living/gym) "uKl" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/maint/hull/upper/u_a_s) "uKv" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/multitool{ @@ -72596,13 +72263,12 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) -"uKA" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/light{ +"uKH" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/maint/hull/lower/l_f_p) "uKV" = ( /obj/structure/sign/safety/storage{ pixel_x = 32; @@ -72618,26 +72284,33 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/shipboard/starboard_point_defense) -"uLu" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 +"uLE" = ( +/obj/structure/machinery/cm_vending/sorted/medical/blood, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" }, -/turf/open/floor/almayer, -/area/almayer/hallways/stern_hallway) -"uLv" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_y = -32 +/area/almayer/shipboard/brig/medical) +"uLG" = ( +/obj/structure/closet/crate/freezer{ + desc = "A freezer crate. Someone has written 'open on christmas' in marker on the top." }, -/obj/structure/sign/safety/manualopenclose{ - pixel_x = 15; - pixel_y = -32 +/obj/item/reagent_container/food/snacks/mre_pack/xmas2, +/obj/item/reagent_container/food/snacks/mre_pack/xmas1, +/obj/item/reagent_container/food/snacks/mre_pack/xmas3, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/maint/hull/upper/s_stern) "uMc" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, /area/almayer/engineering/upper_engineering/starboard) +"uMf" = ( +/obj/structure/machinery/light/small, +/obj/structure/largecrate/random/secure, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/p_bow) "uMj" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -72674,18 +72347,24 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"uNd" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"uNf" = ( +/obj/structure/sign/safety/conference_room{ + pixel_y = 32 }, -/area/almayer/maint/hull/upper/u_f_s) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) "uNg" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/living/bridgebunks) +"uNp" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -30 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "uNq" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/light{ @@ -72700,6 +72379,10 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop/hangar) +"uNz" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_p) "uNB" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -72721,25 +72404,34 @@ icon_state = "blue" }, /area/almayer/living/basketball) +"uNQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_aft_hallway) "uNV" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"uOc" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/hallways/vehiclehangar) "uOi" = ( /turf/closed/wall/almayer/outer, /area/almayer/lifeboat_pumps/south2) +"uOE" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "uOJ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -72752,22 +72444,15 @@ icon_state = "blue" }, /area/almayer/living/basketball) -"uPD" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, +"uPE" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) +"uPN" = ( +/obj/item/tool/wirecutters/clippers, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_p) -"uPI" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/stern_hallway) +/area/almayer/maint/hull/upper/u_a_s) "uPP" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -72778,6 +72463,13 @@ icon_state = "test_floor4" }, /area/almayer/engineering/lower) +"uPQ" = ( +/obj/item/weapon/dart/green, +/obj/structure/dartboard{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "uPW" = ( /obj/structure/bed/chair{ dir = 4 @@ -72786,19 +72478,23 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"uPX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) +"uQi" = ( +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "uQm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) -"uQn" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 3 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "uQo" = ( /obj/structure/machinery/disposal, /obj/item/reagent_container/food/drinks/cans/beer{ @@ -72811,31 +72507,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"uQp" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_stern) -"uQU" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/projector{ - name = "Almayer_Up4"; - vector_x = -19; - vector_y = 104 - }, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/port_hallway) -"uRh" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 32 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "uRo" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -72868,6 +72539,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) +"uRD" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) "uRM" = ( /obj/structure/bed{ can_buckle = 0 @@ -72895,6 +72572,14 @@ }, /turf/open/floor/plating, /area/almayer/living/port_emb) +"uRR" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "Brig" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/s_bow) "uRY" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -72908,15 +72593,6 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"uSB" = ( -/obj/structure/machinery/keycard_auth{ - pixel_x = 25 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/shipboard/brig/chief_mp_office) "uSH" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/reagent_dispensers/water_cooler{ @@ -72928,16 +72604,16 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"uSI" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/stern) "uSS" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/almayer/medical/lockerroom) +"uSU" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) "uSW" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -72952,6 +72628,31 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) +"uSZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) +"uTk" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) +"uTs" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/obj/structure/machinery/door/airlock/almayer/maint/reinforced, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/p_bow) "uTv" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -72960,6 +72661,13 @@ }, /turf/open/floor/almayer, /area/almayer/squads/bravo) +"uTE" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_s) "uTN" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -72967,10 +72675,16 @@ icon_state = "mono" }, /area/almayer/living/pilotbunks) -"uTS" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) +"uTP" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_aft_hallway) "uTU" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -72995,23 +72709,12 @@ icon_state = "orangefull" }, /area/almayer/engineering/lower/workshop) -"uTY" = ( -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "uTZ" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"uUa" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) "uUe" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -73028,6 +72731,28 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/port) +"uUf" = ( +/obj/structure/surface/table/almayer, +/obj/item/prop/helmetgarb/prescription_bottle{ + pixel_x = -7; + pixel_y = 9 + }, +/obj/item/prop/helmetgarb/prescription_bottle{ + pixel_x = 9 + }, +/obj/item/prop/helmetgarb/prescription_bottle{ + pixel_x = -9; + pixel_y = -4 + }, +/obj/item/prop/helmetgarb/prescription_bottle{ + pixel_y = -2 + }, +/obj/item/reagent_container/pill/happy, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/hallways/lower/repair_bay) "uUi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -73080,10 +72805,6 @@ }, /turf/open/floor/plating, /area/almayer/engineering/upper_engineering/port) -"uUD" = ( -/obj/structure/largecrate/supply/weapons/pistols, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_s) "uVc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -73098,12 +72819,30 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"uVg" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "uVh" = ( /obj/structure/filingcabinet/seeds, /turf/open/floor/almayer{ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"uVp" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) "uVv" = ( /obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 1 @@ -73112,18 +72851,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"uVx" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/maint/hull/upper/u_a_s) "uVA" = ( /turf/open/floor/almayer{ dir = 4; @@ -73155,29 +72882,29 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"uVZ" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "uWc" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ icon_state = "emeraldfull" }, /area/almayer/living/briefing) -"uWp" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"uWv" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/upper/stairs) -"uWC" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 +"uWm" = ( +/obj/effect/projector{ + name = "Almayer_Up4"; + vector_x = -19; + vector_y = 104 }, /turf/open/floor/almayer{ - dir = 9; - icon_state = "red" + allow_construction = 0; + icon_state = "plate" }, -/area/almayer/hallways/stern_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "uWV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -73227,15 +72954,32 @@ icon_state = "plate" }, /area/almayer/engineering/lower/engine_core) -"uXu" = ( +"uXm" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/pipes/standard/manifold/hidden/supply{ +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) +"uXu" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "Interrogation Shutters"; + name = "\improper Privacy Shutters" + }, +/obj/structure/machinery/door/airlock/almayer/security{ + dir = 2; + name = "\improper Interrogation" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/interrogation) "uXL" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -73245,6 +72989,13 @@ icon_state = "tcomms" }, /area/almayer/engineering/upper_engineering/starboard) +"uXU" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza, +/obj/item/reagent_container/food/snacks/sliceable/pizza/mushroompizza, +/obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "uYa" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -73277,9 +73028,22 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"uZb" = ( -/turf/open/floor/almayer, -/area/almayer/maint/upper/mess) +"uYM" = ( +/obj/structure/machinery/status_display{ + pixel_y = -30 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_fore_hallway) +"uZm" = ( +/obj/effect/projector{ + name = "Almayer_Up2"; + vector_x = -1; + vector_y = 100 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) "uZo" = ( /obj/structure/bed/stool, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -73305,10 +73069,12 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"uZQ" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/hallways/repair_bay) +"uZI" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "bluecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "uZV" = ( /obj/structure/reagent_dispensers/fueltank/gas/methane{ anchored = 1 @@ -73332,31 +73098,52 @@ icon_state = "test_floor4" }, /area/almayer/living/basketball) -"vag" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ +"vaq" = ( +/obj/structure/disposalpipe/junction{ dir = 4; - pixel_x = -14; - pixel_y = 13 + icon_state = "pipe-j2" }, +/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) -"vak" = ( -/obj/structure/sign/safety/security{ +/area/almayer/hallways/lower/starboard_fore_hallway) +"vaM" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/obj/structure/sign/safety/airlock{ pixel_x = 15; pixel_y = 32 }, -/turf/closed/wall/almayer, -/area/almayer/hallways/starboard_umbilical) -"vaH" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_umbilical) +"vaQ" = ( +/obj/structure/machinery/door/airlock/almayer/medical{ + dir = 1; + name = "Medical Storage" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/lower_medical_medbay) +"vaS" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/mp_bunks) +"vaV" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "vaZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -73378,10 +73165,16 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"vbk" = ( -/obj/docking_port/stationary/escape_pod/south, -/turf/open/floor/plating, -/area/almayer/maint/hull/lower/l_m_s) +"vbu" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/weldpack, +/obj/item/storage/toolbox/mechanical, +/obj/item/reagent_container/spray/cleaner, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/maint/hull/upper/u_a_s) "vbB" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) @@ -73401,12 +73194,6 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) -"vbJ" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) "vbM" = ( /obj/structure/flora/pottedplant{ desc = "It is made of Fiberbush(tm). It contains asbestos."; @@ -73450,25 +73237,18 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) -"vcg" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/structure/largecrate/random/barrel/green, -/obj/structure/sign/safety/maint{ - pixel_x = 15; - pixel_y = 32 +"vbZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/pipes/vents/scrubber{ + dir = 1 }, -/area/almayer/maint/hull/upper/s_bow) -"vcl" = ( -/obj/structure/machinery/light/small, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/maint/hull/upper/p_bow) +/area/almayer/hallways/lower/vehiclehangar) "vcm" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_x = -30 @@ -73499,41 +73279,22 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) -"vcL" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 2; - id = "bot_armory"; - name = "\improper Armory Shutters" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - dir = 2; - name = "\improper Armory" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 2; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -2; - pixel_y = 1 +"vcI" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_s) +"vcO" = ( +/obj/structure/machinery/light{ + dir = 4 }, -/area/almayer/shipboard/brig/armory) -"vdc" = ( -/obj/item/tool/wet_sign, -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 9; + icon_state = "red" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/hallways/upper/aft_hallway) "vdl" = ( /obj/structure/window/reinforced/ultra{ pixel_y = -12 @@ -73546,24 +73307,6 @@ icon_state = "plating_striped" }, /area/almayer/shipboard/brig/execution) -"vdJ" = ( -/obj/structure/surface/table/almayer, -/obj/item/pipe{ - dir = 9 - }, -/obj/item/tool/screwdriver{ - layer = 3.6; - pixel_x = 9; - pixel_y = 8 - }, -/obj/item/tool/crowbar/red{ - pixel_x = 17 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "silver" - }, -/area/almayer/hallways/repair_bay) "vdL" = ( /obj/structure/sign/safety/reception{ pixel_x = -17; @@ -73599,29 +73342,26 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"vdW" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"vef" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Port Viewing Room" +"vdT" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/maint/upper/u_m_s) "ven" = ( /obj/structure/bed/chair, /turf/open/floor/almayer{ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"veq" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "veu" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -73632,16 +73372,27 @@ icon_state = "emeraldfull" }, /area/almayer/living/briefing) -"veN" = ( -/obj/item/stool, -/obj/effect/landmark/yautja_teleport, +"veO" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = 6 + }, +/obj/item/weapon/gun/rifle/l42a, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = -6 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) -"veX" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/shipboard/panic) +/area/almayer/maint/hull/upper/u_m_s) +"veW" = ( +/obj/structure/machinery/door/airlock/almayer/generic/glass{ + name = "\improper Passenger Cryogenics Bay" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_m_p) "vfa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -73654,20 +73405,6 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) -"vfn" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/item/reagent_container/glass/bucket/mopbucket, -/obj/item/tool/mop{ - pixel_x = -6; - pixel_y = 14 - }, -/obj/structure/janitorialcart, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/lower/s_bow) "vfo" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; @@ -73678,15 +73415,6 @@ icon_state = "test_floor4" }, /area/almayer/powered) -"vfw" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/main_office) "vfx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -73713,21 +73441,20 @@ dir = 1 }, /area/almayer/medical/containment/cell) +"vfS" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_s) "vgi" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, /area/almayer/shipboard/brig/general_equipment) -"vgk" = ( -/obj/structure/closet/firecloset, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "greencorner" - }, -/area/almayer/hallways/port_hallway) "vgn" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -73796,22 +73523,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"vgC" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/machinery/door_control{ - id = "hangarentrancenorth"; - name = "North Hangar Podlocks"; - pixel_y = -26; - req_one_access_txt = "2;3;12;19"; - throw_range = 15 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) "vgD" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -73821,61 +73532,9 @@ icon_state = "red" }, /area/almayer/command/lifeboat) -"vgF" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/effect/projector{ - name = "Almayer_Up2"; - vector_x = -1; - vector_y = 100 - }, -/obj/structure/machinery/light, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/starboard_hallway) "vgO" = ( /turf/closed/wall/almayer/research/containment/wall/east, /area/almayer/medical/containment/cell) -"vgW" = ( -/obj/structure/sign/safety/security{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) -"vgY" = ( -/obj/structure/largecrate/random/case/double, -/obj/item/tool/wet_sign{ - pixel_y = 18 - }, -/obj/item/trash/cigbutt/ucigbutt{ - desc = "A handful of rounds to reload on the go."; - icon = 'icons/obj/items/weapons/guns/handful.dmi'; - icon_state = "bullet_2"; - name = "handful of pistol bullets (9mm)"; - pixel_x = -8; - pixel_y = 10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) -"vhb" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - dir = 8; - req_one_access = list(2,34,30) - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/u_m_p) "vhe" = ( /obj/structure/filingcabinet{ density = 0; @@ -73901,15 +73560,10 @@ /obj/structure/machinery/disposal, /turf/open/floor/almayer, /area/almayer/living/offices/flight) -"vhM" = ( -/obj/structure/bed/chair{ - dir = 8; - pixel_y = 3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) +"vhA" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) "vhR" = ( /obj/structure/flora/pottedplant{ desc = "It is made of Fiberbush(tm). It contains asbestos."; @@ -74000,15 +73654,6 @@ allow_construction = 0 }, /area/almayer/command/airoom) -"viH" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "Bathroom" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/main_office) "viJ" = ( /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer{ @@ -74060,19 +73705,29 @@ icon_state = "plating" }, /area/almayer/shipboard/port_missiles) -"vji" = ( -/obj/structure/surface/table/almayer, -/obj/item/fuel_cell, -/obj/item/fuel_cell, -/obj/item/fuel_cell, +"vjk" = ( /obj/structure/machinery/camera/autoname/almayer{ - dir = 1; name = "ship-grade camera" }, +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/obj/structure/sign/safety/airlock{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, -/area/almayer/engineering/lower/engine_core) +/area/almayer/hallways/lower/starboard_umbilical) "vjv" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -74080,6 +73735,12 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) +"vjB" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/starboard_hallway) "vjC" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -74096,10 +73757,45 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"vjG" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orange" + }, +/area/almayer/hallways/lower/port_umbilical) "vjK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/shipboard/port_missiles) +"vjS" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + layer = 5.1; + name = "water pipe" + }, +/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/maint/lower/constr) +"vjT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" + }, +/area/almayer/hallways/lower/port_umbilical) "vjW" = ( /obj/structure/reagent_dispensers/watertank{ anchored = 1 @@ -74134,6 +73830,27 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"vky" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/p_bow) +"vkI" = ( +/obj/item/coin/silver{ + desc = "A small coin, bearing the falling falcons insignia."; + name = "falling falcons challenge coin" + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_p) "vkM" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ dir = 1; @@ -74147,14 +73864,26 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/general_equipment) -"vkQ" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 +"vkO" = ( +/obj/structure/closet, +/obj/item/stack/sheet/glass/large_stack, +/obj/item/device/lightreplacer, +/obj/item/reagent_container/spray/cleaner, +/obj/item/stack/rods{ + amount = 40 }, +/obj/item/tool/weldingtool, +/obj/item/clothing/glasses/welding, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/maint/lower/s_bow) +"vkQ" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) "vkR" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -74165,27 +73894,9 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"vkW" = ( -/obj/structure/sink{ - pixel_y = 24 - }, +"vkV" = ( +/obj/effect/landmark/start/liaison, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) -"vlf" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/medical/medical_science) -"vlj" = ( -/obj/structure/janitorialcart, -/obj/item/tool/mop, -/turf/open/floor/almayer{ - icon_state = "plate" - }, /area/almayer/maint/hull/upper/u_m_p) "vlk" = ( /obj/structure/closet/emcloset, @@ -74221,12 +73932,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"vlN" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "vlO" = ( /obj/structure/window/reinforced{ dir = 4; @@ -74261,6 +73966,13 @@ icon_state = "plate" }, /area/almayer/living/port_emb) +"vlR" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "vlX" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /turf/open/floor/almayer{ @@ -74283,6 +73995,15 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) +"vmq" = ( +/turf/open/floor/almayer, +/area/almayer/maint/hull/lower/l_m_s) +"vmu" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) "vmE" = ( /turf/open/floor/almayer{ icon_state = "orangecorner" @@ -74321,35 +74042,12 @@ icon_state = "red" }, /area/almayer/shipboard/port_missiles) -"vmZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/kitchen/tray, -/obj/item/reagent_container/food/drinks/bottle/whiskey, -/obj/item/toy/deck{ - pixel_x = -9 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) -"vna" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/req) -"vnj" = ( -/obj/structure/largecrate/random/case/small, -/obj/item/device/taperecorder{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/reagent_container/glass/bucket/mopbucket{ - pixel_x = -9; - pixel_y = 8 - }, +"vno" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "blue" }, -/area/almayer/maint/hull/lower/l_f_p) +/area/almayer/hallways/lower/port_midship_hallway) "vnD" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -74359,35 +74057,35 @@ icon_state = "plate" }, /area/almayer/living/gym) -"vnE" = ( -/obj/structure/bed/chair{ +"vnY" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) +"vnZ" = ( +/obj/structure/machinery/light, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) -"vnU" = ( -/obj/structure/closet/emcloset, +/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "orange" }, -/area/almayer/maint/hull/upper/s_bow) -"voo" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = -32 +/area/almayer/hallways/upper/stern_hallway) +"vop" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"voU" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - req_one_access = null; - req_one_access_txt = "19;21" +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silvercorner" }, +/area/almayer/hallways/lower/repair_bay) +"vor" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/prop/broken_arcade, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/squads/req) +/area/almayer/maint/hull/upper/u_m_p) "vpe" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/engineering/reinforced/OT{ @@ -74398,6 +74096,11 @@ icon_state = "test_floor4" }, /area/almayer/engineering/lower/workshop/hangar) +"vpf" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_p) "vpn" = ( /turf/open/floor/almayer{ dir = 9; @@ -74415,6 +74118,22 @@ /obj/item/clothing/mask/cigarette/weed, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) +"vpI" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_p) +"vpT" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/panic) "vpV" = ( /turf/open/floor/almayer{ dir = 10; @@ -74440,6 +74159,19 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/processing) +"vqz" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/hallways/lower/port_fore_hallway) "vqC" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -74509,10 +74241,6 @@ "vra" = ( /turf/closed/wall/almayer, /area/almayer/squads/charlie_delta_shared) -"vrb" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) "vrx" = ( /obj/structure/machinery/status_display{ pixel_x = -32; @@ -74520,17 +74248,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"vrG" = ( -/obj/item/ammo_box/magazine/misc/mre/empty{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/reagent_container/food/drinks/cans/aspen{ - pixel_x = 11; - pixel_y = -3 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_stern) "vrI" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -74580,10 +74297,19 @@ icon_state = "bluecorner" }, /area/almayer/living/briefing) -"vsa" = ( -/obj/structure/barricade/handrail, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_stern) +"vrZ" = ( +/obj/structure/largecrate/machine/bodyscanner, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) +"vsd" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_m_s) "vse" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -74593,10 +74319,32 @@ icon_state = "cargo" }, /area/almayer/living/offices) +"vsf" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/machinery/door_control{ + id = "laddernortheast"; + name = "North East Ladders Shutters"; + pixel_y = -25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "vsh" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/lifeboat) +"vsi" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/stern) "vsz" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -74614,19 +74362,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"vsM" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/toxin{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/firstaid/adv, -/obj/item/device/defibrillator, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/shipboard/brig/surgery) "vta" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -74657,19 +74392,6 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) -"vts" = ( -/obj/item/reagent_container/glass/bucket{ - pixel_x = 4; - pixel_y = 9 - }, -/obj/item/tool/shovel/spade{ - pixel_x = -3; - pixel_y = -3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_s) "vtx" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Bathroom" @@ -74678,29 +74400,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/upper_medical) -"vtB" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 8; - id = "laddersoutheast"; - name = "\improper South East Ladders Shutters" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/port_hallway) -"vtD" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 26 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "vtG" = ( /obj/structure/toilet{ dir = 4 @@ -74709,23 +74408,12 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/perma) -"vtH" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) -"vtL" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) -"vtZ" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, +"vtJ" = ( +/obj/structure/closet/emcloset, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/hull/lower/l_f_s) "vub" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/sea_office) @@ -74734,27 +74422,6 @@ /obj/effect/landmark/late_join/alpha, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) -"vuw" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ - access_modified = 1; - dir = 2; - name = "\improper Requisitions Break Room"; - req_one_access_txt = "19;21" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/req) "vuA" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -74768,6 +74435,16 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) +"vuE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/hallways/upper/aft_hallway) "vuF" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ access_modified = 1; @@ -74801,6 +74478,15 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"vuV" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_aft_hallway) "vuZ" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -74810,10 +74496,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/weapon_room) -"vvj" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) "vvp" = ( /obj/structure/pipes/vents/pump, /obj/structure/sign/safety/intercom{ @@ -74856,9 +74538,29 @@ dir = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/starboard) +"vvH" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) +"vvX" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 2; + id = "OuterShutter"; + name = "\improper Saferoom Shutters" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/area/almayer/engineering/upper_engineering/starboard) +/area/almayer/shipboard/panic) "vvY" = ( /obj/structure/sink{ dir = 1; @@ -74913,44 +74615,16 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) "vwJ" = ( -/obj/structure/machinery/shower{ - pixel_y = 16 - }, -/obj/item/tool/soap, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) -"vwP" = ( -/obj/structure/surface/table/almayer, -/obj/item/prop/helmetgarb/prescription_bottle{ - pixel_x = -7; - pixel_y = 9 - }, -/obj/item/prop/helmetgarb/prescription_bottle{ - pixel_x = 9 - }, -/obj/item/prop/helmetgarb/prescription_bottle{ - pixel_x = -9; - pixel_y = -4 - }, -/obj/item/prop/helmetgarb/prescription_bottle{ - pixel_y = -2 - }, -/obj/item/reagent_container/pill/happy, +/obj/structure/largecrate/random/case/double, +/obj/structure/machinery/light/small, /turf/open/floor/almayer{ - dir = 6; - icon_state = "silver" + icon_state = "plate" }, -/area/almayer/hallways/repair_bay) +/area/almayer/maint/hull/upper/u_m_p) "vwU" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - dir = 8; - req_one_access = list(2,34,30) - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/lower/l_m_s) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) "vwV" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors{ dir = 4 @@ -74968,6 +74642,22 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"vxh" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 2; + id = "Warden Office Shutters"; + name = "\improper Privacy Shutters" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + dir = 1; + name = "\improper Warden's Office"; + closeOtherId = "brigwarden" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/warden_office) "vxu" = ( /obj/structure/machinery/meter, /obj/structure/pipes/standard/simple/visible{ @@ -75013,6 +74703,17 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) +"vxY" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "vyg" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/secure_data, @@ -75020,6 +74721,14 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"vyh" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "vyi" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -75041,6 +74750,12 @@ icon_state = "cargo" }, /area/almayer/living/offices) +"vyr" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "vyu" = ( /obj/structure/bed/sofa/south/white/right, /turf/open/floor/almayer{ @@ -75048,6 +74763,9 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) +"vyB" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/vehiclehangar) "vyH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -75057,22 +74775,13 @@ "vyI" = ( /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) -"vyS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 4; - pixel_y = -3 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) -"vyZ" = ( -/obj/structure/largecrate/guns/merc{ - name = "\improper dodgy crate" +"vzi" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 3 }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "vzj" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 8 @@ -75093,19 +74802,19 @@ "vzp" = ( /turf/open/floor/almayer/research/containment/entrance, /area/almayer/medical/containment/cell/cl) -"vzq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 3 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) -"vzu" = ( +"vzy" = ( /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 + dir = 5 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "redcorner" + }, +/area/almayer/shipboard/brig/starboard_hallway) "vzz" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -75115,9 +74824,24 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cells) +"vzB" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_p) "vzK" = ( /turf/open/floor/almayer, /area/almayer/engineering/ce_room) +"vzO" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + req_one_access = null; + req_one_access_txt = "2;30;34" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_m_s) "vzP" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/cups, @@ -75137,6 +74861,17 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"vAg" = ( +/obj/structure/largecrate/random/barrel/blue, +/obj/structure/sign/safety/restrictedarea{ + pixel_y = -32 + }, +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/s_bow) "vAq" = ( /obj/structure/bed/chair{ dir = 1 @@ -75146,24 +74881,20 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) -"vAu" = ( -/obj/structure/sign/safety/life_support{ - pixel_x = 8; - pixel_y = 32 +"vAx" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_s) -"vAw" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/lower/constr) -"vAB" = ( -/obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/almayer{ - icon_state = "plate" +/area/almayer/maint/hull/lower/l_m_p) +"vAz" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/maint/hull/lower/s_bow) +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "vAE" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -75218,15 +74949,6 @@ icon_state = "silver" }, /area/almayer/command/airoom) -"vBa" = ( -/obj/structure/bed/chair/comfy/orange, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) -"vBm" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/shipboard/brig/main_office) "vBp" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -75239,6 +74961,10 @@ icon_state = "silver" }, /area/almayer/living/briefing) +"vBC" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "vBJ" = ( /obj/structure/surface/table/almayer, /obj/item/tool/pen, @@ -75299,19 +75025,10 @@ icon_state = "green" }, /area/almayer/shipboard/brig/cells) -"vCB" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/disposaloutlet, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "plating_striped" - }, -/area/almayer/maint/hull/lower/l_a_p) +"vCE" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/s_bow) "vCO" = ( /obj/effect/landmark/start/bridge, /turf/open/floor/plating/plating_catwalk, @@ -75324,28 +75041,53 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/hydroponics) -"vDk" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 +"vDh" = ( +/obj/structure/largecrate/random, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 +/area/almayer/maint/hull/upper/s_bow) +"vDo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) +"vDt" = ( +/obj/item/stool, +/obj/effect/landmark/yautja_teleport, /turf/open/floor/almayer{ icon_state = "plate" }, +/area/almayer/maint/upper/u_m_s) +"vDz" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/machinery/light, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_s) +"vDN" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) -"vDZ" = ( +"vDR" = ( /obj/structure/surface/rack, -/obj/effect/spawner/random/tool, -/obj/effect/spawner/random/tool, -/obj/effect/spawner/random/powercell, -/obj/effect/spawner/random/powercell, +/obj/item/tool/wet_sign, +/obj/item/tool/wet_sign, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/maint/hull/upper/u_a_p) "vEf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -75361,10 +75103,6 @@ /obj/effect/landmark/start/synthetic, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/synthcloset) -"vEq" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) "vEr" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -75376,20 +75114,15 @@ }, /area/almayer/medical/medical_science) "vEv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "laddernorthwest"; + name = "\improper North West Ladders Shutters" }, +/obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/hallways/lower/starboard_fore_hallway) "vEx" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -75413,17 +75146,10 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/almayer, /area/almayer/living/briefing) -"vEQ" = ( -/obj/structure/surface/rack, -/obj/item/tool/shovel/etool{ - pixel_x = 6 - }, -/obj/item/tool/shovel/etool, -/obj/item/tool/wirecutters, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) +"vEI" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) "vEV" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -75441,10 +75167,15 @@ icon_state = "plating" }, /area/almayer/shipboard/stern_point_defense) -"vFr" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) +"vFp" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/lower/vehiclehangar) "vFv" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ @@ -75460,41 +75191,44 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) -"vFB" = ( +"vFy" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "NW-out" }, -/obj/structure/machinery/light/small{ - dir = 1 +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/sign/safety/stairs{ + pixel_x = -17 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 8; + icon_state = "green" }, -/area/almayer/maint/hull/upper/p_bow) +/area/almayer/hallways/upper/aft_hallway) "vFH" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/engineering/lower) -"vFS" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/radio/intercom/normandy{ - layer = 3.5 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" +"vFI" = ( +/obj/structure/largecrate/random/secure, +/obj/item/weapon/baseballbat/metal{ + pixel_x = -2; + pixel_y = 8 }, -/area/almayer/living/offices/flight) -"vGw" = ( -/obj/structure/largecrate/random/barrel/red, -/obj/structure/machinery/light/small{ - dir = 8 +/obj/item/clothing/glasses/sunglasses{ + pixel_y = 5 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/hull/lower/l_f_p) +"vGn" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/interrogation) "vGA" = ( /obj/structure/bed/sofa/south/grey/right, /turf/open/floor/almayer{ @@ -75502,14 +75236,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"vGC" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_s) "vGG" = ( /obj/structure/bed/chair/comfy/bravo, /turf/open/floor/almayer{ @@ -75525,13 +75251,6 @@ icon_state = "dark_sterile" }, /area/almayer/living/numbertwobunks) -"vGV" = ( -/obj/structure/largecrate/supply, -/obj/item/tool/crowbar, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/maint/hull/upper/u_f_p) "vHa" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/ares_console{ @@ -75554,6 +75273,33 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/port_emb) +"vHn" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/upper/u_m_s) +"vHp" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/drinks/cans/waterbottle{ + pixel_x = 9; + pixel_y = 3 + }, +/obj/item/prop/helmetgarb/flair_io{ + pixel_x = -10; + pixel_y = 6 + }, +/obj/item/prop/magazine/boots/n160{ + pixel_x = -6; + pixel_y = -5 + }, +/obj/structure/transmitter/rotary{ + name = "Flight Deck Telephone"; + phone_category = "Almayer"; + phone_id = "Flight Deck"; + pixel_y = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/repair_bay) "vHq" = ( /obj/item/device/assembly/mousetrap/armed, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -75571,13 +75317,6 @@ icon_state = "dark_sterile" }, /area/almayer/living/port_emb) -"vHs" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 2 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "vHt" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/door_control{ @@ -75658,15 +75397,6 @@ icon_state = "redfull" }, /area/almayer/command/cic) -"vHZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) "vIf" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -75676,43 +75406,32 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"vIm" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 +"vIg" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_a_s) +"vIr" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "green" + icon_state = "test_floor4" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/aft_hallway) "vIu" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/command/cichallway) -"vIE" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/machinery/light, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) -"vIN" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/intercom{ - pixel_y = 32 - }, +"vJc" = ( /turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" + dir = 4; + icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/shipboard/brig/warden_office) "vJg" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -75730,32 +75449,10 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"vJq" = ( -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) -"vJJ" = ( -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 - }, -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = -32 - }, +"vJR" = ( +/obj/structure/barricade/handrail, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_s) -"vJO" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/maint/hull/lower/l_f_s) +/area/almayer/maint/hull/upper/p_stern) "vJV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -75798,16 +75495,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"vKo" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) "vKB" = ( /obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, /obj/structure/machinery/light/small{ @@ -75816,58 +75503,18 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) "vKF" = ( -/obj/structure/stairs{ - dir = 8; - icon_state = "ramptop" +/obj/structure/machinery/cm_vending/sorted/medical, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" }, +/area/almayer/shipboard/brig/medical) +"vKI" = ( /obj/structure/machinery/light{ dir = 1 }, -/obj/effect/projector{ - name = "Almayer_Down2"; - vector_x = 1; - vector_y = -100 - }, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/aft_hallway) -"vKG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/spiderling_remains{ - pixel_x = 18; - pixel_y = -5 - }, -/obj/effect/decal/cleanable/ash{ - pixel_x = 11; - pixel_y = 25 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/lower_medical_medbay) -"vKU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) -"vLd" = ( -/obj/structure/surface/table/almayer, -/obj/item/organ/lungs/prosthetic, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "vLg" = ( /obj/item/trash/uscm_mre, /obj/structure/bed/chair/comfy/charlie, @@ -75890,6 +75537,15 @@ icon_state = "test_floor4" }, /area/almayer/medical/upper_medical) +"vLp" = ( +/obj/structure/sign/safety/storage{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/lower/repair_bay) "vLA" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -75904,23 +75560,13 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/charlie) -"vLO" = ( -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_s) -"vLX" = ( -/obj/item/robot_parts/arm/l_arm, -/obj/item/robot_parts/leg/l_leg, -/obj/item/robot_parts/arm/r_arm, -/obj/item/robot_parts/leg/r_leg, -/obj/structure/surface/rack, -/obj/effect/decal/cleanable/cobweb{ - dir = 8 +"vMb" = ( +/obj/item/stool{ + pixel_x = -15; + pixel_y = 6 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/synthcloset) +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "vMo" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/operating_room_four) @@ -75928,32 +75574,15 @@ /obj/effect/landmark/start/otech, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices) -"vMv" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/u_a_s) -"vMw" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; +"vMA" = ( +/obj/structure/machinery/firealarm{ pixel_y = 28 }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) -"vMx" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" +/obj/structure/machinery/light{ + dir = 1 }, /turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/lower/port_midship_hallway) "vME" = ( /turf/open/floor/almayer{ dir = 9; @@ -75986,6 +75615,20 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"vMJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "\improper Brig Breakroom" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + layer = 1.9 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/mp_bunks) "vMM" = ( /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, @@ -75993,6 +75636,20 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"vMQ" = ( +/obj/docking_port/stationary/escape_pod/north, +/turf/open/floor/plating, +/area/almayer/maint/hull/upper/u_m_p) +"vMU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "redcorner" + }, +/area/almayer/hallways/lower/port_fore_hallway) "vNp" = ( /obj/structure/sign/safety/three{ pixel_x = -17 @@ -76010,31 +75667,60 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie) +"vNT" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/starboard_hallway) "vNW" = ( /turf/open/floor/almayer/uscm/directional{ dir = 9 }, /area/almayer/command/cic) -"vOb" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/mess) "vOh" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) +"vOu" = ( +/obj/structure/surface/table/almayer, +/obj/item/weapon/gun/energy/taser, +/obj/item/weapon/gun/energy/taser{ + pixel_y = 8 + }, +/obj/structure/machinery/recharger, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/mp_bunks) +"vOw" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/toolbox, +/obj/effect/spawner/random/tool, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/lower/l_m_s) "vOy" = ( /turf/closed/wall/almayer/white/reinforced, /area/almayer/medical/medical_science) -"vOK" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"vOG" = ( +/obj/structure/largecrate/supply/ammo/m41a/half, +/obj/structure/largecrate/supply/ammo/pistol/half{ + pixel_y = 12 }, -/area/almayer/maint/hull/lower/l_m_p) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/p_bow) +"vOM" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/s_bow) "vON" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -76053,6 +75739,38 @@ icon_state = "test_floor4" }, /area/almayer/medical/upper_medical) +"vOV" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_umbilical) +"vOY" = ( +/obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + access_modified = 1; + req_one_access = null; + req_one_access_txt = "2;7" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "CIC Lockdown"; + name = "\improper Combat Information Center Blast Door" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/mess) +"vOZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_midship_hallway) "vPf" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/locked{ @@ -76126,6 +75844,15 @@ icon_state = "redfull" }, /area/almayer/engineering/lower/workshop/hangar) +"vPW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/vehiclehangar) "vQe" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down2"; @@ -76195,22 +75922,16 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"vRF" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/kitchen/tray, -/obj/item/tool/kitchen/tray{ - pixel_y = 6 - }, -/obj/item/reagent_container/food/snacks/sliceable/bread{ - pixel_y = 8 - }, -/obj/item/tool/kitchen/knife{ - pixel_x = 6 +"vRJ" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Emergency Air Storage" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_f_p) +/area/almayer/maint/hull/upper/u_a_s) "vRR" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -76224,12 +75945,6 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"vRW" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_a_p) "vRX" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/medical_diagnostics_manual, @@ -76265,6 +75980,21 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"vSr" = ( +/obj/structure/largecrate/random/case/double, +/obj/item/tool/wet_sign{ + pixel_y = 18 + }, +/obj/item/trash/cigbutt/ucigbutt{ + desc = "A handful of rounds to reload on the go."; + icon = 'icons/obj/items/weapons/guns/handful.dmi'; + icon_state = "bullet_2"; + name = "handful of pistol bullets (9mm)"; + pixel_x = -8; + pixel_y = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) "vSE" = ( /obj/structure/closet/secure_closet/personal, /turf/open/floor/almayer{ @@ -76330,6 +76060,13 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) +"vTM" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/vehiclehangar) "vTS" = ( /obj/structure/machinery/light{ pixel_x = 16 @@ -76360,6 +76097,16 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop/hangar) +"vTX" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_y = -32 + }, +/obj/structure/sign/safety/manualopenclose{ + pixel_x = 15; + pixel_y = -32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) "vUb" = ( /obj/effect/landmark/start/marine/alpha, /obj/effect/landmark/late_join/alpha, @@ -76379,46 +76126,39 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"vUs" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 +"vUI" = ( +/obj/structure/bed/chair/comfy/orange{ + dir = 8 }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Hangar Lockdown"; - name = "\improper Hangar Lockdown Blast Door" +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/warden_office) +"vUJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 }, -/area/almayer/maint/lower/constr) -"vUP" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/shipboard/brig/cic_hallway) -"vUU" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 }, -/obj/structure/sign/safety/three{ - pixel_x = 31; - pixel_y = -8 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 +/area/almayer/maint/hull/lower/l_a_p) +"vUO" = ( +/obj/structure/machinery/light{ + dir = 8 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "emerald" - }, -/area/almayer/hallways/port_hallway) -"vUW" = ( -/obj/item/weapon/dart/green, -/obj/structure/dartboard{ - pixel_y = 32 + dir = 8; + icon_state = "green" }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) +/area/almayer/hallways/upper/aft_hallway) +"vUP" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/cic_hallway) "vVb" = ( /obj/structure/machinery/cm_vending/gear/tl{ density = 0; @@ -76454,12 +76194,14 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) -"vVD" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "plate" +"vVy" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 }, -/area/almayer/maint/hull/lower/l_m_s) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) "vVI" = ( /obj/structure/sign/safety/nonpress_0g{ pixel_x = 8; @@ -76479,29 +76221,40 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"vWa" = ( -/obj/structure/mirror{ - pixel_x = 28 +"vVY" = ( +/turf/open/floor/plating, +/area/almayer/maint/hull/upper/u_m_s) +"vVZ" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/area/almayer/hallways/lower/port_umbilical) +"vWc" = ( +/obj/structure/surface/table/almayer, +/obj/item/device/radio/intercom/normandy{ + layer = 3.5 }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "redfull" }, -/area/almayer/maint/hull/upper/u_a_s) -"vWb" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 +/area/almayer/living/offices/flight) +"vWs" = ( +/obj/structure/largecrate/random/barrel/red, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/sign/safety/fire_haz{ + pixel_x = 8; + pixel_y = -32 }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_p) +/area/almayer/hallways/lower/vehiclehangar) "vWt" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/beaker/large, @@ -76627,6 +76380,12 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"vXk" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/hallways/upper/stern_hallway) "vXo" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -76637,24 +76396,33 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower) -"vXr" = ( +"vXv" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_10"; + pixel_y = 14 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/upper_medical) +"vXF" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - layer = 2.5; + icon_state = "N"; pixel_y = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/s_bow) -"vYi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"vYk" = ( -/obj/structure/window/framed/almayer/hull, -/turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/hallways/lower/port_umbilical) +"vYd" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/vehiclehangar) "vYm" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, @@ -76759,12 +76527,15 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"waa" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"wac" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 80 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) "wan" = ( /obj/structure/surface/table/almayer, /obj/item/facepaint/brown, @@ -76773,29 +76544,11 @@ icon_state = "green" }, /area/almayer/living/offices) -"wax" = ( -/obj/item/reagent_container/glass/bucket, -/obj/item/tool/mop{ - pixel_x = -6; - pixel_y = 24 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) "waD" = ( /turf/open/floor/almayer{ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_one) -"waG" = ( -/obj/structure/surface/rack, -/obj/item/clothing/glasses/meson, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/maint/hull/upper/u_a_p) "waJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -76805,37 +76558,17 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"waS" = ( -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice-simple"; - pixel_x = 16; - pixel_y = -16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) -"waY" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) -"wbh" = ( -/obj/structure/machinery/light{ - dir = 4 +"waV" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" + dir = 8; + icon_state = "red" }, -/area/almayer/hallways/starboard_hallway) -"wbm" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/hallways/upper/aft_hallway) "wbu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname/almayer{ @@ -76846,6 +76579,18 @@ icon_state = "mono" }, /area/almayer/living/pilotbunks) +"wby" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper Starboard Viewing Room" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_f_s) "wbC" = ( /obj/structure/machinery/atm{ pixel_y = 32 @@ -76899,15 +76644,15 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/operating_room_four) -"wbT" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ +"wbV" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "red" }, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/living/cryo_cells) "wbX" = ( /obj/structure/closet/secure_closet/cmdcabinet{ pixel_y = 24 @@ -76927,12 +76672,6 @@ icon_state = "redfull" }, /area/almayer/lifeboat_pumps/south2) -"wcs" = ( -/obj/structure/largecrate/random/secure, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_f_s) "wct" = ( /obj/structure/closet/radiation, /turf/open/floor/almayer{ @@ -76940,19 +76679,20 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"wcx" = ( -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = 32 +"wcD" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 +/area/almayer/hallways/lower/port_midship_hallway) +"wcJ" = ( +/obj/structure/machinery/light/small{ + dir = 4 }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, /turf/open/floor/almayer{ - icon_state = "redfull" + icon_state = "plate" }, -/area/almayer/shipboard/panic) +/area/almayer/maint/hull/lower/s_bow) "wcN" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -76975,16 +76715,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"wdb" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/sign/safety/stairs{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/starboard_hallway) "wdf" = ( /obj/structure/bed/chair{ dir = 1 @@ -77042,14 +76772,19 @@ /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) -"wdA" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/lower/stairs) "wdF" = ( /turf/open/floor/almayer{ allow_construction = 0 }, /area/almayer/shipboard/brig/processing) +"wdG" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_f_p) "wdI" = ( /turf/open/floor/almayer{ dir = 1; @@ -77064,15 +76799,18 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) -"wdN" = ( -/obj/structure/machinery/light{ - dir = 8 +"wdQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, -/obj/structure/machinery/power/reactor, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_umbilical) +"wdW" = ( +/obj/structure/machinery/light/small, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/engineering/lower/engine_core) +/area/almayer/maint/hull/lower/l_m_p) "wed" = ( /obj/structure/surface/table/almayer, /obj/item/storage/belt/utility/full, @@ -77099,6 +76837,24 @@ icon_state = "test_floor4" }, /area/almayer/medical/hydroponics) +"wer" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/repair_bay) +"wes" = ( +/obj/structure/machinery/cm_vending/sorted/medical/marinemed, +/obj/structure/sign/safety/medical{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/panic) "wex" = ( /obj/structure/sign/safety/bathunisex{ pixel_x = 8; @@ -77131,25 +76887,6 @@ icon_state = "cargo" }, /area/almayer/living/offices) -"weW" = ( -/obj/effect/landmark/start/doctor, -/obj/structure/sign/safety/maint{ - pixel_y = 26 - }, -/obj/effect/landmark/late_join/doctor, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/offices) -"wfd" = ( -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/obj/structure/machinery/door/airlock/almayer/maint/reinforced, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/p_bow) "wfn" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer{ @@ -77165,34 +76902,9 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) -"wfB" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "wfE" = ( /turf/closed/wall/almayer, /area/almayer/living/gym) -"wfG" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) "wfZ" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -77215,14 +76927,6 @@ icon_state = "silver" }, /area/almayer/living/briefing) -"wgd" = ( -/obj/structure/sign/safety/restrictedarea{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "wgf" = ( /obj/structure/sign/safety/nonpress_0g{ pixel_x = 32 @@ -77232,9 +76936,6 @@ icon_state = "plating" }, /area/almayer/shipboard/stern_point_defense) -"wgi" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/main_office) "wgk" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -77248,12 +76949,13 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"wgw" = ( -/obj/structure/largecrate/supply/supplies/mre, -/turf/open/floor/almayer{ - icon_state = "plate" +"wgO" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/maint/hull/lower/l_m_s) +/obj/structure/machinery/light, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_f_p) "wgR" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/technology_scanner, @@ -77264,23 +76966,14 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) -"whr" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - dir = 2; - req_one_access = null; - req_one_access_txt = "19;34;30" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"whm" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 }, -/area/almayer/maint/hull/upper/u_m_p) -"whv" = ( -/obj/structure/bed/sofa/south/grey/left, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_f_p) +/area/almayer/maint/hull/lower/l_m_s) "whA" = ( /turf/open/floor/almayer/uscm/directional, /area/almayer/living/briefing) @@ -77299,15 +76992,18 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"whX" = ( -/obj/structure/sign/safety/intercom{ - pixel_x = 32; - pixel_y = 7 +"whQ" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + req_access = null }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/item/storage/donut_box{ + pixel_y = 8 }, -/area/almayer/shipboard/panic) +/turf/open/floor/wood/ship, +/area/almayer/shipboard/brig/warden_office) +"wid" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/lower/p_bow) "wiz" = ( /obj/structure/bed/chair{ dir = 4 @@ -77349,6 +77045,27 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"wiO" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldingtool, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"wiQ" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "vehicle1door"; + name = "Vehicle Bay One" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/vehiclehangar) "wiW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -77405,9 +77122,38 @@ icon_state = "test_floor4" }, /area/almayer/hallways/upper/starboard) -"wjN" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/maint/hull/lower/s_bow) +"wjL" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/repair_bay) +"wjP" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) +"wjQ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -14; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 12; + pixel_y = 13 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/mess) "wjY" = ( /obj/structure/closet/secure_closet/warrant_officer, /turf/open/floor/wood/ship, @@ -77435,10 +77181,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/lockerroom) -"wkw" = ( -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) "wky" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -77468,13 +77210,6 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) -"wkJ" = ( -/obj/structure/surface/rack, -/obj/item/frame/table, -/obj/item/frame/table, -/obj/item/frame/table, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) "wkM" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES StairsLower"; @@ -77499,15 +77234,6 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) -"wkP" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/weldingtool{ - pixel_x = 6; - pixel_y = -16 - }, -/obj/item/clothing/head/welding, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "wkX" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -77529,25 +77255,53 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"wld" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out" +"wlg" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door_control{ + id = "Interrogation Shutters"; + name = "\improper Shutters"; + pixel_x = -6; + pixel_y = -6; + req_access_txt = "3" }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/obj/item/device/taperecorder{ + pixel_x = 3; + pixel_y = 3 }, -/obj/structure/sign/safety/ammunition{ - pixel_x = 15; - pixel_y = -32 +/obj/structure/machinery/light/small{ + dir = 8 }, -/obj/structure/sign/safety/hazard{ - pixel_y = -32 +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/shipboard/brig/interrogation) +"wlh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/execution) -"wli" = ( /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) +/area/almayer/squads/req) +"wlB" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_p) +"wlD" = ( +/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_umbilical) "wlE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -77574,12 +77328,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"wlQ" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) "wmg" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -77597,6 +77345,12 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) +"wmH" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) "wmK" = ( /obj/structure/surface/table/almayer, /obj/item/clipboard, @@ -77655,11 +77409,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"wnQ" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) "wnY" = ( /obj/item/tool/crowbar/red, /obj/structure/disposalpipe/segment{ @@ -77696,21 +77445,9 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"woQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/lattice_prop{ - dir = 1; - icon_state = "lattice-simple"; - pixel_x = 16; - pixel_y = -15 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) +"woU" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/upper/u_m_p) "wpg" = ( /obj/structure/machinery/blackbox_recorder, /turf/open/shuttle/dropship{ @@ -77727,6 +77464,20 @@ }, /turf/open/floor/carpet, /area/almayer/command/corporateliaison) +"wpu" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/device/flashlight/lamp{ + pixel_y = 8 + }, +/obj/item/clothing/glasses/science{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/device/flash, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/upper_medical) "wpw" = ( /obj/structure/bed/chair/comfy/ares{ dir = 1 @@ -77766,6 +77517,12 @@ icon_state = "orange" }, /area/almayer/engineering/lower) +"wpT" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) "wqc" = ( /obj/structure/sign/poster{ pixel_y = 32 @@ -77784,12 +77541,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"wqq" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) "wqr" = ( /obj/structure/sign/safety/terminal{ pixel_x = 7; @@ -77800,18 +77551,15 @@ icon_state = "plate" }, /area/almayer/command/combat_correspondent) -"wqA" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 +"wqO" = ( +/obj/structure/disposalpipe/junction{ + dir = 4 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/hallways/aft_hallway) -"wqU" = ( -/turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_m_p) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_aft_hallway) "wqW" = ( /obj/structure/closet/secure_closet/CMO, /obj/structure/machinery/light{ @@ -77822,27 +77570,55 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/upper_medical) -"wqX" = ( -/obj/structure/surface/rack, +"wra" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_p) -"wri" = ( -/obj/structure/sign/safety/water{ - pixel_x = 8; - pixel_y = -32 +"wrr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/structure/machinery/door_control/railings{ + pixel_y = 24 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, -/area/almayer/maint/hull/lower/stern) +/area/almayer/hallways/lower/vehiclehangar) +"wru" = ( +/obj/structure/machinery/light, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) "wrC" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = -17 }, /turf/open/floor/almayer, /area/almayer/living/gym) +"wrN" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/obj/structure/blocker/forcefield/multitile_vehicles, +/obj/structure/sign/safety/stairs{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/port_fore_hallway) "wrQ" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -77899,25 +77675,23 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"wst" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) "wsw" = ( -/obj/structure/machinery/vending/cola{ - density = 0; - pixel_y = 18 +/obj/structure/machinery/light/small{ + dir = 1 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/hull/lower/stern) +"wsz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) "wsD" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -77930,6 +77704,36 @@ icon_state = "test_floor4" }, /area/almayer/squads/bravo) +"wsS" = ( +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"wtk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) +"wtn" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/item/storage/firstaid{ + pixel_x = -13; + pixel_y = 13 + }, +/obj/item/clipboard, +/obj/item/paper, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_s) "wty" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -77939,6 +77743,14 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/delta) +"wtD" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "Brig" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/p_bow) "wtM" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -77964,22 +77776,14 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) -"wuc" = ( -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - name = "\improper Brig Medbay"; - req_access = null; - req_one_access = null; - req_one_access_txt = "20;3"; - closeOtherId = "brigmed" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ +"wub" = ( +/obj/structure/pipes/vents/pump{ dir = 4 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "mono" }, -/area/almayer/shipboard/brig/surgery) +/area/almayer/medical/upper_medical) "wud" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -77989,6 +77793,26 @@ icon_state = "orangefull" }, /area/almayer/engineering/lower/workshop) +"wuh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/structure/sign/safety/autoopenclose{ + pixel_y = 32 + }, +/obj/structure/sign/safety/water{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) "wup" = ( /obj/structure/supply_drop/echo, /turf/open/floor/almayer, @@ -78011,31 +77835,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop) -"wuP" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -16; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = 12; - pixel_y = 13 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_s) -"wuR" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) "wuT" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -78068,10 +77867,6 @@ /obj/structure/filingcabinet, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"wvt" = ( -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) "wvE" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/almayer_network{ @@ -78116,15 +77911,18 @@ icon_state = "cargo" }, /area/almayer/squads/charlie) -"wwu" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ +"wwv" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_midship_hallway) +"wwE" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "wwJ" = ( /obj/structure/surface/table/almayer, /obj/item/paper, @@ -78133,14 +77931,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) -"wwV" = ( -/obj/structure/sign/safety/storage{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) "wwW" = ( /obj/structure/machinery/camera/autoname/almayer/containment/hidden{ dir = 8; @@ -78172,15 +77962,11 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"wxn" = ( +"wxp" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/mess) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "wxq" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -78189,6 +77975,37 @@ icon_state = "plate" }, /area/almayer/medical/lower_medical_medbay) +"wxu" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) +"wxy" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/upper/p_stern) +"wxD" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) +"wxF" = ( +/obj/structure/closet/secure_closet/cmdcabinet{ + desc = "A bulletproof cabinet containing communications equipment."; + name = "communications cabinet"; + pixel_y = 24; + req_access = null; + req_one_access_txt = "3" + }, +/obj/item/device/radio/listening_bug/radio_linked/mp{ + pixel_y = 8 + }, +/obj/item/device/radio/listening_bug/radio_linked/mp, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/shipboard/brig/warden_office) "wxU" = ( /obj/item/ashtray/bronze{ pixel_x = 7; @@ -78223,6 +78040,32 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) +"wyz" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) +"wyE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silvercorner" + }, +/area/almayer/hallways/upper/aft_hallway) +"wyG" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/lower/l_m_s) "wyQ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/door_control{ @@ -78235,23 +78078,46 @@ icon_state = "plating" }, /area/almayer/command/airoom) -"wzC" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, +"wzy" = ( +/obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) -"wAR" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/area/almayer/hallways/lower/port_fore_hallway) +"wzJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) +"wzL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/machinery/light, /turf/open/floor/almayer{ - dir = 4; + dir = 8; icon_state = "green" }, -/area/almayer/hallways/port_hallway) +/area/almayer/hallways/upper/aft_hallway) +"wzZ" = ( +/obj/structure/machinery/door/airlock/almayer/medical/glass{ + dir = 1; + id = "medcryobeds"; + id_tag = "medcryobeds"; + name = "Medical Wheelchair Storage"; + req_access = null; + req_one_access = null + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/lower_medical_medbay) +"wAK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_umbilical) "wBd" = ( /obj/structure/machinery/status_display{ pixel_x = 32 @@ -78266,22 +78132,16 @@ icon_state = "red" }, /area/almayer/shipboard/brig/lobby) -"wBl" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 8 +"wBw" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/machinery/status_display{ + pixel_y = 30 }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/shipboard/panic) -"wBy" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 + dir = 1; + icon_state = "green" }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/hallways/lower/starboard_midship_hallway) "wBI" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/sign/safety/maint{ @@ -78305,12 +78165,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"wCF" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) "wCI" = ( /turf/open/floor/almayer{ dir = 4; @@ -78343,6 +78197,18 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) +"wDq" = ( +/obj/structure/largecrate/random/case/small, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"wDr" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/lower/stairs) "wDs" = ( /obj/structure/machinery/seed_extractor, /obj/structure/sign/safety/terminal{ @@ -78380,6 +78246,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +"wDG" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) "wDH" = ( /obj/structure/morgue, /obj/structure/machinery/light{ @@ -78407,6 +78282,14 @@ "wDM" = ( /turf/closed/wall/almayer/reinforced/temphull, /area/almayer/engineering/upper_engineering) +"wDP" = ( +/obj/structure/sign/safety/storage{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "wEd" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -78431,23 +78314,6 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) -"wEp" = ( -/obj/structure/bookcase/manuals/medical, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_f_s) -"wEA" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_p) "wEI" = ( /obj/structure/surface/table/reinforced/black, /obj/item/tool/pen, @@ -78461,6 +78327,12 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) +"wEK" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "wEO" = ( /obj/structure/platform_decoration{ dir = 4 @@ -78491,6 +78363,9 @@ icon_state = "redfull" }, /area/almayer/command/cic) +"wFs" = ( +/turf/closed/wall/almayer, +/area/almayer/shipboard/brig/starboard_hallway) "wFz" = ( /obj/item/prop{ desc = "Predecessor to the M56 the M38 was known for its extreme reliability in the field. This particular M38D is fondly remembered for its stalwart defence of the hangar bay during the Arcturian commando raid of the USS Almayer on Io."; @@ -78503,21 +78378,40 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"wFG" = ( -/obj/effect/landmark/yautja_teleport, +"wFN" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "OfficeSafeRoom"; + name = "\improper Office Safe Room" + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_a_p) +/area/almayer/shipboard/panic) +"wFQ" = ( +/obj/structure/machinery/cm_vending/clothing/maintenance_technician, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering/upper_engineering/port) "wFR" = ( /turf/open/floor/almayer, /area/almayer/living/gym) -"wGa" = ( -/obj/structure/machinery/light/small{ - dir = 1 +"wFX" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/hull/upper/u_a_s) +"wGa" = ( +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_s) "wGb" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 @@ -78533,14 +78427,12 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"wGA" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/effect/decal/warning_stripes{ - icon_state = "W" +"wGe" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/maint/hull/lower/l_f_p) "wGE" = ( /obj/structure/disposalpipe/segment, /obj/effect/landmark/start/marine/leader/delta, @@ -78573,6 +78465,13 @@ icon_state = "emerald" }, /area/almayer/living/port_emb) +"wHn" = ( +/obj/structure/sign/safety/autoopenclose{ + pixel_x = 7; + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "wHo" = ( /turf/open/floor/almayer{ icon_state = "emerald" @@ -78585,24 +78484,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"wHM" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - name = "\improper Warden's Office" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/chief_mp_office) -"wIg" = ( -/obj/structure/disposalpipe/segment{ - layer = 5.1; - name = "water pipe" - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "wIr" = ( /obj/structure/machinery/cm_vending/clothing/senior_officer{ req_access = list(); @@ -78616,12 +78497,12 @@ icon_state = "cargo" }, /area/almayer/squads/req) -"wIz" = ( -/obj/structure/largecrate/random/case/small, +"wIu" = ( +/obj/structure/largecrate/random/case, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/s_stern) +/area/almayer/maint/hull/upper/u_a_s) "wIC" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/chief_mp_office) @@ -78652,9 +78533,29 @@ icon_state = "silvercorner" }, /area/almayer/shipboard/brig/cic_hallway) +"wIX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/disposalpipe/up/almayer{ + dir = 8; + id = "almayerlink" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) "wJb" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/lower_medical_medbay) +"wJd" = ( +/turf/open/floor/almayer{ + dir = 10; + icon_state = "orange" + }, +/area/almayer/hallways/upper/stern_hallway) "wJh" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -78674,22 +78575,16 @@ icon_state = "test_floor4" }, /area/almayer/medical/upper_medical) -"wJw" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/computer/supplycomp/vehicle, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/vehiclehangar) "wJB" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/command/airoom) +"wJC" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/s_bow) "wJD" = ( /obj/structure/bed/chair{ dir = 8; @@ -78711,27 +78606,32 @@ "wJH" = ( /turf/closed/wall/almayer/research/containment/wall/east, /area/almayer/medical/containment/cell/cl) -"wJS" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 32 +"wKb" = ( +/obj/structure/bed/chair{ + dir = 8 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) -"wJT" = ( -/obj/structure/bed/chair{ - dir = 4 +/area/almayer/maint/hull/upper/u_f_s) +"wKc" = ( +/obj/effect/decal/cleanable/vomit, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21" }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"wKe" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/engineering/upper_engineering/port) +"wKm" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "green" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/hallways/lower/port_aft_hallway) "wKF" = ( /obj/structure/machinery/power/apc/almayer{ cell_type = /obj/item/cell/hyper; @@ -78750,6 +78650,15 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"wKN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_fore_hallway) "wKP" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -78842,20 +78751,6 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) -"wLM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/largecrate/supply/weapons/m39{ - pixel_x = 2 - }, -/obj/structure/largecrate/supply/weapons/m41a{ - layer = 3.1; - pixel_x = 6; - pixel_y = 17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) "wLN" = ( /obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 8 @@ -78864,6 +78759,38 @@ icon_state = "sterile_green" }, /area/almayer/medical/containment) +"wLS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/shipboard/brig/starboard_hallway) +"wMl" = ( +/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/lower/starboard_midship_hallway) "wMv" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -78872,6 +78799,21 @@ icon_state = "dark_sterile" }, /area/almayer/living/auxiliary_officer_office) +"wMB" = ( +/obj/structure/barricade/handrail{ + dir = 1; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"wMF" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_bow) "wMG" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -78880,6 +78822,17 @@ icon_state = "cargo" }, /area/almayer/squads/alpha) +"wMI" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) "wMO" = ( /obj/structure/machinery/door/poddoor/almayer/biohazard/white{ dir = 4 @@ -78919,12 +78872,27 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/processing) -"wNN" = ( -/obj/structure/platform, +"wNz" = ( +/obj/structure/stairs, +/obj/effect/projector{ + name = "Almayer_Up1"; + vector_x = -19; + vector_y = 98 + }, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"wNG" = ( +/obj/effect/projector{ + name = "Almayer_Up2"; + vector_x = -1; + vector_y = 100 + }, /turf/open/floor/almayer{ - icon_state = "plate" + allow_construction = 0 }, -/area/almayer/maint/hull/upper/u_a_s) +/area/almayer/hallways/lower/starboard_fore_hallway) "wNS" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -78937,19 +78905,18 @@ /obj/structure/platform, /turf/open/floor/almayer, /area/almayer/living/briefing) -"wOh" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/stern_hallway) "wOt" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/starboard) +"wOv" = ( +/obj/structure/platform, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_s) "wOK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -78959,6 +78926,18 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"wPa" = ( +/obj/structure/platform{ + dir = 4 + }, +/obj/item/reagent_container/glass/rag, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "wPf" = ( /obj/structure/sign/safety/reception{ pixel_x = 32; @@ -78968,6 +78947,27 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"wPi" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/lower/port_midship_hallway) +"wPm" = ( +/obj/structure/pipes/standard/cap/hidden{ + dir = 4 + }, +/obj/structure/sign/safety/life_support{ + pixel_x = 8; + pixel_y = -25 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/stern_hallway) "wPz" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -78994,12 +78994,26 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) -"wQg" = ( +"wPR" = ( +/obj/structure/closet, +/obj/item/clothing/under/marine, +/obj/item/clothing/suit/storage/marine, +/obj/item/clothing/head/helmet/marine, +/obj/item/clothing/head/beret/cm, +/obj/item/clothing/head/beret/cm, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) +"wQu" = ( +/obj/effect/projector{ + name = "Almayer_Up3"; + vector_x = -1; + vector_y = 102 + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "greencorner" + allow_construction = 0; + icon_state = "plate" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/lower/port_fore_hallway) "wQA" = ( /obj/structure/pipes/standard/simple/visible{ dir = 5 @@ -79013,27 +79027,19 @@ icon_state = "orange" }, /area/almayer/engineering/lower/engine_core) -"wQM" = ( -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/almayer{ - icon_state = "plate" +"wRf" = ( +/obj/structure/machinery/light/small, +/obj/structure/sign/safety/nonpress_0g{ + pixel_x = 15; + pixel_y = -32 }, -/area/almayer/maint/hull/upper/u_m_p) -"wQV" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 +/obj/structure/sign/safety/press_area_ag{ + pixel_y = 32 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/stern) -"wRn" = ( -/obj/structure/surface/rack, -/obj/item/tool/crowbar, -/obj/item/tool/weldingtool, -/obj/item/tool/wrench, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/hallways/lower/port_umbilical) "wRN" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/goldappleseed, @@ -79073,15 +79079,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"wSk" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/stern_hallway) "wSm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -79106,13 +79103,21 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) -"wSK" = ( -/obj/structure/janitorialcart, -/obj/item/tool/mop, +"wSx" = ( +/obj/structure/platform_decoration, +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/maint/hull/upper/u_a_p) +"wSQ" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/lower/repair_bay) "wSR" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -79152,10 +79157,6 @@ icon_state = "silver" }, /area/almayer/command/securestorage) -"wTe" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_s) "wTg" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -79173,6 +79174,23 @@ icon_state = "red" }, /area/almayer/living/briefing) +"wTn" = ( +/obj/structure/machinery/light/small{ + dir = 1; + pixel_y = 20 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) +"wTu" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/extinguisher, +/obj/item/tool/extinguisher, +/obj/item/tool/crowbar, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "orange" + }, +/area/almayer/maint/upper/mess) "wTw" = ( /obj/structure/machinery/cm_vending/sorted/attachments/squad{ req_access = null; @@ -79190,14 +79208,20 @@ icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/south1) -"wTJ" = ( -/obj/structure/barricade/handrail, -/obj/structure/barricade/handrail{ - dir = 4 +"wTB" = ( +/obj/structure/surface/table/almayer, +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 }, -/obj/structure/largecrate/random, -/turf/open/floor/almayer, -/area/almayer/engineering/upper_engineering/port) +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering/lower/engine_core) "wTM" = ( /turf/closed/wall/almayer/research/containment/wall/south, /area/almayer/medical/containment/cell) @@ -79209,10 +79233,6 @@ icon_state = "plate" }, /area/almayer/living/auxiliary_officer_office) -"wUc" = ( -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) "wUd" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/gloves{ @@ -79222,16 +79242,12 @@ /obj/item/storage/fancy/candle_box, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) -"wUz" = ( -/obj/structure/sign/safety/life_support{ - pixel_x = 8; - pixel_y = 32 +"wUJ" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) -"wUB" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/hull/upper/p_stern) +/area/almayer/maint/hull/upper/u_m_p) "wUK" = ( /turf/open/floor/almayer{ dir = 8; @@ -79267,6 +79283,20 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"wVh" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/warden_office) +"wVm" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) "wVt" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/plating_catwalk, @@ -79313,13 +79343,14 @@ icon_state = "bluefull" }, /area/almayer/living/bridgebunks) -"wVU" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/sign/safety/cryo{ - pixel_x = 36 +"wVN" = ( +/obj/item/roller, +/obj/structure/surface/rack, +/obj/item/roller, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/lower/cryo_cells) +/area/almayer/shipboard/panic) "wVW" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/command/cic) @@ -79327,12 +79358,6 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/living/chapel) -"wWk" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "silver" - }, -/area/almayer/hallways/aft_hallway) "wWl" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/general_air_control/large_tank_control{ @@ -79354,6 +79379,14 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) +"wWt" = ( +/obj/effect/projector{ + name = "Almayer_Up1"; + vector_x = -19; + vector_y = 98 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "wWz" = ( /turf/closed/wall/almayer/research/containment/wall/north, /area/almayer/medical/containment/cell) @@ -79363,10 +79396,6 @@ icon_state = "blue" }, /area/almayer/living/pilotbunks) -"wWD" = ( -/obj/docking_port/stationary/escape_pod/south, -/turf/open/floor/plating, -/area/almayer/maint/upper/u_m_p) "wWP" = ( /obj/structure/prop/cash_register/broken, /obj/structure/machinery/light/small, @@ -79374,12 +79403,6 @@ icon_state = "test_floor5" }, /area/almayer/squads/req) -"wWQ" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = -25 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "wWR" = ( /obj/structure/machinery/medical_pod/bodyscanner{ dir = 8 @@ -79396,17 +79419,6 @@ /obj/effect/landmark/late_join/delta, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) -"wXb" = ( -/obj/structure/machinery/light/small, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) "wXh" = ( /obj/structure/machinery/floodlight/landing{ name = "bolted floodlight" @@ -79415,6 +79427,18 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) +"wXl" = ( +/obj/structure/platform, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"wXz" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/starboard_hallway) "wXH" = ( /obj/structure/bed/chair{ dir = 1 @@ -79427,15 +79451,12 @@ icon_state = "greencorner" }, /area/almayer/living/grunt_rnr) -"wXS" = ( -/obj/structure/platform_decoration, -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +"wXJ" = ( +/obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/hull/upper/u_a_s) "wXT" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ name = "\improper Engineering Storage" @@ -79450,11 +79471,29 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north2) +"wYd" = ( +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) +"wYr" = ( +/obj/structure/machinery/gel_refiller, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lower_medical_medbay) "wYA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"wYG" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/lower/l_m_s) "wYK" = ( /obj/structure/barricade/handrail/medical, /turf/open/floor/almayer{ @@ -79484,9 +79523,30 @@ }, /turf/open/floor/plating, /area/almayer/engineering/ce_room) -"wZa" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/maint/hull/lower/l_f_s) +"wZk" = ( +/obj/structure/stairs{ + dir = 8; + icon_state = "ramptop" + }, +/obj/effect/projector{ + name = "Almayer_Down3"; + vector_x = 1; + vector_y = -102 + }, +/obj/structure/machinery/light, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/upper/aft_hallway) +"wZp" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/stern_hallway) "wZv" = ( /obj/structure/prop/invuln{ desc = "An inflated membrane. This one is puncture proof. Wow!"; @@ -79500,15 +79560,6 @@ icon_state = "outerhull_dir" }, /area/almayer/engineering/upper_engineering/port) -"wZD" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/u_a_s) "wZE" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/book/manual/surgery, @@ -79524,26 +79575,6 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) -"wZM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/hallways/aft_hallway) -"wZN" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/fancy/cigarettes/lucky_strikes, -/obj/item/tool/lighter, -/obj/item/clothing/glasses/sunglasses/blindfold, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/brig/execution) "wZX" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -79561,6 +79592,12 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) +"xas" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_bow) "xaC" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/tool/kitchen/utensil/pfork{ @@ -79626,35 +79663,24 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"xbg" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) "xbk" = ( /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/gym) -"xbG" = ( -/obj/structure/surface/rack, -/obj/effect/decal/cleanable/cobweb{ - dir = 8; - plane = -6 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_container/spray/cleaner{ - desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; - name = "Surgery Cleaner" - }, -/obj/item/reagent_container/spray/cleaner{ - desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; - name = "Surgery Cleaner" - }, -/obj/item/reagent_container/spray/cleaner{ - desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; - name = "Surgery Cleaner" +"xbI" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 }, /turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_corner" + icon_state = "plate" }, -/area/almayer/medical/lower_medical_medbay) +/area/almayer/maint/hull/lower/l_m_s) "xbN" = ( /obj/structure/surface/rack{ density = 0; @@ -79670,24 +79696,60 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/starboard) -"xcl" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 +"xcs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_a_s) +"xcI" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 32 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/port_hallway) -"xcC" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/tool, -/obj/effect/spawner/random/tool, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_m_p) +/area/almayer/maint/hull/lower/p_bow) +"xcV" = ( +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "OfficeSafeRoom"; + name = "\improper Office Safe Room" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/panic) +"xcY" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) +"xdf" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/port_midship_hallway) +"xdl" = ( +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/hallways/upper/aft_hallway) "xdx" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/regular/empty, @@ -79727,27 +79789,53 @@ icon_state = "emeraldfull" }, /area/almayer/living/briefing) -"xdT" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/effect/spawner/random/toolbox, -/obj/item/stack/sheet/metal{ - desc = "Semiotic Standard denoting the nearby presence of coffee: the lifeblood of any starship crew."; - icon = 'icons/obj/structures/props/semiotic_standard.dmi'; - icon_state = "coffee"; - name = "coffee semiotic"; - pixel_x = 20; - pixel_y = 12; - singular_name = "coffee semiotic" +"xee" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) +"xef" = ( +/obj/structure/surface/table/almayer, +/obj/item/folder/yellow, +/obj/structure/machinery/keycard_auth{ + pixel_x = -8; + pixel_y = 25 + }, +/obj/structure/sign/safety/high_rad{ + pixel_x = 32; + pixel_y = -8 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 32; + pixel_y = 7 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = 14; + pixel_y = 26 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) -"xeV" = ( -/obj/structure/sign/safety/hvac_old{ +/area/almayer/engineering/lower/workshop) +"xeq" = ( +/obj/structure/sign/safety/distribution_pipes{ pixel_x = 8; pixel_y = 32 }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/stern_hallway) +"xer" = ( +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) +"xew" = ( +/obj/structure/surface/rack, +/obj/item/facepaint/sniper, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -79757,20 +79845,24 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/cafeteria_officer) -"xft" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, +"xfo" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 10; + icon_state = "blue" }, -/area/almayer/maint/hull/upper/u_a_p) -"xfu" = ( -/obj/structure/largecrate/random/case/double, +/area/almayer/hallways/upper/aft_hallway) +"xfq" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/item/clipboard, +/obj/item/paper, +/obj/item/tool/pen, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_m_p) +/area/almayer/maint/hull/lower/l_a_p) "xfK" = ( /obj/structure/machinery/light{ dir = 1 @@ -79814,6 +79906,17 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/operating_room_one) +"xfW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/weapon/gun/rifle/m41a{ + pixel_y = 6 + }, +/obj/item/weapon/gun/rifle/m41a, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) "xgh" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -79822,25 +79925,50 @@ icon_state = "sterile_green" }, /area/almayer/medical/lower_medical_lobby) -"xgx" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 +"xgk" = ( +/obj/structure/pipes/vents/scrubber, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "greencorner" }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"xgm" = ( +/obj/structure/reagent_dispensers/fueltank/oxygentank, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "plate" }, -/area/almayer/hallways/vehiclehangar) -"xgI" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - req_access = null +/area/almayer/engineering/upper_engineering/starboard) +"xgr" = ( +/obj/structure/ladder{ + height = 1; + id = "AftPortMaint" }, -/obj/item/storage/donut_box{ - pixel_y = 8 +/obj/structure/sign/safety/ladder{ + pixel_x = 8; + pixel_y = -32 }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/brig/chief_mp_office) +/turf/open/floor/plating/almayer, +/area/almayer/maint/hull/lower/l_a_p) +"xgE" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) +"xgJ" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/cm_vending/sorted/medical/blood/bolted, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lockerroom) "xgN" = ( /obj/structure/bed/chair/comfy/bravo{ dir = 1 @@ -79854,19 +79982,44 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"xgP" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/upper_medical) +"xgS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) +"xhi" = ( +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/stern_hallway) "xhn" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) -"xhp" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_s) "xhx" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -79874,18 +80027,28 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"xhE" = ( -/obj/structure/bed/chair/bolted{ - dir = 8 +"xhO" = ( +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/main_office) +/area/almayer/maint/hull/lower/l_a_p) "xhQ" = ( /obj/structure/window/framed/almayer, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/squads/bravo) +"xhU" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/starboard_hallway) +"xhW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) "xhZ" = ( /obj/structure/bed/chair/comfy/beige{ dir = 4 @@ -79900,20 +80063,18 @@ /obj/structure/window/reinforced, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"xiD" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/tool/wrench{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/item/tool/wrench{ - pixel_x = 2; - pixel_y = 7 - }, +"xiH" = ( +/obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/maint/hull/lower/l_f_s) +"xiP" = ( +/obj/structure/closet/secure_closet/engineering_welding{ + req_one_access_txt = "7;23;27" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/s_bow) "xiU" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/tool/minihoe{ @@ -79928,13 +80089,9 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"xiZ" = ( -/obj/structure/closet/toolcloset, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" - }, -/area/almayer/maint/hull/lower/l_m_s) +"xiV" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/upper/p_bow) "xjb" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ access_modified = 1; @@ -79945,12 +80102,6 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) -"xjh" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_bow) "xjt" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/card{ @@ -79993,23 +80144,12 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"xjG" = ( -/obj/structure/machinery/door_control{ - id = "Interrogation Shutters"; - name = "\improper Shutters"; - pixel_x = 24; - pixel_y = 12; - req_access_txt = "3" - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, +"xjI" = ( /turf/open/floor/almayer{ - dir = 5; + dir = 4; icon_state = "red" }, -/area/almayer/shipboard/brig/main_office) +/area/almayer/hallways/upper/stern_hallway) "xjK" = ( /obj/structure/sign/safety/hazard{ pixel_y = 32 @@ -80022,9 +80162,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"xjU" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/stern) "xjW" = ( /obj/structure/sign/safety/hazard{ desc = "A sign that warns of a hazardous environment nearby"; @@ -80036,9 +80173,34 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/shipboard/starboard_point_defense) +"xkb" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) +"xkc" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/s_bow) "xkd" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/cells) +"xky" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "xkB" = ( /obj/structure/bed/chair/comfy/charlie{ dir = 1 @@ -80048,37 +80210,20 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"xkC" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "emerald" - }, -/area/almayer/hallways/port_hallway) -"xkE" = ( -/obj/structure/machinery/door/airlock/almayer/maint/reinforced, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" +"xkN" = ( +/obj/structure/machinery/door_control{ + id = "laddernorthwest"; + name = "North West Ladders Shutters"; + pixel_x = 25; + req_one_access_txt = "2;3;12;19"; + throw_range = 15 }, +/obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/s_bow) -"xkZ" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; - id = "Hangar Lockdown"; - name = "\improper Hangar Lockdown Blast Door" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "greencorner" }, -/area/almayer/maint/lower/constr) +/area/almayer/hallways/lower/starboard_fore_hallway) "xlk" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer, @@ -80115,6 +80260,21 @@ icon_state = "silverfull" }, /area/almayer/shipboard/brig/cic_hallway) +"xmn" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldpack, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 1; + pixel_y = 7 + }, +/obj/item/storage/toolbox/mechanical/green{ + pixel_x = 1; + pixel_y = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_p) "xmJ" = ( /obj/structure/closet, /obj/structure/sign/safety/bathunisex{ @@ -80136,16 +80296,6 @@ icon_state = "cargo" }, /area/almayer/medical/lower_medical_medbay) -"xmX" = ( -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/shipboard/brig/surgery) -"xnn" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_s) "xns" = ( /obj/structure/machinery/door_control{ id = "ARES JoeCryo"; @@ -80168,13 +80318,6 @@ icon_state = "red" }, /area/almayer/command/lifeboat) -"xnG" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_p) "xnI" = ( /obj/effect/landmark/start/requisition, /turf/open/floor/plating/plating_catwalk, @@ -80206,15 +80349,28 @@ icon_state = "bluecorner" }, /area/almayer/squads/delta) +"xog" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) "xoj" = ( /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop) -"xow" = ( -/obj/structure/sign/safety/nonpress_ag{ - pixel_x = 32 +"xos" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/p_bow) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_fore_hallway) +"xoB" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/maint/hull/upper/u_f_s) "xoJ" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -80229,6 +80385,15 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"xpc" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "xpi" = ( /obj/structure/sink{ dir = 8; @@ -80246,36 +80411,38 @@ icon_state = "dark_sterile" }, /area/almayer/living/commandbunks) -"xpo" = ( -/obj/structure/closet/secure_closet/cmdcabinet{ - desc = "A bulletproof cabinet containing communications equipment."; - name = "communications cabinet"; - pixel_y = 24; - req_access = null; - req_one_access_txt = "3" +"xpl" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, -/obj/item/device/radio/listening_bug/radio_linked/mp{ - pixel_y = 8 +/obj/structure/sign/safety/four{ + pixel_x = 31; + pixel_y = -8 + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = 32; + pixel_y = 7 }, -/obj/item/device/radio/listening_bug/radio_linked/mp, /turf/open/floor/almayer{ - dir = 5; - icon_state = "red" + dir = 4; + icon_state = "blue" }, -/area/almayer/shipboard/brig/chief_mp_office) -"xpI" = ( -/obj/structure/stairs{ - dir = 4 +/area/almayer/hallways/lower/port_midship_hallway) +"xpw" = ( +/obj/structure/machinery/medical_pod/sleeper{ + dir = 8 }, -/obj/effect/projector{ - name = "Almayer_Up2"; - vector_x = -1; - vector_y = 100 +/turf/open/floor/almayer{ + icon_state = "dark_sterile" }, -/turf/open/floor/plating/almayer{ - allow_construction = 0 +/area/almayer/shipboard/brig/medical) +"xpL" = ( +/obj/structure/machinery/light/small{ + dir = 4 }, -/area/almayer/hallways/starboard_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) "xpT" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -80296,12 +80463,6 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) -"xqm" = ( -/obj/structure/sign/safety/security{ - pixel_x = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/s_bow) "xqp" = ( /obj/structure/machinery/body_scanconsole{ dir = 8; @@ -80321,12 +80482,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"xqs" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/shipboard/brig/chief_mp_office) "xqv" = ( /obj/structure/bed/sofa/south/white/right, /turf/open/floor/almayer{ @@ -80361,6 +80516,19 @@ icon_state = "plate" }, /area/almayer/command/corporateliaison) +"xrg" = ( +/obj/structure/sign/safety/hazard{ + pixel_x = 32; + pixel_y = 7 + }, +/obj/structure/sign/safety/airlock{ + pixel_x = 32; + pixel_y = -8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/stern) "xrq" = ( /obj/structure/closet/firecloset, /obj/item/clothing/mask/gas, @@ -80369,12 +80537,6 @@ icon_state = "cargo" }, /area/almayer/command/lifeboat) -"xrr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/stern_hallway) "xrt" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -80401,6 +80563,17 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) +"xrC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "greencorner" + }, +/area/almayer/hallways/lower/starboard_fore_hallway) "xrI" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -80409,17 +80582,16 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) -"xsg" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/main_office) -"xsj" = ( -/obj/structure/surface/rack, -/obj/item/tool/weldpack, -/turf/open/floor/almayer{ - icon_state = "plate" +"xrT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/area/almayer/maint/hull/upper/u_a_p) +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "xsl" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -80429,19 +80601,28 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) +"xss" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/lower/cryo_cells) +"xsv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) "xsw" = ( /turf/open/floor/almayer{ dir = 6; icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"xsy" = ( -/obj/item/pipe{ - dir = 4; - layer = 3.5 - }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) "xsz" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -80451,41 +80632,27 @@ icon_state = "plating" }, /area/almayer/medical/upper_medical) -"xsW" = ( -/obj/structure/machinery/cm_vending/gear/vehicle_crew, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hallways/vehiclehangar) -"xtk" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) -"xtr" = ( -/obj/effect/landmark/start/nurse, -/obj/effect/landmark/late_join/nurse, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/offices) -"xtI" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = 12; - pixel_y = 13 +"xsQ" = ( +/obj/structure/surface/table/almayer, +/obj/item/stack/sheet/glass{ + amount = 20; + pixel_x = 3; + pixel_y = 3 }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -14; - pixel_y = 13 +/obj/item/weapon/dart, +/obj/item/weapon/dart, +/obj/item/weapon/dart, +/obj/item/weapon/dart/green, +/obj/item/weapon/dart/green, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) +"xsX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/mess) +/area/almayer/hallways/upper/stern_hallway) "xtM" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -80493,17 +80660,26 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"xtU" = ( +"xtO" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/aft_hallway) +"xub" = ( /obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" + dir = 4 }, -/obj/structure/surface/rack, -/obj/item/frame/table, -/obj/item/frame/table, -/obj/item/frame/table, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_midship_hallway) "xuc" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -80511,13 +80687,23 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cic_hallway) -"xun" = ( -/obj/structure/largecrate/supply/supplies/water, -/obj/item/toy/deck{ - pixel_y = 12 +"xui" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_aft_hallway) +"xuy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) +/obj/structure/machinery/status_display{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/hallways/lower/port_fore_hallway) "xuE" = ( /obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ dir = 1; @@ -80564,13 +80750,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"xvh" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/aft_hallway) "xvE" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/charlie{ @@ -80594,6 +80773,16 @@ icon_state = "silver" }, /area/almayer/command/airoom) +"xvO" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "silver" + }, +/area/almayer/hallways/upper/aft_hallway) "xvQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/sentencing{ @@ -80610,6 +80799,15 @@ icon_state = "plate" }, /area/almayer/squads/bravo) +"xwd" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "xwl" = ( /obj/structure/window/reinforced{ dir = 4; @@ -80623,6 +80821,18 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha_bravo_shared) +"xwm" = ( +/obj/structure/sign/safety/security{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_fore_hallway) "xwp" = ( /obj/item/storage/box/matches{ pixel_x = -11; @@ -80654,13 +80864,14 @@ }, /area/almayer/living/briefing) "xwU" = ( -/obj/item/roller, -/obj/structure/surface/rack, -/obj/item/roller, +/obj/structure/sign/safety/medical{ + pixel_x = 8; + pixel_y = -32 + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "green" }, -/area/almayer/shipboard/panic) +/area/almayer/hallways/upper/aft_hallway) "xwX" = ( /turf/open/floor/almayer{ dir = 9; @@ -80742,16 +80953,19 @@ }, /turf/open/floor/plating, /area/almayer/living/port_emb) -"xxr" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/binoculars, -/obj/item/device/whistle{ - pixel_y = 5 +"xxG" = ( +/obj/structure/prop/holidays/string_lights{ + pixel_y = 27 + }, +/obj/structure/largecrate/random/barrel/red, +/obj/item/reagent_container/food/drinks/cans/cola{ + pixel_x = -2; + pixel_y = 16 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/maint/hull/lower/l_m_s) "xxI" = ( /obj/structure/cargo_container/wy/mid, /obj/structure/sign/poster{ @@ -80803,9 +81017,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/carpet, /area/almayer/living/commandbunks) -"xys" = ( -/turf/closed/wall/almayer, -/area/almayer/shipboard/brig/main_office) "xyt" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/mechanical{ @@ -80850,6 +81061,15 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) +"xyN" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/shipboard/brig/execution_storage) +"xyQ" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silvercorner" + }, +/area/almayer/hallways/lower/repair_bay) "xyY" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -80861,6 +81081,11 @@ icon_state = "green" }, /area/almayer/squads/req) +"xyZ" = ( +/obj/structure/machinery/light/small, +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/s_bow) "xzf" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -80871,41 +81096,24 @@ icon_state = "blue" }, /area/almayer/living/basketball) -"xzx" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_m_p) -"xzO" = ( -/obj/structure/closet/secure_closet{ - name = "\improper Execution Firearms" +"xzh" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_p) +"xzB" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) +"xzI" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 }, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/ammo_box/magazine/m4ra, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "green" }, -/area/almayer/shipboard/brig/execution) +/area/almayer/hallways/lower/port_midship_hallway) "xAe" = ( /turf/closed/wall/almayer/research/containment/wall/corner, /area/almayer/medical/containment/cell) -"xAj" = ( -/obj/structure/bed/chair/bolted{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "xAt" = ( /obj/structure/bed/chair/comfy/charlie{ dir = 8 @@ -80914,6 +81122,13 @@ icon_state = "emeraldfull" }, /area/almayer/living/briefing) +"xAu" = ( +/obj/structure/sign/safety/restrictedarea{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/s_bow) "xAB" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -80958,6 +81173,12 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/port) +"xBK" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/hull/upper/u_f_p) "xBQ" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -80965,12 +81186,14 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"xBT" = ( -/obj/structure/surface/rack, +"xBS" = ( +/obj/structure/bed/chair/comfy/beige{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_p) +/area/almayer/maint/hull/upper/u_a_s) "xBV" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -81000,6 +81223,17 @@ }, /turf/open/floor/carpet, /area/almayer/command/corporateliaison) +"xCy" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -19; + pixel_y = -6 + }, +/obj/structure/sign/safety/bulkhead_door{ + pixel_x = -19; + pixel_y = 6 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) "xDe" = ( /obj/effect/projector{ name = "Almayer_Down4"; @@ -81016,10 +81250,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"xDy" = ( -/obj/item/ammo_casing/bullet, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_p) "xDC" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer/no_build{ @@ -81033,6 +81263,15 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop/hangar) +"xDG" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/hull/upper/u_a_s) "xDV" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -81043,15 +81282,14 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"xEq" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) +"xEe" = ( +/obj/structure/prop/invuln/joey, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"xEs" = ( +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_p) "xEz" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/book/manual/surgery, @@ -81074,22 +81312,21 @@ icon_state = "plate" }, /area/almayer/living/offices) -"xFw" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "silver" - }, -/area/almayer/hallways/aft_hallway) +"xFt" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) "xFP" = ( /turf/open/floor/almayer{ dir = 5; icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) +"xFW" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/upper/aft_hallway) "xFZ" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -81107,28 +81344,18 @@ icon_state = "green" }, /area/almayer/shipboard/brig/cells) -"xGk" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +"xGm" = ( +/obj/structure/platform_decoration{ + dir = 8 }, -/turf/open/floor/almayer, -/area/almayer/hallways/aft_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) "xGo" = ( /obj/structure/machinery/autolathe, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/squads/req) -"xGv" = ( -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_bow) "xGE" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -81150,6 +81377,15 @@ icon_state = "test_floor4" }, /area/almayer/squads/bravo) +"xGF" = ( +/obj/structure/machinery/vending/snack{ + density = 0; + pixel_y = 18 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_f_p) "xGJ" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -81160,38 +81396,78 @@ icon_state = "red" }, /area/almayer/living/briefing) +"xGK" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/storage/box/lights/tubes{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/effect/decal/cleanable/ash{ + pixel_y = 19 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) +"xGT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) +"xHa" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/powercell, +/obj/effect/spawner/random/powercell, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_p) +"xHl" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/vehiclehangar) "xHp" = ( /turf/open/floor/almayer{ icon_state = "orange" }, /area/almayer/squads/alpha_bravo_shared) -"xHr" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/lights/tubes{ - pixel_x = -8 +"xHD" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/obj/item/storage/box/lights/tubes{ - pixel_x = 5 +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" }, -/obj/item/storage/box/lights/tubes{ - pixel_y = 10 +/area/almayer/maint/hull/upper/u_m_p) +"xHS" = ( +/obj/structure/reagent_dispensers/fueltank/oxygentank{ + anchored = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"xHx" = ( /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, -/area/almayer/maint/upper/u_m_s) -"xHC" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 32 +/area/almayer/engineering/lower/workshop/hangar) +"xHX" = ( +/obj/structure/sign/safety/restrictedarea{ + pixel_x = 8; + pixel_y = 32 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_f_p) +/area/almayer/maint/hull/lower/p_bow) "xId" = ( /obj/structure/surface/rack, /obj/item/mortar_shell/he, @@ -81208,14 +81484,6 @@ icon_state = "cargo" }, /area/almayer/medical/lower_medical_medbay) -"xIp" = ( -/obj/structure/surface/table/almayer, -/obj/item/card/id/visa, -/obj/item/tool/crew_monitor, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_s) "xIq" = ( /obj/structure/machinery/firealarm{ dir = 4; @@ -81240,24 +81508,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"xIy" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/lower/cryo_cells) -"xIB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) "xIQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, /turf/open/floor/almayer, /area/almayer/living/offices) +"xIV" = ( +/turf/open/floor/almayer, +/area/almayer/maint/upper/mess) "xIW" = ( /obj/structure/machinery/light{ dir = 4 @@ -81292,18 +81551,17 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"xJp" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) "xJH" = ( /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/squads/charlie_delta_shared) -"xJK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_p) "xJR" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -81320,16 +81578,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"xKo" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" +"xKG" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/largecrate/random, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/door_control{ + id = "Under Construction Shutters"; + name = "shutter-control"; + pixel_x = -25 }, -/area/almayer/maint/hull/upper/s_bow) +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "xKM" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -81376,9 +81636,28 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/general_equipment) -"xLp" = ( -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) +"xLn" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/s_stern) +"xLu" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_s) +"xLX" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_midship_hallway) "xMf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -81397,21 +81676,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"xMk" = ( -/obj/structure/stairs{ - dir = 8; - icon_state = "ramptop" - }, -/obj/effect/projector{ - name = "Almayer_Down3"; - vector_x = 1; - vector_y = -102 - }, -/obj/structure/machinery/light, -/turf/open/floor/plating/almayer{ - allow_construction = 0 - }, -/area/almayer/hallways/aft_hallway) "xMl" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -81422,6 +81686,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) +"xMm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_a_p) "xMs" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/operating_room_two) @@ -81450,6 +81723,26 @@ dir = 6 }, /area/almayer/command/cic) +"xMG" = ( +/obj/structure/machinery/door_control{ + id = "OuterShutter"; + name = "Outer Shutter"; + pixel_x = 5; + pixel_y = -2; + req_one_access_txt = "1;3" + }, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door_control{ + id = "OfficeSafeRoom"; + name = "Office Safe Room"; + pixel_x = 5; + pixel_y = 5; + req_one_access_txt = "1;3" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/panic) "xML" = ( /obj/structure/machinery/computer/cameras/wooden_tv/prop{ pixel_x = -4; @@ -81517,6 +81810,12 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) +"xNl" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "xNu" = ( /obj/structure/toilet{ dir = 1 @@ -81550,33 +81849,24 @@ icon_state = "plate" }, /area/almayer/living/auxiliary_officer_office) -"xNB" = ( -/obj/structure/machinery/light, -/obj/structure/sign/safety/security{ - pixel_y = -32 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_x = 15; - pixel_y = -32 +"xNM" = ( +/obj/structure/machinery/cm_vending/gear/vehicle_crew, +/turf/open/floor/almayer{ + icon_state = "cargo" }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) -"xNL" = ( +/area/almayer/hallways/lower/vehiclehangar) +"xOs" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/vehiclehangar) -"xNY" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/p_bow) -"xOb" = ( -/obj/docking_port/stationary/escape_pod/north, -/turf/open/floor/plating, -/area/almayer/maint/hull/lower/l_m_p) +/obj/structure/sign/poster/pinup{ + pixel_x = -30 + }, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/command/corporateliaison) "xOL" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -81606,6 +81896,26 @@ dir = 4 }, /area/almayer/medical/containment/cell) +"xPn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/lower/repair_bay) "xPq" = ( /obj/structure/filingcabinet, /obj/item/folder/yellow, @@ -81614,6 +81924,12 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop/hangar) +"xPu" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) "xPZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -81629,6 +81945,24 @@ }, /turf/open/floor/almayer, /area/almayer/command/cic) +"xQd" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_p) +"xQe" = ( +/obj/structure/machinery/vending/cigarette{ + density = 0; + pixel_y = 18 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_a_p) "xQg" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -81638,17 +81972,40 @@ icon_state = "bluecorner" }, /area/almayer/living/pilotbunks) +"xQj" = ( +/obj/item/pipe{ + dir = 4; + layer = 3.5 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "xQm" = ( /turf/open/floor/almayer/research/containment/floor2{ dir = 1 }, /area/almayer/medical/containment/cell) +"xQz" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/port_aft_hallway) "xQV" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"xQW" = ( +/obj/structure/sign/safety/bathunisex{ + pixel_x = -18 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_stern) "xRj" = ( /obj/structure/bed/chair{ dir = 8; @@ -81682,6 +82039,12 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"xRn" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "greencorner" + }, +/area/almayer/hallways/upper/aft_hallway) "xRw" = ( /turf/open/floor/almayer/uscm/directional{ dir = 1 @@ -81707,15 +82070,16 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) -"xRU" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 +"xSl" = ( +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 }, /turf/open/floor/almayer{ - dir = 10; - icon_state = "green" + dir = 4; + icon_state = "red" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/hallways/upper/stern_hallway) "xSw" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -81726,6 +82090,12 @@ }, /turf/open/floor/plating, /area/almayer/squads/charlie) +"xSx" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "xSz" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/status_display{ @@ -81736,15 +82106,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"xSI" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/emails{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/repair_bay) "xSM" = ( /obj/structure/machinery/light{ dir = 8 @@ -81775,24 +82136,23 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/containment) -"xTt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/stern_hallway) "xTu" = ( /obj/structure/pipes/vents/scrubber{ dir = 1 }, /turf/open/floor/almayer, /area/almayer/engineering/lower/engine_core) +"xTx" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/maint/hull/upper/u_f_p) +"xTG" = ( +/obj/structure/closet/emcloset, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/p_stern) "xTH" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger, @@ -81812,20 +82172,6 @@ icon_state = "plate" }, /area/almayer/living/numbertwobunks) -"xTQ" = ( -/obj/structure/surface/rack, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/sign/safety/fire_haz{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/p_bow) "xTR" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -81871,18 +82217,13 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"xUb" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/plating, -/area/almayer/maint/lower/constr) -"xUt" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, +"xUy" = ( +/obj/item/reagent_container/food/snacks/wrapped/barcardine, +/obj/structure/surface/rack, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/stern) +/area/almayer/maint/hull/upper/p_stern) "xUA" = ( /obj/structure/surface/table/almayer, /obj/item/storage/pouch/tools/tank, @@ -81899,23 +82240,25 @@ icon_state = "silver" }, /area/almayer/command/cic) -"xUS" = ( -/obj/structure/largecrate/random/secure, -/obj/effect/decal/warning_stripes{ - icon_state = "E" +"xUV" = ( +/obj/structure/bed/chair{ + dir = 4 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/hull/lower/l_a_p) -"xUV" = ( -/obj/structure/bed/chair{ +/area/almayer/command/combat_correspondent) +"xUY" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/command/combat_correspondent) +/area/almayer/maint/hull/lower/l_f_p) "xVc" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/door_control{ @@ -81944,11 +82287,6 @@ "xVk" = ( /turf/open/space, /area/space/almayer/lifeboat_dock) -"xVl" = ( -/turf/open/floor/almayer{ - allow_construction = 0 - }, -/area/almayer/shipboard/brig/main_office) "xVF" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -81978,18 +82316,28 @@ }, /turf/closed/wall/almayer, /area/almayer/living/tankerbunks) +"xVY" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/lower/port_midship_hallway) "xWd" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ icon_state = "orange" }, /area/almayer/squads/alpha_bravo_shared) -"xWh" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 +"xWo" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; + req_one_access = null; + req_one_access_txt = "19;21" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_a_p) +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/req) "xWp" = ( /turf/open/floor/almayer, /area/almayer/living/offices/flight) @@ -81999,17 +82347,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) -"xWI" = ( -/obj/structure/machinery/door_control{ - id = "panicroomback"; - name = "\improper Safe Room"; - pixel_x = -25; - req_one_access_txt = "3" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_s) "xWO" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = -25 @@ -82033,15 +82370,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"xWV" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/radio/intercom/alamo{ - layer = 2.9 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/living/offices/flight) "xXa" = ( /turf/open/floor/almayer{ dir = 8; @@ -82082,21 +82410,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"xXu" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_bow) -"xXD" = ( -/obj/item/clothing/shoes/red, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_m_p) -"xXG" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/lower/l_f_s) "xXT" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -82112,13 +82425,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"xXX" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/toolbox, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_bow) "xYf" = ( /obj/structure/machinery/cm_vending/clothing/sea, /turf/open/floor/almayer{ @@ -82126,6 +82432,12 @@ icon_state = "plating" }, /area/almayer/shipboard/sea_office) +"xYr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) "xYB" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -82133,6 +82445,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/starboard_point_defense) +"xYE" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "xYP" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) @@ -82142,16 +82460,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) -"xYS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "xYZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -82161,6 +82469,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering) +"xZf" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "blue" + }, +/area/almayer/hallways/upper/aft_hallway) "xZk" = ( /obj/item/prop/helmetgarb/gunoil{ layer = 4.2; @@ -82188,15 +82502,10 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"xZs" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_bow) +"xZz" = ( +/obj/item/paper/almayer_storage, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) "xZG" = ( /obj/structure/machinery/light{ dir = 4 @@ -82205,6 +82514,28 @@ /obj/structure/bed, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"xZH" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/almayer, +/area/almayer/maint/hull/upper/u_f_p) +"xZM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_umbilical) +"xZR" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) "xZU" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -82216,12 +82547,6 @@ icon_state = "cargo" }, /area/almayer/squads/charlie) -"yaa" = ( -/obj/structure/surface/rack, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_m_p) "yac" = ( /obj/structure/platform_decoration{ dir = 8 @@ -82231,22 +82556,18 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"yai" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"yap" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_f_s) -"yak" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/maint/hull/upper/u_f_s) +/area/almayer/hallways/lower/starboard_fore_hallway) "yaz" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor{ name = "\improper Officer's Study" @@ -82281,6 +82602,31 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) +"yaR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/stern_hallway) +"yaX" = ( +/obj/structure/machinery/door/poddoor/railing{ + dir = 2; + id = "vehicle_elevator_railing" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/lower/vehiclehangar) "yaZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -82290,25 +82636,26 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"ybf" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" +"ybk" = ( +/turf/closed/wall/almayer, +/area/almayer/hallways/upper/stern_hallway) +"ybm" = ( +/obj/structure/surface/table/almayer, +/obj/item/clothing/head/hardhat{ + pixel_x = 10; + pixel_y = 1 }, -/area/almayer/hallways/aft_hallway) -"ybq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/obj/item/clothing/suit/storage/hazardvest{ + pixel_x = -8; + pixel_y = 6 }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" +/obj/item/clothing/suit/storage/hazardvest/yellow, +/obj/item/clothing/suit/storage/hazardvest{ + pixel_x = 8; + pixel_y = 7 }, -/area/almayer/shipboard/panic) +/turf/open/floor/plating, +/area/almayer/maint/lower/constr) "ybz" = ( /obj/structure/machinery/brig_cell/cell_4{ pixel_x = 32; @@ -82316,16 +82663,14 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"ybU" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" +"ybP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/area/almayer/shipboard/brig/main_office) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_umbilical) "ybZ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/transmitter{ @@ -82354,6 +82699,9 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) +"ycl" = ( +/turf/open/floor/plating, +/area/almayer/maint/hull/lower/l_m_s) "ycm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -82385,6 +82733,14 @@ icon_state = "green" }, /area/almayer/squads/req) +"ycM" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_p) "ycZ" = ( /obj/structure/sign/poster{ pixel_y = 32 @@ -82394,19 +82750,15 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"ydb" = ( -/obj/structure/machinery/light/small{ +"ydf" = ( +/obj/structure/platform{ dir = 1 }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12 - }, -/obj/structure/prop/invuln/overhead_pipe{ - pixel_x = 12; - pixel_y = 12 +/obj/structure/largecrate/random/case, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/stern) +/area/almayer/maint/hull/upper/u_a_s) "ydh" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -82425,6 +82777,19 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) +"ydA" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/effect/projector{ + name = "Almayer_Up3"; + vector_x = -1; + vector_y = 102 + }, +/turf/open/floor/plating/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/lower/port_fore_hallway) "ydE" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -82466,12 +82831,6 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) -"ydR" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/s_bow) "ydY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -82480,27 +82839,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"yef" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/p_bow) -"yen" = ( -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/hull/upper/u_a_p) -"yeu" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/main_office) "yeH" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -82529,16 +82867,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"yeO" = ( -/obj/structure/window/framed/almayer, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "OfficeSafeRoom"; - name = "\improper Office Safe Room" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/panic) "yeR" = ( /obj/structure/machinery/cm_vending/clothing/senior_officer{ req_access = null; @@ -82547,6 +82875,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) +"yfd" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/vehiclehangar) "yff" = ( /obj/structure/machinery/cm_vending/clothing/dress{ density = 0; @@ -82559,6 +82893,13 @@ icon_state = "cargo" }, /area/almayer/command/cic) +"yfg" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/lower/starboard_midship_hallway) "yfm" = ( /obj/effect/landmark/start/marine/delta, /obj/effect/landmark/late_join/delta, @@ -82566,24 +82907,13 @@ icon_state = "plate" }, /area/almayer/squads/delta) -"yfv" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/aft_hallway) -"yfw" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" +"yfy" = ( +/obj/structure/barricade/handrail{ + dir = 1; + pixel_y = 2 }, -/area/almayer/hallways/starboard_hallway) +/turf/open/floor/almayer, +/area/almayer/hallways/lower/port_fore_hallway) "yfG" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -82596,6 +82926,41 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"yfL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/structure/bed/sofa/south/white/left{ + pixel_y = 16 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "silver" + }, +/area/almayer/maint/hull/upper/u_m_p) +"yfO" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + name = "\improper Warden's Office"; + closeOtherId = "brigwarden" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "Warden Office Shutters"; + name = "\improper Privacy Shutters" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/warden_office) "yfS" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -82603,10 +82968,6 @@ }, /turf/open/floor/plating, /area/almayer/living/grunt_rnr) -"ygb" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_m_p) "yge" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/almayer/vehicle{ @@ -82616,12 +82977,44 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"ygo" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 +"ygp" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ygv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/safety/nonpress_ag{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/west{ + pixel_y = -32 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_p) +"ygB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "green" + }, +/area/almayer/hallways/lower/starboard_midship_hallway) +"ygP" = ( +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/obj/structure/surface/table/almayer, +/obj/item/fuel_cell, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering/lower/engine_core) "yhg" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -82630,39 +83023,51 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"yhx" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/clothing/glasses/welding{ - pixel_x = 8; - pixel_y = 3 - }, -/obj/item/tool/weldingtool{ - pixel_x = -11; - pixel_y = 5 - }, -/obj/structure/machinery/light/small{ - dir = 1 +"yht" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "red" }, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/living/cryo_cells) "yhI" = ( /turf/open/floor/almayer{ dir = 4; icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"yiq" = ( -/obj/structure/sign/safety/north{ - pixel_x = -17; - pixel_y = -8 +"yhR" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_s) +"yhV" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "Bathroom" }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/mp_bunks) +"yhZ" = ( +/turf/closed/wall/almayer/reinforced, +/area/almayer/maint/hull/lower/p_bow) +"yia" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) +"yih" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/maint/hull/lower/l_m_s) "yit" = ( /obj/structure/machinery/light{ dir = 4 @@ -82705,18 +83110,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/morgue) -"yjf" = ( -/obj/structure/machinery/door/airlock/almayer/generic/glass{ - name = "\improper Passenger Cryogenics Bay" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/hull/upper/u_m_p) -"yjl" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/p_bow) "yjq" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ icon_state = "almayer_pdoor"; @@ -82726,6 +83119,15 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/notunnel) +"yjE" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/stern) "yjG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -82749,9 +83151,6 @@ icon_state = "emeraldfull" }, /area/almayer/living/briefing) -"ykg" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/upper/u_m_p) "ykj" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -82763,34 +83162,88 @@ icon_state = "test_floor4" }, /area/almayer/living/grunt_rnr) -"ykB" = ( -/obj/structure/bed/chair{ +"yko" = ( +/obj/vehicle/powerloader, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform{ dir = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/lower/l_f_s) +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/lower/repair_bay) +"ykv" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "InnerShutter"; + name = "\improper Saferoom Shutters" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/panic) "ykI" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) -"ykP" = ( -/obj/structure/filingcabinet{ - density = 0; - pixel_x = -8; - pixel_y = 18 +"ykY" = ( +/obj/structure/machinery/light/small{ + dir = 1 }, -/obj/structure/filingcabinet{ - density = 0; - pixel_x = 8; - pixel_y = 18 +/obj/structure/closet/crate, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 }, -/obj/item/device/taperecorder, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 }, -/area/almayer/shipboard/brig/main_office) +/obj/item/ammo_magazine/rifle/l42a/ap{ + current_rounds = 0 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_m_s) "ylc" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -82825,23 +83278,23 @@ icon_state = "test_floor5" }, /area/almayer/engineering/lower/engine_core) -"ylJ" = ( -/obj/structure/sign/safety/maint{ +"ylN" = ( +/obj/structure/sign/safety/galley{ pixel_x = 8; pixel_y = 32 }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" +/turf/open/floor/almayer, +/area/almayer/hallways/lower/starboard_aft_hallway) +"ymg" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 }, -/area/almayer/hallways/stern_hallway) -"yma" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/maint/hull/upper/u_m_s) +/area/almayer/maint/hull/lower/l_f_p) (1,1,1) = {" aaa @@ -90203,13 +90656,13 @@ dhd oog jNT fag -jVP -feb -feb -feb -feb -feb +qCA feb +hRu +hRu +hRu +hRu +hRu ajZ aaa aaa @@ -90407,12 +90860,12 @@ nPb fZX dBS nSu -wld -mtl -jjm -wZN -kgQ -feb +rXE +xyN +ltO +tBP +tfE +hRu aag aaf ajY @@ -90597,8 +91050,8 @@ aaa aaa aaa aad -sOq -sOq +uDg +uDg hPI pQr rib @@ -90611,13 +91064,13 @@ qVF xdJ kzr jqY -kBh -jNT -jNT -wSK -feb -lFL -lFL +elV +dJJ +dJJ +glP +hRu +xiV +xiV ajZ aaa aaa @@ -90799,9 +91252,9 @@ aaf aaf aaf aaf -sOq -sOq -ryg +uDg +uDg +lHk naB wnw pHp @@ -90814,14 +91267,14 @@ mtl mtl mtl ewI -mtl -xzO -pNk -jIH -mtl -ktH -lFL -lFL +xyN +hdQ +hUU +cXD +xyN +igS +xiV +xiV aaf aaf aaf @@ -90995,19 +91448,19 @@ aaa aaa aaa aad -sOq -sOq -sOq -sOq -sOq -sOq -sOq -sOq -nkE -mjC +uDg +uDg +uDg +uDg +uDg +uDg +uDg +uDg +aPN +lSJ naB pQr -jRH +jeR wvI vPf fvA @@ -91017,21 +91470,21 @@ tul mNK gtU bjk -mtl -mtl -mtl -mtl -mtl -vFB -gWL -lFL -lFL -lFL -lFL -lFL -lFL -lFL -lFL +xyN +xyN +xyN +xyN +xyN +iuf +pnh +xiV +xiV +xiV +xiV +xiV +xiV +xiV +xiV ajZ aaa aaa @@ -91198,16 +91651,16 @@ aaa aaa aaa aad -sOq -hNh -sjC -pjr -fHY -aXV -pjr -unI -mIQ -bKG +uDg +cth +gkr +xkc +oGj +hSj +xkc +mph +nlh +rGr naB naB naB @@ -91223,18 +91676,18 @@ rdA alF sql alF -kAk -xXu -ogI -uwJ -hIl -xXu -ubB -csT -xXu -xXu -jIU -lFL +rwe +pdp +hZw +xYr +mjs +pdp +ohu +iUh +pdp +pdp +kSn +xiV ajZ bdH bdH @@ -91401,19 +91854,19 @@ bdH aac aaf aag -sOq -sjC -pjr -sjC -qPC -tla -vcg -xqm -pjr -vnU +uDg +gkr +xkc +gkr +vAg +gxI +kqC +bBU +xkc +eeA naB pQr -dFH +ggS wvI piK fvA @@ -91429,15 +91882,15 @@ xkd xkd xkd xkd -wUc -hfx -kvj -kWA -idf -tyH -tyH -xXu -lFL +lRt +tsE +iVG +hmA +hmZ +oDh +oDh +pdp +xiV aag aaf ajY @@ -91603,17 +92056,17 @@ bdH bdH aad aag -sOq -sOq -sjC -pjr -vBm -vBm -vBm -vBm -vBm -qmC -vBm +uDg +uDg +gkr +xkc +hvd +hvd +hvd +hvd +hvd +mze +eyD naB kry pHp @@ -91638,10 +92091,10 @@ xkd xkd xkd xkd -xXu -tyH -lFL -lFL +pdp +oDh +xiV +xiV aag ajZ bdH @@ -91806,17 +92259,17 @@ bdH bdH aad aag -sOq -pnI -sjC -hNh -vBm -rBV -oPk -mqo -vBm -eRL -puv +uDg +pOp +gkr +cth +hvd +ddj +wlg +fuY +hvd +cQG +jXc naB pQr bsp @@ -91841,10 +92294,10 @@ uns vCy eyV xkd -nWt -tyH -xXu -lFL +mkF +oDh +pdp +xiV aag ajZ bdH @@ -92009,17 +92462,17 @@ bdH bdH aad aag -sOq -naN -pjr -lHE -vBm -ldu -wgi -wgi -ckS -eRL -sDV +uDg +lDT +xkc +xyZ +hvd +vGn +ehl +ehl +uXu +cQG +alp naB naB naB @@ -92044,10 +92497,10 @@ xGh jVa wDs xkd -abN -tyH -xXu -lFL +oHf +oDh +pdp +xiV aag ajZ bdH @@ -92212,23 +92665,23 @@ bdH bdH aad aag -sOq -pjr -sjC -vBm -vBm -sFC -sFC -sFC -vBm -lOI -pJv -jLM -sXy -cMb -rbi -kwU -xys +uDg +xkc +gkr +hvd +hvd +iRp +iRp +iRp +hvd +cyc +vzy +fqQ +kHo +sFu +hnE +tTO +wFs nkX iQB cmv @@ -92248,9 +92701,9 @@ tUx wRN xkd xkd -xXu -tyH -lFL +pdp +oDh +xiV aag ajZ bdH @@ -92318,10 +92771,10 @@ aaa bdH aad aag -tNf -tNf -tNf -tNf +nBJ +nBJ +nBJ +nBJ aag dqw uwv @@ -92343,10 +92796,10 @@ dqw aag aag aag -tQN -tQN -tQN -tQN +wid +wid +wid +wid aag ajZ bdH @@ -92415,23 +92868,23 @@ bdH bdH aad aag -ocS -pjr -sjC -vBm -ykP -xAj -xhE -xhE -vBm -hKq -lwK -hrO -xsg -xsg -grF -xVl -uqy +lrE +xkc +gkr +hvd +iUX +gii +gIO +gIO +hvd +gYx +oyC +bKI +xhU +xhU +jCX +sEz +iNh wdF wdF wdF @@ -92451,9 +92904,9 @@ tUx xJe qLt xkd -xXu -tyH -pqG +pdp +oDh +cPj aag etE bdH @@ -92521,9 +92974,9 @@ aaa bdH aad aag -tNf -sOH -dRN +nBJ +kJc +jFt bAs bAs bAs @@ -92547,9 +93000,9 @@ bTT bTT bTT bAs -oFb -obx -tQN +kOR +jYM +wid aag ajZ bdH @@ -92618,23 +93071,23 @@ bdH bdH aad aag -ocS -sjC -pjr -vBm -ykP -xjG -ssD -gcT -rmv -eRL -eRL -rhl -gcT -gcT -xVl -gcT -lxy +lrE +gkr +xkc +hvd +iUX +gJE +cKJ +hyV +keG +cQG +cQG +ugw +cwC +cwC +sEz +cwC +uun oRk oRk oRk @@ -92654,9 +93107,9 @@ ycm qCo pWr xkd -xXX -tyH -pqG +aGa +oDh +cPj aag ajZ bdH @@ -92724,9 +93177,9 @@ aaa bdH aad aag -tNf -jln -vXr +nBJ +rUi +grv bBA bAK bCY @@ -92750,9 +93203,9 @@ acr bPG acN bBA -nHN -sjZ -tQN +gTK +fWg +wid aag ajZ bdH @@ -92821,9 +93274,9 @@ bdH bdH aad aag -ocS -lYZ -pjr +lrE +vDh +xkc lrq lrq lrq @@ -92831,8 +93284,8 @@ lrq lrq lrq lrq -cxA -uwS +uhA +aaP tpn tpn srT @@ -92857,9 +93310,9 @@ cyZ jVa fJT xkd -mPQ -xXu -pqG +rfB +pdp +cPj aag eSU bdH @@ -92927,9 +93380,9 @@ aaa bdH aad aag -tNf -pDk -wjN +nBJ +uRR +mFQ bBA hWJ bCY @@ -92953,9 +93406,9 @@ bHP bPG hpk bBA -rAk -szS -tQN +yhZ +wtD +wid aag ajZ bdH @@ -93024,9 +93477,9 @@ bdH bdH aad aag -sOq -hNh -vtH +uDg +cth +qsp lrq kEc chv @@ -93034,8 +93487,8 @@ cAy uhE vKB lrq -szR -cZj +vjB +gIz tpn eVR cak @@ -93060,9 +93513,9 @@ dfk vzz moB xkd -pVg -xXu -lFL +gNZ +pdp +xiV aag ajZ bdH @@ -93130,9 +93583,9 @@ aaa bdH aad aag -tNf -qqi -fvs +nBJ +ecS +eQR gol akb bCY @@ -93156,9 +93609,9 @@ bPn bPG ald gol -kuI -lGZ -tQN +sGK +hLu +wid aag ajZ bdH @@ -93227,9 +93680,9 @@ bdH bdH aad aag -sOq -tnD -sjC +uDg +cUl +gkr lrq heo nqe @@ -93237,8 +93690,8 @@ nqe nqe nqe tLa -eRL -igt +cQG +gfd tpn rqS cak @@ -93263,9 +93716,9 @@ eZH tUx cXi xkd -vFr -xXu -lFL +ttB +pdp +xiV aag twB bdH @@ -93333,9 +93786,9 @@ aaa bdH aad aag -tNf -fvs -neX +nBJ +eQR +xAu bBA bAN bCY @@ -93359,9 +93812,9 @@ bPo bPG acs bBA -edx -kuI -tQN +xHX +sGK +wid aag ajZ bdH @@ -93430,9 +93883,9 @@ bdH bdH aad aag -ocS -nMT -sjC +lrE +vOM +gkr lrq kui uqo @@ -93440,8 +93893,8 @@ pId qMD uqo lrq -sYi -sYE +nVm +dRA tpn gIU xIq @@ -93466,9 +93919,9 @@ nYd thL jVa fgR -pwx -tyH -pqG +nEc +oDh +cPj aag ajZ bdH @@ -93536,9 +93989,9 @@ aaa bdH aad aag -tNf -cCG -iWW +nBJ +ldF +eox bBA bAO bCZ @@ -93562,9 +94015,9 @@ bDW bPJ iuz bBA -aGh -bjh -tQN +mVh +uMf +wid aag ajZ bdH @@ -93633,18 +94086,18 @@ bdH bdH aad aag -ocS -lFv -pjr +lrE +etN +xkc lrq sEZ nqe nqe nqe nqe -vcL -eRL -wfB +mza +cQG +qvE tpn tpn tpn @@ -93669,9 +94122,9 @@ liZ rUk jVa fgR -xGv -tht -pqG +azg +gKv +cPj aag rEr bdH @@ -93739,9 +94192,9 @@ aaa bdH aad aag -tNf -cCG -fvs +nBJ +ldF +eQR bBA bAP aqu @@ -93765,9 +94218,9 @@ aqu aqu bQz bBA -kuI -tDw -tQN +sGK +vOG +wid aag ajZ bdH @@ -93836,9 +94289,9 @@ bdH bdH aad aag -ocS -sjC -pjr +lrE +gkr +xkc lrq dEX fxJ @@ -93846,13 +94299,13 @@ fxJ fAr qmU lrq -hZU -cWs -fAE -kHa -frX -mHA -kHa +dmr +wLS +aVm +cmM +miy +iUG +cmM snX oIh oIh @@ -93872,9 +94325,9 @@ uaU rUk xaM fgR -tDq -xXu -pqG +hIG +pdp +cPj aag ajZ bdH @@ -93942,9 +94395,9 @@ aaa bdH aad aag -tNf -uAN -cCG +nBJ +vCE +ldF bBA bBu amg @@ -93968,9 +94421,9 @@ amg amg rAD bBA -kuI -aGh -tQN +sGK +mVh +wid aag ajZ bdH @@ -94039,9 +94492,9 @@ bdH bdH aad aag -sOq -pjr -pjr +uDg +xkc +xkc lrq iwV iwV @@ -94049,13 +94502,13 @@ iwV iwV lrq lrq -gob -cWs -irF -kHa -rEQ -xmX -eGr +kXt +wLS +eBx +cmM +hAf +cNI +bbi wdF wdF wdF @@ -94075,9 +94528,9 @@ uxa iZU nhG xkd -tyH -qnN -lFL +oDh +uqg +xiV aag uJk bdH @@ -94145,9 +94598,9 @@ aaa bdH aad aag -tNf -pTQ -fvs +nBJ +amu +eQR bBA bBu amg @@ -94171,9 +94624,9 @@ amg amg rAD bBA -oac -eEq -tQN +ozH +flr +wid aag ajZ bdH @@ -94242,9 +94695,9 @@ bdH bdH aad aag -sOq -sjC -lgM +uDg +gkr +old cQv oVf rmx @@ -94252,13 +94705,13 @@ bvH evR cQv cQv -vtD -rAX -kHa -kHa -lRe -mvR -kHa +rmk +nuZ +cmM +cmM +pdT +otp +cmM tzd tzd sgi @@ -94278,9 +94731,9 @@ tov thL sUs xkd -pVg -xXu -lFL +gNZ +pdp +xiV aag ajZ bdH @@ -94348,9 +94801,9 @@ aaa bdH aad aag -tNf -bHC -fvs +nBJ +kMW +eQR bBA bBv aqu @@ -94374,9 +94827,9 @@ tkq aqu bQG bBA -irA -aGh -tQN +uoO +mVh +wid aag ajZ bdH @@ -94445,9 +94898,9 @@ bdH bdH aad aag -ocS -sjC -ogi +lrE +gkr +wJC cQv cBw kde @@ -94455,13 +94908,13 @@ kde ajj mZQ cQv -vgW -igt -swn -rpF -tQm -ond -swn +dFl +tUK +kTp +sYl +fgt +kCY +kTp gHt oIh eNR @@ -94481,9 +94934,9 @@ tov thL xhx fgR -tyH -xXu -pqG +oDh +pdp +cPj aag scz bdH @@ -94551,9 +95004,9 @@ aaa bdH aad aag -tNf -eYN -fvs +nBJ +iWJ +eQR bBA bBx amg @@ -94577,9 +95030,9 @@ bPq amg rAD bBA -kuI -ucU -tQN +sGK +nhV +wid aag ajZ bdH @@ -94648,9 +95101,9 @@ bdH bdH aad aag -ocS -sjC -eDN +lrE +gkr +wMF cQv eaf bEv @@ -94658,13 +95111,13 @@ quj vgi rXd cqJ -ldu -igt -swn -dfO -dQv -doj -swn +oJm +tUK +kTp +hUh +nWS +xpw +kTp neC mjt vqc @@ -94684,9 +95137,9 @@ iFc thL tUx fgR -xXu -tDq -pqG +pdp +hIG +cPj aag ajZ bdH @@ -94754,9 +95207,9 @@ aaa aac aag aag -tNf -tzw -pcY +nBJ +dKS +ffN bBA bBy amg @@ -94780,9 +95233,9 @@ aoa amg bQE bBA -dkR -kuI -tQN +bME +sGK +wid aag aag ajY @@ -94851,9 +95304,9 @@ bdH bdH aad aag -ocS -pjr -lYZ +lrE +xkc +vDh cQv eaf bEv @@ -94861,13 +95314,13 @@ lEe pGT pGT vkM -sjc -xYS -kHa -qPO -wuc -qPO -qPO +ksm +bxE +cmM +oeZ +uzH +oeZ +oeZ ptq oRk eNR @@ -94887,9 +95340,9 @@ thL thL tUx fgR -xXu -rlY -pqG +pdp +aCA +cPj aag okD bdH @@ -94956,10 +95409,10 @@ aaa aaa aad aag -tNf -tNf -fvs -phn +nBJ +nBJ +eQR +bTW bBA bBz aqu @@ -94983,10 +95436,10 @@ bEx aqu bQI bBA -xTQ -kuI -tQN -tQN +gsy +sGK +wid +wid aag ajZ aaa @@ -95054,9 +95507,9 @@ bdH bdH aad aag -sOq -pjr -pjr +uDg +xkc +xkc cQv eaf bEv @@ -95064,13 +95517,13 @@ vyH ajj rXd cqJ -ldu -igt -swn -plI -dQv -lNN -qPO +oJm +tUK +kTp +uLE +nWS +cTy +oeZ emp emp emp @@ -95090,9 +95543,9 @@ thL thL tUx xkd -xXu -xNY -lFL +pdp +vhA +xiV aag ajZ bdH @@ -95159,10 +95612,10 @@ aaa aaa aad aag -tNf -cCG -cCG -oVn +nBJ +ldF +ldF +xiP bBA lsV amg @@ -95186,10 +95639,10 @@ bPC amg pyL bBA -nrG -kuI -ucU -tQN +cDb +sGK +nhV +wid aag ajZ bdH @@ -95257,9 +95710,9 @@ bdH bdH aad aag -sOq -naN -pjr +uDg +lDT +xkc cQv eaf bEv @@ -95267,13 +95720,13 @@ sBg uGN rXd cQv -gax -igt -swn -vsM -dQv -ebv -qPO +mAY +tUK +kTp +hoW +nWS +aIY +oeZ cFC oIh lUm @@ -95293,9 +95746,9 @@ thL thL tUx xkd -xXu -tyH -lFL +pdp +oDh +xiV aag ajZ bdH @@ -95361,11 +95814,11 @@ aaf aaf aaf aag -tNf -tNf -cCG -fvs -grf +nBJ +nBJ +ldF +eQR +uFp bBA bBA tiR @@ -95382,18 +95835,18 @@ cmJ alU alU alU -jAi -jAi -jAi -jAi -aib -jAi -jAi -hNJ -aGh -kuI -tQN -tQN +pzW +pzW +pzW +pzW +hNB +pzW +pzW +ipB +mVh +sGK +wid +wid aag aaf aaf @@ -95460,9 +95913,9 @@ bdH bdH aad aag -sOq -sjC -vtH +uDg +gkr +qsp cQv xLl bEv @@ -95470,13 +95923,13 @@ kde ajj tuk cQv -rzY -igt -swn -skq -dQv -hhW -qPO +kYU +tUK +kTp +vKF +nWS +glG +oeZ ehX mTN hZJ @@ -95496,9 +95949,9 @@ tUx vsz oEE xkd -pVg -xXu -lFL +gNZ +pdp +xiV aag ajZ bdH @@ -95561,18 +96014,18 @@ aaa aaa aad aag -tNf -tNf -tNf -tNf -cCG -cCG -oZF -oZF -oZF -hLW -bOy -cLk +nBJ +nBJ +nBJ +nBJ +ldF +ldF +bos +bos +bos +haR +uHT +jHn kcp bWJ nar @@ -95585,21 +96038,21 @@ aoi grG bXY alU -xsW -uBn -wJw -bEz -bzA -dRw -bzy -bzy -bzy -aGh -kuI -tQN -tQN -tQN -tQN +xNM +ikl +eLp +dFM +lEV +mZP +sDx +sDx +sDx +mVh +sGK +wid +wid +wid +wid aag ajZ aaa @@ -95662,10 +96115,10 @@ aaa bdH bdH aad -sOq -sOq -pjr -vnU +uDg +uDg +xkc +eeA cQv dzG kde @@ -95673,13 +96126,13 @@ ioV cQv tlk cQv -cxA -suc -qPO -qPO -wuc -qPO -qPO +uhA +bKN +oeZ +oeZ +uzH +oeZ +oeZ mFc eKa emp @@ -95693,16 +96146,16 @@ bQc pgP uVV iBl -wIC -smZ -smZ -wIC -tMH -wIC -cBQ -xXu -lFL -lFL +cHk +rkV +rkV +cHk +yfO +cHk +pRs +pdp +xiV +xiV ajZ bdH bdH @@ -95764,18 +96217,18 @@ aaa aaa aad aag -tNf -naW -cCG -fvs -cCG -eFI -oZF -luJ -bOy -nrh -bOy -jrN +nBJ +fUz +ldF +eQR +ldF +ikA +bos +gpO +uHT +bKP +uHT +sGQ kcp wMv nCR @@ -95788,21 +96241,21 @@ aoi bNk ecZ alU -bNW -uBn -fut -pqQ -pqQ -pqQ -bzA -rEu -bzy -aGh -ffX -aGh -lHV -ftA -tQN +odt +ikl +qAy +mua +mua +mua +lEV +eQz +sDx +mVh +fJu +mVh +roj +qzA +wid aag ajZ aaa @@ -95865,20 +96318,20 @@ aaa bdH bdH aad -sOq -vvj -sjC -mzk +uDg +hzN +gkr +krG cQv rdM gUg cov cqJ -hNl -tak -uhW -uJs -tsX +may +hoK +mcp +hzG +eyD ngr cDN peO @@ -95896,16 +96349,16 @@ emp lFJ emp emp -wIC -puE -crp -dco -dqZ -wIC -fGB -tyH -xXu -lFL +cHk +hlI +ekZ +kvL +oix +cHk +uxb +oDh +pdp +xiV ajZ bdH bdH @@ -95967,14 +96420,14 @@ aaa aaa aad aag -tNf -cvL -cCG -fvs -cCG -sep -oZF -luJ +nBJ +lJM +ldF +eQR +ldF +lyP +bos +gpO kcp kcp iqp @@ -95991,21 +96444,21 @@ cmJ alU alU alU -bOe -nrt -qyF -ecR -uOc -uOc -uOc -bPj -bzy -laB -aGh -kuI -kuI -ucU -tQN +wrr +kjw +hBr +tqQ +hgp +hgp +hgp +nef +sDx +mXm +mVh +sGK +sGK +nhV +wid aag ajZ aaa @@ -96068,20 +96521,20 @@ aaa bdH bdH aad -sOq -vEq -sjC +uDg +fHb +gkr vxM vxM vxM vxM vxM vxM -qlS -eRL -eRL -uJs -tsX +tfZ +cQG +cQG +hzG +eyD tdy cDN oFY @@ -96099,16 +96552,16 @@ qUz ksg oIh iTl -wIC -cBZ -hMc -vAG -jIo -wIC -wIC -tyH -xXu -lFL +cHk +frt +vUI +tgJ +wVh +cHk +cHk +oDh +pdp +xiV ajZ bdH bdH @@ -96170,14 +96623,14 @@ aaa aaa aad aag -tNf -fvs -fvs -cCG -fvs -hdO -oZF -luJ +nBJ +eQR +eQR +ldF +eQR +sxS +bos +gpO kcp bBD bTS @@ -96185,30 +96638,30 @@ bTS lxo qcy kcp -kmk -kmk -mIJ -bLt -bXX -bKh -egq -bKh -bNp -fsd -bKj -jjs -jjs -jjs -jjs -jjs -jYd +sub +sub +tqf +pHF +vYd +ghF +eSp +ghF +aFG +pPQ +juS +mdk +mdk +mdk +mdk +mdk +kCd bSv bSv bSv bSv bSv -kuI -tQN +sGK +wid aag ajZ aaa @@ -96271,20 +96724,20 @@ aaa bdH bdH aad -sOq -pjr -sjC +uDg +xkc +gkr vxM rfY kGu iqR fyp wJh -ldu -eRL -eRL -uJs -diP +oJm +cQG +cQG +hzG +asC tff cDN oFY @@ -96302,16 +96755,16 @@ oDy wsq vxK gwj -rCU -jPS -jPS -sJm -dqZ -rDY -wIC -xXu -wkw -lFL +vxh +csy +csy +bWQ +deH +szG +cHk +pdp +kIf +xiV ajZ bdH bdH @@ -96373,14 +96826,14 @@ aaa aaa aad aag -tNf -cCG -cCG -dzU -vAB -gsA -oZF -bOy +nBJ +ldF +ldF +wcJ +jCr +nQn +bos +uHT kcp bTR iEg @@ -96388,30 +96841,30 @@ oQM aqI aqI kcp -jaK -jxP -xNL -bLu -bBB -bBB -bBB -bBB -bNp -mYY -nka -afz -afz -afz -afz -afz -iDd +bOw +mYt +jsR +vPW +vyB +vyB +vyB +vyB +aFG +vFp +yaX +sje +sje +sje +sje +sje +jhS qih bTH foN cDZ bSv -lGZ -tQN +hLu +wid aag ajZ aaa @@ -96474,20 +96927,20 @@ aaa bdH aac aag -sOq -oAr -pjr +uDg +kac +xkc vxM tQi wee wee fRS wJh -yeu -sjc -rVm -mMZ -aDM +iFK +ksm +haY +kaQ +vNT oSC uFq wsl @@ -96505,16 +96958,16 @@ mBx utZ pyj jPP -wIC -xpo -xqs -rWF -uSB -lzY -wIC -xXu -xjh -lFL +cHk +wxF +vJc +kUg +ifz +fyI +cHk +pdp +ome +xiV aag ajY bdH @@ -96576,14 +97029,14 @@ aaa aaa aad aag -tNf -qqi -cCG -oZF -oZF -oZF -oZF -bOy +nBJ +ecS +ldF +bos +bos +bos +bos +uHT kcp lxW hPh @@ -96591,30 +97044,30 @@ wGX bFr ppe kcp -bzA -bKh -bKh -hcs -kCS -kCS -kCS -kCS -hHJ -iWL -bkD -afz -afz -afz -afz -afz -iDd +lEV +ghF +ghF +jak +jdC +jdC +jdC +jdC +wiQ +dEo +fGd +sje +sje +sje +sje +sje +jhS bSv tjw bTH bTV bSv -kuI -tQN +sGK +wid aag ajZ aaa @@ -96677,20 +97130,20 @@ bdH bdH aad aag -sOq -eUe -vtH +uDg +fco +qsp vxM jvP rDQ rDQ rDQ ctT -mLJ -bua -ybU -vBm -tsX +wXz +aNW +tvJ +eyD +eyD tsX tsX epu @@ -96711,13 +97164,13 @@ lnh wIC rWn rWn -wIC -wIC -wHM -wIC -pEp -rlY -lFL +cHk +cHk +gxt +cHk +dJy +aCA +xiV aag ajZ bdH @@ -96779,14 +97232,14 @@ aaa aaa aad aag -tNf -fvs -cCG -oZF -uDl -eZK -oZF -gzE +nBJ +eQR +ldF +bos +vkO +ibf +bos +rIw kcp wTN kZN @@ -96794,30 +97247,30 @@ rgK hbu iYe bJl -bKa -bKa -bKa -gCl -bzA -bzA -bzA -bzA -bNp -pqQ -nka -afz -afz -afC -afz -afz -bRx +yfd +yfd +yfd +kgS +lEV +lEV +lEV +lEV +aFG +mua +yaX +sje +sje +oiX +sje +sje +rqQ bSv ifb bTH bSv xVT -eEq -tQN +flr +wid aag ajZ aaa @@ -96880,19 +97333,19 @@ bdH bdH aad aag -sOq -naN -pjr +uDg +lDT +xkc vxM sbP sbP sbP sbP wJh -ekF -uif -vBm -vBm +oWK +jwr +eyD +eyD tHr mqg udR @@ -96906,7 +97359,7 @@ xuZ xuZ xuZ rEY -lfa +gxU giR vUP wIC @@ -96915,12 +97368,12 @@ dgx fKi vxG wIC -xgI -dBQ -wIC -gOu -tDq -lFL +whQ +bHu +cHk +oLf +hIG +xiV aag ajZ bdH @@ -96982,14 +97435,14 @@ aaa aaa aad aag -tNf -cCG -fvs -oZF -ueH -oTn -oZF -luJ +nBJ +ldF +eQR +bos +lBl +nEO +bos +gpO kcp oMi bAZ @@ -96997,30 +97450,30 @@ bTS bTS niR kcp -bzA -bKh -bKh -bLt -bzA -bKh -bKh -bKh -bNp -pqQ -fti -afz -afz -afz -afz -afz -iDd +lEV +ghF +ghF +pHF +lEV +ghF +ghF +ghF +aFG +mua +hoc +sje +sje +sje +sje +sje +jhS bSv aIX aIX bSv -gib -yjl -tQN +xcI +sIu +wid aag ajZ aaa @@ -97083,18 +97536,18 @@ bdH bdH aad aag -sOq -pjr -sjC +uDg +xkc +gkr vxM pas ncf kjk qxr wJh -ekF -ugT -qqC +oWK +rPF +pfd ceZ jnD hUW @@ -97118,12 +97571,12 @@ jPS jPS xrt wIC -qqV -nNg -wIC -tyH -yef -lFL +aDt +jTU +cHk +oDh +xas +xiV aag ajZ bdH @@ -97185,14 +97638,14 @@ aaa aaa aad aag -tNf -cCG -fvs -jtv -luJ -luJ -oZF -luJ +nBJ +ldF +eQR +rqv +gpO +gpO +bos +gpO kcp kcp kcp @@ -97200,30 +97653,30 @@ sXE kcp kcp kcp -bzA -bBB -bBB -bLt -bzA -bKh -bBB -bBB -bNp -xgx -nka -afz -afz -afz -afz -afz -iDd +lEV +vyB +vyB +pHF +lEV +ghF +vyB +vyB +aFG +pJq +yaX +sje +sje +sje +sje +sje +jhS bSv cop cop bSv -oLa -kuI -tQN +kxe +sGK +wid aag ajZ aaa @@ -97286,18 +97739,18 @@ bdH bdH aad aag -sOq -pjr -sjC +uDg +xkc +gkr vxM vxM vxM vxM vxM gaJ -hmG -xys -vBm +vMJ +qFX +cAR vGA hUW dHd @@ -97321,12 +97774,12 @@ qFi vAG hsj wIC -wIC -wIC -wIC -tyH -pwx -lFL +cHk +cHk +cHk +oDh +nEc +xiV aag ajZ bdH @@ -97388,45 +97841,45 @@ aaa aaa aad aag -tNf -cCG -fvs -oZF -vfn -luJ -oZF -luJ -jSz +nBJ +ldF +eQR +bos +iWH +gpO +bos +gpO +nEZ kcp bTU gZK bTS lyX kcp -bAr -bKh -bBB -bLt -bzA -bKh -bBB -bKh -bNp -fsd -bKj -eGg -eGg -eGg -eGg -eGg -jYd +rMj +ghF +vyB +pHF +lEV +ghF +vyB +ghF +aFG +pPQ +juS +jjl +jjl +jjl +jjl +jjl +kCd bSv kBY bTn bSv -aGh -aGh -tQN +mVh +mVh +wid aag ajZ aaa @@ -97489,18 +97942,18 @@ aaf aaf aag aag -sOq -tnD -pjr -ugt -pjr -ixl -vBm -tJM -viH -lCp -ttE -vBm +uDg +cUl +xkc +ode +xkc +gNg +cAR +dRj +yhV +jvc +jEV +cAR iuE uwN vka @@ -97524,12 +97977,12 @@ jhI jfY bra wIC -ssx -sdP -htn -tyH -xXu -lFL +eQm +rXQ +vky +oDh +pdp +xiV aag aag aaf @@ -97587,53 +98040,53 @@ aaa aaa aaa aaa -tNf -tNf -tNf -tNf -tNf -fvs -cCG -oZF -oZF -fCG -oZF -bOy -nkR +nBJ +nBJ +nBJ +nBJ +nBJ +eQR +ldF +bos +bos +olW +bos +uHT +gUi kcp onY wdf bTS kcp kcp -bzy -bKh -bBB -bLt -bzA -bKh -bBB -bKh -bzy -tBz -fBD -ntt -jXk -hdh -hdh -hdh -bRD +sDx +ghF +vyB +pHF +lEV +ghF +vyB +ghF +sDx +prl +gNy +fbU +vbZ +qEl +qEl +qEl +vWs bSv bSv bSv bSv -kuI -aGh -tQN -tQN -tQN -tQN -tQN +sGK +mVh +wid +wid +wid +wid +wid aaa aaa aaa @@ -97693,17 +98146,17 @@ adG adG adG adG -xKo -pfy -ugt -sjC -sjC -vBm -vBm -vBm -vfw -occ -vBm +rvI +cYo +ode +gkr +gkr +cAR +cAR +cAR +pKU +vOu +cAR udK mwA lnt @@ -97727,11 +98180,11 @@ jES vBJ qTQ wIC -tyH -xXu -htn -xXu -xZs +oDh +pdp +vky +pdp +paJ tuA tuA tuA @@ -97790,53 +98243,53 @@ aaa aaa aaa aaa -tNf -cCG -sic -ydR -fvs -fvs -fvs -cCG -gPs -ydR -qiD -bOy -bxZ +nBJ +ldF +jsE +rdN +eQR +eQR +eQR +ldF +sXq +rdN +rMO +uHT +hfv kcp xNz utK rKA kcp kcp -bzy -bXs -bBB -bLt -bzA -bKh -bBB -bXZ -bzy -bAg -bBB -qJN -jjZ -bzH -bBB -bzA -cBl -bRU -aGh -ixc -kuI -aGh -aGh -aGh -kuI -xow -kuI -tQN +sDx +hIF +vyB +pHF +lEV +ghF +vyB +kEW +sDx +xHl +vyB +mQd +akn +vTM +vyB +lEV +meE +gGw +mVh +iBu +sGK +mVh +mVh +mVh +sGK +gDX +sGK +wid aaa aaa aaa @@ -97899,14 +98352,14 @@ akC akC akC akC -sLs -sjC -vBm -mvE -tak -lCp -iLo -vBm +uvp +gkr +cAR +pbm +qjK +jvc +dGT +cAR bmz wSR mMV @@ -97930,8 +98383,8 @@ vAG opF pDW wIC -tyH -iJb +oDh +lhj kCi kCi kCi @@ -97993,16 +98446,16 @@ aaa aaa aaa aaa -aPy -aPY -aQv -aQv -aQv -aQv -aQv -aQv -aQv -aQv +fwK +cZB +uaG +uaG +uaG +uaG +uaG +uaG +uaG +uaG bcm bcm kcp @@ -98012,34 +98465,34 @@ kcp kcp kcp kcp -bzy -bZL -cat -caC -caD -bZL -cat -bZL -bzy -bzy -bzy -bzy -bzy -bzy -bzy -bzy -bzy -bzy -bJh -bJh -cmH -bJh -bJh -bJh -bJh -bJh -ces -bSg +sDx +lQB +qax +jTH +gPU +lQB +qax +lQB +sDx +sDx +sDx +sDx +sDx +sDx +sDx +sDx +sDx +sDx +rgt +rgt +sYr +rgt +rgt +rgt +rgt +rgt +ctw +hAh aaa aaa aaa @@ -98102,14 +98555,14 @@ sFf bbV bzz akC -qoj -sjC -vBm -qkn -eRL -lwK -vlN -vBm +pzc +gkr +cAR +pQI +gym +gSz +cNJ +cAR pZS pEB jUY @@ -98133,8 +98586,8 @@ vzj wIC wIC wIC -tyH -mWh +oDh +nYi kCi sDD kOv @@ -98196,16 +98649,16 @@ aaa aaa aaa aaa -aPy -dhZ -aQv -bbn -bmu -bot -bpU -rFB -bmu -aQv +fwK +elY +uaG +vjk +lxd +dPk +nBV +dyq +lxd +uaG lYN byr aXh @@ -98233,16 +98686,16 @@ aXj qUh xyw ccG -bJh -cax -cet -cfx -cgG -cex -dfc -bJh -bJO -bSg +rgt +gMS +vXF +hsc +epk +lwG +uJb +rgt +wRf +hAh aaa aaa aaa @@ -98305,14 +98758,14 @@ nIt adu aHZ akC -naN -sjC -vBm -rJN -nJz -wgi -rEO -vBm +lDT +gkr +cAR +jgR +iAg +vaS +bsF +cAR vkR wsD jUY @@ -98336,8 +98789,8 @@ aTg rFg kkv wIC -xXu -xXu +pdp +pdp kCi uAj qfa @@ -98399,16 +98852,16 @@ aaa aaa aaa aaa -bhh -aPZ -bhh -bjL -bmw -kIm -bmw -brO -bmx -bvT +okd +lql +okd +urk +fmZ +ePq +fmZ +cqd +jhc +eml btO aYt bzQ @@ -98436,16 +98889,16 @@ bVM bVM bwn bVM -cdb -cdw -bGp -cfy -rBk -cfy -cim -cjl -bRz -cjm +oTH +kUA +gRJ +mqB +vjG +mqB +oQw +avp +oAa +efk aaa aaa aaa @@ -98508,14 +98961,14 @@ nkx bbZ btv akC -isz -sjC -vBm -vBm -knO -wgi -ugT -vBm +lCm +gkr +cAR +cAR +eLX +vaS +nCD +cAR kfE wsD jUY @@ -98539,8 +98992,8 @@ aTg wIC wIC wIC -xXu -vcl +pdp +iEa kCi eqI ssZ @@ -98602,16 +99055,16 @@ aaa aaa aaa aaa -bhh -aPZ -bhh -bjM -bmx -eBC -aZB -qld -kyZ -bvT +okd +lql +okd +nDb +jhc +ccL +rDf +xZM +mnc +eml btO aYt aYt @@ -98639,16 +99092,16 @@ aYt aYt aYt btO -cdc -jdk -mLu -erS -pZo -cdx -cin -cjm -bRA -cjm +tpG +wdQ +ybP +dhQ +dcx +mLg +wAK +efk +bTz +efk aaa aaa aaa @@ -98711,14 +99164,14 @@ pvP adu aHZ akC -myy -dwX -sBD -vBm -rRr -dFU -fnC -vBm +jdn +lgk +hMM +cAR +jlE +cXV +kqd +cAR xDn pEB jUY @@ -98741,9 +99194,9 @@ wtY aTg jIT wIC -rlY -xXu -xXu +aCA +pdp +pdp kCi nwW btD @@ -98805,16 +99258,16 @@ aaa aaa aaa aaa -bhh -aPZ -bhh -bjM -bmx -bmx -bmx -brP -qTZ -bvT +okd +lql +okd +nDb +jhc +jhc +jhc +vOV +eAm +eml btO aYu aYu @@ -98842,16 +99295,16 @@ aYu aYu aYu btO -cdc -nEs -cev -cdx -cdx -cdx -cin -cjm -bRA -cjm +tpG +hbA +uky +mLg +mLg +mLg +wAK +efk +bTz +efk aaa aaa aaa @@ -98914,14 +99367,14 @@ adu adu aHZ akC -soC -xkE -soC -vBm -hqU -gcT -oPp -vBm +pek +rir +pek +cAR +gdG +kxP +mea +cAR nNv pEB jUY @@ -98944,9 +99397,9 @@ yeR aTg nNg wIC -apx -wfd -apx +pjz +uTs +pjz kCi nRR btD @@ -99008,16 +99461,16 @@ aaa aaa aaa aaa -bhh -aPZ -bhh -bjN -bmy -pAR -hHR -brQ -btp -bvV +okd +lql +okd +bRt +oGm +hPD +aIy +ekR +gWm +mpV bvf bdL bvf @@ -99045,16 +99498,16 @@ bvf bvf bdL bvf -cdd -cdy -cew -cfz -sSY -kZA -cio -cjm -bRA -cjm +srh +gKo +fsf +fuU +cnI +qfq +vjT +efk +bTz +efk aaa aaa aaa @@ -99117,14 +99570,14 @@ nIt adu hxG akC -sUI -ihF -xLp -vBm -vBm -vBm -vBm -vBm +ibP +loE +cmr +cAR +cAR +cAR +cAR +cAR xSz pEB jUY @@ -99147,9 +99600,9 @@ wIC wIC wIC wIC -pVK -tqG -mGE +hrI +ioM +xCy kCi nNt vqC @@ -99211,16 +99664,16 @@ aaa aaa aaa aaa -aPy -hhe -aQv -bjO -bmu -bou -bpW -rFB -bmu -aQv +fwK +jru +uaG +vaM +lxd +cif +jaz +dyq +lxd +uaG vCg bHB xyw @@ -99248,16 +99701,16 @@ xyw xyw bHB osx -bJh -cdz -aTq -cfA -cgH -cex -dfc -bJh -tdK -bSg +rgt +qTu +wlD +gTk +qSI +lwG +uJb +rgt +oCa +hAh aaa aaa aaa @@ -99320,10 +99773,10 @@ wmg adu cqQ afT -gRB -jfn -oyg -rRg +txy +rbp +cri +euL hiM hiM qRj @@ -99349,10 +99802,10 @@ xuZ pcj hXm fZq -kXV -wbT -xJK -xJK +iFA +sLx +twQ +twQ bpd bqT vZv @@ -99414,16 +99867,16 @@ aaa aaa aaa aaa -aPy -aPY -aQv -aQv -aQv -aQv -aQv -aQv -vak -ovP +fwK +cZB +uaG +uaG +uaG +uaG +uaG +uaG +hte +lma xyw bHB xyw @@ -99452,15 +99905,15 @@ xyw bHB xyw bcm -vAw -vAw -vAw -vAw -vAw -vAw -vAw -cjK -bSg +hOV +hOV +hOV +hOV +hOV +hOV +hOV +vVZ +hAh aaa aaa aaa @@ -99523,10 +99976,10 @@ pvP adu frF akC -skO -xLp -lAX -tCi +oUt +cmr +iPq +aMf vka vka mPj @@ -99548,14 +100001,14 @@ awz vSN mPj rWs -hIh +inh ewr lPC mgy -hCv -asV -cxi -hLD +qoN +tVx +feG +pPy kCi nRR btM @@ -99617,16 +100070,16 @@ aaa aaa aaa aaa -wZa -lqd -nqC -wcx -nhU -ybq -mch -fGG -wBl -sbb +sGw +nmp +eWs +usq +rQw +pOH +sbt +smU +nZR +lpl xyw bHB gjm @@ -99655,15 +100108,15 @@ bcb bHB btO bcm -sBP -eVY -nrD -xUb -spn -sWy -vAw -fgA -sNF +sCW +nvX +tTC +jdu +tWd +aPe +hOV +ygv +kyP aaa aaa aaa @@ -99727,10 +100180,10 @@ tyK iKI akC akC -tCi -fwT -hAd -hAd +aMf +hSv +xoB +xoB kzy wIQ jHh @@ -99754,11 +100207,11 @@ vka jHh lnt ckP -izT -izT -aWY -uFb -izT +xTx +xTx +cyv +eKZ +xTx kCi cfk uws @@ -99820,16 +100273,16 @@ aaa aaa aaa aaa -wZa -uJT -nqC -kWG -hDA -qvl -bQF -gqy -jWn -yeO +sGw +klT +eWs +njO +riC +eqd +goY +fqJ +nOX +xcV xyw bHB wqh @@ -99858,15 +100311,15 @@ bcc bHB aYt bcm -aFx -nrD -nrD -nrD -nrD -nrD -vUs -cUf -sNF +xsQ +tTC +tTC +tTC +tTC +tTC +iho +uKH +kyP aaa aaa aaa @@ -99929,12 +100382,12 @@ akC akC akC akC -paN -xLp -lAX -qEa -hAd -hAd +ehM +cmr +iPq +oQJ +xoB +xoB vSN jHh lnt @@ -99956,12 +100409,12 @@ sTo wIQ jHh jUY -izT -izT -pVK -asV -cxi -sCs +xTx +xTx +hrI +tVx +feG +bxY kCi kCi kCi @@ -100023,16 +100476,16 @@ aaa aaa aaa aaa -wZa -jca -ezR -veX -veX -veX -veX -duX -dCb -yeO +sGw +xzB +bfs +bYW +bYW +bYW +bYW +kNf +vpT +xcV xyw bHB sXB @@ -100061,15 +100514,15 @@ fVz bHB bBN bcm -vUW -nrD -nrD -nrD -nrD -voo -vAw -qip -sNF +uPQ +tTC +tTC +tTC +tTC +gzN +hOV +uXm +kyP aaa aaa aaa @@ -100129,15 +100582,15 @@ adG adG adG adG -pbd -xLp -bUJ -xLp -xLp -lAX -qEa -rXM -hAd +ltw +cmr +oRm +cmr +cmr +iPq +oQJ +pcc +xoB xDn uwN wiN @@ -100159,15 +100612,15 @@ awz oWg uwN jUY -izT -hTj -pVK -mSG -ois -xnG -vef -cxi -tkX +xTx +lym +hrI +lIQ +noy +rcG +lwY +feG +kfB tuA tuA tuA @@ -100226,16 +100679,16 @@ aaa aaa aaa aaa -wZa -jca -ezR -fKv -mot -ndc -veX -cIl -dej -yeO +sGw +xzB +bfs +qfQ +cJm +jwi +bYW +phw +xMG +xcV xyw bHB aZO @@ -100264,15 +100717,15 @@ bGF bHB aYt bcm -oMp -nrD -rRP -tqs -ciO -hAu -vAw -wXb -sNF +vKI +tTC +hhd +ybm +ffq +rsV +hOV +mLN +kyP aaa aaa aaa @@ -100331,16 +100784,16 @@ aag aag aag aag -btL -xLp -rTj -uNd -cET -cET -hyj -xLp -oTN -hAd +cZe +cmr +lSX +uaA +snx +snx +fLt +cmr +fYr +xoB pNa iCu awz @@ -100362,16 +100815,16 @@ awz ceE eMP faX -izT -reF -tqG -bjH -tqG -mSG -lGW -pep -bBp -teI +xTx +tIX +ioM +abn +ioM +lIQ +qOY +xZH +mSr +nLp aag aag aag @@ -100429,16 +100882,16 @@ aaa aaa aaa aaa -wZa -jca -ezR -xwU -sIw -bVk -veX -djW -djW -lmy +sGw +xzB +bfs +wVN +qxI +qmM +bYW +wFN +wFN +tGH hmy bHB aZP @@ -100467,15 +100920,15 @@ bGG bHB btO bcm -odT -nrD -nrD -nrD -nrD -nrD -vAw -cUf -sNF +kQr +tTC +tTC +tTC +tTC +tTC +hOV +uKH +kyP aaa aaa aaa @@ -100534,9 +100987,9 @@ aag aag aag aag -btL -lZD -vIE +cZe +cCL +vDz kcH kcH kcH @@ -100572,9 +101025,9 @@ aES aES aES aES -mSG -pep -teI +lIQ +xZH +nLp aag aag aag @@ -100632,16 +101085,16 @@ aaa aaa aaa aaa -wZa -tXA -ezR -fiz -sIw -sIw -cWt -sIw -sIw -iny +sGw +onv +bfs +pjh +qxI +qxI +iXm +qxI +qxI +vvX xyw bHB aZQ @@ -100670,15 +101123,15 @@ bGH bHB btO bcm -lim -bOb -hvP -nrD -nrD -nrD -vAw -cUf -sNF +qhG +krJ +jOt +tTC +tTC +tTC +hOV +uKH +kyP aaa aaa aaa @@ -100734,12 +101187,12 @@ aaa aad aag aag -btL -btL -btL -btL -lAX -xLp +cZe +cZe +cZe +cZe +iPq +cmr kcH kcH kcH @@ -100775,12 +101228,12 @@ tKr uNg cLN aES -pVK -asV -teI -teI -teI -teI +hrI +tVx +nLp +nLp +nLp +nLp aag aag ajZ @@ -100835,16 +101288,16 @@ aaa aaa aaa aaa -wZa -jca -ezR -kGh -sIw -aDG -lnG -bCI -whX -qHZ +sGw +xzB +bfs +wes +qxI +dKO +ykv +jPu +qKl +pPd xyw bHB aZR @@ -100873,15 +101326,15 @@ bGI bHB xyw bcm -vyZ -nrD -nrD -nrD -nrD -cOy -vAw -raT -sNF +gOk +tTC +tTC +tTC +tTC +bjg +hOV +siT +kyP aaa aaa aaa @@ -100937,12 +101390,12 @@ aaa aad aag aag -btL -fyq -pcR -pbd -lAX -xLp +cZe +ivu +gSy +ltw +iPq +cmr kcH rlf soq @@ -100978,12 +101431,12 @@ iTD vCO vCO jxB -pVK -asV -pVK -pVK -pVK -teI +hrI +tVx +hrI +hrI +hrI +nLp aag aag ajZ @@ -101038,16 +101491,16 @@ aaa aaa aaa aaa -wZa -gtF -ezR -ezR -ngc -ezR -ezR -nqC -nqC -nqC +sGw +dvD +bfs +bfs +sir +bfs +bfs +eWs +eWs +eWs xyw bHB aZO @@ -101075,16 +101528,16 @@ baI bGF bHB eEc -vAw -vAw -nrD -wkP -ade -nrD -hAu -vAw -raT -sNF +hOV +hOV +tTC +tSm +tcd +tTC +rsV +hOV +siT +kyP aaa aaa aaa @@ -101140,12 +101593,12 @@ aaa aad aag aag -btL -hpa -lyL -cET -yak -eAa +cZe +nHu +sit +snx +oVY +cGA kcH rBa nPs @@ -101181,12 +101634,12 @@ vCO vCO vCO jxB -cBz -tgh -kfV -qyw -tcn -teI +gUu +dWc +lVW +kcs +rDH +nLp aag aag ajZ @@ -101241,16 +101694,16 @@ aaa aaa aaa aaa -wZa -rIG -nqC -xWI -jca -kXe -vJO -uKl -jsj -nqC +sGw +fea +eWs +rsS +xzB +mKs +sCT +rXU +rEt +eWs wlb bHB aZP @@ -101278,16 +101731,16 @@ baI bGG bHB bGK -qny -kYb -nGz -cSl -nMN -nrD -sGm -vAw -raT -sNF +rrh +xKG +gyH +rSx +dCz +tTC +lDA +hOV +siT +kyP aaa aaa aaa @@ -101343,18 +101796,18 @@ aaa aad aag aag -btL -rTj -kCo -xLp -xLp -jcs +cZe +lSX +nRE +cmr +cmr +sWw kcH rIW oGx wvU yiX -vLX +nrb hyQ aic aov @@ -101384,12 +101837,12 @@ wmT jhW mWD jxB -rgL -dNy -koa -asV -pVK -teI +xBK +moc +pYQ +tVx +hrI +nLp aag aag ajZ @@ -101444,16 +101897,16 @@ aaa aaa aaa aaa -wZa -gtF -vkQ -jca -gtF -jyU -gtF -jca -gtF -jUK +sGw +dvD +kWI +xzB +dvD +ipk +dvD +xzB +dvD +meT wqh bHB aZQ @@ -101481,16 +101934,16 @@ baI bGH bHB cuy -qny -slu -kXq -nrD -nrD -nrD -wIg -tcY -tVl -sNF +rrh +iNR +uCR +tTC +tTC +tTC +fca +vjS +xee +kyP aaa aaa aaa @@ -101544,12 +101997,12 @@ aaa aaa aaa aad -aXO -aXO -btL -ouy -xLp -xLp +cZe +cZe +cZe +vfS +cmr +cmr agj agj agj @@ -101589,12 +102042,12 @@ aES aES aES aES -qFr -fqP -pVK -teI -teI -teI +nVn +cZO +hrI +nLp +nLp +nLp ajZ aaa aaa @@ -101647,16 +102100,16 @@ aaa aac aaf aaf -wZa -jca -nqC -oqW -jca -jwa -uIZ -jsj -vJO -nqC +sGw +xzB +eWs +omx +xzB +rAw +qNK +rEt +sCT +eWs pyC bHB aZR @@ -101684,16 +102137,16 @@ baI bGI bHB kwQ -qny -slu -kXq -dvN -nrD -wJT -voo -vAw -cUf -sNF +rrh +iNR +uCR +rDR +tTC +wyz +gzN +hOV +uKH +kyP aaf aaf ajY @@ -101747,11 +102200,11 @@ aaa aaa aaa aad -huD -gRq -cmb -yai -xLp +tvt +fRg +peM +jUV +cmr agj agj jbN @@ -101788,16 +102241,16 @@ aVU aRq bHG ceK -aWj +sxD bhJ bHG aES aES -jLB -pVK -exx -nrg -vYk +fMU +hrI +dPd +rLH +rwZ ajZ aaa aaa @@ -101849,17 +102302,17 @@ aaa aaa aad aag -wZa -wZa -jca -nqC -nqC -nvA -nqC -nqC -nqC -nqC -nqC +sGw +sGw +xzB +eWs +eWs +sOr +eWs +eWs +eWs +eWs +eWs cCE bHB aZO @@ -101887,17 +102340,17 @@ baI bGF bHB iAw -vAw -vAw -nrD -nrD -nrD -xun -hAu -vAw -rLi -sNF -sNF +hOV +hOV +tTC +tTC +tTC +jRp +rsV +hOV +kzs +kyP +kyP aag ajZ aaa @@ -101950,11 +102403,11 @@ aaa aaa aaa aad -huD -esl -wBy -nRC -xLp +tvt +jhR +fix +pfL +cmr agj kyR agc @@ -101996,11 +102449,11 @@ bpe brS rOs aES -cGC -pVK -pVK -bxw -vYk +dWA +hrI +hrI +dPO +rwZ ajZ aaa aaa @@ -102052,17 +102505,17 @@ aaa aaa aad aag -wZa -gtF -jca -nqC -aas -alI -agw -anB -ajp -vdJ -bJo +sGw +dvD +xzB +eWs +kRU +dON +oJj +vLp +oYA +gWt +jHt amo bHB aZP @@ -102091,16 +102544,16 @@ bGG bHB btO xjW -rDC -nrD -nrD -nrD -kCN -nrD -vAw -iDD -rhf -sNF +uTk +tTC +tTC +tTC +cyR +tTC +hOV +qpV +hSb +kyP aag ajZ aaa @@ -102153,11 +102606,11 @@ aaa aaa aaa aad -huD -fcl -dXm -thK -bTL +tvt +oyX +vBC +rhm +she agj ogK qgr @@ -102199,11 +102652,11 @@ aES aES aES aES -vMw -htB -fII -fpj -vYk +tPc +jwq +vwU +uew +rwZ ajZ aaa aaa @@ -102255,17 +102708,17 @@ aaa aaa aad aag -wZa -gtF -jca -nqC -aga -alQ -amR -adg -cdF -sgw -bJo +sGw +dvD +xzB +eWs +irJ +bKk +kil +vnY +fCG +gYg +jHt gRP bHB aZQ @@ -102294,16 +102747,16 @@ bGH bHB btO bcm -gnI -nrD -nrD -uqW -nrD -dkv -vAw -cUf -lHU -sNF +gBU +tTC +tTC +efJ +tTC +sHe +hOV +uKH +vyr +kyP aag ajZ aaa @@ -102356,11 +102809,11 @@ aaa aaa aaa aad -btL -wEp -xLp -xLp -jQa +cZe +kwg +cmr +cmr +jkq agj nCx tYM @@ -102397,16 +102850,16 @@ ceK lcy iTw ceK -aWj +sxD bhJ bHG nis aES -cMk -asV -taM -tcn -teI +xGF +tVx +jne +rDH +nLp ajZ aaa aaa @@ -102458,22 +102911,22 @@ aaa aaa aad aag -wZa -ptr -pvv -nqC -aav -amj -agG -anD -adg -ajB -bJo +sGw +fzx +dWJ +eWs +yko +qlL +oxz +gnB +vnY +mRH +jHt xjK bHB btO bdU -hPf +aog bdU bfV baM @@ -102497,16 +102950,16 @@ bcb bHB aYt bcm -uDT -nrD -nrD -nrD -nrD -lRV -vAw -cUf -uTS -sNF +ohI +tTC +tTC +tTC +tTC +tml +hOV +uKH +hZZ +kyP aag ajZ aaa @@ -102559,11 +103012,11 @@ bdH aaa aaa aad -huD -szs -xLp -riI -nPF +tvt +gJf +cmr +hYE +vAz agj nXO hvH @@ -102605,11 +103058,11 @@ bpe brS cpj aES -jLa -asV -whv -tqG -vYk +hro +tVx +tNB +ioM +rwZ ajZ aaa aaa @@ -102661,17 +103114,17 @@ aaa aaa aad aag -wZa -gtF -lmW -nqC -aay -adg -amU -anK -ccJ -ajL -bJo +sGw +dvD +nsd +eWs +kqm +vnY +wjL +oGF +gKK +dBR +jHt bwl bHB xyw @@ -102700,16 +103153,16 @@ bcc bHB xyw bcm -prS -nrD -nrD -jJl -nrD -hAu -vAw -raT -vtL -sNF +grT +tTC +tTC +ove +tTC +rsV +hOV +siT +bUQ +kyP aag ajZ aaa @@ -102762,11 +103215,11 @@ bdH aaa aaa aad -huD -dlW -xLp -xxr -lAX +tvt +hsu +cmr +pFq +iPq agj dyj fnv @@ -102808,11 +103261,11 @@ aES aES aES aES -uyK -fqP -psl -tqG -vYk +uhh +cZO +ppG +ioM +rwZ ajZ aaa aaa @@ -102864,17 +103317,17 @@ aaa aaa aad aag -wZa -gtF -ykB -nqC -aaD -ahB -ahB -anL -ajz -aBC -cfM +sGw +dvD +kFU +eWs +oUz +mqZ +mqZ +lVZ +ctQ +wer +pKW wqh bHB vpW @@ -102903,16 +103356,16 @@ fVz bHB vpW bcm -gTi -nrD -iLv -nrD -nrD -lju -vAw -raT -oPu -sNF +cKm +tTC +cOh +tTC +tTC +dPq +hOV +siT +xFt +kyP aag ajZ aaa @@ -102965,11 +103418,11 @@ bdH aaa aaa aad -huD -gSq -xLp -nYu -hYw +tvt +hJD +cmr +fFQ +pMH agj mXj mXj @@ -103006,16 +103459,16 @@ ceK wVB psa ceK -aWj +sxD bhJ bHG brS aES -cuk -asV -bwM -tqG -vYk +jrI +tVx +raO +ioM +rwZ ajZ aaa aaa @@ -103067,22 +103520,22 @@ aaa aaa aad aag -wZa -jca -kog -nqC -aaK -cfN -afe -adg -ajz -aBC -cfM +sGw +xzB +xer +eWs +uES +xrT +gYj +vnY +ctQ +wer +pKW wqh bHB xyw aho -vFS +vWc geg aEj aho @@ -103106,16 +103559,16 @@ jSo bHB xyw bcm -xHr -nrD -xsy -nrD -nrD -rDC -vAw -raT -oPu -sNF +qKb +tTC +xQj +tTC +tTC +uTk +hOV +siT +xFt +kyP aag ajZ aaa @@ -103168,11 +103621,11 @@ aaa aaa aaa aad -btL -rXs -qKT -bOz -lAX +cZe +bLc +fOK +pWd +iPq agj mXj pjR @@ -103214,11 +103667,11 @@ tJi ivf bpe aES -gvj -asV -rDp -rkF -teI +pok +tVx +kzc +gen +nLp ajZ aaa aaa @@ -103270,22 +103723,22 @@ aaa aaa aad aag -wZa -tYh -gtF -nqC -ceQ -ceU -aff -adg -ajz -aBC -cfM +sGw +nkj +dvD +eWs +rVt +tVZ +bkS +vnY +ctQ +wer +pKW wqh bHB ezQ eXq -mdT +fAa oYp oZp eXq @@ -103309,16 +103762,16 @@ xyw bHB aYt bcm -iVQ -nrD -oqn -era -uRh -sGm -vAw -raT -tdN -sNF +jNG +tTC +vMb +xYE +iuI +lDA +hOV +siT +fFU +kyP aag ajZ aaa @@ -103371,11 +103824,11 @@ aaa bdH aaa aad -huD -wcs -xLp -meQ -eAK +tvt +nCM +cmr +wKb +pri agj qlI cdB @@ -103417,11 +103870,11 @@ aES aES aES aES -vaH -asV -lUr -vGV -vYk +gBd +tVx +fjz +hPu +rwZ ajZ aaa aaa @@ -103473,21 +103926,21 @@ aac aaf aag aag -wZa -pau -gtF -nqC -ceR -ceU -aff -agy -ajx -tqg -bJo +sGw +vEI +dvD +eWs +nCe +tVZ +bkS +bfO +tWL +aLx +jHt mVE rgy baN -iGO +anU gEg imy gEg @@ -103516,12 +103969,12 @@ bcm bcm bcm bcm -vAw -xkZ -vAw -iDD -vrb -sNF +hOV +pIC +hOV +qpV +nGk +kyP aag aag aaf @@ -103574,11 +104027,11 @@ bdH bdH aaa aad -huD -nWx -xLp -wvt -rLl +tvt +mPw +cmr +wGa +bAy agj eBE hvH @@ -103615,16 +104068,16 @@ bFC jUb qjz ceK -aWj +sxD bhJ bHG gCP aES -kqI -rJf -kkg -pVK -vYk +imt +noE +dcT +hrI +rwZ ajZ aaa aaa @@ -103676,22 +104129,22 @@ aad aag aag aag -wZa -ctW -gtF -nqC -abd -adk -afu -anT -eLz -uFL -ssa +sGw +oGf +dvD +eWs +jkY +ktI +xPn +xyQ +ixT +hBG +ngK sqa hBF hCt eXq -cIq +qYN lsD lkf eXq @@ -103719,12 +104172,12 @@ lRX rux sEt bcm -uhS -vtL -vtL -raT -vtL -sNF +qyG +bUQ +bUQ +siT +bUQ +kyP aag aag aag @@ -103777,11 +104230,11 @@ bdH bdH bdH aad -huD -ruD -xLp -xLp -wax +tvt +qwY +cmr +cmr +mVA agj kSH hvH @@ -103823,11 +104276,11 @@ mhm brS bpe aES -tqG -fqP -oHy -oHy -vYk +ioM +cZO +pfD +pfD +rwZ ajZ aaa aaa @@ -103879,22 +104332,22 @@ aad aag aag aag -wZa -dDQ -gtF -nqC -uZQ -uZQ -bJo -aoH -aoF -aBC -cfM +sGw +fzT +dvD +eWs +qmh +qmh +jHt +wSQ +rOv +wer +pKW wqh bHB xyw aho -xWV +dkj siz gYt aho @@ -103922,12 +104375,12 @@ myo dtH eyR bcm -wEA -oPu -vtL -cUf -mkk -sNF +rQs +xFt +bUQ +uKH +gsp +kyP aag aag aag @@ -103980,11 +104433,11 @@ bdH bdH bdH aad -btL -btL -btL -guv -dYM +cZe +cZe +cZe +tiX +vcI agj ikQ hvH @@ -104026,11 +104479,11 @@ aES aES aES aES -mOw -fqP -teI -teI -teI +ied +cZO +nLp +nLp +nLp ajZ aaa aaa @@ -104082,17 +104535,17 @@ aad aag aag aag -wZa -bqM -uJT -nqC -cdE -xSI -uZQ -aoH -aoF -aBC -cfM +sGw +iPf +klT +eWs +vHp +gJp +qmh +wSQ +rOv +wer +pKW wqh bHB vpW @@ -104125,12 +104578,12 @@ mhd aYt tuN fPn -oPu -oPu -vtL -cUf -vRF -sNF +xFt +xFt +bUQ +uKH +eLC +kyP aag aag aag @@ -104185,9 +104638,9 @@ aaa aad aag aag -btL -xLp -udH +cZe +cmr +iNk agj muV hvH @@ -104224,14 +104677,14 @@ aWq aXb aGr ceK -aWj +sxD bhJ bHG cWy aES -pVK -asV -teI +hrI +tVx +nLp aag aag ajZ @@ -104285,17 +104738,17 @@ aad aag aag aag -wZa -rgC -jca -qlt -adg -amp -uZQ -aoH -gds -aky -bJo +sGw +cqp +xzB +smH +vnY +asE +qmh +wSQ +vop +tgy +jHt vPM bHB xyw @@ -104328,12 +104781,12 @@ omP aYt bOC bcm -vtL -oPu -vtL -cUf -mod -sNF +bUQ +xFt +bUQ +uKH +rVc +kyP aag aag aag @@ -104388,9 +104841,9 @@ aaa aad aag aag -btL -qyj -nPF +cZe +huD +vAz agj mXj fnv @@ -104398,7 +104851,7 @@ hvH hvH iNY hvH -ofp +hmV mXj agj aic @@ -104432,9 +104885,9 @@ eBd brS cpj aES -eqh -hwQ -teI +luE +wgO +nLp aag aag ajZ @@ -104488,22 +104941,22 @@ aad aag aag aag -wZa -vLO -jca -nqC -hSL -agn -afx -agX -ajy -vwP -bJo +sGw +jOq +xzB +eWs +nso +jdZ +pqM +bZS +rlD +uUf +jHt kCm bHB btO bea -jzb +aoN bea bfZ baS @@ -104531,12 +104984,12 @@ ivg llO kSv bcm -oyJ -ter -tVJ -cUf -oPu -sNF +emC +dZZ +xmn +uKH +xFt +kyP aag aag aag @@ -104591,9 +105044,9 @@ aaa aad aag aag -btL -cZw -nPF +cZe +pcf +vAz agj agj agj @@ -104635,9 +105088,9 @@ aES aES aES aES -fDT -eKi -teI +hXD +tYV +nLp aag aag ajZ @@ -104691,10 +105144,10 @@ aad aag aag aag -wZa -gtF -kil -nqC +sGw +dvD +qig +eWs eXq adR eXq @@ -104735,11 +105188,11 @@ wXT cdA bcm bcm -oyJ -oyJ -kjE -oPu -sNF +emC +emC +mTL +xFt +kyP aag aag aag @@ -104794,9 +105247,9 @@ aaa aad aag aag -btL -egW -kUr +cZe +uTE +fZy gpY uBi wYA @@ -104838,9 +105291,9 @@ baw oaK nUn pgD -asV -pVK -teI +tVx +hrI +nLp aag aag ajZ @@ -104894,10 +105347,10 @@ aad aag aag aag -wZa -gtF -gtF -nqC +sGw +dvD +dvD +eWs abG aeh afy @@ -104939,10 +105392,10 @@ aYt aYt lrX bcm -oin -raT -tdN -sNF +jGQ +siT +fFU +kyP aag aag aag @@ -104997,9 +105450,9 @@ bdH aad aag aag -btL -xLp -nPF +cZe +cmr +vAz gpY uac vFw @@ -105041,9 +105494,9 @@ aZz wUP lrF pgD -fqP -pVK -teI +cZO +hrI +nLp aag aag ajZ @@ -105097,10 +105550,10 @@ aad aag aag aag -wZa -gtF -uJT -nqC +sGw +dvD +klT +eWs abH aer agf @@ -105142,10 +105595,10 @@ btO btO uII fPn -uwi -raT -vrb -sNF +htq +siT +nGk +kyP aag aag aag @@ -105200,9 +105653,9 @@ abs abs abs abs -btL -tCi -elF +cZe +aMf +wby gpY mto acW @@ -105244,9 +105697,9 @@ baw sgU baw pgD -aWY -uFb -teI +cyv +eKZ +nLp tQV tQV tQV @@ -105300,10 +105753,10 @@ aag aag aag aag -wZa -gtF -fgv -loQ +sGw +dvD +sZc +dGP acq aeJ azl @@ -105345,10 +105798,10 @@ aYt puI iWx bcm -oYP -cUf -vtL -sNF +ymg +uKH +bUQ +kyP aag aag aag @@ -105503,10 +105956,10 @@ aag aag aag aag -wZa -gtF -pTD -nqC +sGw +dvD +iQJ +eWs acu aeh afF @@ -105548,10 +106001,10 @@ cdA bcm bcm bcm -oyJ -khh -mPW -sNF +emC +wuh +fgU +kyP aag aag aag @@ -105706,10 +106159,10 @@ aag aag aag aag -wZa -cpG -mcs -nqC +sGw +nHX +cEA +eWs acM aer agf @@ -105749,12 +106202,12 @@ apE icp fER bcm -oyJ -ceI -vtL -cUf -rhf -sNF +emC +hVL +bUQ +uKH +hSb +kyP aag aag aag @@ -105831,9 +106284,9 @@ awY kOB awZ aiX -jnw -aBq -pRL +opN +bDi +vIr awF aEM aGV @@ -105909,10 +106362,10 @@ aag aag aag aag -wZa -jca -kGZ -nqC +sGw +xzB +hRA +eWs acZ aeN azl @@ -105952,12 +106405,12 @@ uiT aYt jyR bcm -aPd -oPu -vtL -cUf -iBs -sNF +fUZ +xFt +bUQ +uKH +eyM +kyP aag aag aag @@ -106034,9 +106487,9 @@ pXx jrm evg aiX -asj -aAW -aCl +dCb +dDc +rdo awF aFg aGY @@ -106112,10 +106565,10 @@ aag aag aag aag -wZa -jca -fCZ -nqC +sGw +xzB +ghA +eWs vhw khD azw @@ -106155,12 +106608,12 @@ apL aYt iKb bcm -dUA -oPu -vtL -raT -gKl -sNF +umk +xFt +bUQ +siT +qBl +kyP aag aag aag @@ -106237,9 +106690,9 @@ wWC auZ aiX aiX -asl -amO -aGO +mJp +bNT +cbK awF hRk aGY @@ -106315,10 +106768,10 @@ aag aag aag aag -wZa -tYh -bQd -nqC +sGw +nkj +rjF +eWs eXq eXq eXq @@ -106358,12 +106811,12 @@ uiT aYt xNj bcm -rhf -oPu -vtL -cUf -eAP -sNF +hSb +xFt +bUQ +uKH +pTX +kyP aag aag aag @@ -106440,9 +106893,9 @@ pQV apq ana aiX -asp -amO -avj +glc +bNT +rmB awF xTL lmA @@ -106518,10 +106971,10 @@ aag aag aag aag -wZa -jca -gzx -nqC +sGw +xzB +oes +eWs aRu aRu aRu @@ -106561,12 +107014,12 @@ fpW llO vml bcm -oyJ -mod -mod -cUf -rwh -sNF +emC +rVc +rVc +uKH +nBF +kyP aag aag aag @@ -106643,9 +107096,9 @@ xQg wWC szO aiX -atU -amO -qLj +nLM +bNT +iPU awF awF aEW @@ -106721,10 +107174,10 @@ aag aag aag aag -wZa -gtF -gzx -nqC +sGw +dvD +oes +eWs aRu aRu aRu @@ -106760,16 +107213,16 @@ bGO bHB uAb bcm -oyJ -riv -oyJ -oyJ -oyJ -oyJ -oyJ -iDD -vtL -sNF +emC +hvx +emC +emC +emC +emC +emC +qpV +bUQ +kyP aag aag aag @@ -106846,10 +107299,10 @@ yjM qbO aqw hnI -bYe -amO -wZM -aPm +kGS +bNT +gFN +bMi awF nvG vGI @@ -106924,10 +107377,10 @@ aag aag aag aag -wZa -gtF -pTD -nqC +sGw +dvD +iQJ +eWs aRu aRu aRu @@ -106963,16 +107416,16 @@ bcp bHB xAY aYz -oyJ -vtL -wwV -epq -xBT -oyJ -gKl -cUf -vtL -sNF +emC +bUQ +wDP +mHF +hhg +emC +qBl +uKH +bUQ +kyP aag aag aag @@ -107049,10 +107502,10 @@ aqy nBE pOD bZa -ahM -aEf -wZM -ejp +nIF +duR +gFN +mqd awF aHn szU @@ -107127,10 +107580,10 @@ aag aag aag aag -wZa -jca -gzx -nqC +sGw +xzB +oes +eWs aRu aRu aRu @@ -107166,16 +107619,16 @@ bcc bHB xAY aYz -oyJ -dSC -oPu -oPu -vtL -ltw -oPu -raT -vrb -sNF +emC +vFI +xFt +xFt +bUQ +wdG +xFt +siT +nGk +kyP aag aag aag @@ -107252,15 +107705,15 @@ aiX aiX aiX aiX -atV -amO -oXd -nPh -nPh -nPh -nPh -nPh -nPh +eFI +bNT +sQu +tsr +tsr +tsr +tsr +tsr +tsr aRE qVC qVC @@ -107330,10 +107783,10 @@ aag aag aag aag -wZa -ptr -mcs -nqC +sGw +fzx +cEA +eWs aRu aRu aRu @@ -107369,16 +107822,16 @@ fVz bHB uII ruz -oyJ -vnj -xDy -oPu -epp -oyJ -oUM -raT -oPu -sNF +emC +jev +aML +xFt +oFn +emC +jaI +siT +xFt +kyP aag aag aag @@ -107455,15 +107908,15 @@ aiX aKG amb aiX -ayT -amO -avj -nPh -ipF -aJB -osQ -eVP -nPh +eWN +bNT +rmB +tsr +sOL +jIC +lFr +wTu +tsr aSq aTE aTE @@ -107533,10 +107986,10 @@ aag aag aag aag -wZa -jca -jLY -nqC +sGw +xzB +rsP +eWs aRu aRu aRu @@ -107572,16 +108025,16 @@ xyw bHB uII wrT -oyJ -krm -hiU -bkB -kel -oyJ -ygo -raT -tdN -sNF +emC +fqb +ury +dFW +mvi +emC +daF +siT +fFU +kyP aag aag aag @@ -107658,15 +108111,15 @@ aqz aKH and aiX -lzj -amO -bYe -jSF -uZb -uZb -uwk -nnT -nPh +umD +bNT +kGS +fyT +xIV +xIV +edV +reM +tsr aSt aTE aTE @@ -107730,16 +108183,16 @@ aaa bdH aaY aad -wZa -wZa -wZa -wZa -wZa -wZa -wZa -gtF -oiR -nqC +sGw +sGw +sGw +sGw +sGw +sGw +sGw +dvD +iOX +eWs aRu aRu aRu @@ -107781,16 +108234,16 @@ lFp lFp lFp lFp -pFx -raT -oPu -sNF -sNF -sNF -sNF -sNF -sNF -sNF +ljm +siT +xFt +kyP +kyP +kyP +kyP +kyP +kyP +kyP ajZ aaY bdH @@ -107861,15 +108314,15 @@ aiX aiX aiX aiX -ukh -amO -nxK -nPh -tHA -mkb -iKB -fdD -nPh +cwi +bNT +fBA +tsr +iPN +dbX +rGL +cyL +tsr aSx aTE aTG @@ -107933,16 +108386,16 @@ aaa bdH aaY aad -wZa -iJA -gtF -jca -jca -jca -gtF -gtF -qXg -nqC +sGw +lrH +dvD +xzB +xzB +xzB +dvD +dvD +wsz +eWs aRu aRu aRu @@ -107984,16 +108437,16 @@ kjD gHl qoL lFp -rhf -raT -oPu -vtL -vtL -rYK -vtL -gew -mPB -sNF +hSb +siT +xFt +bUQ +bUQ +gQQ +bUQ +cOt +uSU +kyP ajZ aaY bdH @@ -108064,22 +108517,22 @@ aqz mBe atT aiX -ayU -amO -avm -nPh -nPh -jpX -nPh -nPh -nPh -mSu -tms -mSu -mSu -mSu -mSu -mSu +fXf +bNT +hCF +tsr +tsr +vOY +tsr +tsr +tsr +lIj +mVF +lIj +lIj +lIj +lIj +lIj pgD nUv aJU @@ -108136,16 +108589,16 @@ aaa bdH aaY aad -wZa -jca -jca -gtF -gtF -fgv -ful -eSZ -gHx -nqC +sGw +xzB +xzB +dvD +dvD +sZc +abj +mUE +coo +eWs aRu aRu aRu @@ -108187,16 +108640,16 @@ aId aId poA lFp -rhf -lJb -oPx -oPx -xHC -oPx -oPx -pSK -gKl -sNF +hSb +uGU +kGi +kGi +khI +kGi +kGi +kow +qBl +kyP ajZ aaY bdH @@ -108267,22 +108720,22 @@ aiX asf atT aiX -mQH -amT -ioX -mSu -hIT -upv -wxn -xtI -cJz -vOb -vOb -tEo -ikL -alY -alY -eFg +cKW +mqR +xZf +lIj +tBY +gkE +cTM +rqD +pcY +srO +srO +lWO +wjQ +uag +uag +jnh pgD lza gZw @@ -108339,15 +108792,15 @@ aaa bdH aaa aad -wZa -gtF -gtF -nqC -oFv -oiR -gEk -nVC -rye +sGw +dvD +dvD +eWs +jri +iOX +kIl +jmz +hsK wfE wfE wfE @@ -108356,9 +108809,9 @@ wfE wfE wfE wfE -bsk -sxu -cBI +yap +bqg +eIO bkA eFG bej @@ -108374,15 +108827,15 @@ qjN qjN oWf gfW -tKu +xgJ fdZ bnS fdZ -tbd +tzx gfW -bLT -cbQ -ccq +rZt +qyP +tuC lFp lGg aId @@ -108397,9 +108850,9 @@ nmY nmY nmY nmY -raT -vtL -sNF +siT +bUQ +kyP ajZ aaa bdH @@ -108470,22 +108923,22 @@ aiX aiX aiX aiX -nVe -akV -bRs -mSu -mSu -aux -mSu -mSu -mSu -mSu -mSu -mSu -mSu -mSu -mSu -gRz +dRo +fsu +enz +lIj +lIj +dvZ +lIj +lIj +lIj +lIj +lIj +lIj +lIj +lIj +lIj +tWF pgD nUv aJU @@ -108542,9 +108995,9 @@ aaa bdH aaa aad -wZa -gtF -gtF +sGw +dvD +dvD wfE wfE rXv @@ -108559,9 +109012,9 @@ bqm bsD btr wfE -owH -stY -owH +kLE +lIu +kLE bkA bcC bej @@ -108577,15 +109030,15 @@ ham qjN oDY omo -epW +fvJ fdZ ixj fdZ -kmZ +bET gfW -bGT -bHH -bGT +kSA +tpB +kSA lFp xDF eRS @@ -108596,13 +109049,13 @@ nmY ouw jDP aId -ctX +xHS tEd vjW nmY -raT -vtL -sNF +siT +bUQ +kyP ajZ aaa bdH @@ -108648,12 +109101,12 @@ adq aei aka aWn -uIw -uIw -uIw -uIw -uIw -uIw +njn +njn +njn +njn +njn +njn oGC awW acW @@ -108662,31 +109115,31 @@ awW awW fSm hiy -apl -bbL -bbL -kij -bbL -bYe -bYe -yfv -bbL -aWl -bbL -bbL -bax -bbL -bbL -aWl -afv -yfv -bbL -bbL -bbL -bbL -kij -bbL -xRU +ddp +fCP +fCP +stk +fCP +kGS +kGS +sVA +fCP +vUO +fCP +fCP +wzL +fCP +fCP +vUO +pwd +sVA +fCP +fCP +fCP +fCP +stk +fCP +uVg pEY jsP baw @@ -108695,12 +109148,12 @@ baw sgU baw baw -ykg -ykg -ykg -ykg -ykg -ykg +nIN +nIN +nIN +nIN +nIN +nIN hXV yhI rRz @@ -108745,9 +109198,9 @@ aaa bdH aaa aad -wZa -gtF -gtF +sGw +dvD +dvD wfE mcL jOo @@ -108762,9 +109215,9 @@ wFR wFR xbk aWw -bys -bxd -vgC +cJK +oGL +hOu bkA eUn bcD @@ -108782,13 +109235,13 @@ qyD omo blZ bqN -gtA +nTo bqN bwR gfW -bUe -cbR -ccr +oJL +jMa +cVt sHm ddM hZe @@ -108803,9 +109256,9 @@ dKK dKK xry nmY -raT -vtL -sNF +siT +bUQ +kyP ajZ aaa bdH @@ -108851,12 +109304,12 @@ adq apr apr aoV -uIw -qZx -qZx -qZx -omL -uIw +njn +rWz +rWz +rWz +tWM +njn aea oGC xjD @@ -108865,31 +109318,31 @@ ajf ajf oAO pIZ -aod -qgG -amC -amC -amC -fXB -amC -amC -hyc -all -all -amC -bYh -amC -fXB -fXB -fBL -bYc -bYc -suV -bYc -bYc -bYc -qgG -dqN +qwf +jRm +gDQ +gDQ +gDQ +rUN +gDQ +gDQ +dFd +rDm +rDm +gDQ +saT +gDQ +rUN +rUN +bxt +tPz +tPz +tiZ +tPz +tPz +tPz +jRm +rHn tFW dGC aZz @@ -108898,12 +109351,12 @@ aZz nsc baw cxk -ykg -iSe -iSe -iSe -wWD -ykg +nIN +rgL +rgL +rgL +nTc +nIN wTy wTy wTy @@ -108948,9 +109401,9 @@ aaa bdH aaa aad -wZa -pxO -jca +sGw +xiH +xzB wfE dgl jOo @@ -108965,9 +109418,9 @@ esM uUi xbk aWw -aNO -sLE -qLo +gtD +uRD +wru bkA nvM bgG @@ -108989,10 +109442,10 @@ gfW uFo omo gfW -iRx -iEb -bHa -apm +eWx +lLO +juo +otq gJO pwG aId @@ -109006,9 +109459,9 @@ vXf qGw uZV nmY -cUf -vtL -sNF +uKH +bUQ +kyP ajZ aaa bdH @@ -109054,12 +109507,12 @@ adq aub akc euO -uIw -qZx -qZx -qZx -qZx -uIw +njn +rWz +rWz +rWz +rWz +njn oGC sHp oGC @@ -109068,31 +109521,31 @@ awW awW aSJ isI -dtM -aii -mce -avn -mTb -avn -avn -gyy -avn -avn -avn -avn -mRl -avn -gyy -avn -avn -avn -avn -avn -mTb -avn -nFr -aii -ajC +dgP +jao +uIa +qxK +rYG +qxK +qxK +iRi +qxK +qxK +qxK +qxK +xcY +qxK +iRi +qxK +qxK +qxK +qxK +qxK +rYG +qxK +bTD +jao +uQi dCD aXe baw @@ -109101,12 +109554,12 @@ baw mnA baw baw -ykg -iSe -iSe -iSe -iSe -ykg +nIN +rgL +rgL +rgL +rgL +nIN crh csI nqG @@ -109151,9 +109604,9 @@ aaa bdH aaa aad -wZa -vLO -jca +sGw +jOq +xzB wfE krp jOo @@ -109168,9 +109621,9 @@ wFR soA xbk wfE -kEb -sLE -aLG +xos +uRD +qPk bCd iey baf @@ -109192,10 +109645,10 @@ bPk bsj byb bCd -buH -iEb -buH -app +knm +lLO +knm +yfy ruL qUZ aId @@ -109209,9 +109662,9 @@ kyh dKK xry nmY -iDD -sZQ -sNF +qpV +hNh +kyP ajZ aaa bdH @@ -109258,22 +109711,22 @@ avd akt awW qHq -qZx -qZx -qZx -qZx -uIw -ukk -uIw -uIw -uIw -uIw -uIw -uIw -uIw -dtM -aii -ajC +rWz +rWz +rWz +rWz +njn +vzO +njn +njn +njn +njn +njn +njn +njn +dgP +jao +uQi aoe aoe aoe @@ -109293,22 +109746,22 @@ aoe aoe aoe aoe -aEI -aii -aik -ykg -ykg -ykg -ykg -ykg -ykg -iUS -ykg -ykg -iSe -iSe -iSe -iSe +maF +jao +mOw +nIN +nIN +nIN +nIN +nIN +nIN +rBD +nIN +nIN +rgL +rgL +rgL +rgL eOM baw sMM @@ -109354,9 +109807,9 @@ aaa bdH aaa aad -wZa -pkx -jca +sGw +eoE +xzB wfE eiP qOp @@ -109371,9 +109824,9 @@ qtv xFZ btx naV -bxk -aYI -aLG +pij +kJh +qPk bCd tmg qjN @@ -109395,10 +109848,10 @@ qjN tzP wYK bCd -buH -iEb -buH -app +knm +lLO +knm +yfy ruL gsd aId @@ -109412,9 +109865,9 @@ hgD pSQ dOe nmY -bFf -hlm -sNF +rEK +bba +kyP ajZ aaa bdH @@ -109460,23 +109913,23 @@ adq aGP aka aWu -uIw -qZx -qZx -qZx -qZx -uIw -oOh -juV -veN -ljl -iSr -vGw -fKL -uIw -mOL -aii -ajC +njn +rWz +rWz +rWz +rWz +njn +gur +osn +vDt +puJ +deA +olC +ujf +njn +xky +jao +uQi aoe aoh jHQ @@ -109496,23 +109949,23 @@ cnV isN cnZ aoe -dtM -aii -ajC -ykg -qcM -qcM -gxS -dvx -gxS -iov -nGH -ykg -iSe -iSe -iSe -iSe -ykg +dgP +jao +uQi +nIN +cHn +cHn +gNo +aZv +gNo +xzh +dcZ +nIN +rgL +rgL +rgL +rgL +nIN hWB yhI qSX @@ -109557,9 +110010,9 @@ aaa bdH aaa aad -wZa -fSj -jca +sGw +jIJ +xzB wfE fHz opD @@ -109574,9 +110027,9 @@ esM jpt xbk aWw -aLG -aZi -cOM +qPk +hKe +uJM baZ bep qjN @@ -109598,10 +110051,10 @@ qjN qjN imo baZ -oLv -iEb -buH -app +sbE +lLO +knm +yfy ruL xPq aId @@ -109615,9 +110068,9 @@ smW prP xXl nmY -idV -aca -sNF +idL +gnM +kyP ajZ aaa bdH @@ -109663,23 +110116,23 @@ adq aGQ akc apg -uIw -qZx -qZx -qZx -qZx -uIw -xHx -nel -tqt -wuP -tqt -nel -xHx -sWb -bYe -akU -ajC +njn +rWz +rWz +rWz +rWz +njn +jsA +cGR +tey +urL +tey +cGR +jsA +tQA +kGS +lOn +uQi aoe vbS arb @@ -109699,23 +110152,23 @@ cnW aEi coa aoe -ahr -akU -bYe -dvx -gxS -iov -iov -ykg -tEk -gxS -gxS -ykg -iSe -iSe -iSe -iSe -ykg +tWf +lOn +kGS +aZv +gNo +xzh +xzh +nIN +gJY +gNo +gNo +nIN +rgL +rgL +rgL +rgL +nIN wvj csI iPH @@ -109760,9 +110213,9 @@ aaa bdH aaa aad -wZa -jca -gtF +sGw +xzB +dvD wfE iYx opD @@ -109777,9 +110230,9 @@ nEF tXi pcE aWw -aLG -aZi -aLG +qPk +hKe +qPk hqW qjN qjN @@ -109801,10 +110254,10 @@ hDX qjN qjN jpp -buH -iEb -buH -eDG +knm +lLO +knm +hnP lFp xlO aId @@ -109818,9 +110271,9 @@ oqt oEy qmY tUN -raT -urD -sNF +siT +lZb +kyP ajZ aaa bdH @@ -109866,23 +110319,23 @@ aee avd akt qWI -uIw -uIw -uIw -uIw -uIw -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -ahr -akU -ajC +njn +njn +njn +njn +njn +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +tWf +lOn +uQi aoe qQc fXg @@ -109902,23 +110355,23 @@ jBy aEi fFh aoe -dtM -akU -ajC -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -ykg -ykg -ykg -ykg -ykg +dgP +lOn +uQi +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +nIN +nIN +nIN +nIN +nIN ehj irS ilJ @@ -109963,9 +110416,9 @@ aaa bdH aaa aad -wZa -jca -gtF +sGw +xzB +dvD wfE gww opD @@ -109980,9 +110433,9 @@ ljf maL uKe aWw -aLG -avX -tzf +qPk +ckh +gyn vcq qPS qPS @@ -110004,10 +110457,10 @@ iaF bqL bqL ocf -bFu -mKY -hvp -mWw +wwE +sAD +cIO +tAb vpe dxT olN @@ -110021,9 +110474,9 @@ uxX oZy orN nmY -aNz -eDF -sNF +lQf +tHk +kyP ajZ aaa bdH @@ -110069,23 +110522,23 @@ adq aWm aka kyY -uIw -dDR -kEJ -qBE -qBE -uWv -aax -aax -aax +njn +mfR +sqP +tVs +tVs +gxm +tPB +tPB +tPB dkO aps aps aps -uWv -vIm -aii -ajC +gxm +xtO +jao +uQi aoe vbS koB @@ -110105,23 +110558,23 @@ aoe hFF aoe aoe -dtM -aii -ajC -uWv +dgP +jao +uQi +gxm aiJ aiJ aiJ qYr -atj -atj -atj -uWv -cNJ -xfu -iov -cNJ -ykg +cJV +cJV +cJV +gxm +ear +aGm +xzh +ear +nIN rQW yhI tmI @@ -110166,26 +110619,26 @@ aaa bdH aaa aad -wZa -tYh -gtF +sGw +nkj +dvD wfE rYi opD wFR wFR -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -aLG -aZi -cOM +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +qPk +hKe +uJM baZ eyQ qjN @@ -110207,26 +110660,26 @@ qjN qjN xtM baZ -oLv -hop -vMx -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA +sbE +jZe +cbL +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr iZE oqt oZy qhD nmY -raT -oPu -sNF +siT +xFt +kyP ajZ aaa bdH @@ -110272,23 +110725,23 @@ adq apr apr apr -uIw -ory -vGC -xHx -xHx -uWv -aax -aax -aax +njn +hzl +vdT +jsA +jsA +gxm +tPB +tPB +tPB vQe aps aps aps -uWv -ahq -akU -ajC +gxm +hGo +lOn +uQi aoe aop koB @@ -110308,23 +110761,23 @@ uRt aQz aRJ ajl -dtM -akU -ajC -uWv +dgP +lOn +uQi +gxm aiJ aiJ aiJ str -atj -atj -atj -uWv -xfu -iov -iov -rxm -ykg +cJV +cJV +cJV +gxm +aGm +xzh +xzh +moq +nIN wTy wTy wTy @@ -110369,26 +110822,26 @@ aaa bdH aaa aad -wZa -jca -gtF +sGw +xzB +dvD wfE cVK opD oRO ren -wdA +wDr aeL aeL aeL -aqM -arO -arO -arO -wdA -beB -byI -beB +oLj +wNG +wNG +wNG +wDr +qZT +pSF +eZC bCd mlH bqR @@ -110398,7 +110851,7 @@ tlA nyj vVW vhX -lia +unU rlZ twq vhX @@ -110410,26 +110863,26 @@ cle bCe sdO bCd -bJz -rrV -bJz -wdA -aue -aue -aue -txi +hBW +dxJ +rdT +wDr +mQx +mQx +mQx +jsa azy azy azy -wdA +wDr kJH oqt qlm kRD nmY -cUf -oPu -sNF +uKH +xFt +kyP ajZ aaa bdH @@ -110475,23 +110928,23 @@ aet afB akW apu -uIw -uIw -lGH -nel -evF -uWv -acV -acV -acV +njn +njn +lBB +cGR +mOR +gxm +gHX +gHX +gHX vQe aps aps aps -uWv -dtM -nmx -cpw +gxm +dgP +hBy +dlT hSI pMp gzK @@ -110511,23 +110964,23 @@ akw aQz aRK ajl -aDk -akU -ajC -uWv +kUs +lOn +uQi +gxm aiJ aiJ aiJ str -atl -atl -atl -uWv -maU -iov -gxS -ykg -ykg +oAY +oAY +oAY +gxm +rTe +xzh +gNo +nIN +nIN crh csI qhb @@ -110572,26 +111025,26 @@ aaa bdH aaa aad -wZa -jca -kmL +sGw +xzB +esm wfE wfE viJ wfE wfE -wdA +wDr aeL aeL aeL -kHj -arO -arO -arO -wdA -aLG -aZi -aLG +uZm +wNG +wNG +wNG +wDr +qPk +hKe +qPk bCd bmn knH @@ -110602,7 +111055,7 @@ rHo kan kan kan -phx +jXf kan kan kan @@ -110613,26 +111066,26 @@ kan iXW iLs bCd -buH -hop -buH -wdA -aue -aue -aue -tGO +knm +jZe +knm +wDr +mQx +mQx +mQx +guK azy azy azy -wdA +wDr euW rOI aId hQP nmY -iDD -vtL -sNF +qpV +bUQ +kyP ajZ aaa bdH @@ -110679,22 +111132,22 @@ boL akY boL aiH -ixB -nel -gWj -evF -uWv -adb -adb -adb -uWv +hbl +cGR +fwP +mOR +gxm +tpj +tpj +tpj +gxm asm asm asm -uWv -dtM -ajt -pvt +gxm +dgP +mxg +mnV aoe pjF wUd @@ -110714,22 +111167,22 @@ akw fOL aRS ajl -ahq -aii -ajC -uWv +hGo +jao +uQi +gxm alW alW alW -uWv -atI -atI -atI -uWv -xfu -cNJ -gxS -dvx +gxm +nVA +nVA +nVA +gxm +aGm +ear +gNo +aZv aJU baw sMM @@ -110776,25 +111229,25 @@ aKR aKR aKR aKR -gtF -jca -hkN -jca -jca -fMZ -kkm -wdA +dvD +xzB +pIo +xzB +xzB +fQy +nAm +wDr aeL aeL aeL -kHj -nLg -nLg -nLg -wdA -aLG -aZi -bad +uZm +kaq +kaq +kaq +wDr +qPk +hKe +qqf kan kan kan @@ -110816,25 +111269,25 @@ kan kan kan kan -bGe -bHL -buH -wdA -auk -auk -auk -tGO +tzw +sPY +knm +wDr +wQu +wQu +wQu +guK azy azy azy -wdA +wDr sJI aId aId hQP nmY -cUf -vtL +uKH +bUQ bVU bVU bVU @@ -110881,23 +111334,23 @@ aez boL akY wrQ -uIw -uIw -uIw -uIw -uIw -uWv -adb -adb -adb -uWv +njn +njn +njn +njn +njn +gxm +tpj +tpj +tpj +gxm asm asm asm -uWv -dtM -akU -wgd +gxm +dgP +lOn +tQO sqf sqf sqf @@ -110917,23 +111370,23 @@ upM akw alD vEx -bYe -akU -ajC -uWv +kGS +lOn +uQi +gxm alW alW alW -uWv -atI -atI -atI -uWv -ykg -ykg -ykg -ykg -ykg +gxm +nVA +nVA +nVA +gxm +nIN +nIN +nIN +nIN +nIN nTH sMM baw @@ -110979,30 +111432,30 @@ aKS aKU aKS aLL -cXy -xXG -nqC -fKj -pkx -iJA -gUo -wdA +vtJ +stP +eWs +hKO +eoE +lrH +kdo +wDr aiR aiR aiR -wdA -xpI -xpI -xpI -wdA -aLG -aZi -aLG +wDr +hwH +hwH +hwH +wDr +qPk +hKe +qPk kan -rmB -vKG -qFm -iYR +qWS +oDJ +vaQ +iIH rlZ buu rlZ @@ -111019,25 +111472,25 @@ kan psO gjK kan -buH -bHL -buH -wdA -aul -aul -aul -wdA +knm +sPY +knm +wDr +ydA +ydA +ydA +wDr azD azD azD -wdA +wDr ePN aId aId hQP nmY -jVM -imt +xUY +wGe bSf bWe bWn @@ -111084,23 +111537,23 @@ aet agS aiP aYq -uIw -qZx -qZx -qZx -omL -uWv -adb -adb -adb -uWv +njn +rWz +rWz +rWz +tWM +gxm +tpj +tpj +tpj +gxm asm asm asm -uWv -dtM -akU -ajC +gxm +dgP +lOn +uQi sqf anp wjz @@ -111108,8 +111561,8 @@ fnA jZY jZY sqf -jTb -iDe +wpu +okO ajl ajl ajl @@ -111120,23 +111573,23 @@ ajl onQ alD ajl -hon -akU -ajC -uWv +bNI +lOn +uQi +gxm alW alW alW -uWv -atI -atI -atI -uWv -iSe -iSe -iSe -wWD -ykg +gxm +nVA +nVA +nVA +gxm +rgL +rgL +rgL +nTc +nIN gnv yhI tTu @@ -111189,23 +111642,23 @@ aLL aLL aLL aLL -wdA +wDr aiR aiR aiR -wdA -xpI -xpI -xpI -wdA -aLG -aZi -aLG +wDr +hwH +hwH +hwH +wDr +qPk +hKe +qPk kan -cpU -xbG +kAp +dYU kan -jJu +cWm soK gDW rlZ @@ -111218,22 +111671,22 @@ rlZ gYl frl wFb -hEQ +wzZ tdI vbV kan -buH -hop -buH -wdA -aul -aul -aul -wdA +knm +jZe +knm +wDr +ydA +ydA +ydA +wDr azD azD azD -wdA +wDr bSf bSf auW @@ -111287,23 +111740,23 @@ aet agB akW aYs -uIw -qZx -qZx -qZx -qZx -uWv -vKF -adb -adb -uWv +njn +rWz +rWz +rWz +rWz +gxm +lbc +tpj +tpj +gxm asm asm asm -uWv -dtM -aii -ajC +gxm +dgP +jao +uQi sqf sOZ oNJ @@ -111311,8 +111764,8 @@ eDo eDo eDo sqf -dfE -mHv +vXv +wub gXl ajl wqW @@ -111323,23 +111776,23 @@ ajl aCp alD ajl -wqA -aii -ajC -uWv +kiq +jao +uQi +gxm alW alW alW -uWv -atI -atI -xMk -uWv -iSe -iSe -iSe -iSe -ykg +gxm +nVA +nVA +wZk +gxm +rgL +rgL +rgL +rgL +nIN vpn csI goL @@ -111392,18 +111845,18 @@ coT fgh rZP gmj -wdA +wDr aiR aiR aiR -wdA -xpI -xpI -xpI -wdA -bxD -byI -beB +wDr +hwH +hwH +hwH +wDr +iGi +pSF +eZC bst bst bst @@ -111425,18 +111878,18 @@ biA biA biA biA -bJz -bHT -koc -wdA -aul -aul -aul -wdA +hBW +ltv +uYM +wDr +ydA +ydA +ydA +wDr azD azD azD -wdA +wDr wcN nGi bVd @@ -111491,22 +111944,22 @@ boL akY boL avJ -qZx -qZx -qZx -qZx -uWv -adb -adb -adb -uWv +rWz +rWz +rWz +rWz +gxm +tpj +tpj +tpj +gxm asm asm asm -uWv -dtM -ajt -aik +gxm +dgP +mxg +mOw sqf anq awn @@ -111514,8 +111967,8 @@ xsz jTj jTj sqf -fYV -uJP +lmi +xgP dwA wJo cyU @@ -111526,22 +111979,22 @@ fQu akx alD gWG -dtM -aii -ajC -uWv +dgP +jao +uQi +gxm alW alW alW -uWv -atI -atI -atI -uWv -iSe -iSe -iSe -iSe +gxm +nVA +nVA +nVA +gxm +rgL +rgL +rgL +rgL qxz baw sMM @@ -111595,18 +112048,18 @@ uUt aLW aLW guS -wdA +wDr aiR aiR aiR -wdA -xpI -xpI -vgF -wdA -jgU -aZi -aLG +wDr +hwH +hwH +srR +wDr +cvg +hKe +qPk bst bui bvz @@ -111617,7 +112070,7 @@ bJw rlZ hBc hzs -kDj +bHg hzs aZK rlZ @@ -111628,18 +112081,18 @@ bsQ bmj caS biA -buH -bHL -wWQ -wdA -aun -aul -aul -wdA +knm +sPY +jxu +wDr +oVk +ydA +ydA +wDr azD azD azD -wdA +wDr wgR bTO bTO @@ -111693,23 +112146,23 @@ aez boL akY aqk -uIw -qZx -qZx -qZx -qZx -uWv -adb -adb -adb -uWv +njn +rWz +rWz +rWz +rWz +gxm +tpj +tpj +tpj +gxm asm asm asm -uWv -dtM -aii -ajC +gxm +dgP +jao +uQi sqf anr awn @@ -111729,23 +112182,23 @@ fQu akx alD gWG -dtM -aii -ajC -uWv +dgP +jao +uQi +gxm alW alW alW -uWv -atI -atI -atI -uWv -iSe -iSe -iSe -iSe -ykg +gxm +nVA +nVA +nVA +gxm +rgL +rgL +rgL +rgL +nIN xuY sMM baw @@ -111798,18 +112251,18 @@ bbS xka uLn uoA -wdA +wDr aiR aiR aiR -wdA -xpI -xpI -xpI -wdA -aLG -aZi -aLG +wDr +hwH +hwH +hwH +wDr +qPk +hKe +qPk bst bcR bev @@ -111831,18 +112284,18 @@ bCl bsz caT biA -buH -bHL -buH -wdA -aul -aul -aul -wdA +knm +sPY +knm +wDr +ydA +ydA +ydA +wDr azD azD azD -wdA +wDr hkB bTO qSm @@ -111896,23 +112349,23 @@ aet agS aiP aYq -uIw -qZx -qZx -qZx -qZx -uWv -adb -adb -adb -uWv +njn +rWz +rWz +rWz +rWz +gxm +tpj +tpj +tpj +gxm asm asm asm -uWv -aEI -aii -ajC +gxm +maF +jao +uQi sqf sqf awp @@ -111932,23 +112385,23 @@ ajl hVz alD ajl -ahr -aii -ajC -uWv +tWf +jao +uQi +gxm alW alW alW -uWv -atI -atI -atI -uWv -iSe -iSe -iSe -iSe -ykg +gxm +nVA +nVA +nVA +gxm +rgL +rgL +rgL +rgL +nIN gnv yhI tTu @@ -112001,18 +112454,18 @@ rlh aLW aLW gxh -wdA +wDr aiR aiR aiR -wdA -xpI -xpI -xpI -wdA -aLG -aZi -mzR +wDr +hwH +hwH +hwH +wDr +qPk +hKe +tON bst bcS bag @@ -112034,18 +112487,18 @@ bCm bsP hgZ biA -buH -bHL -buH -wdA -aul -aul -aul -wdA +knm +sPY +knm +wDr +ydA +ydA +ydA +wDr azD azD azD -wdA +wDr wjC bTO xMf @@ -112099,23 +112552,23 @@ aet afB akW biT -uIw -uIw -uIw -uIw -uIw -uWv -adc -adc -adc -uWv -uWv -uWv -uWv -uWv -kYU -akU -rxG +njn +njn +njn +njn +njn +gxm +hWV +hWV +hWV +gxm +gxm +gxm +gxm +gxm +mYd +lOn +xwU ajl qhx akw @@ -112135,23 +112588,23 @@ ajl nMV vIf ajl -aEI -akU -gMa -uWv -uWv -uWv -uWv -uWv -adc -adc -adc -uWv -ykg -ykg -ykg -ykg -ykg +maF +lOn +nwu +gxm +gxm +gxm +gxm +gxm +hWV +hWV +hWV +gxm +nIN +nIN +nIN +nIN +nIN crh csI qhb @@ -112204,18 +112657,18 @@ djQ nFs aLW gFa -wdA +wDr aiR aiR aiR -wdA -xpI -xpI -xpI -wdA -aLG -aZi -aLG +wDr +hwH +hwH +hwH +wDr +qPk +hKe +qPk bst buj bev @@ -112237,18 +112690,18 @@ bCn bsz hMN biA -buH -bHL -buH -wdA -aul -aul -aul -wdA +knm +sPY +knm +wDr +ydA +ydA +ydA +wDr azD azD azD -wdA +wDr xad roG mZr @@ -112307,18 +112760,18 @@ cWv cWv cWv cWv -kaj -uId -adH -adH -fMA -atC -bbL -aWl -bbL -wQg -akU -bYe +omp +kmx +xog +xog +vFy +ltt +fCP +vUO +fCP +xRn +lOn +kGS bVE aos akw @@ -112338,23 +112791,23 @@ ans aos alE bVE -bYe -akU -aGd -aWl -hJu -bbL -atC -aAa -aww -aww -wst -axs -bbL -bbL -bYe -bbL -bit +kGS +lOn +mnC +vUO +qRx +fCP +ltt +cuI +ocX +ocX +sYj +fvj +fCP +fCP +kGS +fCP +oiB baw baw qYC @@ -112407,18 +112860,18 @@ aLL aLL aLL hrF -wdA -wdA -wdA -wdA -wdA -kaF -jWU -jWU -wdA -pGM -aZi -aLG +wDr +wDr +wDr +wDr +wDr +jXR +enK +enK +wDr +kgt +hKe +qPk bst aYQ bbd @@ -112440,18 +112893,18 @@ bnT btX byc biA -buH -bHL -bIR -wdA -cyG -cyG -sos -wdA -wdA -wdA -wdA -wdA +knm +sPY +qPU +wDr +sai +sai +wrN +wDr +wDr +wDr +wDr +wDr bSf bSf auX @@ -112510,18 +112963,18 @@ boL boL boL boL -kGL -uTY -azY -azY -azY -atC -abx -abx -abx -abx -tal -ait +fGD +bfb +qEc +qEc +qEc +ltt +gfv +gfv +gfv +gfv +aPC +tzF aEe akA akA @@ -112541,23 +112994,23 @@ akA oap aSb aEe -ait -bjJ -abx -abx -abx -abx -atC -azY -azY -azY -fad -kGL -abg -abg -abg -abg -ajC +tzF +lzF +gfv +gfv +gfv +gfv +ltt +qEc +qEc +qEc +rWP +fGD +acQ +acQ +acQ +acQ +uQi baw vbB ley @@ -112603,25 +113056,25 @@ aKS aKV aKS aLL -jBI -sro -pAH -nqL -ecf -eNq -mLr -gnh -pWg -lGh -aQt -lDg -lpD -wGA -lpD -hmc -tBF -jWt -aLG +qVE +iGc +bwG +hCk +nRN +mzI +olQ +oCK +eob +gMk +qRb +axY +xrC +oWF +xrC +toQ +exl +qyX +qPk bst bst bst @@ -112631,7 +113084,7 @@ bst cjW rlZ rlZ -tZO +hrJ kan biy boX @@ -112643,25 +113096,25 @@ biA biA biA biA -ghD -vdW -hvp -ayE -azE -ajd -azS -chE -azI -ciT -cjw -cjS -ckl -ckI -cla -cly -vOK -hVl -fkF +wHn +rDO +cIO +rEd +fml +fqU +bIO +rSA +cIm +emw +bvD +gZW +lUA +bwv +hDU +iNH +cDx +ndl +iDk bSf bWe bWp @@ -112713,18 +113166,18 @@ dux iYr dux ado -atC -kHT -avn -avn -mTb -atC -avn -avn -avn -nFr -ajt -ajC +ltt +uVZ +qxK +qxK +rYG +ltt +qxK +qxK +qxK +bTD +mxg +uQi vOy vOy vOy @@ -112744,23 +113197,23 @@ vOy wMO wky sqf -hon -ajt -mce -avn -avn -avn -atC -mTb -avn -avn -aim -atC -avn -bYe -cre -avn -aim +bNI +mxg +uIa +qxK +qxK +qxK +ltt +rYG +qxK +qxK +fdf +ltt +qxK +kGS +ftZ +qxK +fdf baw dBp gVA @@ -112806,25 +113259,25 @@ aKR aKR aKR aKR -xnn -wli -mfc -wli -wli -ijw -kYj -xnn -pAH -aNn -aNO -asO -apC -apC -apC -aqx -aLG -aYO -aLG +deq +lfx +jgK +lfx +lfx +yih +kgD +deq +bwG +vVy +gtD +vEv +cvI +cvI +cvI +aza +qPk +wKN +qPk kan ihw beW @@ -112834,7 +113287,7 @@ vhX akQ rlZ rlZ -jAl +pnC dBH bky ryt @@ -112846,25 +113299,25 @@ tAU xmT tAU kan -buH -bHL -buH -azB -azT -azT -azT -azG -bHa -ccU -kzP -cjT -ckm -bHa -clb -clz -rng -hIq -cER +knm +sPY +knm +qEM +wzy +wzy +wzy +qEM +juo +seL +siC +jNw +xuy +juo +vqz +vMU +mJO +vDN +xbg bVU bVU bVU @@ -112925,9 +113378,9 @@ abE abE abE abE -jKK -pjM -aim +bff +rnd +fdf vOy nos fcy @@ -112947,27 +113400,27 @@ ayX kXw pxo sqf -kHT -pjM -aim -lYm -lYm -lYm -lYm -lYm -lYm -lYm -lYm -lYm -lYm -vhb -lYm -lYm -lYm -lYm -lYm -lYm -ckw +uVZ +rnd +fdf +mRU +mRU +mRU +mRU +mRU +mRU +mRU +mRU +mRU +mRU +oiq +mRU +mRU +mRU +mRU +mRU +mRU +woU aaa aaa aaa @@ -113008,26 +113461,26 @@ aaa aaa bdH aad -nnw -xnn -wli -pAH +kyw +deq +lfx +bwG aQF aQF aQF aQF szE aQF -bBb -jtJ -asO -asP -uKA -asP -aqx -aLG -aZi -aLG +ihW +qOS +vEv +xkN +dwj +xkN +aza +qPk +hKe +qPk kan iMI rlZ @@ -113049,26 +113502,26 @@ wJb wJb bPu kan -buH -bHL -buH -azB -qKM -rYj -ssE -azG -uxZ -vgk -rng -rng -rng +knm +sPY +knm +qEM +hEg +ewc +lLl +qEM +jvD +cBV +mJO +mJO +mJO bTq -rng -rng -rng -jbS -cER -qbs +mJO +mJO +mJO +mgb +xbg +lyW ajZ bdH aaa @@ -113128,9 +113581,9 @@ gwo aed aeG abE -atL -akV -atL +umI +fsu +umI vOy oNp aSn @@ -113150,27 +113603,27 @@ niL kXw pxo sqf -atL -bkQ -atL -lYm -wqU -wqU -wqU -wqU -sLJ +umI +uch +umI +mRU +qSw +qSw +qSw +qSw +fHM pBG rLp ttX -lYm -dhe -lYm -kDP -eYw -lEz -jsn -kyQ -ckw +mRU +vpf +mRU +vor +qnA +vkI +gNN +lyz +woU aaa aaa aaa @@ -113211,10 +113664,10 @@ aaa aaa bdH aad -nnw -sMe -wli -pAH +kyw +xwd +lfx +bwG weR aPE weR @@ -113228,9 +113681,9 @@ aQF aQF aQF aQF -esi -byI -beB +mNG +pSF +eZC kan avW bZn @@ -113240,7 +113693,7 @@ vhX gDW rlZ rlZ -jmm +wYr dBH bky ryt @@ -113252,9 +113705,9 @@ xIk cLA xIk kan -bJz -bHT -quI +hBW +ltv +qEz bJt bJt bJt @@ -113262,16 +113715,16 @@ bJt bJt bJt bJt -rng -kks -kks -kks -kks -owS -rng -jbS -jbS -qbs +mJO +plv +plv +plv +plv +mvg +mJO +mgb +mgb +lyW ajZ bdH aaa @@ -113331,9 +113784,9 @@ adF aef dWw agA -ago -snm -cwJ +okx +hgA +xfo vOy anz vgx @@ -113353,27 +113806,27 @@ aCC kXw pxo asn -ago -asW -cwJ -lYm -wqU -wqU -wqU -wqU -wqU +okx +cFH +xfo +mRU +qSw +qSw +qSw +qSw +qSw pBG jZU jAe -lYm -iTV -lYm -oDh -xXD -vbJ -iTV -vLd -ckw +mRU +jtU +mRU +tNw +ebI +ukC +jtU +fCi +woU aaa aaa aaa @@ -113414,14 +113867,14 @@ aaa aaa bdH aad -nnw -xnn -eSH -pAH -xtr -xtr -jXC -jXC +kyw +deq +cGY +bwG +rUq +rUq +sab +sab izk aWD cWr @@ -113431,9 +113884,9 @@ eKT wan cTC aQF -pno -aYO -bad +syj +wKN +qqf xMs xMs xMs @@ -113443,7 +113896,7 @@ xMs cjW rlZ rlZ -bvm +jbO kan quv rZB @@ -113455,9 +113908,9 @@ vMo vMo vMo vMo -bGe -bHL -smn +tzw +sPY +hkC bJt xOL gGI @@ -113465,16 +113918,16 @@ eeu gfq eFP gAz -rng -kks -kks -kks -kks -kks -rng -cER -rzK -qbs +mJO +plv +plv +plv +plv +plv +mJO +xbg +pgJ +lyW ajZ bdH aaa @@ -113534,9 +113987,9 @@ adF aef aef uZZ -bYe -amO -avj +kGS +bNT +rmB vOy awQ oLU @@ -113556,27 +114009,27 @@ edv kXw pxo asn -ayT -akU -avj -lYm -wqU -wqU -wqU -wqU -wqU +eWN +lOn +rmB +mRU +qSw +qSw +qSw +qSw +qSw pBG cVq nOb -lYm -uCU -lYm -lYm -lYm -hdf -lYm -lYm -ckw +mRU +vpI +mRU +mRU +mRU +gBs +mRU +mRU +woU aaa aaa aaa @@ -113617,12 +114070,12 @@ aaa aaa bdH aad -nnw -xnn -dle -pAH -hys -jXC +kyw +deq +veq +bwG +pKh +sab rDv bmW jWu @@ -113634,9 +114087,9 @@ aRy aRy nIj aQF -aWM -aZi -aLG +rWv +hKe +qPk xMs aSO feY @@ -113658,9 +114111,9 @@ wZE iGn byd vMo -buH -bHL -buH +knm +sPY +knm lhB pOY bDs @@ -113668,16 +114121,16 @@ jge bDs bDs hLC -rng -kks -kks -kks -kks -kks -rng -cER -jbS -qbs +mJO +plv +plv +plv +plv +plv +mJO +xbg +mgb +lyW ajZ bdH aaa @@ -113737,9 +114190,9 @@ adF bls aeH agq -ahM -kSJ -avj +nIF +ijn +rmB vOy hng dnC @@ -113759,27 +114212,27 @@ aCt kXw pxo asn -ayT -aii -avm -lYm -wqU -wqU -wqU -wqU -wqU +eWN +jao +hCF +mRU +qSw +qSw +qSw +qSw +qSw pBG dzp ngV -lYm -iTV -iTV -qHK -uPD -dhe -rkS -dhe -ckw +mRU +jtU +jtU +uBx +fLi +vpf +prf +vpf +woU aaa aac aaf @@ -113820,10 +114273,10 @@ aaa aaa bdH aad -nnw -xnn -wbm -pAH +kyw +deq +deF +bwG mTi lJK kYV @@ -113837,9 +114290,9 @@ bQU bQU bjD dqE -aem -mUa -uLv +htl +vaq +vTX xMs lOH dUS @@ -113861,9 +114314,9 @@ bof vit dxu vMo -buH -bHL -buH +knm +sPY +knm lhB xCb bDs @@ -113871,16 +114324,16 @@ bIJ bDs bDs qJS -rng -kks -kks -kks -kks -kks -rng -cER -cER -qbs +mJO +plv +plv +plv +plv +plv +mJO +xbg +xbg +lyW ajZ aaa avo @@ -113940,9 +114393,9 @@ adF aef kqN agA -ayT -ajt -avm +eWN +mxg +hCF vOy xyt wiW @@ -113962,10 +114415,10 @@ vOy mFq vqW sqf -ybf -aii -avj -lYm +jMP +jao +rmB +mRU pBG pBG pBG @@ -113974,15 +114427,15 @@ pBG pBG saL pBG -lYm -lYm -lYm -lYm -lYm -lYm -iTV -dhe -ckw +mRU +mRU +mRU +mRU +mRU +mRU +jtU +vpf +woU aaa aad aag @@ -114023,15 +114476,15 @@ aaa aaa bdH aad -nnw -xnn -dpD -pAH +kyw +deq +oWq +bwG aQF aQF aPH xIQ -mrm +tmX aWD rrK aRy @@ -114040,9 +114493,9 @@ brb cpp buv aWF -aLG -aZi -aLG +qPk +hKe +qPk xMs akE qGF @@ -114064,9 +114517,9 @@ ggz dka bye vMo -buH -bHL -buH +knm +sPY +knm lhB aQW bDs @@ -114081,9 +114534,9 @@ bJt bJt bJt bJt -cER -keN -qbs +xbg +otW +lyW ajZ avo avo @@ -114143,9 +114596,9 @@ aef aef tRD abE -aTL -ajt -avj +ciI +mxg +rmB vOy iYf bIM @@ -114165,12 +114618,12 @@ hPe sdu btC vLj -ahM -kSJ -avj -cGr +nIF +ijn +rmB +dyJ pBG -hqJ +gqQ cHG nQA wph @@ -114182,10 +114635,10 @@ gel gel gel fkX -lYm -iTV -enA -ckw +mRU +jtU +tMU +woU aaf aag aag @@ -114226,10 +114679,10 @@ bdH bdH bdH aad -nnw -sMe -wli -pAH +kyw +xwd +lfx +bwG weR aPE izk @@ -114243,9 +114696,9 @@ aTY iCF gJP aQF -qcl -aZi -aLG +uNf +hKe +qPk xMs aYR dUS @@ -114267,9 +114720,9 @@ jZd vit bzo vMo -buH -bHL -buH +knm +sPY +knm lhB pxD bDs @@ -114284,9 +114737,9 @@ iIl bDs ujV bJt -cER -cER -qbs +xbg +xbg +lyW ajZ avo avs @@ -114346,9 +114799,9 @@ adF aef afs agA -ayT -akU -avj +eWN +lOn +rmB vOy mTp wiW @@ -114368,10 +114821,10 @@ lON dVu oDR vOP -bYe -bnD -aWH -aYn +kGS +fAW +vlR +qPv qvL wmP wmP @@ -114385,10 +114838,10 @@ cXF rLU dKp cHu -lYm -iTV -dhe -ckw +mRU +jtU +vpf +woU aag aag aag @@ -114429,12 +114882,12 @@ bdH bdH bdH aad -nnw -xnn -cnP -pAH -weW -jXC +kyw +deq +sJa +bwG +pGG +sab izk hds aQF @@ -114446,9 +114899,9 @@ qZH bsN buB aWD -aLG -aZi -aLG +qPk +hKe +qPk xMs bXw eiw @@ -114470,9 +114923,9 @@ boh qDP wbP vMo -buH -bHL -vMx +knm +sPY +cbL bJt qom bDs @@ -114487,8 +114940,8 @@ idx hAz gHj bJt -ygb -cER +oqI +xbg avo avo avo @@ -114549,9 +115002,9 @@ adD sOw afs agA -ayT -akU -avj +eWN +lOn +rmB vOy axn dRh @@ -114571,10 +115024,10 @@ vOy aRd aIo vOy -qLK -akU -avj -eAT +gyb +lOn +rmB +aRl pBG lvb eAN @@ -114588,10 +115041,10 @@ bHk vZw bHk cHu -lYm -dhe -lYm -ckw +mRU +vpf +mRU +woU aag aag aag @@ -114632,10 +115085,10 @@ bdH bdH bdH aad -nnw -wli -xnn -mfc +kyw +lfx +deq +jgK aNs aNs hyw @@ -114649,9 +115102,9 @@ fHF bml buB aWD -beB -byI -beB +eZC +pSF +eZC xMs xMs xMs @@ -114673,9 +115126,9 @@ vMo vMo vMo vMo -bJz -bHT -uFP +hBW +ltv +kGw bJt bJt nFI @@ -114690,8 +115143,8 @@ gSk bDs bpI bJt -rrp -cER +jLH +xbg lpy avC avC @@ -114752,9 +115205,9 @@ adF aef afs agA -ayT -akU -avj +eWN +lOn +rmB vOy aAr pGK @@ -114774,9 +115227,9 @@ aCD hFC qmy vOy -ayT -akU -avj +eWN +lOn +rmB pBG pBG hEl @@ -114791,10 +115244,10 @@ vzp vZw erd cHu -lYm -eLq -lYm -ckw +mRU +vzB +mRU +woU aag aag aag @@ -114835,10 +115288,10 @@ bdH bdH bdH aad -nnw -dDd -sro -pAH +kyw +txp +iGc +bwG vMr vMr izk @@ -114852,9 +115305,9 @@ htL aUL buB aWD -aLG -aZi -aLG +qPk +hKe +qPk nyw iXU hDw @@ -114876,9 +115329,9 @@ vEH uFH tQd nyw -buH -bHL -buH +knm +sPY +knm yfS sEi dck @@ -114893,8 +115346,8 @@ gSk reL wiI bJt -kbz -meM +tqV +dSm avo avo avo @@ -114955,9 +115408,9 @@ aef aef pHG abE -aTL -aii -avj +ciI +jao +rmB vOy aID gLc @@ -114977,9 +115430,9 @@ aoM aoM vgB kgs -ayT -aii -avj +eWN +jao +rmB bvX ojQ eAN @@ -114994,10 +115447,10 @@ bHk vZw bHk cHu -lYm -dhe -lYm -ckw +mRU +vpf +mRU +woU aah aag aag @@ -115038,10 +115491,10 @@ bdH bdH bdH aad -nnw -kQZ -ohw -pAH +kyw +cme +whm +bwG mTi lJK izk @@ -115055,9 +115508,9 @@ aTZ aUM gJP aQF -lRU -aYO -aLG +rmz +wKN +qPk nyw beH dcd @@ -115079,9 +115532,9 @@ beH beH beH nyw -buH -bHL -buH +knm +sPY +knm yfS hgL swt @@ -115096,9 +115549,9 @@ gSk bDs vwI bJt -qxb -jbS -qbs +lAa +mgb +lyW ajZ avo avs @@ -115158,9 +115611,9 @@ adF aef aGS agA -ayT -aii -avj +eWN +jao +rmB vOy aMd pGK @@ -115180,9 +115633,9 @@ prx fpT eVT kgs -ayT -aii -avj +eWN +jao +rmB bvX kVV vQR @@ -115197,10 +115650,10 @@ pRy wwW mRW cHu -lYm -iTV -dhe -ckw +mRU +jtU +vpf +woU aaa aad aag @@ -115241,15 +115694,15 @@ bdH bdH bdH aad -nnw -eSH -hWV -pAH +kyw +cGY +ipn +bwG aQF aQF sPc xIQ -jXC +sab aWD olM aRy @@ -115258,9 +115711,9 @@ eXr iFH buv aWE -aLG -avX -aem +qPk +ckh +htl aum emr emr @@ -115282,9 +115735,9 @@ rCO rCO rCO eVv -bFu -lAO -buH +wwE +mDZ +knm ykj rlQ ven @@ -115299,9 +115752,9 @@ gSk bDs fUB bJt -jbS -fLl -qbs +mgb +nhw +lyW ajZ avo avo @@ -115361,9 +115814,9 @@ adF aef nIS uZZ -bYe -aii -avj +kGS +jao +rmB vOy aMg aSo @@ -115383,16 +115836,16 @@ ger aoM aFf mmN -ayT -aii -avj +eWN +jao +rmB bvX maO lPm iZV fdx cuq -edn +eQJ fVF pBG qWR @@ -115400,10 +115853,10 @@ wJH wJH wJH sNR -lYm -iTV -dhe -ckw +mRU +jtU +vpf +woU aaa aae aah @@ -115444,10 +115897,10 @@ bdH bdH bdH aad -nnw -jtG -xnn -pAH +kyw +oif +deq +bwG weR aPE izk @@ -115461,9 +115914,9 @@ pOi pOi nVF aWF -aLG -aYO -aLG +qPk +wKN +qPk nyw eGZ ieX @@ -115485,9 +115938,9 @@ bhq dcd eTd nyw -buH -vdW -qLp +knm +rDO +hqp kKk rDt gpI @@ -115502,9 +115955,9 @@ gSk bDs nqO bJt -lBj -rzK -qbs +nQo +pgJ +lyW ajZ aaa avo @@ -115564,9 +116017,9 @@ adF aef nIS eWF -bYe -aii -avj +kGS +jao +rmB vOy aQZ bkT @@ -115584,11 +116037,11 @@ ggl jjS qMP kBP -qIB +aSl vOy -aTL -aii -avm +ciI +jao +hCF pBG pBG pBG @@ -115599,14 +116052,14 @@ pBG pBG pBG pBG -lYm -lYm -lYm -lYm -lYm -iTV -enA -ckw +mRU +mRU +mRU +mRU +mRU +jtU +tMU +woU bdH bdH bdH @@ -115647,12 +116100,12 @@ bdH bdH bdH aad -nnw -pDZ -wli -pAH -esV -esV +kyw +byt +lfx +bwG +iWQ +iWQ uFd mUq qwt @@ -115664,9 +116117,9 @@ tou tou jhy aQF -beB -aYT -jfD +eZC +hMk +mkw bdd bdd bdd @@ -115688,9 +116141,9 @@ bdd bdd bdd bdd -fZx -bHT -bJz +xwm +ltv +hBW yfS ape ven @@ -115705,9 +116158,9 @@ cnu bDs knK bJt -cER -wRn -qbs +xbg +oUZ +lyW ajZ bdH bdH @@ -115767,9 +116220,9 @@ adF aef kqN agA -ayT -akU -avj +eWN +lOn +rmB vOy dVd lea @@ -115789,27 +116242,27 @@ vti vti aEZ vOy -ayT -akU -avj +eWN +lOn +rmB fKh gQk trU oNY fdx pBG -eNw +pVF ppF fiE pBG -iTV -iTV -qHK -qsr -dhe -iTV -dhe -ckw +jtU +jtU +uBx +ycM +vpf +jtU +vpf +woU bdH bdH bdH @@ -115850,13 +116303,13 @@ bdH bdH bdH aad -nnw -vEQ -wli -pAH -esV -esV -jXC +kyw +jNo +lfx +bwG +iWQ +iWQ +sab aNr pQY aWD @@ -115867,9 +116320,9 @@ dVO bsR aQr aQF -aLG -aYO -aLG +qPk +wKN +qPk tda ngI dkq @@ -115891,9 +116344,9 @@ qby btY bAJ huU -buH -bHL -buH +knm +sPY +knm yfS ape ven @@ -115908,9 +116361,9 @@ gSk ljG tSp bJt -cER -meC -qbs +xbg +ssk +lyW ajZ bdH bdH @@ -115970,9 +116423,9 @@ fcE aef uNN abE -giB -akU -avj +iGZ +lOn +rmB vOy vOy vOy @@ -115992,9 +116445,9 @@ nPE oqZ uaI vOy -atV -akU -avj +eFI +lOn +rmB fKh iuG sOv @@ -116005,14 +116458,14 @@ dzp rMT dzp pBG -iTV -lYm -lYm -lYm -lYm -dhe -lYm -ckw +jtU +mRU +mRU +mRU +mRU +vpf +mRU +woU bdH bdH bdH @@ -116053,10 +116506,10 @@ bdH bdH bdH aad -nnw -xnn -wli -pAH +kyw +deq +lfx +bwG mTi lJK mTi @@ -116070,9 +116523,9 @@ aQF aQF aQF aQF -ePA -akO -bwd +ldb +rYI +fzc bdg vyg bni @@ -116094,9 +116547,9 @@ snb xbd bAU bdg -bCi -bCo -ivB +jlD +pYN +raE bJt wbC lHu @@ -116111,9 +116564,9 @@ gSk oDE bJt bJt -cER -jbS -qbs +xbg +mgb +lyW ajZ bdH bdH @@ -116173,11 +116626,11 @@ aeI eva xzf abE -aTL -aii -ali -amD -cwJ +ciI +jao +uZI +cSM +xfo vOy vOy vOy @@ -116195,9 +116648,9 @@ vOy vOy vOy vOy -vIN -aii -avj +czJ +jao +rmB fKh ubI nQA @@ -116208,14 +116661,14 @@ nTR gDp rwq pBG -iTV -lYm -fhb -vlj -lYm -eLq -lYm -ckw +jtU +mRU +oyO +nve +mRU +vzB +mRU +woU bdH bdH bdH @@ -116256,10 +116709,10 @@ bdH bdH bdH aad -nnw -dwU -wli -pAH +kyw +xbI +lfx +bwG aQF aQF aQF @@ -116269,13 +116722,13 @@ aQF aQF aQF aQF -beA -hmM -gFc -pAH -aeb -alx -aeb +wYG +yhR +gHi +bwG +pzj +uhq +pzj bdg apz dyd @@ -116297,9 +116750,9 @@ vPw bvr bBQ bdg -bCj -bDx -bCj +sgL +aRL +sgL rde vjC iMm @@ -116313,10 +116766,10 @@ bDs gSk luS bJt -ebL -cER -jbS -qbs +uCw +xbg +mgb +lyW ajZ bdH bdH @@ -116358,11 +116811,11 @@ aaa aaa aaa aaa -qdy -rOR -jZD -rOR -rOR +vHn +cGd +moK +cGd +cGd aNi aNi bWr @@ -116376,11 +116829,11 @@ aNi aNi aNi aNi -atV -aii -abx -abx -avj +eFI +jao +gfv +gfv +rmB vOy elR xXh @@ -116398,9 +116851,9 @@ dMK vOy vOy vOy -ayT -aii -avj +eWN +jao +rmB pBG mGT nQA @@ -116411,14 +116864,14 @@ pBG pBG pBG pBG -iTV -pmS -iTV -eLq -lYm -jDh -lYm -ckw +jtU +rXF +jtU +vzB +mRU +kuK +mRU +woU aaa aaa aaa @@ -116459,26 +116912,26 @@ bdH aaa bdH aad -nnw -xnn -xnn -pAH -uBS -vDZ -inq -sVv -jVi -pAH -cTc -cVZ -qvG -nqL -xnn -ecf -pAH -bwd -auv -bwd +kyw +deq +deq +bwG +tEu +mUY +vOw +ouU +dro +bwG +gSH +xJp +qxJ +hCk +deq +nRN +bwG +wsS +vxY +wsS bdg auj bbf @@ -116500,9 +116953,9 @@ bpv tMW bBY bCh -bCi -bCo -bCi +mPM +esd +mPM ejw xML iMm @@ -116516,10 +116969,10 @@ bDs gSk vSp lHG -rHA -jbS -jbS -qbs +kOJ +mgb +mgb +lyW ajZ bdH bdH @@ -116561,11 +117014,11 @@ aaf aaf aaf aaf -qdy -qTv -oKB -oKB -nSm +vHn +ejV +hoT +hoT +vyh aNi cYT aNm @@ -116579,11 +117032,11 @@ bhx vif aOR bsw -ayT -xGk -all -amK -avj +eWN +uSZ +rDm +ldq +rmB vOy wWz vHO @@ -116599,29 +117052,29 @@ ruc xOY wTM vOy -nzA -amD -ajr -aii -avm +qqb +cSM +fvE +jao +hCF pBG -bfO +tGT nQA nQA jDO pBG aYH cHG -cgd +cOY pBG -gck -lYm -cep -caL -lYm -iTV -dhe -ckw +mSM +mRU +gRc +oOp +mRU +jtU +vpf +woU aaf aaf aaf @@ -116655,33 +117108,33 @@ bdH bdH bdH aac -nnw -nnw -nnw -nnw -nnw -nnw -nnw -nnw -xnn -jkb -pAH -xhp -vVD -ftr -kmu -vdc -oTR -waY -kmu -byD -oBQ -kmu -kmu -dZT -aem -mUa -aLG +kyw +kyw +kyw +kyw +kyw +kyw +kyw +kyw +deq +caq +bwG +igb +cpz +ooA +kpj +sBY +wyG +qjL +kpj +rAo +lka +kpj +kpj +mQY +ygp +tdi +fZE tda mng wTm @@ -116703,9 +117156,9 @@ mng wTm wCI tda -buH -bHL -buH +oSM +ter +oSM bJt swE wpI @@ -116719,17 +117172,17 @@ qxE rui vSp bJt -ogj -cER -fLl -qbs -qbs -qbs -qbs -qbs -qbs -qbs -qbs +uXU +xbg +nhw +lyW +lyW +lyW +lyW +lyW +lyW +lyW +lyW ajY aaa aaa @@ -116764,11 +117217,11 @@ aag aag aag aag -qdy -bEj -nxJ -oKB -nxJ +vHn +dGg +tob +hoT +tob aNi aZe aNm @@ -116782,11 +117235,11 @@ aco aco dYu bsw -mQH -hee -aEX -aii -avm +cKW +xNl +dpS +jao +hCF vOy wWz anw @@ -116802,11 +117255,11 @@ wLy eiE wTM vOy -ayT -akT -amC -bKe -avj +eWN +gFL +gDQ +xgE +rmB fKh eYn nQA @@ -116817,14 +117270,14 @@ eAN eAN eAN pBG -dhe -lYm -lYm -lYm -lYm -uCU -dhe -ckw +vpf +mRU +mRU +mRU +mRU +vpI +vpf +woU aag aag aag @@ -116857,22 +117310,22 @@ bdH bdH bdH bdH -nnw -nnw -nqL -mQQ -wli -wli -wli -xnn -xnn -xnn -wli -ddN -wli -oPY -oPs -sbA +kyw +kyw +hCk +maK +lfx +lfx +lfx +deq +deq +deq +lfx +eYp +lfx +vmq +cqH +tjO bdd bdd bdd @@ -116882,9 +117335,9 @@ bdd bdd bdd bdd -rhW -aYO -xNB +nhE +naa +nVQ bdd vuA vuA @@ -116906,9 +117359,9 @@ vuA vuA vuA bdd -bSj -bHL -bIR +fvV +ter +gvK bdd bdd bdd @@ -116923,17 +117376,17 @@ cDC vuF bJt bJt -cER -jbS -jbS -jbS -aTu -iPm -jbS -jbS -jbS -qbs -qbs +xbg +mgb +mgb +mgb +gLm +ttD +mgb +mgb +mgb +lyW +lyW aaa aaa aaa @@ -116967,11 +117420,11 @@ aag aag aag aag -qdy -xIp -nxJ -nxJ -nxJ +vHn +oSG +tob +tob +tob aNi aZr aNm @@ -116987,9 +117440,9 @@ cCa aNi aNi aNi -ybf -ajt -avj +jMP +mxg +rmB vOy wWz ovG @@ -117005,11 +117458,11 @@ gxP aOe wTM vOy -atU -akU -abg -abg -avj +nLM +lOn +acQ +acQ +rmB fKh wvo nQA @@ -117020,14 +117473,14 @@ skR oxc nBi pBG -eLq -lYm -mre -flK -lYm -iTV -enA -ckw +vzB +mRU +pGh +xEs +mRU +jtU +tMU +woU aag aag aag @@ -117060,22 +117513,22 @@ bdH bdH bdH bdH -nnw -cVZ -wli -xnn -ijw -xnn -xnn -wli -wli -wli -qkc -pAH -jEj -bTr -gVP -xiZ +kyw +xJp +lfx +deq +yih +deq +deq +lfx +lfx +lfx +rHq +bwG +nPO +cGB +ugj +fbC bdd uvU xZk @@ -117085,9 +117538,9 @@ eYj aSp mho bdg -aLG -awb -aLG +fZE +iLm +fZE bdg bqZ bqZ @@ -117109,9 +117562,9 @@ bqZ bqZ bqZ bdg -buH -hOR -buH +oSM +xub +oSM bdg lCE oZD @@ -117126,17 +117579,17 @@ feq loY aDU bJt -mHj -jbS -cER -jbS -kus -jbS -jbS -cER -cER -jbS -qbs +vAx +mgb +xbg +mgb +xpL +mgb +mgb +xbg +xbg +mgb +lyW aaa aaa aaa @@ -117170,11 +117623,11 @@ aag aag aag aag -qdy -pPq -nxJ -oKB -nxJ +vHn +oeH +tob +hoT +tob aNi aZs aNm @@ -117190,9 +117643,9 @@ qiy ahR ahR egt -ait -ani -avj +tzF +gIN +rmB vOy woh vgO @@ -117208,13 +117661,13 @@ qxm vgO xAe vOy -aOP -aii -aow -hee -ioX +oxg +jao +iUV +xNl +xZf fKh -sSP +lDa eAN eAN vEG @@ -117223,14 +117676,14 @@ pBG pBG pBG pBG -dhe -whr -dhe -eLq -lYm -iQR -dhe -ckw +vpf +tra +vpf +vzB +mRU +iJT +vpf +woU aag aag aag @@ -117263,9 +117716,9 @@ bdH bdH bdH bdH -nnw -xnn -wli +kyw +deq +lfx nsY nsY pRT @@ -117275,10 +117728,10 @@ nsY nsY nsY nsY -pAH -pAH -vwU -pAH +bwG +bwG +msC +bwG bdd xwE dAQ @@ -117288,9 +117741,9 @@ tGG bpA mho bdg -aLG -aYO -aLG +fZE +naa +fZE bdg bqZ beH @@ -117312,9 +117765,9 @@ beH beH bqZ bdg -buH -bHL -buH +oSM +ter +oSM bdg lCE uek @@ -117337,9 +117790,9 @@ nsY nsY nsY nsY -ogM -jbS -qbs +kqb +mgb +lyW aaa aaa aaa @@ -117373,11 +117826,11 @@ aag aag aag aag -qdy -brD -oKB -oKB -oKB +vHn +mId +hoT +hoT +hoT aNi jWr aNm @@ -117393,9 +117846,9 @@ hpY aOR aOR bgK -bYe -ajt -avj +kGS +mxg +rmB vOy vOy vOy @@ -117411,29 +117864,29 @@ aoK vOy vOy vOy -asp -aii -avj -lYm -lYm +glc +jao +rmB +mRU +mRU pBG aGs eAN eAN vEG vrJ -tQM +xOs kOH hIs pBG -gck -lYm -kqu -dhe -whr -dhe -lYm -ckw +mSM +mRU +tCd +vpf +tra +vpf +mRU +woU aag aag aag @@ -117466,9 +117919,9 @@ aaa aaa aaa aaa -nnw -wli -xnn +kyw +lfx +deq nsY xWT kxd @@ -117478,10 +117931,10 @@ rSG rur oqS nsY -hnK -niy -xnn -fLI +hsh +cPP +deq +eLH bdd eUZ lCr @@ -117491,9 +117944,9 @@ tGG lJD mho bdg -aLG -aYO -aLG +fZE +naa +fZE bdg bqZ beH @@ -117515,9 +117968,9 @@ gBo beH bqZ bdg -buH -bHL -buH +oSM +ter +oSM bdg lCE fMe @@ -117540,9 +117993,9 @@ rSG qkP oqS nsY -jbS -jbS -qbs +mgb +mgb +lyW aaa aaa aaa @@ -117576,11 +118029,11 @@ aag aag aag aag -qdy -rMG -fra -rOR -jZD +vHn +eDq +jFI +cGd +moK aNi aNi aNi @@ -117596,9 +118049,9 @@ aOR aOR agr aNi -ayT -amO -avj +eWN +bNT +rmB vOy vOy vOy @@ -117614,11 +118067,11 @@ vOy vOy vOy vOy -meJ -amO -avj -lYm -dhe +kbT +bNT +rmB +mRU +vpf pBG xiU xUa @@ -117629,14 +118082,14 @@ pZH nnL lgt pBG -uCU -lYm -aHx -iTV -lYm -eLq -lYm -ckw +vpI +mRU +bhV +jtU +mRU +vzB +mRU +woU aag aag aag @@ -117669,9 +118122,9 @@ aaa aaa aaa aaa -nnw -wli -xnn +kyw +lfx +deq nsY xWT kxd @@ -117681,10 +118134,10 @@ iIP kxd dDt nsY -krA -xnn -xnn -uoF +exb +deq +deq +qLY bdd ljW bDP @@ -117694,9 +118147,9 @@ lCr mpn pZR bdd -beB -aYT -beB +atH +iEM +atH bCx bqZ beH @@ -117718,9 +118171,9 @@ bgO beH bqZ bCx -buH -bHL -buH +oSM +ter +oSM bdd tSF lsn @@ -117743,9 +118196,9 @@ dmR kxd dDt nsY -jbS -cER -qbs +mgb +xbg +lyW aaa aaa aaa @@ -117779,15 +118232,15 @@ aag aag aag aag -qdy -rOR -rOR -rOR -rLQ -rJF -rMG -rMG -rMG +vHn +cGd +cGd +cGd +iTQ +lWt +eDq +eDq +eDq aNi aNi aNi @@ -117799,9 +118252,9 @@ aNi aNi aNi aNi -asp -amO -avj +glc +bNT +rmB bPF aqG ata @@ -117814,14 +118267,14 @@ vYz awR uoi vOy -pOR -vlf +jyJ +niF bPF -aTL -akU -avj -lYm -dhe +ciI +lOn +rmB +mRU +vpf pBG pBG pBG @@ -117832,14 +118285,14 @@ pBG pBG pBG pBG -iTV -lYm -lYm -lYm -lYm -dhe -lYm -ckw +jtU +mRU +mRU +mRU +mRU +vpf +mRU +woU aag aag aag @@ -117872,9 +118325,9 @@ aaa aaa aaa aaa -nnw -wli -xnn +kyw +lfx +deq nsY gsg vHq @@ -117884,10 +118337,10 @@ rNb bxC jiU nsY -dXU -tIN -xnn -vgY +jvt +hiu +deq +vSr bdd asr asr @@ -117897,9 +118350,9 @@ nYp fZG phd pmv -tBF -fSK -aLG +mzv +yfg +fZE nyw bqZ beH @@ -117921,9 +118374,9 @@ tmB eBg vKe eVv -bFu -omW -bFu +cVZ +xdf +cVZ hLS vKe vKe @@ -117946,9 +118399,9 @@ iSm bxC jiU nsY -jbS -cER -qbs +mgb +xbg +lyW aaa aaa aaa @@ -117972,39 +118425,39 @@ aaa aaa aaa aaa -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -oKB -nxJ -nxJ -oKB -nxJ -nxJ -mvu -oKB -nxJ -nxJ -nxJ -nxJ -oKB -nSm -oKB -nxJ -nxJ -cLx -bYe -amO -bYe +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +hoT +tob +tob +hoT +tob +tob +hqm +hoT +tob +tob +tob +tob +hoT +vyh +hoT +tob +tob +fkK +kGS +bNT +kGS cbg aqG atb @@ -118017,42 +118470,42 @@ paa sXd gVq vOy -dan -vlf +sLk +niF cbg -bYe -akU -bYe -pmS -iTV -iTV -dhe -qsr -leZ -iTV -iTV -dhe -qsr -dhe -iTV -iTV -iTV -qHK -uPD -iTV -dhe -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv +kGS +lOn +kGS +rXF +jtU +jtU +vpf +ycM +tne +jtU +jtU +vpf +ycM +vpf +jtU +jtU +jtU +uBx +fLi +jtU +vpf +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm aaa aaa aaa @@ -118075,9 +118528,9 @@ aaa aac aaf aaf -nnw -wli -xnn +kyw +lfx +deq nsY nsY qxC @@ -118087,10 +118540,10 @@ nsY ntx nsY nsY -biv -oSy -waS -pJE +qWL +kIk +eXD +kMr bdd bdd bdd @@ -118100,9 +118553,9 @@ bdd bdd bdd bdd -aLG -awb -aLG +fZE +iLm +fZE bdg bqZ beH @@ -118124,9 +118577,9 @@ bgO beH bqZ bdg -buH -hOR -buH +oSM +xub +oSM bdd bdd bdd @@ -118149,9 +118602,9 @@ nsY gLZ nsY nsY -jbS -fLl -qbs +mgb +nhw +lyW aaf aaf ajY @@ -118175,7 +118628,7 @@ aaa aaa aaa aaa -uWv +gxm dxF dxF aaH @@ -118186,28 +118639,28 @@ aam aam aam aam -uWv -dRE -nxJ -rOR -rOR -rOR -rOR -rOR -rOR -rOR -rOR -rOR -rOR -rOR -rOR +gxm +hgk +tob +cGd +cGd +cGd +cGd +cGd +cGd +cGd +cGd +cGd +cGd +cGd +cGd aej aej aej aej -iiC -amO -tHh +jZW +bNT +rZC vOy vOy vOy @@ -118223,28 +118676,28 @@ vOy vOy vOy vOy -apv -akU -jHG -lYm -lYm -lYm -lYm -lYm -lYm -lYm -lYm -lYm -lYm -lYm -lYm -lYm -lYm -lYm -lYm -iTV -dhe -uWv +bxV +lOn +uAi +mRU +mRU +mRU +mRU +mRU +mRU +mRU +mRU +mRU +mRU +mRU +mRU +mRU +mRU +mRU +mRU +jtU +vpf +gxm aeT aeT aeT @@ -118255,7 +118708,7 @@ aeT nnD aZF aZF -uWv +gxm aaa aaa aaa @@ -118276,11 +118729,11 @@ aaa aaa aaa aad -nnw -nnw -nnw -xnn -jkb +kyw +kyw +kyw +deq +caq nsY tUS bNh @@ -118290,10 +118743,10 @@ fPp lqN vlO nsY -kkj -mIX -lls -wli +xxG +smA +ktR +lfx bdd dJI jaf @@ -118303,9 +118756,9 @@ mPR osU vKe dYX -tBF -lBz -aLG +mzv +xhW +fZE bdg bqZ beH @@ -118327,9 +118780,9 @@ bgO beH bqZ bdg -buH -uXu -bFu +oSM +iOo +cVZ iUk cIx fUC @@ -118352,11 +118805,11 @@ iQt uZo xmJ nsY -cER -jbS -qbs -qbs -qbs +xbg +mgb +lyW +lyW +lyW ajZ aaa aaa @@ -118378,7 +118831,7 @@ aaa aaa aaa aaa -uWv +gxm dxF dxF aaH @@ -118389,28 +118842,28 @@ aam aam aam aam -uWv -tvm -nxJ -rOR -ivy -ivy -ivy -ivy -lYS -ivy -ivy -ivy -ivy -lYS +gxm +bLf +tob +cGd +vVY +vVY +vVY +vVY +kLB +vVY +vVY +vVY +vVY +kLB aej aeO afG ags aej -ayT -amO -avj +eWN +bNT +rmB vOy elR xXh @@ -118426,28 +118879,28 @@ xXh xXh dMK vOy -ayT -akU -avj -lYm -vWb -fDC -vWb -lYm -wqU -wqU -wqU -wqU -tJa -wqU -wqU -wqU -wqU -tJa -lYm -iTV -kFL -uWv +eWN +lOn +rmB +mRU +bnF +lBw +bnF +mRU +qSw +qSw +qSw +qSw +urg +qSw +qSw +qSw +qSw +urg +mRU +jtU +nVE +gxm aeT aeT aeT @@ -118458,7 +118911,7 @@ aeT nnD aZF aZF -uWv +gxm aaa aaa aaa @@ -118478,12 +118931,12 @@ aaa aaa aaa aaa -nnw -nnw -dle -xnn -xnn -wli +kyw +kyw +veq +deq +deq +lfx nsY kio sJY @@ -118493,10 +118946,10 @@ xTW oGP cnM nsY -foa -chi -chi -xnn +kqB +txH +txH +deq bdd fva lkL @@ -118506,9 +118959,9 @@ cHB hDV vmP bdd -aLG -awb -aLG +fZE +iLm +fZE bdg bqZ bqZ @@ -118530,9 +118983,9 @@ bgO bqZ bqZ bdg -buH -hOR -buH +oSM +xub +oSM bdd oNP tge @@ -118555,12 +119008,12 @@ pyc uMn ivz nsY -cER -jbS -cER -cER -qbs -qbs +xbg +mgb +xbg +xbg +lyW +lyW aaa aaa aaa @@ -118581,7 +119034,7 @@ aaa aaa aaa aaa -uWv +gxm dxF dxF aaH @@ -118592,28 +119045,28 @@ aam aam aam aam -uWv -qXe -nxJ -rOR -ivy -ivy -ivy -ivy -ivy -ivy -ivy -ivy -ivy -ivy +gxm +rGz +tob +cGd +vVY +vVY +vVY +vVY +vVY +vVY +vVY +vVY +vVY +vVY aej aeP agI aia yaz -bYe -ajt -avj +kGS +mxg +rmB vOy wWz vHO @@ -118629,28 +119082,28 @@ uXj rdt wTM vOy -ayT -aii -avj -uai -iTV -tzZ -lOt -lYm -wqU -wqU -wqU -wqU -wqU -wqU -wqU -wqU -wqU -wqU -lYm -iTV -wlQ -uWv +eWN +jao +rmB +eyI +jtU +jaW +vkV +mRU +qSw +qSw +qSw +qSw +qSw +qSw +qSw +qSw +qSw +qSw +mRU +jtU +bWg +gxm aeT aeT aeT @@ -118661,7 +119114,7 @@ aeT nnD aZF aZF -uWv +gxm aaa aaa aaa @@ -118681,12 +119134,12 @@ aaa aaa aaa aaa -nnw -cXh -wli -wli -wli -wli +kyw +lHB +lfx +lfx +lfx +lfx heK kam axc @@ -118696,10 +119149,10 @@ vHh pvh sZs nsY -pAH -mtR -vmZ -jkb +bwG +erL +scX +caq bdd cDH cHB @@ -118709,9 +119162,9 @@ wmz rhy rec bdg -aLG -aYO -bad +fZE +naa +onn bdd bdd bDQ @@ -118733,9 +119186,9 @@ bgO cab bdd bdd -bGe -bHL -buH +tmE +ter +oSM bdg jLS xdP @@ -118758,12 +119211,12 @@ xuQ uPW kYv oDx -lTL -lTL -lTL -tzC -cER -qbs +sAS +sAS +sAS +rCh +xbg +lyW aaa aaa aaa @@ -118784,39 +119237,39 @@ aaa aaa aaa aaa -uWv +gxm adj apk apk -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -euu -yma -rOR -ivy -ivy -ivy -ivy -ivy -ivy -ivy -ivy -ivy -ivy +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +hqb +vsd +cGd +vVY +vVY +vVY +vVY +vVY +vVY +vVY +vVY +vVY +vVY aej aeQ agK agu eup -bYe -ajt -avj +kGS +mxg +rmB vOy wWz uwZ @@ -118832,39 +119285,39 @@ coZ sNz wTM vOy -ayT -aii -avj -uai -sbU -fWj -kdX -lYm -wqU -wqU -wqU -wqU -wqU -wqU -wqU -wqU -wqU -wqU -lYm -dDo -lqL -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv +eWN +jao +rmB +eyI +yfL +sjw +xHD +mRU +qSw +qSw +qSw +qSw +qSw +qSw +qSw +qSw +qSw +qSw +mRU +jZo +hQK +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm asM asM mwR -uWv +gxm aaa aaa aaa @@ -118884,12 +119337,12 @@ aaa aaa aaa aaa -nnw -hpO -wli -pzi -pAH -pAH +kyw +eqm +lfx +vvH +bwG +bwG nsY wpz oEX @@ -118899,10 +119352,10 @@ xxm qSK ieu nsY -aSV -wli -eKE -xnn +mZc +lfx +neH +deq bdd xXW gVu @@ -118912,10 +119365,10 @@ wmz vbI rec bdg -beB -aYT -beB -beB +atH +iEM +atH +ppV bdd bqZ bgO @@ -118935,10 +119388,10 @@ gAj bgO bqZ bdd -bJz -bJz -bHT -bJz +eoy +brq +jnc +brq bdg jLS frb @@ -118961,12 +119414,12 @@ mzV pML ivz nsY -gcu -jbS -cER -fKC -dvD -qbs +iZd +mgb +xbg +jPx +xQd +lyW aaa aaa aaa @@ -118987,7 +119440,7 @@ aaa aaa aaa aaa -uWv +gxm ojH ojH taV @@ -119001,25 +119454,25 @@ ouf aLc wBI hGG -rOR -ivy -ivy -ivy -ivy -ivy -ivy -ivy -ivy -ivy -ivy +cGd +vVY +vVY +vVY +vVY +vVY +vVY +vVY +vVY +vVY +vVY aej aeR agK agu aej -pSL -amT -mIW +ftb +mqR +djd vOy wWz pEJ @@ -119035,25 +119488,25 @@ xQm tfH wTM vOy -aEK -aSv -ioX -uai -jEm -iTV -ety -lYm -wqU -wqU -wqU -wqU -wqU -wqU -wqU -wqU -wqU -wqU -lYm +ddx +pFf +xZf +eyI +byH +jtU +nvd +mRU +qSw +qSw +qSw +qSw +qSw +qSw +qSw +qSw +qSw +qSw +mRU vmJ elv vRR @@ -119067,7 +119520,7 @@ qXS hXX xDe xDe -uWv +gxm aaa aaa aaa @@ -119087,12 +119540,12 @@ aaa aaa aaa aaa -nnw -slx -xnn -xnn -mSc -wgw +kyw +htg +deq +deq +qCH +cXm nsY hUz dbn @@ -119102,10 +119555,10 @@ uRM ipe ehR nsY -sEE -wli -tLD -rMk +xEe +lfx +tdH +igw bdd sgm kEg @@ -119115,10 +119568,10 @@ xgN vgn xgN bdg -aLG -aYO -aLG -aLG +fZE +naa +fZE +fZE bdg bqZ qMR @@ -119138,10 +119591,10 @@ tXb fOk bqZ bdg -buH -buH -bHL -buH +oSM +oSM +ter +oSM bdg vLg loy @@ -119164,12 +119617,12 @@ sZH rjV ivz nsY -eCZ -rEF -vDk -woQ -kHx -qbs +qZy +jfS +bUH +ciB +soT +lyW aaa aaa aaa @@ -119190,7 +119643,7 @@ aaa aaa aaa aaa -uWv +gxm ojH ojH taV @@ -119204,25 +119657,25 @@ ouf sdf cRL hGG -rOR -rOR -rOR +cGd +cGd +cGd ahi -rOR -rOR -rOR -rOR +cGd +cGd +cGd +cGd uux -rOR -rOR +cGd +cGd aej aej agO aid aej -atL -akV -atL +umI +fsu +umI vOy wWz uwZ @@ -119238,25 +119691,25 @@ vfP sNz wTM vOy -atL -akV -atL -lYm -lYm -yjf -lYm -lYm -lYm -lYm +umI +fsu +umI +mRU +mRU +veW +mRU +mRU +mRU +mRU nNX -lYm -lYm -lYm -lYm +mRU +mRU +mRU +mRU ayo -lYm -lYm -lYm +mRU +mRU +mRU cna nzD xDV @@ -119270,7 +119723,7 @@ qXS hXX xDe xDe -uWv +gxm aaa aaa aaa @@ -119290,12 +119743,12 @@ aaa aaa aaa aaa -nnw -wli -wli -ijw -mSc -hYE +kyw +lfx +lfx +yih +qCH +spT nsY nsY nsY @@ -119305,10 +119758,10 @@ nsY nsY nsY nsY -pAH -pAH -pAH -pAH +bwG +bwG +bwG +bwG bdd bdd bdd @@ -119318,10 +119771,10 @@ bdd bdd bdd bdd -hDL -aYO -aNO -aLG +tvl +naa +meQ +fZE bdg bqZ beH @@ -119341,10 +119794,10 @@ gAj beH bqZ bdg -buH -bHa -bHL -bIR +oSM +awE +ter +gvK bdd bdd bdd @@ -119367,12 +119820,12 @@ nsY nsY nsY nsY -fXy -leL -kIr -nZp -ffL -qbs +ecj +bZf +lZI +faR +wxu +lyW aaa aaa aaa @@ -119393,7 +119846,7 @@ aaa aaa aaa aaa -uWv +gxm ojH ojH taV @@ -119418,14 +119871,14 @@ cuN cQW lQa wjE -aeU -bUE -bYe -bYe -aaO -alp -aio -baB +vuE +bkb +kGS +kGS +pvi +bgh +spW +pjQ vOy wWz qxP @@ -119441,14 +119894,14 @@ gxP nMe wTM vOy -alp -aio -baB -aEV -bUE -bYe -nBW -bWP +bgh +spW +pjQ +eJg +bkb +kGS +rRf +pOC qtj fpA qUx @@ -119473,7 +119926,7 @@ qXS hXX xDe xDe -uWv +gxm aaa aaa aaa @@ -119493,38 +119946,38 @@ aaa aaa aaa aaa -nnw -wli -xnn -pAH -pAH -pAH -pAH -pAH -aLB -acF -heb -cqa -bBh -aMV -dRG -aMV -yiq -kLp -aMV -bBh -tCN -lDJ -tCN -tCN -yfw -tCN -bBh -aLG -aLG -aYO -aNO -aLG +kyw +lfx +deq +bwG +bwG +bwG +bwG +bwG +bwG +kUI +bFB +iPt +atH +sCg +hgs +sCg +osX +uCt +sCg +atH +eUf +pwx +eUf +eUf +rIP +eUf +atH +fZE +fZE +naa +meQ +fZE bdg bqZ beH @@ -119544,38 +119997,38 @@ beH beH bqZ bdg -buH -bHa -bHL -buH -buH -cbD -iZH -xkC -njL -njL -njL -njL -cbD -bUM -bUM -mYw -iAT -rdY -bUM -cbD -rGg -qtn -kJV -rng -rng -rng -rng -rng -rng -fKC -jbS -qbs +oSM +awE +ter +oSM +oSM +brq +mdC +qWK +lyq +lyq +lyq +lyq +brq +eMI +eMI +gjg +bom +kiy +eMI +brq +cSP +cSH +svt +mJO +mJO +mJO +mJO +mJO +mJO +jPx +mgb +lyW aaa aaa aaa @@ -119596,17 +120049,17 @@ aaa aaa aaa aaa -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm dho wVt wVt @@ -119621,14 +120074,14 @@ jlc kbv dTn ngE -abg -abg -abg -abg -acC -iWN -amO -dLE +acQ +acQ +acQ +acQ +xdl +klr +bNT +dOW vOy woh vgO @@ -119644,14 +120097,14 @@ vgO vgO xAe vOy -aIS -alq -wWk -chu -aZE -aZE -aZE -aZE +gTV +mGk +xFW +lrd +kkI +kkI +kkI +kkI usL gsC cMz @@ -119666,17 +120119,17 @@ qLg iup ryY cnn -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv -uWv +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm +gxm aaa aaa aaa @@ -119696,38 +120149,38 @@ aaa aaa aaa aaa -nnw -wli -xnn -pAH -pCe -pCe -pCe -vbk -aLB -nyG -iDN -tit -nFV -tBL -tBL -tBL -tBL -tBL -tBL -mRS -tBL -tBL -tBL -tBL -tBL -tBL -luz -tzf -tBL -fau -aNO -aLG +kyw +lfx +deq +bwG +ycl +ycl +ycl +jCg +bwG +eNL +pVr +oHs +osQ +tpR +tpR +tpR +tpR +tpR +tpR +osQ +tpR +tpR +tpR +tpR +tpR +tpR +osQ +wxp +tpR +baW +meQ +fZE bdg bqZ beH @@ -119747,38 +120200,38 @@ beH beH bqZ bdg -buH -bHa -wwu -buI -bFu -cbE -buI -buI -buI -buI -buI -buI -rpd -buI -buI -buI -buI -buI -buI -rpd -fkO -bHY -kro -bGb -kks -kks -kks -xOb -rng -vKU -fLl -qbs +oSM +awE +jas +jhA +cVZ +qWx +jhA +jhA +jhA +jhA +jhA +jhA +qWx +jhA +jhA +jhA +jhA +jhA +jhA +qWx +ldW +mkx +eWv +mJO +plv +plv +plv +mbR +mJO +eBG +nhw +lyW aaa aaa aaa @@ -119806,10 +120259,10 @@ aag aag aag aag -qdy -xEq -oKB -oFg +vHn +fbe +hoT +rpG bGa dVn vwC @@ -119824,14 +120277,14 @@ sdv xMO wDg vHA -aaL -aJs -bYe -bYe -aaE -afD -kaA -anh +waV +iGE +kGS +kGS +pjY +gqv +hKJ +nww vOy vOy vOy @@ -119847,14 +120300,14 @@ vOy vOy vOy vOy -xFw -iTK -anh -aFF -cjo -bYe -kSN -aTQ +xvO +peu +nww +vcO +ssF +kGS +bij +hux kfo rCl ePM @@ -119869,10 +120322,10 @@ dbc cNM ofU njk -pmS -iTV -eLq -ckw +rXF +jtU +vzB +woU aag aag aag @@ -119899,38 +120352,38 @@ aaa aaa aaa aaa -nnw -wli -xnn -pAH -pCe -pCe -pCe -pCe -aLB -csl -gjn -jJs -bBh -aMM -aMM -aNG -bga -taA -aSr -bBh -gyC -wbh -bsX -bAa -bKE -eBj -bBh -aLG -aNO -aYT -aNO -bad +kyw +lfx +deq +bwG +ycl +ycl +ycl +ycl +bwG +xgk +oUi +tLZ +atH +xSx +xSx +fBi +tXo +mBa +pYh +atH +wMl +aAU +dkP +dsY +rwj +xZR +atH +fZE +meQ +iEM +meQ +onn bdd bDQ mng @@ -119950,38 +120403,38 @@ vUe kuw cab bdd -bGe -bHa -bHT -bHa -buH -cbD -bMt -bMt -bOv -bOX -jLK -vUU -cbD -ciU -rOj -bUd -bUF -clR -clR -cbD -dQs -sFh -guc -bGb -kks -kks -kks -kks -rng -fKC -rOD -qbs +tmE +awE +jnc +awE +oSM +brq +gOS +gOS +sLX +bIj +jtZ +eLu +brq +xpl +exc +jCx +mqt +vno +vno +brq +wDG +ihI +fnc +mJO +plv +plv +plv +plv +mJO +jPx +enQ +lyW aaa aaa aaa @@ -120009,73 +120462,73 @@ aag aag aag aag -qdy -gLo -nxJ -rOR -rOR -rOR -rOR -rOR -rOR -rOR +vHn +ggD +tob +cGd +cGd +cGd +cGd +cGd +cGd +cGd hZE sVV oON -rOR -rOR -leQ -rOR -rOR +cGd +cGd +cva +cGd +cGd ael ael agQ aih ael -tnl -amO -anc -atC -apJ -apJ -aMl -apJ -apJ -apJ -apJ -apJ -apJ -apJ -aMl -apJ -apJ -atC -cnv -amO -lqJ -lYm -lYm -hdf -lYm -lYm -lYm -hdf -lYm -lYm -lYm +htF +bNT +jvz +ltt +pPU +pPU +ecz +pPU +pPU +pPU +pPU +pPU +pPU +pPU +ecz +pPU +pPU +ltt +riK +bNT +hmB +mRU +mRU +gBs +mRU +mRU +mRU +gBs +mRU +mRU +mRU mKi sfT hGV -lYm -lYm -lYm -lYm -lYm -lYm -lYm -dhe -enA -ckw +mRU +mRU +mRU +mRU +mRU +mRU +mRU +vpf +tMU +woU aag aag aag @@ -120102,18 +120555,18 @@ aaa aaa aaa aaa -nnw -wli -xnn -pAH -pCe -pCe -pCe -pCe +kyw +lfx +deq +bwG +ycl +ycl +ycl +ycl jUx -aLG -qmL -rZz +fZE +bBR +tup jeb jeb jeb @@ -120129,11 +120582,11 @@ mWy jeb jeb jeb -aLG -aNO -aYT -aNO -aLG +fZE +meQ +iEM +meQ +fZE bdg bqZ udi @@ -120153,11 +120606,11 @@ veu mDW bqZ bdg -buH -bHa -bHT -bHa -buH +oSM +awE +jnc +awE +oSM vra vra vra @@ -120173,18 +120626,18 @@ rJx vra vra vra -jJe -bHY -buH +uGf +mkx +oSM vfo -kks -kks -kks -kks -rng -xIB -xcC -qbs +plv +plv +plv +plv +mJO +nEl +bhy +lyW aaa aaa aaa @@ -120212,73 +120665,73 @@ aag aag aag aag -qdy -dRE -oKB -oKB -rOR -ivy -ivy -ivy -pJa -rOR +vHn +hgk +hoT +hoT +cGd +vVY +vVY +vVY +tvS +cGd xVe sVV mbx -rOR -bJK -tsI -hkF -mEL +cGd +orq +rRb +qjT +kRk ael afE agT agT ael -cZm -akU -abg -atC -abg -abx -abx -abx -abg -abx -abx -abx -abg -abx -abx -abx -avD -atC -abg -amO -nQx -lYm -eSp -dhe -eSp -lYm -jnl -iTV -iTV -gOf -lYm +oPT +lOn +acQ +ltt +acQ +gfv +gfv +gfv +acQ +gfv +gfv +gfv +acQ +gfv +gfv +gfv +jRg +ltt +acQ +bNT +oNa +mRU +tih +vpf +tih +mRU +jwM +jtU +jtU +jHX +mRU aDS sfT hGV -lYm -wqU -wqU -wqU -axT -lYm -pzA -iTV -iTV -ckw +mRU +qSw +qSw +qSw +vMQ +mRU +upS +jtU +jtU +woU aag aag aag @@ -120305,18 +120758,18 @@ aac aaf aaf aaf -nnw -xnn -wli -pAH -pCe -pCe -pCe -pCe -aLB -dEC -aNO -qHl +kyw +deq +lfx +bwG +ycl +ycl +ycl +ycl +bwG +hiP +meQ +czN jeb vlX aNx @@ -120332,11 +120785,11 @@ xHp hmF vlX jeb -aNn -aNO -aYT -aNO -aLG +bMf +meQ +iEM +meQ +fZE bdg bqZ udi @@ -120356,11 +120809,11 @@ fIZ mDW bqZ bdg -buH -bHa -bHT -bHa -deH +oSM +awE +jnc +awE +eOx vra asX chf @@ -120376,18 +120829,18 @@ lpt mgF asX vra -tfw -bHY -sVf -bGb -kks -kks -kks -kks -rng -xIB -nuH -qbs +pHh +mkx +hNv +mJO +plv +plv +plv +plv +mJO +nEl +rxe +lyW aaf aaf aaf @@ -120415,73 +120868,73 @@ aag aag aag aag -qdy -qdy -nxJ -nxJ -rOR -ivy -ivy -ivy -ivy -rOR +vHn +vHn +tob +tob +cGd +vVY +vVY +vVY +vVY +cGd hHe gxn ioH -rOR -wLM -nxJ -vhM -qFp +cGd +mNS +tob +hvq +pCQ ael afH agV ain ael -eGl -aii -anf -atC -apK -anf -apK -arf -auG -azb -azb -azb -auG -aDp -apK -cbr -apK -atC -cbr -amO -uGt -lYm -lYm -iTV -ajq -lYm -yaa -dhe -iTV -yaa -lYm +bMV +jao +tbF +ltt +dZP +tbF +dZP +eQh +mTo +tCD +tCD +tCD +mTo +wyE +dZP +dKD +dZP +ltt +dKD +bNT +enF +mRU +mRU +jtU +wlB +mRU +bBc +vpf +jtU +bBc +mRU uRY pMA waJ -lYm -wqU -wqU -wqU -wqU -lYm -lcL -dhe -ckw -ckw +mRU +qSw +qSw +qSw +qSw +mRU +oNM +vpf +woU +woU aag aag aag @@ -120508,18 +120961,18 @@ aad aag aag aag -nnw -pDq -uxx -pAH -pCe -pCe -pCe -pCe -aLB -udF -aNO -nLZ +kyw +xkb +dAA +bwG +ycl +ycl +ycl +ycl +bwG +cVf +meQ +jTt jeb obE tdE @@ -120535,11 +120988,11 @@ xHp xwl rHf jeb -jgU -aNO -aYT -aNO -aLG +rrU +meQ +iEM +meQ +fZE bdg bqZ ngI @@ -120559,11 +121012,11 @@ xAt nNH bqZ bdg -buH -bHa -bHT -bHa -bKc +oSM +awE +jnc +awE +uNp vra bMq qUq @@ -120579,18 +121032,18 @@ lpt qYQ ptj vra -mEb -bHY -haT -bGb -kks -kks -kks -kks -rng -fKC -jbS -qbs +opV +mkx +xVY +mJO +plv +plv +plv +plv +mJO +jPx +mgb +lyW aag aag aag @@ -120619,31 +121072,31 @@ aag aag aag aag -qdy -oKB -oKB -rOR -ivy -ivy -ivy -ivy +vHn +hoT +hoT +cGd +vVY +vVY +vVY +vVY aba aGA kbv fZo -rOR -oJX -oKB -oKB -oxo +cGd +nnH +hoT +hoT +eJj ael afI agY oxi xfm -als -ani -anc +jux +gIN +jvz mOi mOi mOi @@ -120659,31 +121112,31 @@ aHq aHq aHq aHq -iWN -ajt -kGI -aPm -lYm -iTV -dhe -pmS -iTV -iTV -iTV -dhe -lYm +klr +mxg +qGZ +bMi +mRU +jtU +vpf +rXF +jtU +jtU +jtU +vpf +mRU mzs aPT xyB ceD -wqU -wqU -wqU -wqU -lYm -qUT -dhe -ckw +qSw +qSw +qSw +qSw +mRU +isq +vpf +woU aag aag aag @@ -120711,18 +121164,18 @@ aad aag aag aag -nnw -xnn -lpH -pAH -pAH -pAH -pAH -pAH -aLB -dzF -dzF -dac +kyw +deq +qZK +bwG +bwG +bwG +bwG +bwG +bwG +dTd +dTd +div jeb vlX thA @@ -120738,11 +121191,11 @@ gAA fFD vlX jeb -kEb -aNO -aYT -aNO -aLG +wEK +meQ +iEM +meQ +fZE bdg bqZ beH @@ -120762,11 +121215,11 @@ beH beH bqZ bdg -buH -bHa -bHT -bHa -rKy +oSM +awE +jnc +awE +dNW vra asX drj @@ -120782,18 +121235,18 @@ cgo hQc asX vra -cwQ -vtB -tQo -bGb -rng -rng -rng -rng -rng -fKC -rzK -qbs +crc +goo +hAA +mJO +mJO +mJO +mJO +mJO +mJO +jPx +pgJ +lyW aag aag aag @@ -120822,31 +121275,31 @@ aag aag aag aag -qdy -oKB -nxJ -rOR -ivy -ivy -ivy -ivy -rOR +vHn +hoT +tob +cGd +vVY +vVY +vVY +vVY +cGd mAF ilq pjj -rOR -dzS -nxJ -oKB -cNn +cGd +dkt +tob +hoT +xfW ael afJ agY aiq ajJ -aEX -ajt -aow +dpS +mxg +iUV mOi rCw rCw @@ -120862,31 +121315,31 @@ dgg xRk bti aHq -sDC -ajt -kGI -ejp -lYm -iTV -eLq -lYm -yaa -dhe -iTV -dhe -lYm +rwf +mxg +qGZ +mqd +mRU +jtU +vzB +mRU +bBc +vpf +jtU +vpf +mRU gfN efj sxE -lYm -wqU -wqU -wqU -wqU -lYm -uCU -iTV -ckw +mRU +qSw +qSw +qSw +qSw +mRU +vpI +jtU +woU aag aag aag @@ -120914,18 +121367,18 @@ aad aag aag aag -nnw -sMe -wli -pAH -pCe -pCe -pCe -vbk -aLB -enx -aQt -oQj +kyw +xwd +lfx +bwG +ycl +ycl +ycl +jCg +bwG +wBw +bZo +vsf jeb vlX tdE @@ -120941,11 +121394,11 @@ xHp xwl vlX jeb -pGM -aNO -aYT -aNO -bad +dQV +meQ +iEM +meQ +onn bdd bDQ lnm @@ -120965,11 +121418,11 @@ sCA bVw cab bdd -bGe -bHa -bHT -bHa -bIR +tmE +awE +jnc +awE +gvK vra asX qUq @@ -120985,18 +121438,18 @@ lpt qYQ asX vra -ojR -tki -lQQ -bGb -kks -kks -kks -xOb -rng -fKC -jbS -qbs +lDk +dEK +oWN +mJO +plv +plv +plv +mbR +mJO +jPx +mgb +lyW aag aag aag @@ -121025,31 +121478,31 @@ aag aag aag aag -qdy -nxJ -wTe -rOR -ivy -ivy -ivy -ivy -rOR +vHn +tob +xLu +cGd +vVY +vVY +vVY +vVY +cGd hZE kbv mbx -rOR -uUD -nxJ -oKB -cNn +cGd +gMJ +tob +hoT +xfW ael afK ahc air ael -isW -ajt -ali +nBo +mxg +uZI mOi wCT sIf @@ -121065,31 +121518,31 @@ oqv iqd rUy cnS -iWN -ajt -nYv -lYm -lYm -iTV -lcL -lYm -eSp -qsr -iTV -dhe -lYm +klr +mxg +pSN +mRU +mRU +jtU +oNM +mRU +tih +ycM +jtU +vpf +mRU aDS aPT hGV -lYm -wqU -wqU -wqU -wqU -lYm -iTV -dhe -ckw +mRU +qSw +qSw +qSw +qSw +mRU +jtU +vpf +woU aag aag aag @@ -121117,18 +121570,18 @@ aad aag aag aag -nnw -xnn -wli -pAH -pCe -pCe -pCe -pCe -aLB -ewo -aNO -jLv +kyw +deq +lfx +bwG +ycl +ycl +ycl +ycl +bwG +tQe +meQ +ktl jeb obE thA @@ -121144,11 +121597,11 @@ xHp diJ rHf jeb -aLG -aNO -aYT -aNO -aLG +fZE +meQ +iEM +meQ +fZE bCx bqZ cNf @@ -121168,11 +121621,11 @@ nuK dVe bqZ bCx -buH -bHa -rrV -bHa -buH +oSM +awE +vOZ +awE +oSM vra bMq drj @@ -121188,18 +121641,18 @@ lpt eBV ptj vra -fsH -bHY -pBn -bGb -kks -kks -kks -kks -rng -xIB -cER -qbs +xzI +mkx +hdV +mJO +plv +plv +plv +plv +mJO +nEl +xbg +lyW aag aag aag @@ -121228,31 +121681,31 @@ aag aag aag aag -qdy -nxJ -ujc -rOR -rOR -rOR -rOR -rOR -rOR +vHn +tob +hUb +cGd +cGd +cGd +cGd +cGd +cGd laM kbv nkH -rOR -cFb -tsI -sYe -eOY +cGd +eJZ +rRb +cXd +xew ael afL ahe aij ael -abg -akU -abg +acQ +lOn +acQ mOi kbH kbH @@ -121268,31 +121721,31 @@ wDy aGN dxv cnS -cnv -ajt -bYe -pmS -dhe -dhe -tXX -lYm -lYm -lYm -hdf -lYm -lYm +riK +mxg +kGS +rXF +vpf +vpf +aBQ +mRU +mRU +mRU +gBs +mRU +mRU oIa aPT bqY -lYm -lYm -lYm -lYm -lYm -lYm -dhe -dhe -ckw +mRU +mRU +mRU +mRU +mRU +mRU +vpf +vpf +woU aag aag aag @@ -121315,23 +121768,23 @@ aKQ aaa aaa aab -nnw -nnw -nnw -nnw -nnw -nnw -xnn -sro -pAH -pCe -pCe -pCe -pCe +kyw +kyw +kyw +kyw +kyw +kyw +deq +iGc +bwG +ycl +ycl +ycl +ycl cmC -aLG -aNO -uBw +fZE +meQ +hvz jeb vlX tdE @@ -121347,11 +121800,11 @@ xHp xwl vlX jeb -aLG -aNO -aYV -bai -bbg +fZE +meQ +cmL +czR +jzT bCy bDS cNf @@ -121371,11 +121824,11 @@ qnC dVe cac bCy -bzK -bHb -bHV -bHa -rbX +hQf +sTU +xLX +awE +hCf vra asX qUq @@ -121391,23 +121844,23 @@ lpt qYQ asX vra -pJJ -bHY -buH +wcD +mkx +oSM cnd -kks -kks -kks -kks -rng -faC -cER -qbs -qbs -qbs -qbs -qbs -qbs +plv +plv +plv +plv +mJO +kLm +xbg +lyW +lyW +lyW +lyW +lyW +lyW aaa aab aaa @@ -121431,31 +121884,31 @@ aag aag aag aag -qdy -wGa -tvm -rOR -ivy -ivy -ivy -pJa -rOR +vHn +tJq +bLf +cGd +vVY +vVY +vVY +tvS +cGd hZE kbv mbx -rOR -leQ -rOR -rOR -rOR +cGd +cva +cGd +cGd +cGd adO adO adO adO adO -lwm -akU -nQx +frI +lOn +oNa mOi mOi mOi @@ -121471,31 +121924,31 @@ nTs pje pje cnT -xvh -fNC -cKY -lYm -lYm -lYm -lYm -lYm -jnl -wzC -iTV -bDN -lYm +meS +gUk +naj +mRU +mRU +mRU +mRU +mRU +jwM +oZn +jtU +lPW +mRU aDS aPT hGV -lYm -wqU -wqU -wqU -axT -lYm -vJq -dhe -ckw +mRU +qSw +qSw +qSw +vMQ +mRU +wUJ +vpf +woU aag aag aag @@ -121518,23 +121971,23 @@ aKQ aaa aaa aab -nnw -eNf -xnn -xnn -xnn -xnn -xnn -cVZ -pAH -pCe -pCe -pCe -pCe -aLB -fTU -bbO -cmg +kyw +ety +deq +deq +deq +deq +deq +xJp +bwG +ycl +ycl +ycl +ycl +bwG +lFL +sNL +ygB jeb jeb hfa @@ -121550,11 +122003,11 @@ xWd oSL jeb jeb -aLG -aNO -aYW -sLE -bbh +fZE +meQ +dAm +fEF +otC bdd bDT tHv @@ -121574,11 +122027,11 @@ iXb pzV cad bdd -oLT -iEb -bHW -bHa -buH +vMA +oYi +sIR +awE +oSM vra vra eUh @@ -121594,23 +122047,23 @@ mSU wVy vra vra -cmd -cmh -wAR -bGb -kks -kks -kks -kks -rng -xIB -cER -wuR -jbS -pga -ygb -fkF -qbs +siy +wIX +aCu +mJO +plv +plv +plv +plv +mJO +nEl +xbg +jPU +mgb +cgU +oqI +iDk +lyW aaa aab aaa @@ -121634,31 +122087,31 @@ aag aag aag aag -qdy -oKB -qXe -rOR -ivy -ivy -ivy -ivy -rOR +vHn +hoT +rGz +cGd +vVY +vVY +vVY +vVY +cGd hHe gxn gKd -rOR -oKB -oKB -far -ssF +cGd +hoT +hoT +svV +rIE adO afM fpR ahf adO -wUz -aii -abg +dni +jao +acQ aqU sdl mLE @@ -121674,31 +122127,31 @@ rsO aGN rbB cnS -cbr -ajt -anc +dKD +mxg +jvz aUH aXx jKI aXx -lYm -eSp -dhe -iTV -dhe -lYm +mRU +tih +vpf +jtU +vpf +mRU lCL pMA gcm -lYm -wqU -wqU -wqU -wqU -lYm -bEW -iTV -ckw +mRU +qSw +qSw +qSw +qSw +mRU +uNz +jtU +woU aag aag aag @@ -121721,23 +122174,23 @@ aKQ aaa aaa aab -nnw -pDZ -wli -wli -wli -wli -dDd -dle -pAH -pCe -pCe -pCe -pCe -aLB -ahj -ahj -ahj +kyw +byt +lfx +lfx +lfx +lfx +txp +veq +bwG +ycl +ycl +ycl +ycl +bwG +bwP +bwP +bwP jeb tkN qHg @@ -121753,11 +122206,11 @@ gAA cGV tkN jeb -aWM -aNO -aYX -gjn -bbi +hjQ +meQ +fNd +oUi +qdV bdd bDU bqZ @@ -121777,11 +122230,11 @@ bqZ bqZ cae bdd -bGg -bHd -bHX -bHa -buH +huP +nbu +kcg +awE +oSM vra gNq hXb @@ -121797,23 +122250,23 @@ cgo skF gNq vra -ajX -ajX -ajX -bGb -kks -kks -kks -kks -rng -ncw -lTL -kyH -lTL -lTL -onr -cER -qbs +fqA +fqA +fqA +mJO +plv +plv +plv +plv +mJO +rxq +sAS +cXX +sAS +sAS +nHG +xbg +lyW aaa aab aaa @@ -121837,31 +122290,31 @@ aag aag aag aag -qdy -nxJ -sen -rOR -ivy -ivy -ivy -ivy +vHn +tob +alh +cGd +vVY +vVY +vVY +vVY bWh hmj kbv fZo -rOR -cWP -oKB -oKB -vyS +cGd +ykY +hoT +hoT +tjz adO afN ahh aiw ahG -bYe -ajt -abg +kGS +mxg +acQ aqU xbN gfE @@ -121877,31 +122330,31 @@ liJ pTj cnq cnS -iWN -aii -abg +klr +jao +acQ aUH oyE mMP mMP -lYm -iTV -dhe -iTV -dhe -lYm +mRU +jtU +vpf +jtU +vpf +mRU mzs aPT xyB cix -wqU -wqU -wqU -wqU -lYm -wlQ -iTV -ckw +qSw +qSw +qSw +qSw +mRU +bWg +jtU +woU aag aag aag @@ -121924,23 +122377,23 @@ aKQ aaa aaa aab -nnw -xnn -wli -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdb -ahj -ahj +kyw +deq +lfx +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +txE +bwP +bwP jeb aMx qHg @@ -121956,11 +122409,11 @@ xHp cGV nBa jeb -beB -beB -aYW -bzV -cBA +atH +atH +dAm +aCX +suH bdd beQ beQ @@ -121980,11 +122433,11 @@ beQ beQ beQ bdd -bRQ -cbS -bHW -bJz -bJz +oCb +wwv +sIR +brq +brq vra bMu hXb @@ -122000,23 +122453,23 @@ lpt skF pQF vra -ajX -ajX -hBC -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -xIB -jbS -qbs +fqA +fqA +gzM +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +nEl +mgb +lyW aaa aab aaa @@ -122040,31 +122493,31 @@ aag aag aag aag -qdy -xeV -oKB -rOR -ivy -ivy -ivy -ivy -rOR +vHn +btV +hoT +cGd +vVY +vVY +vVY +vVY +cGd mAF ilq pjj -rOR -eKk -jEB -oKB -pqU +cGd +boU +nNI +hoT +veO adO afO ahh aiw adO -aEp -xTt -aEp +mQF +yaR +mQF lmK lmK lmK @@ -122080,31 +122533,31 @@ cnH kzk cnR aHq -aEp -xTt -aEp +mQF +yaR +mQF aUH sIA gSj aXA -lYm -iTV -dhe -iTV -yaa -lYm +mRU +jtU +vpf +jtU +bBc +mRU gfN efj sxE -lYm -wqU -wqU -wqU -wqU -lYm -uyb -enA -ckw +mRU +qSw +qSw +qSw +qSw +mRU +kUL +tMU +woU aag aag aag @@ -122127,23 +122580,23 @@ aKQ aaa aaa aab -nnw -xnn -sro -wdA -bbB -bbB -arn -ajO -ajO -ajO -clC -ajO -ajO -cno -ahj -ahj -ahj +kyw +deq +iGc +wDr +mFL +mFL +iFp +wNz +wNz +wNz +oWE +wNz +wNz +suU +bwP +bwP +bwP jeb iow aMO @@ -122159,11 +122612,11 @@ xHp aUi iow jeb -aLG -aNO -aYY -bal -bbj +fZE +meQ +rTA +tAW +stR bCz bDV bGw @@ -122183,18 +122636,18 @@ bGw bGw bGw bCz -buH -iEb -bHW -bHa -vMx +oSM +oYi +sIR +awE +dnP vra wTw bNE wDJ ivs nyQ -ipY +dXH vWB bSK nyQ @@ -122203,23 +122656,23 @@ bUi bUT wTw vra -ajX -ajX -ajX -amS -aoc -aoc -uQU -aoc -aoc -aoc -aAv -eZi -eZi -wdA -fKC -lyV -qbs +fqA +fqA +fqA +dBg +aqL +aqL +buY +aqL +aqL +aqL +uWm +nRA +nRA +wDr +jPx +wdW +lyW aaa aab aaa @@ -122243,31 +122696,31 @@ aag aag aag aag -qdy -nxJ -nxJ -rOR -ivy -ivy -ivy -ivy -rOR +vHn +tob +tob +cGd +vVY +vVY +vVY +vVY +cGd xXT sVV tkR -rOR -ulG -lrD -nxJ -kiY +cGd +ipr +pUL +tob +eQd adO jkj ahh aiw adO -uLu -anC -aiC +ebV +mbu +kCo ioU pvK qPE @@ -122283,31 +122736,31 @@ liJ hgB cbn aHq -uLu -aQo -aTS +ebV +qGP +pym aUd ckK iKM aHM -lYm -iTV -dhe -bDN -dRf -lYm +mRU +jtU +vpf +lPW +vwJ +mRU nme sfT vAH -lYm -wqU -wqU -wqU -wqU -lYm -wQM -dhe -ckw +mRU +qSw +qSw +qSw +qSw +mRU +edG +vpf +woU aag aag aag @@ -122330,23 +122783,23 @@ aKQ aaa aaa aab -nnw -wli -cTc -wdA -bbB -bbB -arn -ajO -ajO -ajO -ajO -ajO -ajO -cno -ahj -ahj -ahj +kyw +lfx +gSH +wDr +mFL +mFL +iFp +wNz +wNz +wNz +wNz +wNz +wNz +suU +bwP +bwP +bwP aLT aLT aLT @@ -122362,11 +122815,11 @@ aQL aQL aQL aQL -pGM -aNO -aYW -sLE -aLG +dQV +meQ +dAm +fEF +fZE bCA bCA bdj @@ -122386,11 +122839,11 @@ bCA bdj bCA bCA -buH -iEb -bHW -bHa -bIR +oSM +oYi +sIR +awE +gvK bJC bJC bJC @@ -122406,23 +122859,23 @@ bSJ bSJ bSJ bSJ -ajX -ajX -ajX -amS -aoc -aoc -aoc -aoc -aoc -aoc -aAv -eZi -eZi -wdA -xIB -jbS -qbs +fqA +fqA +fqA +dBg +aqL +aqL +aqL +aqL +aqL +aqL +uWm +nRA +nRA +wDr +nEl +mgb +lyW aaa aab aaa @@ -122446,31 +122899,31 @@ aag aag aag aag -qdy -oKB -oKB -rOR -rOR -rOR -rOR -rOR -rOR +vHn +hoT +hoT +cGd +cGd +cGd +cGd +cGd +cGd ehL kyr chb -rOR -rOR -rOR -jZD -rOR -rOR +cGd +cGd +cGd +moK +cGd +cGd lFt ahh aiw adO -aSz -anG -aiC +qHu +hqx +kCo ioU qyZ wTd @@ -122486,31 +122939,31 @@ liJ qmP uoH aHq -aiC -anC -aiC +kCo +mbu +kCo aUH dbv lII aWc -lYm -hdf -lYm -lYm -lYm -lYm +mRU +gBs +mRU +mRU +mRU +mRU tCx ncG tZg -lYm -lYm -lYm -lYm -lYm -lYm -iTV -iTV -ckw +mRU +mRU +mRU +mRU +mRU +mRU +jtU +jtU +woU aag aag aag @@ -122533,23 +122986,23 @@ aKQ aaa aaa aab -nnw -jtG -ecf -wdA -bbB -bbB -arn -ajO -ajO -ajO -ajO -ajO -ajO -cno -ahj -ahj -ahj +kyw +oif +nRN +wDr +mFL +mFL +iFp +wNz +wNz +wNz +wNz +wNz +wNz +suU +bwP +bwP +bwP aLT kaB vVb @@ -122565,11 +123018,11 @@ aQL mJP bSn aQL -vHs -ehH -aYZ -sLE -bAV +hEm +kti +eFa +fEF +exQ bCB bCB bCB @@ -122589,11 +123042,11 @@ bCB bCB bCB bCB -cbv -iEb -bHY -mru -syP +uuI +oYi +mkx +bIW +eMZ bJC jSp lAQ @@ -122609,23 +123062,23 @@ bSJ hII iJS bSJ -ajX -ajX -ajX -amS -aoc -aoc -aoc -aoc -aoc -aoc -aAv -eZi -eZi -wdA -buY -jta -qbs +fqA +fqA +fqA +dBg +aqL +aqL +aqL +aqL +aqL +aqL +uWm +nRA +nRA +wDr +xgS +svF +lyW aaa aab aaa @@ -122649,31 +123102,31 @@ aag aag aag aag -qdy -oKB -nxJ -cgU -oKB -nxJ -nxJ -mvu -oFg +vHn +hoT +tob +lso +hoT +tob +tob +hqm +rpG cSa aeA sjz -oFg -mvu -nxJ -nxJ -oKB -cLx +rpG +hqm +tob +tob +hoT +fkK aiw ahh aiw nph -aiC -ajF -aiC +kCo +tSY +kCo ioU mSz nIG @@ -122689,31 +123142,31 @@ iKf aGN qrv aHq -cgJ -ajG -aiC +hBa +gft +kCo aGz ckd mQC aHM -pmS -iTV -iTV -ivG -qsr -pmS +rXF +jtU +jtU +egQ +ycM +rXF wcm lJY guo -pmS -uPD -dhe -qHK -iTV -iTV -dhe -dhe -ckw +rXF +fLi +vpf +uBx +jtU +jtU +vpf +vpf +woU aag aag aag @@ -122736,21 +123189,21 @@ aKQ aaa aaa aab -nnw -oBS -qvG -wdA -bbC -aan -aan -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA +kyw +vaV +qxJ +wDr +lFw +wWt +wWt +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr aLT aLT aLT @@ -122768,11 +123221,11 @@ aTw aUj kLk aQL -mTn -aiy -aYZ -sLE -bbk +npw +vzi +eFa +fEF +rbd bdk bdk bgR @@ -122792,11 +123245,11 @@ myJ eKI bdk bdk -bGh -iEb -bHY -njy -hkE +cxF +oYi +mkx +fic +kjW bJC ojF bNG @@ -122813,22 +123266,22 @@ bUU uDW bSJ bSJ -lij -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -tGq -tGq -jjT -wdA -hLq -jbS -qbs +ljv +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +fCg +fCg +geu +wDr +wtk +mgb +lyW aaa aab aaa @@ -122853,30 +123306,30 @@ aag aag aag abh -rOR -rOR -jZD -rOR -rOR -rOR -rOR -rOR +cGd +cGd +moK +cGd +cGd +cGd +cGd +cGd wYa nBK mzS -rOR -rOR -rOR -rOR -nxJ -rOR +cGd +cGd +cGd +cGd +tob +cGd afP ahh aiw nph -aiC -anG -aiC +kCo +hqx +kCo ioU ioU ioU @@ -122892,30 +123345,30 @@ aGN aGN pSU aHq -czM -ajG -aiC +qcL +gft +kCo aGz drk mQC mkG -lYm -uCU -lYm -lYm -lYm -lYm +mRU +vpI +mRU +mRU +mRU +mRU nuM uHr xwX -lYm -lYm -lYm -lYm -lYm -hdf -lYm -lYm +mRU +mRU +mRU +mRU +mRU +gBs +mRU +mRU uOi aag aag @@ -122939,10 +123392,10 @@ aKQ aaa aaa aab -nnw -wli -egM -wdA +kyw +lfx +gUn +wDr bdY bdY bdY @@ -122953,7 +123406,7 @@ aaF aaF aaF aaF -wdA +wDr aLT aLT aLT @@ -122972,10 +123425,10 @@ aQL aQL aQL aQL -uQn -aYZ -sLE -bbl +uBj +eFa +fEF +wMB bdl bdl bdl @@ -122995,10 +123448,10 @@ bdl bdl bdl bdl -bGi -iEb -bHY -oyy +opd +oYi +mkx +jwP bJC bJC bJC @@ -123016,8 +123469,8 @@ bSJ bSJ bSJ bSJ -lij -wdA +ljv +wDr anm anm anm @@ -123028,10 +123481,10 @@ anm pfp pfp pfp -wdA -xIB -cER -qbs +wDr +nEl +xbg +lyW aaa aab aaa @@ -123070,16 +123523,16 @@ aeA bbe aeA aeA -rOR -nxJ -rOR +cGd +tob +cGd afQ aiw aiw nph -aiC -anG -aiC +kCo +hqx +kCo ioU lPO vJg @@ -123095,16 +123548,16 @@ eEo aGN rub aHq -cES -ajG -aiC +gar +gft +kCo aGz eqB obC hcf -lYm -dlt -lYm +mRU +cpQ +mRU lJY lJY lFK @@ -123142,10 +123595,10 @@ aKQ aaa aaa aab -nnw -nsh -nsh -wdA +kyw +oxn +oxn +wDr bdY bdY bdY @@ -123156,7 +123609,7 @@ aaF aaF aaF aaF -wdA +wDr aLT aLT bbY @@ -123175,17 +123628,17 @@ brn aRT buM aQL -aLG -aYZ -sLE -bbl +fZE +eFa +fEF +wMB bdl bEr bEs bIs bdm rbY -gwD +eAG bOK bPD bYa @@ -123198,10 +123651,10 @@ bYu nmK caf bdl -bGj -iEb -bHY -buH +oDU +oYi +mkx +oSM bJC cdT cfo @@ -123219,8 +123672,8 @@ clI clg clW bSJ -lij -wdA +ljv +wDr anm anm anm @@ -123231,10 +123684,10 @@ anm pfp pfp pfp -wdA -xzx -mSm -qbs +wDr +cZI +xGT +lyW aaa aab aaa @@ -123273,16 +123726,16 @@ asA amF kmE aeA -rOR -rLQ -rOR +cGd +iTQ +cGd ahJ ahJ ahJ adO -aiC -ajF -aiC +kCo +tSY +kCo ioU dnS viN @@ -123298,16 +123751,16 @@ aRi aGN qrv aHq -aOS -ajG -aiC +oUO +gft +kCo aUH aGz aGz aGz -lYm -eLq -lYm +mRU +vzB +mRU lJY qbx dcp @@ -123345,10 +123798,10 @@ aKQ aaa aaa aab -kHq -fhT -fhT -wdA +emA +vIg +vIg +wDr bdY bdY bdY @@ -123359,7 +123812,7 @@ aaF aaF aaF aaF -wdA +wDr aLT aLT bca @@ -123378,10 +123831,10 @@ aQL aUY buN aQL -aLG -aYZ -sLE -bbl +fZE +eFa +fEF +wMB bdl bDX bCA @@ -123401,10 +123854,10 @@ rIH tUh cag bdl -bGk -iEb -bHY -buH +jDz +oYi +mkx +oSM bJC cdU bMy @@ -123422,8 +123875,8 @@ bSJ bVo clX bSJ -lij -wdA +ljv +wDr anm anm anm @@ -123434,10 +123887,10 @@ anm pfp pfp pfp -wdA -hgR -kzd -nhJ +wDr +cOo +rJf +tcO aaa aab aaa @@ -123476,16 +123929,16 @@ aeC vOh gUX ily -rOR -jZD -rOR -aWd -aWd -aWd -pji -aiC -ajF -aiC +cGd +moK +cGd +fiH +fiH +fiH +ybk +kCo +tSY +kCo ioU pPM qKz @@ -123501,16 +123954,16 @@ xNv iLO bUa aHq -aSz -anC -aiC -pji -aWd -aWd -aWd -lYm -hdf -lYm +qHu +mbu +kCo +ybk +fiH +fiH +fiH +mRU +gBs +mRU cBb xVS lJY @@ -123548,21 +124001,21 @@ aKQ aaa aaa aab -kHq -uBE -uBE -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA +emA +gPS +gPS +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr aLT aLT aLT @@ -123581,10 +124034,10 @@ aQL aQL aQL aQL -pGM -aYZ -sLE -bbm +dQV +eFa +fEF +fNH bdl bDY bCA @@ -123604,10 +124057,10 @@ jac bCA cah bdl -bGl -iEb -bHY -bIR +wPi +oYi +mkx +gvK bJC bJC bJC @@ -123625,22 +124078,22 @@ bSJ bSJ bSJ bSJ -lij -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -wdA -drQ -pGD -nhJ +ljv +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +wDr +nGM +hIp +tcO aaa aab aaa @@ -123679,16 +124132,16 @@ aeC aeC ajs aeC -aGD -aWd -eTO -anR -anR -lNl -aFW -aSy -anH -aoB +bZq +fiH +rGc +xjI +xjI +fzm +pBg +gmZ +dpN +txd alL alL alL @@ -123704,16 +124157,16 @@ jvY alL alL alL -aSy -aoS -dZd -aFW -aIe -anR -anR -uWC -aHQ -apj +gmZ +onh +wJd +pBg +iOP +xjI +xjI +roY +vXk +jgS vcE kUV vcE @@ -123751,22 +124204,22 @@ aKQ aaa aaa aab -kHq -aYf -hsf -lpj -iED -hsf -aYf -iJU -gBP -kSA -twO -pkv -glm -qXm -sNC -pkv +emA +jEM +ikT +owU +iTq +ikT +jEM +kjY +riB +fGi +qan +jkN +jUh +tIF +bCk +jkN aLT bco aMB @@ -123784,10 +124237,10 @@ brr aUZ buO aQL -aLG -aYZ -sLE -jJs +fZE +eFa +fEF +tLZ bdl bDZ bdj @@ -123807,10 +124260,10 @@ jac xxa cai bdl -bII -iEb -bHY -buH +tkg +oYi +mkx +oSM bJC cdV bMx @@ -123828,22 +124281,22 @@ clJ bVn clY bSJ -lij -vCB -oKi -oKi -oKi -tfj -qLO -vRW -lij -xtU -doX -fmZ -fmZ -bYd -fJA -nhJ +ljv +dnZ +eHy +eHy +eHy +cyp +oaO +lWY +ljv +jiM +ere +lYg +lYg +sEu +lia +tcO aaa aab aaa @@ -123882,16 +124335,16 @@ wXh aeC ydz ayb -aGC -tSw -agJ -aXE -aXE -agJ -aFV -hPK -aXE -akH +rrG +gBZ +tGW +rfQ +rfQ +tGW +oOi +szb +rfQ +vnZ jvY jvY jvY @@ -123907,16 +124360,16 @@ jvY jvY jvY jvY -aSB -iWd -elA -aFV -aGC -aXE -aXE -aGC -rph -agJ +urs +eEF +wmH +oOi +rrG +rfQ +rfQ +rrG +sBK +tGW sSl kkx vcE @@ -123954,22 +124407,22 @@ aKQ aaa aaa aab -kHq -aXd -iJU -kFi -eTJ -aYf -hsf -aYf -gYL -aEE -gYL -aYf -hsf -iJU -sNC -lPP +emA +kJZ +kjY +fGB +snN +jEM +ikT +jEM +lty +eTD +lty +jEM +ikT +kjY +bCk +heO aLT bco bdr @@ -123987,17 +124440,17 @@ brr aRT buO aQL -aLG -aYZ -sLE -bkY +fZE +eFa +fEF +xpc bdl lOr lOr iwI bdl bdl -bEt +reH bNP bmD bNP @@ -124010,10 +124463,10 @@ bYv tiE tiE bdl -rqw -iEb -bHY -buH +fJt +oYi +mkx +oSM bJC cdV cfo @@ -124031,22 +124484,22 @@ clJ clg clY bSJ -lij -vHZ -fmZ -fmZ -eyp -moT -dwn -lCT -lij -fNY -aCr -aCr -aCr -ofP -eQa -nhJ +ljv +eaz +lYg +lYg +aqH +oxl +wac +mjy +ljv +ien +xhO +xhO +xhO +cmN +srl +tcO aaa aab aaa @@ -124085,16 +124538,16 @@ ngl aeA ajk aeA -aIe -aWd -kYP -aHQ -aHQ -apj -aFW -rFY -aVY -akI +iOP +fiH +dwJ +vXk +vXk +jgS +pBg +vkQ +brm +aOw jvY arg atf @@ -124110,16 +124563,16 @@ jvY aMm aOq jvY -aDx -dsk -mLU -aFW -aGD -aHQ -aHQ -lKk -kKb -lNl +biB +uvq +cVT +pBg +bZq +vXk +vXk +siS +aRr +fzm lJY xVS lJY @@ -124157,22 +124610,22 @@ aKQ aaa aaa aab -kHq -kHq -kHq -kHq -kHq -pMI -hsf -aYf -nmq -gEM -sRk -aYf -hsf -aYf -aYf -sNC +emA +emA +emA +emA +emA +sEg +ikT +jEM +ahL +bFl +nZW +jEM +ikT +jEM +jEM +bCk aLT bcZ bdr @@ -124190,16 +124643,16 @@ brs aRT bew aQL -beB -aYW -bzV -beB +atH +dAm +aCX +atH mCo iwZ -lBF +jFy bKA -sbM -pWA +mPK +dmF pXV bNP bmD @@ -124213,10 +124666,10 @@ eHa cmo xAB mCo -bJz -cbS -bHW -bJz +brq +wwv +sIR +brq bJC bKX cfo @@ -124234,22 +124687,22 @@ clK clg bVy bSJ -lij -lij -lij -lij -eYC -crr -lij -lij -lij -myA -lkg -nhJ -nhJ -nhJ -nhJ -nhJ +ljv +ljv +ljv +ljv +tWl +jer +ljv +ljv +ljv +jEA +hCq +tcO +tcO +tcO +tcO +tcO aaa aab aaa @@ -124288,16 +124741,16 @@ nqV aeA ajk ily -mBf -rFS -mBf -blb -aWd -aXT -pji -aEp -aEp -akJ +taw +mRI +taw +qnf +fiH +wPm +ybk +mQF +mQF +nbW jvY arh atm @@ -124313,16 +124766,16 @@ jvY nSG aOs jvY -aEp -ixC -aEp -pji -jFg -aWd -pCD -fcW -kAO -fcW +mQF +pZq +mQF +ybk +dJF +fiH +dAr +kNq +cWo +kNq cBb xVS lJY @@ -124364,18 +124817,18 @@ aaa aaa aaa aaa -kHq -ozP -hsf -aYf -kAN -cSi -kAN -aYf -hsf -gHm -aYf -hsf +emA +tcm +ikT +jEM +uzv +tYr +uzv +jEM +ikT +hYf +jEM +ikT aLT bco bdr @@ -124393,10 +124846,10 @@ brr aRT buO aQL -aXS -aYZ -kfP -tBF +jpW +eFa +svw +mzv bmv bEg bGU @@ -124416,10 +124869,10 @@ bYw nDM bWL sSa -qLp -lYi -bIb -mHm +bRo +dOG +gKw +tgz bJC cdV cfo @@ -124437,18 +124890,18 @@ clJ clg clY bSJ -jQK -fmZ -fmZ -fmZ -bYd -vHZ -doX -fmZ -fmZ -bYd -gbz -nhJ +bXh +lYg +lYg +lYg +sEu +eaz +ere +lYg +lYg +sEu +gEh +tcO aaa aaa aaa @@ -124491,16 +124944,16 @@ wXh aeC ajs qon -mBf -nUS +taw +obJ aep ggQ ggQ aME aep -aiB -ajN -akK +ivV +jnx +iPK jvY ari aoP @@ -124516,16 +124969,16 @@ axo atm aOr jvY -aiB -aWf -aiB +ivV +otE +ivV aep aME ggQ aME aep -eWV -fcW +hog +kNq dHe kUV vcE @@ -124567,18 +125020,18 @@ aaa aaa aaa aaa -kHq -enq -kFi -iJU -lSH -bJr -gQz -aRm -hsf -aYf -aYf -hsf +emA +hyb +fGB +kjY +yia +ugZ +kcG +fBo +ikT +jEM +jEM +ikT aLT bco aMC @@ -124596,10 +125049,10 @@ brr aUY buO aQL -aLG -aYZ -sLE -jJs +fZE +eFa +fEF +tLZ mCo bEh bNQ @@ -124619,10 +125072,10 @@ bKA cXR cal mCo -pJJ -iEb -bHY -buH +wcD +oYi +mkx +oSM bJC cdV bMy @@ -124640,18 +125093,18 @@ clJ bVo clY bSJ -dOr -aCr -aCr -aCr -aCr -gbz -tNy -gbz -aCr -aCr -nxM -nhJ +tgm +xhO +xhO +xhO +xhO +gEh +sOD +gEh +xhO +xhO +tWp +tcO aaa aaa aaa @@ -124694,16 +125147,16 @@ aeC aeC ajs aeC -mBf -nHf +taw +oxy aep afj afk agM aep -alG -aYj -aoD +pEd +tbD +fDk jvY arj atm @@ -124719,16 +125172,16 @@ bzD atm aOs jvY -alG -anG -apd +pEd +hqx +xhi aep aHS afk sHo aep -waa -fcW +vmu +kNq vcE kUV vcE @@ -124770,18 +125223,18 @@ aaa aaa aaa aaa -kHq -kHq -kHq -kHq -kHq -kHq -kHq -kHq -kHq -kHq -iED -eTJ +emA +emA +emA +emA +emA +emA +emA +emA +emA +emA +iTq +snN aLT aLT aLT @@ -124799,10 +125252,10 @@ aQL aQL aQL aQL -aLG -aYZ -sLE -qFb +fZE +eFa +fEF +bNr bdl bEi bZr @@ -124822,10 +125275,10 @@ bKA cir bdl bdl -lgX -iEb -bHY -buH +sXC +oYi +mkx +oSM bJC bJC bJC @@ -124843,18 +125296,18 @@ bSJ bSJ bSJ bSJ -oeY -aCr -nhJ -nhJ -nhJ -nhJ -nhJ -nhJ -nhJ -nhJ -nhJ -nhJ +cZp +xhO +tcO +tcO +tcO +tcO +tcO +tcO +tcO +tcO +tcO +tcO aaa aaa aaa @@ -124897,16 +125350,16 @@ aeC aeA ajk aeA -mBf -nHf +taw +oxy aep afk afk afk aep -alG -aYj -aoD +pEd +tbD +fDk jvY ark atm @@ -124922,16 +125375,16 @@ axo atm thv jvY -alG -anG -apd +pEd +hqx +xhi aep afk aHl afk aep -tWL -fcW +hLt +kNq lJY itR kKR @@ -124982,9 +125435,9 @@ aaa aaa aaa aaa -kHq -hsf -aYf +emA +ikT +jEM aLT bcE aMB @@ -125002,10 +125455,10 @@ brt aUZ buS aQL -aLG -aYZ -sLE -jJs +fZE +eFa +fEF +tLZ bdl brp bZr @@ -125024,11 +125477,11 @@ bNQ bNQ bNQ bGz -hMs -cbw -iEb -bHY -buH +egD +oQn +oYi +mkx +oSM bJC cdX bMx @@ -125046,9 +125499,9 @@ clL bVn clZ bSJ -dOr -aCr -nhJ +tgm +xhO +tcO aaa aaa aaa @@ -125100,16 +125553,16 @@ asA amF ohL aeA -mBf -sJo +taw +oQL aep aep aep aep aep -alJ -aYj -aoD +pvE +tbD +fDk jvY alL atk @@ -125125,16 +125578,16 @@ jvY aAy alL jvY -alG -anG -apd +pEd +hqx +xhi aep aep aep aep aep -vKo -fcW +ddF +kNq lJY ucw dcp @@ -125185,9 +125638,9 @@ aaa aaa aaa aaa -kHq -bhe -aYf +emA +qGC +jEM aLT bcE bdr @@ -125205,10 +125658,10 @@ brt bpC buS aQL -aNn -aYZ -sLE -jJs +bMf +eFa +fEF +tLZ bdl bEl wup @@ -125227,11 +125680,11 @@ krN krN krN oqY -can -buH -iEb -bHY -buH +lde +oSM +oYi +mkx +oSM bJC cdX cfo @@ -125249,9 +125702,9 @@ clL clg clZ bSJ -iLH -tRd -nhJ +xMm +pFr +tcO aaa aaa aaa @@ -125303,16 +125756,16 @@ ntI aeA aeC puO -mBf -nHf -nXv +taw +oxy +eRG aep aep aep aep -alG -aYj -aoD +pEd +tbD +fDk jvY arl atm @@ -125328,16 +125781,16 @@ alL aMo aOt jvY -alG -anG -apf +pEd +hqx +jhm oIB jgr -gGp -dMf +qUG +rtc oIB -waa -fcW +vmu +kNq lJY uxC lJY @@ -125388,9 +125841,9 @@ aaa aaa aaa aaa -kHq -hsf -aYf +emA +ikT +jEM aLT abS bdr @@ -125408,10 +125861,10 @@ brs bpC abT aQL -beB -aYW -bzV -beB +atH +dAm +aCX +atH bdl buz bZr @@ -125430,11 +125883,11 @@ ibc uly bNN vbR -pky -cbv -cbS -bHW -bJz +eGq +uuI +wwv +sIR +brq bJC ack cfo @@ -125452,9 +125905,9 @@ clK clg acp bSJ -mAO -gbz -nhJ +qKK +gEh +tcO aaa aaa aaa @@ -125500,22 +125953,22 @@ atr aeC atr aeC -mBf -mBf -mBf -mBf -rFS -mBf -mBf -nHf -iIt -mBf -mBf -mBf -mBf -alG -aYj -aoD +taw +taw +taw +taw +mRI +taw +taw +oxy +hja +taw +taw +taw +taw +pEd +tbD +fDk jvY abF atm @@ -125531,22 +125984,22 @@ aIT atm aVF jvY -alG -aYD -uPI +pEd +wZp +amc oIB fXE kaS aiQ oIB -waa -fcW -fcW -fcW -fcW -nVz -fcW -fcW +vmu +kNq +kNq +kNq +kNq +qDB +kNq +kNq vcE bXe vcE @@ -125591,9 +126044,9 @@ aaa aaa aaa aaa -kHq -aYf -hsf +emA +jEM +ikT aLT bcE aMC @@ -125611,10 +126064,10 @@ brt aUY buS aQL -aLG -aYZ -sLE -uBw +fZE +eFa +fEF +hvz bdl bEm bZr @@ -125634,10 +126087,10 @@ uys uys uys uys -iRr -iEb -bHY -buH +bfd +oYi +mkx +oSM bJC cdX bMy @@ -125655,9 +126108,9 @@ clL bVo clZ bSJ -cBR -uIF -nhJ +hTU +lNk +tcO aaa aaa aaa @@ -125703,22 +126156,22 @@ atr aeC atr aeC -mBf -eHJ -lhS -mBf -mFa -mBf -jYh -nHf -sJo -mBf -sJo -sJo -mBf -alK -ajP -aoD +taw +hEj +cvi +taw +wFX +taw +ncV +oxy +oQL +taw +oQL +oQL +taw +pqv +gqf +fDk jvY jvY jvY @@ -125734,22 +126187,22 @@ jvY jvY jvY jvY -sUF -anG -apd +xeq +hqx +xhi oIB wqr bZw xUV oIB -waa -nUs -fcW -glz -jbl -gGX -bWm -fcW +vmu +vDR +kNq +toD +wDq +aPO +sNP +kNq vcE bXe vcE @@ -125794,9 +126247,9 @@ aaa aaa aaa aaa -kHq -kin -omi +emA +rIV +dYc aLT aLT aLT @@ -125814,10 +126267,10 @@ aQL aQL aQL aQL -bxx -byF -bzW -bxx +edn +qRd +gtH +edn bdl bpT bNN @@ -125837,10 +126290,10 @@ dyx eYr bUo uys -cbz -cbU -ccu -cbz +kKB +rsL +jts +kKB bJC bJC bJC @@ -125858,9 +126311,9 @@ bSJ bSJ bSJ bSJ -sFO -gbz -nhJ +xsv +gEh +tcO aaa aaa aaa @@ -125906,22 +126359,22 @@ atu azU aeC ldl -mBf -nHf -euw -mBf -llF -mBf -pBE -rDk -tcP -nVY -rDk -rDk -nVY -aTS -ajP -aoD +taw +oxy +stA +taw +tvA +taw +oTc +nwT +ocI +mfH +nwT +nwT +mfH +pym +gqf +fDk alL urM dBG @@ -125937,22 +126390,22 @@ jvY wjv fDG alL -alG -aYD -aTS -uHZ +pEd +wZp +pym +qgK tEB uBM dXo oIB -ePc -wKe -fcW -wCF -pNu -gGX -ddC -fcW +xPu +uOE +kNq +swG +jei +aPO +hIX +kNq vcE pxJ swM @@ -125997,9 +126450,9 @@ aaa aaa aaa aaa -kHq -aYf -dJF +emA +jEM +kDd aLT bdJ bds @@ -126017,20 +126470,20 @@ aQL bsS mqK aQL -aLG -aYZ -sLE -jJs +bqc +tcS +mww +sZe bdl bEp bCA -iPy -qvd -nAC -hcx -oxt -hcx -lSF +wlh +cvb +bmC +nwG +lDL +nwG +lMw jeO nQv ltb @@ -126040,10 +126493,10 @@ dyx hGN pVx uys -ttM -iEb -ccv -bIS +wKm +ekM +aVM +wVm bJC cfp cgu @@ -126061,9 +126514,9 @@ bSJ clM clS bSJ -oeY -gbz -nhJ +cZp +gEh +tcO aaa aaa aaa @@ -126103,28 +126556,28 @@ aaa aad aag aag -sTT -mBf -mBf -mBf -rFS -mBf -mBf -fWP -euw -mBf -lOa -mBf -iao -nHf -sEC -mBf -sJo -sJo -mBf -uBz -aYj -aoE +fTl +taw +taw +taw +mRI +taw +taw +wpT +stA +taw +wTn +taw +nQw +oxy +wjP +taw +oQL +oQL +taw +gbR +tbD +chC aqe amw anO @@ -126140,28 +126593,28 @@ arq anO qaV kwd -aSB -anG -mPX +urs +hqx +tFQ oIB wKF hzb ltU oIB -gGX -xsj -fcW -maG -pNu -gGX -cvp -fcW -fcW -fcW -fcW -nVz -fcW -bMH +aPO +eDk +kNq +bCR +jei +aPO +fJp +kNq +kNq +kNq +kNq +qDB +kNq +fVe aag aag afm @@ -126200,9 +126653,9 @@ aaa aaa aaa aaa -kHq -aYf -hsf +emA +jEM +ikT aLT beT bdr @@ -126220,20 +126673,20 @@ ihY bpC dnE aQL -kgr -aYW -bzV -beB +qfI +dpA +ggo +lhs bdl ycp ycp -qmb +tPj ycp ycp bdl bdl -vna -vuw +rtj +agv bdl bdl bdl @@ -126243,10 +126696,10 @@ uys uys uys uys -bJz -cbS -bJz -bHW +gyw +bFX +gyw +hza bJC bMA cfo @@ -126264,9 +126717,9 @@ clG clg bVq bSJ -fNY -fcx -nhJ +ien +dFL +tcO aaa aaa aaa @@ -126306,28 +126759,28 @@ aaa aaa aad aag -sTT -bic -bZu -mBf -lOa -ihI -mBf -oBM -euw -mBf -mFa -mBf -sMC -nHf -iIt -mBf -sJo -iIt -mBf -jMK -ajR -aoG +fTl +vrZ +qlu +taw +wTn +kCu +taw +uPN +stA +taw +wFX +taw +lsh +oxy +hja +taw +oQL +hja +taw +bwN +gxR +lCc aqg arr atn @@ -126343,28 +126796,28 @@ atn atn aOB aRj -aSC -aZH -iAB +dZR +kWc +cwL oIB phj vEf cNK oIB -gGX -pNu -caZ -gGX -gGX -gGX -pNu -pNu -vtZ -pNu -pNu -gGX -pNu -bMH +aPO +jei +oYr +aPO +aPO +aPO +jei +jei +lYt +jei +jei +aPO +jei +fVe aag ajZ aaa @@ -126403,9 +126856,9 @@ aaa aaa aaa aaa -kHq -pMI -hsf +emA +sEg +ikT aLT aLT aLT @@ -126423,20 +126876,20 @@ aQL aQL aQL aQL -pGM -aYZ -sLE -jJs +oxe +tcS +mww +sZe bdl fKT bGy -fUL -aZJ -fMK +kOW +snM +iqo bdl -rGZ -tLA -lVK +clV +crD +kLP gvU cyo bdl @@ -126446,10 +126899,10 @@ sgc xCa bUy bdl -qYt -iEb -bHa -bIT +eTx +ekM +cJs +pOW bJC bJC bJC @@ -126467,9 +126920,9 @@ bSJ bSJ bSJ bSJ -oeY -aCr -nhJ +cZp +xhO +tcO aaa aaa aaa @@ -126509,28 +126962,28 @@ aaa aaa aad aag -sTT -khz -cPy -mBf -kFM -ihI -mBf -rFS -mBf -mBf -llF -mBf -sJo -nHf -sJo -mBf -rsr -uUa -mBf -rFY -ctC -aoQ +fTl +hjT +rWb +taw +oAK +kCu +taw +mRI +taw +taw +tvA +taw +oQL +oxy +oQL +taw +cap +fiN +taw +vkQ +kzR +mXP kwd amA atq @@ -126546,28 +126999,28 @@ atq atq aoT kwd -rFY -ctC -gPF +vkQ +kzR +oig oIB -opI +cHC dha pxj oIB -gGX -gRt -fcW -tpQ -pNu -fFN -aYN -uhn -iWD -iWD -iWD -mVY -pNu -bMH +aPO +oUx +kNq +fPF +jei +nNT +jwJ +mgX +nZG +nZG +nZG +xGm +jei +fVe aag ajZ aaa @@ -126606,9 +127059,9 @@ aaa aaa aaa aaa -kHq -aYf -hsf +emA +jEM +ikT aLT beT bdr @@ -126626,10 +127079,10 @@ mUx bpC dnE aQL -aLG -aYZ -sLE -jJs +bqc +tcS +mww +sZe bdl fgm bdj @@ -126649,10 +127102,10 @@ fYZ vYC noj hpS -pJJ -iEb -bHa -bIT +gyE +ekM +cJs +pOW bJC bMA cfo @@ -126670,9 +127123,9 @@ clH oFV bVq bSJ -vEv -lkg -nhJ +vUJ +hCq +tcO aaa aaa aaa @@ -126712,28 +127165,28 @@ aaa aaa aad aag -sTT -bZu -ace -vMv -nHf -sJo -lGV -sJo -iAo -nHf -nHf -vMv -nHf -nHf -sJo -mBf -mBf -mBf -mBf -aEp -lIw -aoR +fTl +qlu +uKl +kiR +oxy +oQL +jsu +oQL +gqt +oxy +oxy +kiR +oxy +oxy +oQL +taw +taw +taw +taw +mQF +rnO +ogd alO ars amx @@ -126749,9 +127202,9 @@ amx amx aOC alO -aEp -lIw -aEp +mQF +rnO +mQF loP loP loP @@ -126760,17 +127213,17 @@ loP qej loP loP -fcW -cvp -gGX -ekz -cBE -crG -xdT -qeO -uAx -gRt -bMH +kNq +fJp +aPO +wXl +dJe +unQ +nxe +tjH +tVn +oUx +fVe aag ajZ aaa @@ -126809,9 +127262,9 @@ aaa aaa aaa aaa -kHq -hsf -aYf +emA +ikT +jEM aLT beU bdv @@ -126829,13 +127282,13 @@ aQL bsW xvX aQL -aLG -txe -baq -jJs +bqc +noI +dJG +sZe bdl ntd -iVj +hgO eqb mLR hdE @@ -126852,10 +127305,10 @@ scH nzO kxL hpS -pJJ -vzu -vYi -bIT +gyE +nzt +jhs +pOW bJC cfq cgv @@ -126873,9 +127326,9 @@ bSJ clN clT bSJ -sFO -gbz -nhJ +xsv +gEh +tcO aaa aaa aaa @@ -126915,28 +127368,28 @@ aaa aaa aad aag -sTT -glC -oCV -mBf -nHf -hYj -mtj -oPS -nHf -sJo -hoC -mBf -sJo -nHf -sJo -mBf -lLx -aoZ -mBf -ndJ -anJ -aoS +fTl +wIu +wXJ +taw +oxy +kMa +qIa +iSB +oxy +oQL +hdy +taw +oQL +oxy +oQL +taw +liF +wPR +taw +cui +fQU +onh inw amA amx @@ -126952,9 +127405,9 @@ atq amx aoT inw -aiB -anJ -mnG +ivV +fQU +hPr loP iwB tOC @@ -126963,17 +127416,17 @@ vqL xBY qwo loP -qrS -jzp -gGX -ekz -cvp -nLT -nLT -nLT -uAx -pNu -bMH +ang +hqu +aPO +wXl +fJp +iCD +iCD +iCD +tVn +jei +fVe aag ajZ aaa @@ -127012,9 +127465,9 @@ aaa aaa aaa aaa -kHq -bhe -aYf +emA +qGC +jEM aLT aLT aLT @@ -127032,10 +127485,10 @@ aQL aQL aQL aQL -aLG -aYO -kBK -hyt +bqc +ubQ +fpM +bEk bdl tFS bdj @@ -127055,10 +127508,10 @@ jaR mJa wWP rsK -aGc -kkE -iEb -bIT +cBC +feo +ekM +pOW bJC bJC bJC @@ -127076,9 +127529,9 @@ bSJ bSJ bSJ bSJ -kTt -toh -nhJ +goM +tfQ +tcO aaa aaa aaa @@ -127118,28 +127571,28 @@ aaf aaf aag aag -sTT -mBf -mBf -mBf -lOa -wNN -vts -lVv -nHf -sJo -ftE -mBf -kWc -nHf -sJo -mBf -sJo -sJo -mBf -alG -aDZ -aoU +fTl +taw +taw +taw +wTn +wOv +tuJ +iKV +oxy +oQL +oFr +taw +mUL +oxy +oQL +taw +oQL +oQL +taw +pEd +gBg +bLg aqj arw anP @@ -127155,9 +127608,9 @@ atq atq wwJ inw -alG -aYj -apd +pEd +tbD +xhi loP joG sDu @@ -127166,17 +127619,17 @@ wSn xBY lKa loP -yhx -pNu -gGX -ekz -fcW -qyu -pNu -fXG -xft -riw -bMH +fvo +jei +aPO +wXl +kNq +jcE +jei +lVR +pHD +dhp +fVe aag aag aaf @@ -127211,13 +127664,13 @@ aaa aaa aaa aaa -kHq -kHq -kHq -kHq -kHq -hsf -hsf +emA +emA +emA +emA +emA +ikT +ikT aLT vZb tnY @@ -127235,10 +127688,10 @@ aUZ uqA bES kcl -aLG -aYO -sou -bAX +bqc +ubQ +uPX +rHr bdl wIr aQy @@ -127258,10 +127711,10 @@ nPT bdl bdl bdl -dhU -vzq -iEb -bIT +jLg +uEO +ekM +pOW hNw wos bMC @@ -127279,13 +127732,13 @@ hcI hcI vPK bSJ -oeY -gbz -nhJ -nhJ -nhJ -nhJ -nhJ +cZp +gEh +tcO +tcO +tcO +tcO +tcO aaa aaa aaa @@ -127321,28 +127774,28 @@ aag aag aag aag -sTT -siP -sJo -vMv -nHf -wNN -bZu -hBR -nHf -hYj -sGD -mBf -sMC -nHf -sEC -mBf -sJo -sJo -mBf -ylJ -aDZ -aoD +fTl +hEr +oQL +kiR +oxy +wOv +qlu +qAG +oxy +kMa +gQu +taw +lsh +oxy +wjP +taw +oQL +oQL +taw +rhX +gBg +fDk inw qHM emn @@ -127358,9 +127811,9 @@ amx amx aBs inw -alG -aYj -apd +pEd +tbD +xhi loP kxo wSn @@ -127369,17 +127822,17 @@ kdi xBY kxo loP -pwJ -pNu -gGX -ekz -fcW -wsw -jzp -cua -qJr -pNu -bMH +nSk +jei +aPO +wXl +kNq +cke +hqu +oSR +fZI +jei +fVe aag aag aag @@ -127414,13 +127867,13 @@ aaa aaa aaa aaa -kHq -enq -iJU -gQz -qXm -aYf -hsf +emA +hyb +kjY +kcG +tIF +jEM +ikT aWT aMH beV @@ -127438,9 +127891,9 @@ aSE aVf bES kcl -aLG -aZg -bar +bqc +sUk +slo bdl bdl bdl @@ -127450,21 +127903,21 @@ bdl bdl bdl bdl -voU +xWo bdl bdl bdl bdl -fqh -qtO -fqh -qgM -qtO +reN +dEp +reN +htk +dEp bdl bdl -cbV -fpO -bIT +udf +iyC +pOW hNw sZq jZv @@ -127482,13 +127935,13 @@ aMI wGE erG ewO -bYd -aCr -uFE -eMt -eQa -vRW -nhJ +sEu +xhO +ffx +jhK +srl +lWY +tcO aaa aaa aaa @@ -127524,28 +127977,28 @@ aag aag aag aag -sTT -siP -dOX -mBf -ckq -wNN -glC -lGi -nHf -wNN -heI -mBf -oCV -nHf -nHf -vMv -nHf -nHf -vMv -aWd -aDZ -nfp +fTl +hEr +xBS +taw +tTG +wOv +wIu +ydf +oxy +wOv +ixu +taw +wXJ +oxy +oxy +kiR +oxy +oxy +kiR +fiH +gBg +xsX alO alO alO @@ -127561,9 +128014,9 @@ atq atq aBs alO -alG -aDZ -aWd +pEd +gBg +fiH fTF xBY xBY @@ -127572,17 +128025,17 @@ xBY xBY jGI loP -fcW -cvp -uyV -ekz -fcW -fcW -fcW -fcW -jCu -pNu -bMH +kNq +fJp +nOx +wXl +kNq +kNq +kNq +kNq +pAV +jei +fVe aag aag aag @@ -127617,13 +128070,13 @@ aaa aaa aaa aaa -kHq -pkv -hsf -hsf -hsf -hsf -hsf +emA +jkN +ikT +ikT +ikT +ikT +ikT aLT aZf duV @@ -127641,33 +128094,33 @@ iIR aVf bES kcl -aLG -aYO -bZK -mgZ -wVU -row -rXg -row -row -kDT -fRD -fRD -fRD -muJ -row -row -fRD -jZz -row -evQ -fRD -row -row -mgZ -cbW -iEb -bIT +bqc +ubQ +kwi +lZM +rSR +xss +rLK +xss +xss +uHk +dXb +dXb +dXb +cTX +xss +xss +dXb +ndm +xss +iFY +dXb +xss +xss +lZM +kYl +ekM +pOW hNw sZq jZv @@ -127685,13 +128138,13 @@ jGR jGR oqu bSJ -gbz -gbz -gbz -gbz -gbz -aCr -nhJ +gEh +gEh +gEh +gEh +gEh +xhO +tcO aaa aaa aaa @@ -127727,28 +128180,28 @@ aag aag aag aag -sTT -ozw -qzm -mBf -nHf -shJ -jXL -rcw -nHf -wNN -bZu -mBf -bZu -nHf -sJo -mBf -sJo -sJo -jpu -alG -aDZ -xrr +fTl +oqc +smw +taw +oxy +rgk +nUT +cnP +oxy +wOv +qlu +taw +qlu +oxy +oQL +taw +oQL +oQL +lnD +pEd +gBg +iea alO gKZ vTv @@ -127764,9 +128217,9 @@ atq atq aBs alO -alJ -aYj -apd +pvE +tbD +xhi gdS wSn kXN @@ -127775,17 +128228,17 @@ odD xBY mOg oHx -gGX -vnE -gGX -rji -lcM -cTb -cTb -cTb -gxW -pNu -bMH +aPO +iXB +aPO +gof +bVr +ivL +ivL +ivL +fVa +jei +fVe aag aag aag @@ -127820,9 +128273,9 @@ aaa aaa aaa aaa -kHq -kSA -hsf +emA +fGi +ikT aLT aLT aLT @@ -127844,16 +128297,16 @@ chp aVf aQL aQL -beB -aYT -bzY -qwT -qwT -xIy -qwT -qwT -qwT -qwT +lhs +bww +tHF +cvx +cvx +bKJ +cvx +cvx +cvx +cvx vub vub vub @@ -127861,16 +128314,16 @@ owW vub vub vub -qwT -qwT -qwT -xIy -qwT -qwT -qwT -cbX -cbS -ccO +cvx +cvx +cvx +bKJ +cvx +cvx +cvx +xQz +bFX +pmd bJC bJC bMD @@ -127892,9 +128345,9 @@ bSJ bSJ bSJ bSJ -gbz -fcx -nhJ +gEh +dFL +tcO aaa aaa aaa @@ -127930,28 +128383,28 @@ aag aag aag aag -sTT -mBf -mBf -mBf -lOa -sJo -sJo -rEs -nHf -oFn -kpl -mBf -bZu -nHf -iIt -mBf -wfG -lPE -jpu -alG -aDZ -xrr +fTl +taw +taw +taw +wTn +oQL +oQL +lUQ +oxy +tBU +iDs +taw +qlu +oxy +hja +taw +kLZ +tty +lnD +pEd +gBg +iea alO arz atq @@ -127967,9 +128420,9 @@ auB atc aOF alO -alG -aYj -apd +pEd +tbD +xhi gdS lBg dXd @@ -127978,17 +128431,17 @@ loP eMh loP loP -fcW -cGP -gGX -wXS -kHv -rbE -kHv -kHv -foU -pNu -bMH +kNq +hnt +aPO +wSx +gYI +wPa +gYI +gYI +rzk +jei +fVe aag aag aag @@ -128023,9 +128476,9 @@ aaa aaa aaa aaa -kHq -aYf -hsf +emA +jEM +ikT aLT bBg vPv @@ -128047,9 +128500,9 @@ brA aVf lQz aQL -aLG -aZi -aLG +bqc +qIf +bqc bbs cbh xYP @@ -128071,9 +128524,9 @@ tez gsm bCM bbr -buH -iEb -bIT +uPE +ekM +pOW bJC jht jZv @@ -128095,9 +128548,9 @@ qNd hzu hcI bSJ -aCr -aCr -nhJ +xhO +xhO +tcO aaa aaa aaa @@ -128133,28 +128586,28 @@ aag aag aag aag -sTT -sJo -oPv -rEd -nHf -sJo -mBf -mBf -rFS -mBf -mBf -mBf -heI -nHf -sJo -mBf -mBf -mBf -mBf -alG -aDZ -xrr +fTl +oQL +mOE +gUG +oxy +oQL +taw +taw +mRI +taw +taw +taw +ixu +oxy +oQL +taw +taw +taw +taw +pEd +gBg +iea alO arz atq @@ -128170,9 +128623,9 @@ aIU aMq aOG alO -alG -aDZ -apd +pEd +gBg +xhi loP loP loP @@ -128182,16 +128635,16 @@ vyI lPB oHl jWh -fcW -nVz -fcW -fcW -fcW -fcW -fcW -eEv -gRt -bMH +kNq +qDB +kNq +kNq +kNq +kNq +kNq +gGb +oUx +fVe aag aag aag @@ -128226,9 +128679,9 @@ aaa aaa aaa aaa -kHq -aYf -aYf +emA +jEM +jEM aLT nuN nuN @@ -128250,9 +128703,9 @@ bOG aVf iaq aQL -aLG -aZi -aLG +bqc +qIf +bqc bbs bKD vTS @@ -128274,9 +128727,9 @@ tez ccQ bCN bbr -buH -iEb -bIT +uPE +ekM +pOW bJC cjC jZv @@ -128298,9 +128751,9 @@ rYp oEo oEo bSJ -aCr -aCB -nhJ +xhO +lMO +tcO aaa aaa aaa @@ -128336,28 +128789,28 @@ aag aag aag aag -sTT -nHf -nHf -vag -nHf -sJo -mBf -lnb -gBO -ozt -mBf -sMC -sJo -nHf -sJo -eNO -sCi -kpl -mBf -alG -aDZ -xrr +fTl +oxy +oxy +bCv +oxy +oQL +taw +gCQ +rEs +tvr +taw +lsh +oQL +oxy +oQL +aYU +uxs +iDs +taw +pEd +gBg +iea alO arz atq @@ -128373,9 +128826,9 @@ xBe xBe xBe xBe -alG -aDZ -apd +pEd +gBg +xhi jWh eFK wGd @@ -128385,16 +128838,16 @@ hSk hSk uIv jWh -nmp -iPe -dbj -fcW -eje -olv -njr -eEv -pNu -bMH +jZj +sRP +oko +kNq +tiY +qAK +xGK +gGb +jei +fVe aag aag aag @@ -128429,9 +128882,9 @@ aaa aaa aaa aaa -kHq -slG -aYf +emA +oPF +jEM aLT vug vug @@ -128453,9 +128906,9 @@ bRg aVf aQL aQL -fvK -aZi -aLG +ylN +qIf +bqc bbs ydM xYP @@ -128477,9 +128930,9 @@ tez ccQ cdn bbr -buH -iEb -bIT +uPE +ekM +pOW bJC bJC kGF @@ -128501,9 +128954,9 @@ yle wWX wWX bSJ -aCr -dvi -nhJ +xhO +xHa +tcO aaa aaa aaa @@ -128539,28 +128992,28 @@ aag aag aag aag -sTT -lOa -sJo -dLx -sJo -rYM -mBf -lnb -pVG -ndd -mBf -vAu -sJo -nHf -sJo -sJo -sJo -tlX -mBf -alJ -aDZ -xrr +fTl +wTn +oQL +qmq +oQL +nXo +taw +gCQ +bNc +tCC +taw +ftG +oQL +oxy +oQL +oQL +oQL +keE +taw +pvE +gBg +iea xnR arm ats @@ -128576,9 +129029,9 @@ aIV qqr arH xBe -alG -aDZ -apd +pEd +gBg +xhi vXd duF hSk @@ -128588,16 +129041,16 @@ hSk hSk uIv jWh -iCI -gGX -gMj -fcW -pNu -vBa -bcQ -eEv -yen -bMH +eHz +aPO +tMT +kNq +jei +ltm +oAT +gGb +cmV +fVe aag aag aag @@ -128632,9 +129085,9 @@ aaa aaa aaa aaa -kHq -kin -iZh +emA +rIV +nvI aLT iPS vAE @@ -128656,9 +129109,9 @@ jOi aVf bES kcl -aLG -aZi -aLG +bqc +qIf +bqc bbs dvs xYP @@ -128680,9 +129133,9 @@ tez ccQ bCM bbr -buH -iEb -bIT +uPE +ekM +pOW hNw sZq lef @@ -128704,9 +129157,9 @@ vSW scy kPJ bSJ -aCr -wkJ -nhJ +xhO +eeR +tcO aaa aaa aaa @@ -128742,28 +129195,28 @@ aag aag aag aag -sTT -nHf -mBf -mBf -mkq -mBf -mBf -opU -nHf -iqN -ovx -fwQ -wJS -fwQ -fwQ -fwQ -fwQ -fwQ -wZD -alP -ajW -apc +fTl +oxy +taw +taw +xcs +taw +taw +utC +oxy +ikC +vRJ +gNQ +laP +gNQ +gNQ +gNQ +gNQ +gNQ +xDG +tJH +qpH +iSu alO arA att @@ -128779,9 +129232,9 @@ azo aJg abR xBe -alG -aDZ -apf +pEd +gBg +jhm jWh oih khE @@ -128791,16 +129244,16 @@ vyI kpQ vSE jWh -pPw -iay -waG -fcW -pNu -vBa -xiD -eEv -pNu -bMH +nwA +xZz +kRN +kNq +jei +ltm +ejj +gGb +jei +fVe aag aag aag @@ -128835,9 +129288,9 @@ aaa aaa aaa aaa -kHq -pMI -dJF +emA +sEg +kDd aLT aLT aLT @@ -128859,9 +129312,9 @@ vfx aVf bES kcl -beB -byI -beB +lhs +uvh +lhs kFY jmK bDL @@ -128883,9 +129336,9 @@ tez ccQ bCN jhb -jiw -cbS -bHW +kAj +bFX +hza hNw sZq ltI @@ -128907,9 +129360,9 @@ bSJ bSJ bSJ bSJ -twi -uIF -nhJ +qid +lNk +tcO aaa aaa aaa @@ -128945,28 +129398,28 @@ aag aag aag aag -sTT -nHf -mBf -vkW -uVx -aFE -mBf -lnb -fmY -mkW -mBf -mBf -mBf -rFS -mBf -mBf -mBf -mBf -mBf -ylJ -aDZ -apd +fTl +oxy +taw +tZM +qEZ +frV +taw +gCQ +uqJ +vbu +taw +taw +taw +mRI +taw +taw +taw +taw +taw +rhX +gBg +xhi wDM wDM wDM @@ -128982,9 +129435,9 @@ atv auV amE xBe -alG -aDZ -apd +pEd +gBg +xhi jWh jWh uUz @@ -128994,16 +129447,16 @@ qbZ jWh jWh jWh -rYT -gGX -lQk -fcW -iOt -pNu -fXG -xft -riw -bMH +fQl +aPO +nGZ +kNq +xQe +jei +lVR +pHD +dhp +fVe aag aag aag @@ -129038,9 +129491,9 @@ aaa aaa aaa aaa -kHq -aEE -hsf +emA +eTD +ikT aLT bBg vPv @@ -129062,9 +129515,9 @@ bRV bSe bES kcl -aLG -aZi -aLG +bqc +qIf +bqc bBd aPr bfl @@ -129086,9 +129539,9 @@ bSb bEa bFp bBd -buH -iEb -bIT +uPE +ekM +pOW hNw sZq lwJ @@ -129110,9 +129563,9 @@ mAV hzu hcI bSJ -dpM -aCr -nhJ +rqz +xhO +tcO aaa aaa aaa @@ -129148,17 +129601,17 @@ aag aag aag aag -sTT -pSP -mBf -vwJ -vWa -iIa -mBf -lnb -gBO -sXg -mBf +fTl +lmq +taw +mDz +pIf +uwf +taw +gCQ +rEs +bhZ +taw uiG rTZ tfb @@ -129167,9 +129620,9 @@ tfb tfb tfb ptK -alG -aYj -apd +pEd +tbD +xhi wDM aOM aoW @@ -129185,9 +129638,9 @@ atv auV amE xBe -alG -aYj -apd +pEd +tbD +xhi jWh xXa xXa @@ -129197,16 +129650,16 @@ cKL jbH rJh jWh -pOa -fZu -gyT -fcW -eeL -pNu -cua -fNv -pNu -bMH +rJY +dPl +qQG +kNq +cfm +jei +oSR +grd +jei +fVe aag aag aag @@ -129241,9 +129694,9 @@ aaa aaa aaa aaa -kHq -gER -hsf +emA +efP +ikT aLT cjc cjc @@ -129265,9 +129718,9 @@ csZ odB aQL aQL -aLG -aZg -tBF +bqc +sUk +ade bBe bFq bfm @@ -129289,9 +129742,9 @@ bCD bEb bFq bBe -bFu -fpO -bIT +hWD +iyC +pOW bJC bJC rbH @@ -129313,9 +129766,9 @@ yfm fXN fXN bSJ -gbz -aCr -nhJ +gEh +xhO +tcO aaa aaa aaa @@ -129351,17 +129804,17 @@ aag aag aag aag -sTT -nHf -mBf -mBf -mBf -mBf -mBf -mBf -rFS -mBf -mBf +fTl +oxy +taw +taw +taw +taw +taw +taw +mRI +taw +taw bNM wkX jhx @@ -129370,9 +129823,9 @@ jhx jhx dnH gpc -aWd -aYj -apd +fiH +tbD +xhi wDM uto aoX @@ -129388,9 +129841,9 @@ nNY qKi abR xBe -alJ -ajR -aTS +pvE +gxR +pym dEt soP pDr @@ -129400,16 +129853,16 @@ soP eoG uIv jWh -fcW -nVz -fcW -fcW -fcW -cvp -tIE -eEv -gRt -bMH +kNq +qDB +kNq +kNq +kNq +fJp +ekz +gGb +oUx +fVe aag aag aag @@ -129444,9 +129897,9 @@ aaa aaa aaa aaa -kHq -kAN -hsf +emA +uzv +ikT aLT cjc cjc @@ -129468,9 +129921,9 @@ vil bpC qZX aQL -kEb -aZi -bad +pjP +qIf +lfz bbs cdp cdp @@ -129492,9 +129945,9 @@ fJO fJO fJO bbs -nmD -iEb -twT +wMI +ekM +oHt bJC lbf cft @@ -129516,9 +129969,9 @@ yfm fXN fXN bSJ -aCr -fcx -nhJ +xhO +dFL +tcO aaa aaa aaa @@ -129554,13 +130007,13 @@ aag aag aag aag -sTT -lOa -oPv -dFW -gog -bBO -mBf +fTl +wTn +mOE +sWp +nUm +moL +taw mDJ owg xUA @@ -129573,9 +130026,9 @@ nwU owg owg ptK -wOh -ajP -apd +nhT +gqf +xhi wDM aOQ fxI @@ -129591,9 +130044,9 @@ azp qJf anV xBe -alG -aYj -apd +pEd +tbD +xhi jWh iqH khE @@ -129603,16 +130056,16 @@ ovi iat eim jWh -fcW -mEN -fcW -fcW -ieG -nGp -lcM -xft -pNu -bMH +kNq +spd +kNq +kNq +dVH +cAz +bVr +pHD +jei +fVe aag aag aag @@ -129647,9 +130100,9 @@ aaa aaa aaa aaa -kHq -aDY -hsf +emA +hfO +ikT aLT iPS vAE @@ -129671,9 +130124,9 @@ vil bpC qDq kbc -aLG -aYO -aLG +bqc +ubQ +bqc bbs bdw bfo @@ -129695,9 +130148,9 @@ lJu bEd bFs bbs -buH -iEb -bIT +uPE +ekM +pOW fzq oXb cft @@ -129719,9 +130172,9 @@ gEo scy kPJ bSJ -gbz -tRd -nhJ +gEh +pFr +tcO aaa aaa aaa @@ -129757,13 +130210,13 @@ aag aag aag aag -sTT -nHf -nHf -fcK -nHf -nHf -vMv +fTl +oxy +oxy +tIN +oxy +oxy +kiR owg owg uKV @@ -129776,9 +130229,9 @@ eNi eNi eNi eNi -alG -aDZ -apf +pEd +gBg +jhm wDM aOH aJf @@ -129794,9 +130247,9 @@ xBe xBe xBe xBe -alG -aYj -wSk +pEd +tbD +rXV jWh jWh jlQ @@ -129806,16 +130259,16 @@ thV uWV uIv oSx -fcW -gRt -fcW -fcW -cvp -tIE -jzp -pNu -ght -bMH +kNq +oUx +kNq +kNq +fJp +ekz +hqu +jei +qDS +fVe aag aag aag @@ -129850,9 +130303,9 @@ aaa aaa aaa aaa -kHq -pkv -hsf +emA +jkN +ikT aLT aLT aLT @@ -129874,9 +130327,9 @@ ngA koC koC xGE -aem -mUa -aLG +jno +fqw +bqc lgy ccb xYP @@ -129898,9 +130351,9 @@ rXk xYP jew laU -buH -jGN -bJb +uPE +dEL +rzy uCM lNw eFj @@ -129922,9 +130375,9 @@ bSJ bSJ bSJ bSJ -gbz -owD -nhJ +gEh +kMR +tcO aaa aaa aaa @@ -129960,13 +130413,13 @@ aah aag aag aag -sTT -jaF -emX -iGH -mtj -mtj -mBf +fTl +pWw +hbE +cbc +qIa +qIa +taw ptK afX ptK @@ -129979,9 +130432,9 @@ olO wiG nWN eNi -alG -aYj -apd +pEd +tbD +xhi wDM wDM wDM @@ -129997,9 +130450,9 @@ aJh arq ufx alR -alG -aYj -apf +pEd +tbD +jhm jWh hSk hSk @@ -130009,16 +130462,16 @@ upR fCL uIv vVw -cWF -pNu -caZ -pNu -gGX -gGX -gGX -mdG -hNn -bMH +iSV +jei +oYr +jei +aPO +aPO +aPO +gtQ +wiO +fVe aag aag aag @@ -130053,14 +130506,14 @@ aaa aaa aaa aaa -kHq -enq -aYf -aYf -aYf -aYf -enq -aYf +emA +hyb +jEM +jEM +jEM +jEM +hyb +jEM aLT cjc cjc @@ -130077,9 +130530,9 @@ jOx bpC qDq aQL -jKA -aYT -beB +nYR +bww +lhs lgy bsG xYP @@ -130101,9 +130554,9 @@ lJu xYP hLI laU -bJz -rrV -bJz +gyw +uNQ +gyw bJC oXb cfo @@ -130120,14 +130573,14 @@ kPJ fXN fXN bSJ -hMV -eQa -gbz -aCr -aCr -aCr -sce -nhJ +enY +srl +gEh +xhO +xhO +xhO +jay +tcO aaa aaa aaa @@ -130163,13 +130616,13 @@ aaa aad aag aag -sTT -hEB -ojg -mbp -bib -bZu -mBf +fTl +prX +oYs +odG +biC +qlu +taw bKm hsr mDJ @@ -130182,9 +130635,9 @@ ueG rPt jyE eNi -alG -aYj -apd +pEd +tbD +xhi hwC rcS amx @@ -130200,9 +130653,9 @@ aJi azs atq alR -alG -aYj -apd +pEd +tbD +xhi jlQ tst uUe @@ -130212,16 +130665,16 @@ pZK fCL uIv lFA -fcW -pNu -fcW -fcW -pNu -pNu -kjY -kMW -uGy -bMH +kNq +jei +kNq +kNq +jei +jei +gYU +oGi +dVR +fVe aag aag ajZ @@ -130256,14 +130709,14 @@ aaa aaa aaa aaa -kHq -kHq -kHq -kHq -kHq -aYf -hsf -aYf +emA +emA +emA +emA +emA +jEM +ikT +jEM aLT iPS vAE @@ -130280,9 +130733,9 @@ jOx bpC ksp aQL -aLG -bSY -aWR +bqc +wqO +wxD cau bCG cgE @@ -130302,11 +130755,11 @@ xYP jmK hcw cgE -qGS -dPf -buJ -lln -buH +yht +blq +ddL +eZR +uPE bJC kIP cfo @@ -130323,14 +130776,14 @@ oer vSW scy bSJ -ljD -twi -lkg -nhJ -nhJ -nhJ -nhJ -nhJ +mCE +qid +hCq +tcO +tcO +tcO +tcO +tcO aaa aaa aaa @@ -130366,13 +130819,13 @@ aaa aad aag aag -sTT -sTT -sTT -sTT -sTT -sTT -sTT +fTl +fTl +fTl +fTl +fTl +fTl +fTl qJx hsr mDJ @@ -130385,9 +130838,9 @@ iKD rPt rPt eNi -alG -aYj -apd +pEd +tbD +xhi alR amA atq @@ -130403,9 +130856,9 @@ aJj aMD atq alR -alG -aYj -apd +pEd +tbD +xhi jlQ tZZ gLz @@ -130415,16 +130868,16 @@ ovi fCL lYk bYn -bMH -bMH -bMH -bMH -bMH -bMH -bMH -bMH -bMH -bMH +fVe +fVe +fVe +fVe +fVe +fVe +fVe +fVe +fVe +fVe aag aag ajZ @@ -130463,10 +130916,10 @@ aaa aaa aaa aaa -kHq -slG -hsf -aYf +emA +oPF +ikT +jEM aLT meY meY @@ -130483,9 +130936,9 @@ pyl pDt aQL aQL -aLG -aYO -aLG +bqc +ubQ +bqc lgy ccN xYP @@ -130505,11 +130958,11 @@ wLm wLm lJu xYP -hko +wbV laU -buH -hop -buH +uPE +vuV +uPE bJC bJC vLA @@ -130526,10 +130979,10 @@ oer oer oer oer -tQw -gbz -tRd -nhJ +uVp +gEh +pFr +tcO aaa aaa aaa @@ -130588,9 +131041,9 @@ eNi eNi gIh eNi -geH -aDZ -apd +iIQ +gBg +xhi alR amA atq @@ -130606,9 +131059,9 @@ amA ayl amx alR -alG -aYj -apd +pEd +tbD +xhi jWh jmQ vcu @@ -130666,18 +131119,18 @@ aaa aaa aaa aaa -kHq -eRm -hsf -hsf -hsf -hsf -hsf -hsf -hsf -aYf -hsf -aYf +emA +wtn +ikT +ikT +ikT +ikT +ikT +ikT +ikT +jEM +ikT +jEM aQL qZX qZX @@ -130686,9 +131139,9 @@ jOx bpC qZX aQL -aLG -aYO -aLG +bqc +ubQ +bqc lgy ccb xYP @@ -130710,9 +131163,9 @@ rXk xYP jew laU -buH -hop -buH +uPE +vuV +uPE bJC lbf cfo @@ -130721,18 +131174,18 @@ lbf lbf lbf bJC -gbz -ofP -gbz -aCr -doM -nda -aCr -gbz -gbz -gbz -gbz -nhJ +gEh +cmN +gEh +xhO +dzX +foS +xhO +gEh +gEh +gEh +gEh +tcO aaa aaa aaa @@ -130791,9 +131244,9 @@ aWb dyK vzK wYY -alG -aDZ -apd +pEd +gBg +xhi alR amA atq @@ -130809,9 +131262,9 @@ aJl amx atq alR -alG -aYj -apd +pEd +tbD +xhi jlQ snE sGL @@ -130869,18 +131322,18 @@ aaa aaa aaa aaa -kHq -dJm -nmS -aYf -aYf -aYf -aYf -aRm -aYf -aYf -aYf -aYf +emA +pGj +uoj +jEM +jEM +jEM +jEM +fBo +jEM +jEM +jEM +jEM aQL qDq qDq @@ -130889,9 +131342,9 @@ jOx bpC qDq bTb -aLG -aYO -aLG +bqc +ubQ +bqc bbs ccd ccN @@ -130913,9 +131366,9 @@ lJu huK jeQ bbs -buH -hop -buH +uPE +vuV +uPE xSw oXb cfo @@ -130924,18 +131377,18 @@ oXb oXb oXb bJC -gbz -aCr -gbz -aCr -gbz -uvB -aCr -gbz -aCr -aCr -wqX -nhJ +gEh +xhO +gEh +xhO +gEh +hWH +xhO +gEh +xhO +xhO +rhD +tcO aaa aaa aaa @@ -130994,9 +131447,9 @@ tii eJX sAC wYY -alG -aDZ -apd +pEd +gBg +xhi alR amA amx @@ -131012,9 +131465,9 @@ aJk amx atq alR -alG -aYj -apd +pEd +tbD +xhi jlQ tZZ cBj @@ -131072,18 +131525,18 @@ aaa aaa aaa aaa -kHq -kHq -kHq -kHq -kHq -kHq -kHq -kHq -kHq -kHq -hsf -qwE +emA +emA +emA +emA +emA +emA +emA +emA +emA +emA +ikT +oBr aQL qDq qDq @@ -131092,9 +131545,9 @@ osA cHl cHl bTb -beB -aYT -beB +lhs +bww +lhs bbs cdp cdp @@ -131116,9 +131569,9 @@ fJO fJO fJO bbs -bJz -rrV -bJz +gyw +uNQ +gyw xSw ejo ejo @@ -131127,18 +131580,18 @@ oXb oXb oXb bJC -aCr -gbz -gbz -nhJ -nhJ -urZ -nhJ -nhJ -nhJ -nhJ -nhJ -nhJ +xhO +gEh +gEh +tcO +tcO +ucy +tcO +tcO +tcO +tcO +tcO +tcO aaa aaa aaa @@ -131197,9 +131650,9 @@ sjj fzP sAC wYY -alG -aYj -apd +pEd +tbD +xhi alR amA atq @@ -131215,9 +131668,9 @@ xEO xEO lnP alR -alG -aYj -apf +pEd +tbD +jhm jWh qLs qLs @@ -131284,9 +131737,9 @@ aaa aaa aaa aaa -kHq -bhe -enq +emA +qGC +hyb aQL ksp ksp @@ -131295,33 +131748,33 @@ 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 -hop -buH +bqc +ubQ +bqc +bqc +bqc +bqc +bqc +bqc +dYb +bqc +fpI +bqc +bqc +tGS +uPE +uPE +uuT +uPE +fRL +uPE +uPE +uPE +uPE +uPE +uPE +vuV +uPE xSw oXb oXb @@ -131330,10 +131783,10 @@ kIP qer kIP bJC -aCr -wFG -tRd -nhJ +xhO +wYd +pFr +tcO aaa aaa aaa @@ -131400,9 +131853,9 @@ fcM uzE qsL nim -qhc -ajP -apd +prV +gqf +xhi alR amA atq @@ -131418,9 +131871,9 @@ iWR iWR kbx alR -alG -aYj -apd +pEd +tbD +xhi jWh jWh jlQ @@ -131487,9 +131940,9 @@ aaa aaa aaa aaa -kHq -hsf -aYf +emA +ikT +jEM aQL aQL aQL @@ -131498,33 +131951,33 @@ ksp rou ksp aQL -aLG -nFG -tzf -mRS -tzf -tBL -dUf -tBL -tBL -tBL -sub -tBL -tBL -wnQ -uWp -uWp -kJr -uWp -uWp -uWp -xcl -uWp -hvp -mBZ -hvp -gcz -bIR +bqc +qas +qUO +qUO +qUO +reu +fLf +reu +reu +reu +kkN +reu +reu +uTP +kEE +kEE +dCM +kEE +kEE +kEE +ulH +kEE +wzJ +wzJ +wzJ +nmH +xui bJC kIP qer @@ -131533,10 +131986,10 @@ bJC bJC bJC bJC -gbz -gbz -gbz -nhJ +gEh +gEh +gEh +tcO aaa aaa aaa @@ -131603,9 +132056,9 @@ xlC gyO kTN eNi -alJ -aYj -apd +pvE +tbD +xhi alR amA atq @@ -131621,14 +132074,14 @@ xEO xEO aOV alR -alG -aYj -apd +pEd +tbD +xhi jWh -kUw -dod -eNv -rxV +wFQ +bop +vyI +jnp thV fCL uIv @@ -131690,56 +132143,56 @@ aaa aaa aaa aaa -kHq -hsf -aYf -aYf -gHm -aYf -qwE -qwE -qwE -qwE -qwE -tfl -aLG -aLG -bBh -aLG -aNO -sLE -aNO -aNO -aLG -beB -aLG -aLG -qll -buH -buH -bJz -buH -bHa -bHa -hop -bHa -buH -cbD -buH -buH -sXh +emA +ikT +jEM +jEM +hYf +jEM +oBr +oBr +oBr +oBr +oBr +ovQ +bqc +bqc +bqc +bqc +nci +mww +nci +nci +bqc +rVC +bqc +bqc +tGS +uPE +uPE +tIl +uPE +cJs +cJs +vuV +cJs +uPE +uPE +uPE +uPE +pqw bJC bJC bJC bJC bJC -aCr -aCr -aCr -gbz -aCr -dXc -nhJ +xhO +xhO +xhO +gEh +xhO +xfq +tcO aaa aaa aaa @@ -131806,9 +132259,9 @@ oNb iFC qAA eNi -alG -aDZ -apd +pEd +gBg +xhi alR arK atc @@ -131824,15 +132277,15 @@ aJq aMG aOW alR -alG -aYj -apd +pEd +tbD +xhi jWh -tZP -hSk -hSk +bXy +bop +vyI +vyI vyI -thV fCL uIv hSk @@ -131893,56 +132346,56 @@ aaa aaa aaa aaa -kHq -kai -aYf -hsf -hsf -aYf -aYf -lfs -hsf -hsf -qwE -qwE -bhV -qwE -qwE -bCW -bEH -bHt -bJi -bKE -bKE +emA +kAv +jEM +ikT +ikT +jEM +jEM +gCu +ikT +ikT +oBr +oBr +qPn +oBr +oBr +jxX +knl +pum +jAj +kKY +kKY oJk lNR lNR -lNR +oJk lNR lNR oJk -bWV -jkd -bYE -bZz -cav -bBa -lij -lij -saa -lij -lij -aCr -aCr -aCr -aCr -aCr -aCr -aCr -aCr -aCr -eQa -nhJ +mXy +oGh +far +vDo +nnr +cNm +ljv +ljv +sUi +ljv +ljv +xhO +xhO +xhO +xhO +xhO +xhO +xhO +xhO +xhO +srl +tcO aaa aaa aaa @@ -132009,9 +132462,9 @@ eNi eNi eNi eNi -aEp -lIw -aEp +mQF +rnO +mQF alO alO alO @@ -132027,14 +132480,14 @@ alO alO alO alO -aEp -lIw -aEp +mQF +rnO +mQF jWh -nDL +wFQ +bop vyI -vyI -wTJ +wKc thV uWV uIv @@ -132096,22 +132549,22 @@ aaa aaa aaa aaa -kHq -qev -gaW -aYf -aYf -aYf -aYf -lfs -aYf -aYf -qwE -nSI -aYf -aYf -qwE -qwE +emA +qFS +pPG +jEM +jEM +jEM +jEM +gCu +jEM +jEM +oBr +sRM +jEM +jEM +oBr +oBr sqg rPQ sqg @@ -132129,23 +132582,23 @@ oJk sqg mgu sqg -lij -lij -aCr -gbz -aCr -aCr -gbz -gbz -gbz -aCr -aCr -aCr -aCr -gbz -tbz -xUS -nhJ +ljv +ljv +xhO +gEh +xhO +xhO +gEh +gEh +gEh +xhO +xhO +xhO +xhO +gEh +aEr +keO +tcO aaa aaa aaa @@ -132212,9 +132665,9 @@ dWX owg owg ptK -aGD -aPb -apj +bZq +hfc +jgS aqq aPa eky @@ -132230,9 +132683,9 @@ eky eky aPa aqq -aGD -aPb -kff +bZq +hfc +lBf jWh xXa xXa @@ -132299,22 +132752,22 @@ aaa aaa aaa aaa -kHq -hFR -kJD -fMn -hsf -hsf -hsf -aPP -fMn -aYf -aYf -aYf -aYf -hsf -hsf -qwE +emA +twp +iyE +ecb +ikT +ikT +ikT +ctp +ecb +jEM +jEM +jEM +jEM +ikT +ikT +oBr fcS gdJ oyR @@ -132332,23 +132785,23 @@ oJk ppn nAY cjt -lij -xtk -xWh -gbz -gbz -gbz -aCr -erR -aCr -gbz -aCr -gbz -gbz -tNy -lgI -ulI -nhJ +ljv +ceY +gIm +gEh +gEh +gEh +xhO +wra +xhO +gEh +xhO +gEh +gEh +sOD +eMx +xgr +tcO aaa aaa aaa @@ -132415,9 +132868,9 @@ keR jhx keR dwI -aTS -wqq -agJ +pym +jae +tGW hal uYg nau @@ -132433,9 +132886,9 @@ uYg nau uYg hal -aGC -wqq -aTS +rrG +jae +pym mPh soP tWi @@ -132502,22 +132955,22 @@ aaa aaa aaa aaa -kHq -kHq -kHq -kHq -kHq -kHq -kHq +emA +emA +emA +emA +emA +emA +emA vgw sqg sqg sqg mpP sqg -qwE -bhe -qwE +oBr +qGC +oBr fcS gdJ oyR @@ -132535,23 +132988,23 @@ oJk pkA nAY cjt -lij -gbz -lij +ljv +gEh +ljv sqg mpP aep aep aep dKL -nhJ -nhJ -nhJ -nhJ -nhJ -nhJ -nhJ -nhJ +tcO +tcO +tcO +tcO +tcO +tcO +tcO +tcO aaa aaa aaa @@ -132618,9 +133071,9 @@ kPG kPG cVw ptK -aIe -anR -lNl +iOP +xjI +fzm aqq eky aNl @@ -132636,9 +133089,9 @@ eky aNl eky aqq -aIe -iYj -lNl +iOP +xSl +fzm jWh tim uWV @@ -132719,8 +133172,8 @@ sqg rwB lKM sqg -vJJ -qwE +nSq +oBr fcS gdJ cjt @@ -132738,8 +133191,8 @@ pRZ fcS nAY jOE -lij -lGo +ljv +mPc sqg qEL vmE @@ -132821,9 +133274,9 @@ ucp cIW ptK ptK -pji -dKm -pji +ybk +sDe +ybk aHe jlT exi @@ -132839,9 +133292,9 @@ eky ins wRP aHe -wUB -wUB -wUB +eZm +eZm +eZm jWh jWh sWC @@ -132922,8 +133375,8 @@ sqg eKy wQA sqg -aYf -qwE +jEM +oBr uYn jaM oXM @@ -132941,8 +133394,8 @@ mkP muQ ojh nxx -lij -aCr +ljv +xhO sqg gEC skC @@ -133024,9 +133477,9 @@ gPc trB exy ptK -diy -diy -diy +fLl +fLl +fLl eky eky aNl @@ -133042,9 +133495,9 @@ eky aNl eky rqj -wUB -pLB -tpk +eZm +jYm +aZI jWh duz hXG @@ -133227,9 +133680,9 @@ eet fcP pDh ptK -uQp -uQp -rlO +aqZ +aqZ +ptQ aMT aMT dPm @@ -133245,9 +133698,9 @@ okg dPm aMT aMT -qtZ -aBO -aBO +hbp +mwP +mwP jWh axR mIP @@ -133430,9 +133883,9 @@ wxj lht rYv ptK -frq -iDx -diy +haO +pKB +fLl svf arV wZX @@ -133448,9 +133901,9 @@ eky wZX arV vUh -wUB -dnW -aBO +eZm +xUy +mwP jWh vpv pgw @@ -133633,9 +134086,9 @@ ptK afX ptK ptK -frq -diy -diy +haO +fLl +fLl lDn arV wZX @@ -133651,9 +134104,9 @@ eky wZX arV wkA -wUB -wUB -aBO +eZm +eZm +mwP jWh jWh kLc @@ -133828,16 +134281,16 @@ bdH uMc bNM ofK -diy -lkN -frq -dfv -frq -uQp -hOc -frq -oeq -diy +fLl +uxl +haO +ebf +haO +aqZ +tot +haO +qqS +fLl xrq vVu arV @@ -133855,16 +134308,16 @@ wZX arV oIt xrq -wUB -hZp -aBO -dsp -vsa -aBO -exX -fDm -hyL -wUB +eZm +qHG +mwP +xQW +vJR +mwP +hkz +ckj +oaw +eZm lbB uIv pql @@ -134031,16 +134484,16 @@ bdH uMc bNM ofK -diy -lkN -frq -cIZ -frq -uQp -fUF -frq -ruS -diy +fLl +uxl +haO +uLG +haO +aqZ +pbo +haO +xLn +fLl vlk mKy aMT @@ -134058,16 +134511,16 @@ sQO aMT wNS vlk -wUB -fAH -fOO -aBO -vsa -aBO -iUD -cLt -ebz -wUB +eZm +oHg +uiK +mwP +vJR +mwP +jrB +eoK +xTG +eZm lbB uIv pql @@ -134140,8 +134593,8 @@ aWZ qAB gEC sqg -jon -iQK +aIh +eTb kkW iwf uFg @@ -134159,8 +134612,8 @@ vXo gWu xMl lft -iQK -jon +eTb +aIh sqg siN cjt @@ -134234,17 +134687,17 @@ bdH uMc bNM rtd -rlO -uQp -uQp -uQp -uQp -uQp -nLN -frq -wIz -diy -diy +ptQ +aqZ +aqZ +aqZ +aqZ +aqZ +leM +haO +iYm +fLl +fLl vjd aRp jBX @@ -134260,17 +134713,17 @@ tKf jBX aRp quy -wUB -wUB -jDf -hfs -aBO -opf -opf -opf -opf -opf -qtZ +eZm +eZm +bjt +eIN +mwP +ksw +ksw +ksw +ksw +ksw +hbp uWV uIv pql @@ -134343,14 +134796,14 @@ ggQ pYS ivS sqg -xjU -iQK +ppM +eTb hbs vZU elx jnI oJk -ggx +xef dPQ ams eni @@ -134362,8 +134815,8 @@ nYn elx mDL fSF -iQK -xjU +eTb +ppM sqg lvh iks @@ -134437,17 +134890,17 @@ bdH cuC htb pfc -diy -diy -diy -diy -gNj -uQp -uQp -uQp -uQp -uQp -rlO +fLl +fLl +fLl +fLl +rht +aqZ +aqZ +aqZ +aqZ +aqZ +ptQ qYG atM bGc @@ -134463,17 +134916,17 @@ atM bGc atK qYG -qtZ -opf -opf -vrG -opf -vsa -oDI -wUB -wUB -wUB -wUB +hbp +ksw +ksw +rHB +ksw +vJR +rPq +eZm +eZm +eZm +eZm jAJ lAu bYn @@ -134546,8 +134999,8 @@ aep mkL gEC sqg -xjU -iQK +ppM +eTb hsy hsy baJ @@ -134565,8 +135018,8 @@ foC kph hsy hsy -iQK -nJm +eTb +eUe sqg wWl trh @@ -134643,14 +135096,14 @@ tgK tfb wuT lMx -bma -bma -bma -bma -bma -bma -bma -bma +gJF +gJF +gJF +gJF +gJF +gJF +gJF +gJF aPw avu mhG @@ -134666,14 +135119,14 @@ dxK dPC aMU aPw -nzC -nzC -nzC -nzC -nzC -nzC -nzC -nzC +wxy +wxy +wxy +wxy +wxy +wxy +wxy +wxy jFY qKY jHL @@ -134749,27 +135202,27 @@ wpS fZA fEe sqg -xjU -xjU +ppM +ppM hsy shL uXk mlF hsy -wdN -lsQ -lsQ +ckZ +hmv +hmv dTS -lsQ -lsQ -wdN +hmv +hmv +ckZ hsy tos uXk tkn hsy -jon -xjU +aIh +ppM sqg fEe nqW @@ -134952,8 +135405,8 @@ vgw vgw vgw vgw -jon -jon +aIh +aIh hsy wed uXk @@ -134971,8 +135424,8 @@ tos uXk wed hsy -hts -afA +qBS +lib vgw vgw vgw @@ -135154,11 +135607,11 @@ aah aag aag aag -eUf -ioT -xjU +nic +tmQ +ppM hsy -ujr +txS bVN oGJ xpZ @@ -135172,11 +135625,11 @@ coH oTO uqh iAE -vji +sct hsy -gMX -uSI -eUf +iWa +fZR +nic aag aag aag @@ -135357,29 +135810,29 @@ bdH aad aag aag -eUf -jon -jon +nic +aIh +aIh hsy -lxm +fCT uXk rae jIV pzM mtZ -lsQ -lsQ -lsQ +hmv +hmv +hmv fQn pzM nac xNf uXk -kIj +slv hsy -jon -jon -eUf +aIh +aIh +nic aag aag ajZ @@ -135560,29 +136013,29 @@ bdH aad aag aag -eUf -xjU -xjU +nic +ppM +ppM hsy -duP +igs nCn oGJ uSW kzO vaZ kYL -lsQ +hmv sCV rjO suY pdK uqh pJr -kIj +slv hsy -jon -jon -eUf +aIh +aIh +nic aag aag ajZ @@ -135763,29 +136216,29 @@ bdH aad aag aag -eUf -jon -xjU +nic +aIh +ppM hsy hsy -mBT +wTB mlF uXk hmw gSa mtZ -lsQ +hmv fQn wSV ulp uXk tos -kIj +slv hsy hsy -xjU -nJm -eUf +ppM +eUe +nic aag aag ajZ @@ -135966,29 +136419,29 @@ bdH aad aag aag -eUf -jon -jon -jon +nic +aIh +aIh +aIh hsy -osd +ygP mlF hsy -jiq +hcX fQn mtZ -lsQ +hmv fQn mtZ -lsQ +hmv hsy beL -osd +ygP hsy -tHw -jon -jon -eUf +cWb +aIh +aIh +nic aag aag ajZ @@ -136169,29 +136622,29 @@ bdH aad aag aag -eUf -xjU -xjU -xjU +nic +ppM +ppM +ppM hsy ylh opH hsy -gTV +pvI fQn qoR aPU rjO mtZ -goF +njS hsy iEw ylh hsy -qEP -xjU -qEP -eUf +dDT +ppM +dDT +nic aag aag ajZ @@ -136372,29 +136825,29 @@ bdH aad aag aag -eUf -eUf -xUt -jon +nic +nic +wsw +aIh hsy ylh mlF hsy -lsQ +hmv eZp kzO pzM hip ptZ -lsQ +hmv hsy tos ylh hsy -hts -hEy -eUf -eUf +qBS +piJ +nic +nic aag aag ajZ @@ -136576,9 +137029,9 @@ aad aag aag aag -eUf -hts -afA +nic +qBS +lib hsy hsy suJ @@ -136594,9 +137047,9 @@ hsy wdv hsy hsy -sUq -xjU -eUf +yjE +ppM +nic aag aag aag @@ -136779,9 +137232,9 @@ aad aag aag aag -eUf -jon -mtQ +nic +aIh +vsi hsy uiC sIr @@ -136797,9 +137250,9 @@ rlc hfb hUk hsy -xjU -uSI -eUf +ppM +fZR +nic aag aag aag @@ -136982,9 +137435,9 @@ aad aag aag aag -eUf -xjU -xjU +nic +ppM +ppM hsy thc sIr @@ -137000,9 +137453,9 @@ pAm sIr fZl hsy -tyY -jon -eUf +mxV +aIh +nic aag aag aag @@ -137185,9 +137638,9 @@ aad aag aag aag -eUf -jon -jon +nic +aIh +aIh hsy tIe uAK @@ -137203,9 +137656,9 @@ bVv nJa jPd hsy -xjU -flY -eUf +ppM +eeC +nic aag aag aag @@ -137388,9 +137841,9 @@ aad aag aag aag -eUf -xjU -xjU +nic +ppM +ppM hsy dPH sov @@ -137406,9 +137859,9 @@ pAm fZl oex hsy -jon -jon -eUf +aIh +aIh +nic aag aag aag @@ -137591,9 +138044,9 @@ aad aag aag aag -eUf -jon -jon +nic +aIh +aIh hsy rBv sov @@ -137609,9 +138062,9 @@ pAm fZl snt hsy -xjU -xjU -eUf +ppM +ppM +nic aag aag aag @@ -137794,9 +138247,9 @@ aad aag aag aag -eUf -xjU -xjU +nic +ppM +ppM hsy fqW qYq @@ -137812,9 +138265,9 @@ mQn wQD fqW hsy -jon -jon -eUf +aIh +aIh +nic aag aag aag @@ -137997,9 +138450,9 @@ aad aag aag aag -eUf -jon -xjU +nic +aIh +ppM hsy hsy hsy @@ -138015,9 +138468,9 @@ hsy hsy hsy hsy -xjU -xjU -eUf +ppM +ppM +nic aag aag aag @@ -138200,11 +138653,11 @@ aad aag aag aag -eUf -jon -xjU -liF -aBK +nic +aIh +ppM +csd +dDJ hsy haz fQn @@ -138216,11 +138669,11 @@ pzM mtZ haz hsy -aBK -feZ -jon -jon -eUf +dDJ +rXH +aIh +aIh +nic aag aag aag @@ -138294,7 +138747,7 @@ aaa cuC cuC jPq -jZS +xgm aqK cuC uiR @@ -138403,11 +138856,11 @@ aad aag aag aag -eUf -jon -jon -jon -jon +nic +aIh +aIh +aIh +aIh hsy haz pLt @@ -138419,11 +138872,11 @@ mZL lOX haz hsy -gvt -jon -jon -jon -eUf +fpi +aIh +aIh +aIh +nic aag aag aag @@ -138606,11 +139059,11 @@ aad aag aag aag -eUf -eUf -ydb -hEy -hEy +nic +nic +mem +piJ +piJ hsy mkI aPS @@ -138622,11 +139075,11 @@ nop aPS ddf hsy -wQV -xjU -uSI -eUf -eUf +atS +ppM +fZR +nic +nic aag aag aag @@ -138810,10 +139263,10 @@ aag aag aag aag -eUf -jon -xjU -wri +nic +aIh +ppM +sER hsy hsy hsy @@ -138825,10 +139278,10 @@ hsy hsy hsy hsy -jon -jon -jon -eUf +aIh +aIh +aIh +nic aag aag aag @@ -139013,25 +139466,25 @@ aag aag aag aag -eUf -jon -xjU -jon -xjU -olk -jon -mdF -xjU -xjU -xjU -mdF -jon -ssH -xjU -xjU -xjU -jon -eUf +nic +aIh +ppM +aIh +ppM +puT +aIh +xrg +ppM +ppM +ppM +xrg +aIh +erE +ppM +ppM +ppM +aIh +nic aag aag aag diff --git a/maps/shuttles/dropship_alamo.dmm b/maps/shuttles/dropship_alamo.dmm index d23036afdea3..dd799ca7cd6e 100644 --- a/maps/shuttles/dropship_alamo.dmm +++ b/maps/shuttles/dropship_alamo.dmm @@ -18,14 +18,6 @@ /obj/structure/shuttle/part/dropship1/transparent/nose_center, /turf/template_noop, /area/shuttle/drop1/sulaco) -"bc" = ( -/obj/effect/attach_point/electronics/dropship1{ - dir = 1; - attach_id = 5 - }, -/obj/structure/shuttle/part/dropship1/transparent/inner_left_weapons, -/turf/template_noop, -/area/shuttle/drop1/sulaco) "be" = ( /obj/structure/shuttle/part/dropship1/transparent/upper_right_wing, /turf/template_noop, @@ -81,15 +73,6 @@ icon_state = "floor8" }, /area/shuttle/drop1/sulaco) -"ed" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1{ - dir = 1; - id = "starboard_door" - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/shuttle/drop1/sulaco) "eD" = ( /obj/structure/shuttle/part/dropship1/transparent/engine_right_cap, /turf/template_noop, @@ -101,7 +84,7 @@ /area/shuttle/drop1/sulaco) "if" = ( /obj/structure/shuttle/part/dropship1/left_outer_wing_connector, -/turf/open/space/basic, +/turf/template_noop, /area/shuttle/drop1/sulaco) "ig" = ( /turf/closed/shuttle/dropship1{ @@ -218,7 +201,7 @@ /area/shuttle/drop1/sulaco) "rl" = ( /obj/structure/shuttle/part/dropship1/lower_right_wall, -/turf/open/space/basic, +/turf/template_noop, /area/shuttle/drop1/sulaco) "rr" = ( /turf/closed/shuttle/dropship1/transparent{ @@ -229,17 +212,9 @@ /obj/structure/shuttle/part/dropship1/transparent/left_outer_bottom_wing, /turf/template_noop, /area/shuttle/drop1/sulaco) -"sm" = ( -/obj/effect/attach_point/fuel/dropship1{ - attach_id = 10 - }, -/turf/closed/shuttle/dropship1/transparent{ - icon_state = "28" - }, -/area/shuttle/drop1/sulaco) "sA" = ( /obj/structure/shuttle/part/dropship1/lower_left_wall, -/turf/open/space/basic, +/turf/template_noop, /area/shuttle/drop1/sulaco) "tR" = ( /obj/item/device/radio/intercom/alamo{ @@ -279,7 +254,7 @@ /area/shuttle/drop1/sulaco) "xM" = ( /obj/structure/shuttle/part/dropship1/bottom_right_wall, -/turf/open/space/basic, +/turf/template_noop, /area/shuttle/drop1/sulaco) "yQ" = ( /turf/closed/shuttle/dropship1/transparent{ @@ -288,7 +263,7 @@ /area/shuttle/drop1/sulaco) "yU" = ( /obj/structure/shuttle/part/dropship1/bottom_left_wall, -/turf/open/space/basic, +/turf/template_noop, /area/shuttle/drop1/sulaco) "zw" = ( /obj/structure/shuttle/part/dropship1/transparent/upper_left_wing, @@ -319,6 +294,14 @@ icon_state = "63" }, /area/shuttle/drop1/sulaco) +"BM" = ( +/obj/effect/attach_point/crew_weapon/dropship1/floor{ + attach_id = 9 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/drop1/sulaco) "BS" = ( /turf/closed/shuttle/dropship1{ icon_state = "48" @@ -358,7 +341,7 @@ /area/shuttle/drop1/sulaco) "EN" = ( /obj/structure/shuttle/part/dropship1/transparent/engine_left_exhaust, -/turf/open/space/basic, +/turf/template_noop, /area/shuttle/drop1/sulaco) "FA" = ( /obj/structure/shuttle/part/dropship1/transparent/engine_left_cap, @@ -369,6 +352,15 @@ icon_state = "39" }, /area/shuttle/drop1/sulaco) +"GQ" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1{ + dir = 1; + id = "starboard_door" + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/drop1/sulaco) "Ho" = ( /obj/structure/machinery/computer/dropship_weapons/dropship1, /obj/structure/transmitter/rotary{ @@ -401,6 +393,23 @@ icon_state = "35" }, /area/shuttle/drop1/sulaco) +"Iu" = ( +/obj/effect/attach_point/fuel/dropship1{ + dir = 1; + pixel_x = -32 + }, +/turf/closed/shuttle/dropship1/transparent{ + icon_state = "33" + }, +/area/shuttle/drop1/sulaco) +"IP" = ( +/obj/effect/attach_point/electronics/dropship1{ + dir = 1; + attach_id = 6 + }, +/obj/structure/shuttle/part/dropship1/transparent/inner_right_weapons, +/turf/template_noop, +/area/shuttle/drop1/sulaco) "Jb" = ( /turf/closed/shuttle/dropship1/transparent{ icon_state = "80" @@ -408,23 +417,17 @@ /area/shuttle/drop1/sulaco) "Jm" = ( /obj/structure/shuttle/part/dropship1/transparent/engine_right_exhaust, -/turf/open/space/basic, +/turf/template_noop, /area/shuttle/drop1/sulaco) "JP" = ( /turf/closed/shuttle/dropship1{ icon_state = "62" }, /area/shuttle/drop1/sulaco) -"Kk" = ( -/obj/effect/attach_point/crew_weapon/dropship1/floor{ - attach_id = 7 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" +"Kt" = ( +/obj/structure/machinery/door/airlock/hatch/cockpit{ + dir = 1 }, -/area/shuttle/drop1/sulaco) -"KC" = ( -/obj/structure/machinery/door/airlock/hatch/cockpit, /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/shuttle/dropship{ icon_state = "rasputin15" @@ -442,30 +445,13 @@ /area/shuttle/drop1/sulaco) "Me" = ( /obj/structure/shuttle/part/dropship1/left_inner_wing_connector, -/turf/open/space/basic, +/turf/template_noop, /area/shuttle/drop1/sulaco) "MP" = ( /turf/closed/shuttle/dropship1{ icon_state = "64" }, /area/shuttle/drop1/sulaco) -"Nv" = ( -/obj/effect/attach_point/crew_weapon/dropship1/floor{ - attach_id = 8 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/shuttle/drop1/sulaco) -"ND" = ( -/obj/effect/attach_point/fuel/dropship1{ - pixel_x = -32; - attach_id = 11 - }, -/turf/closed/shuttle/dropship1/transparent{ - icon_state = "33" - }, -/area/shuttle/drop1/sulaco) "NQ" = ( /obj/structure/shuttle/part/dropship1/transparent/left_inner_bottom_wing, /turf/template_noop, @@ -506,9 +492,9 @@ icon_state = "rasputin15" }, /area/shuttle/drop1/sulaco) -"PV" = ( +"PA" = ( /obj/effect/attach_point/crew_weapon/dropship1/floor{ - attach_id = 9 + attach_id = 7 }, /turf/open/shuttle/dropship{ icon_state = "rasputin15" @@ -539,7 +525,7 @@ /area/shuttle/drop1/sulaco) "Ta" = ( /obj/structure/shuttle/part/dropship1/right_inner_wing_connector, -/turf/open/space/basic, +/turf/template_noop, /area/shuttle/drop1/sulaco) "Te" = ( /obj/structure/shuttle/part/dropship1/transparent/right_inner_bottom_wing, @@ -598,6 +584,14 @@ icon_state = "rasputin15" }, /area/shuttle/drop1/sulaco) +"UN" = ( +/obj/effect/attach_point/electronics/dropship1{ + dir = 1; + attach_id = 5 + }, +/obj/structure/shuttle/part/dropship1/transparent/inner_left_weapons, +/turf/template_noop, +/area/shuttle/drop1/sulaco) "Vm" = ( /turf/closed/shuttle/dropship1/transparent{ icon_state = "78" @@ -609,7 +603,7 @@ /area/shuttle/drop1/sulaco) "Wg" = ( /obj/structure/shuttle/part/dropship1/right_outer_wing_connector, -/turf/open/space/basic, +/turf/template_noop, /area/shuttle/drop1/sulaco) "WQ" = ( /turf/closed/shuttle/dropship1{ @@ -634,7 +628,15 @@ icon_state = "rasputin7" }, /area/shuttle/drop1/sulaco) -"XP" = ( +"XH" = ( +/obj/effect/attach_point/fuel/dropship1{ + dir = 1 + }, +/turf/closed/shuttle/dropship1/transparent{ + icon_state = "28" + }, +/area/shuttle/drop1/sulaco) +"XI" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1{ id = "port_door"; dir = 2 @@ -643,13 +645,13 @@ icon_state = "rasputin15" }, /area/shuttle/drop1/sulaco) -"Ye" = ( -/obj/effect/attach_point/electronics/dropship1{ - dir = 1; - attach_id = 6 +"YV" = ( +/obj/effect/attach_point/crew_weapon/dropship1/floor{ + attach_id = 8 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" }, -/obj/structure/shuttle/part/dropship1/transparent/inner_right_weapons, -/turf/template_noop, /area/shuttle/drop1/sulaco) "Za" = ( /turf/closed/shuttle/dropship1{ @@ -683,7 +685,7 @@ mb mb FA Oq -sm +XH iz EN mb @@ -700,7 +702,7 @@ Et iI JP il -XP +XI mW qn sA @@ -717,7 +719,7 @@ NQ mb mb mb -bc +UN oo TK ws @@ -787,7 +789,7 @@ ax EB Py tR -KC +Kt dU Ph BB @@ -796,11 +798,11 @@ BB OK OU il -Kk +PA il -Nv +YV il -PV +BM il mb mb @@ -855,7 +857,7 @@ Wg mb mb mb -Ye +IP oo TK cr @@ -884,7 +886,7 @@ iv zV MP il -ed +GQ nC nE rl @@ -913,7 +915,7 @@ mb mb eD Gw -ND +Iu qy Jm mb diff --git a/maps/shuttles/dropship_normandy.dmm b/maps/shuttles/dropship_normandy.dmm index e64fbe62372d..969e5927d3f8 100644 --- a/maps/shuttles/dropship_normandy.dmm +++ b/maps/shuttles/dropship_normandy.dmm @@ -15,6 +15,16 @@ icon_state = "rasputin15" }, /area/shuttle/drop2/sulaco) +"ba" = ( +/obj/effect/attach_point/fuel/dropship2{ + dir = 1; + pixel_x = -32; + attach_id = 11 + }, +/turf/closed/shuttle/dropship2/transparent{ + icon_state = "33" + }, +/area/shuttle/drop2/sulaco) "bc" = ( /obj/structure/shuttle/part/dropship2/transparent/left_outer_bottom_wing, /turf/template_noop, @@ -36,6 +46,14 @@ /obj/structure/shuttle/part/dropship2/transparent/right_outer_bottom_wing, /turf/template_noop, /area/shuttle/drop2/sulaco) +"db" = ( +/obj/effect/attach_point/crew_weapon/dropship2/floor{ + attach_id = 7 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" + }, +/area/shuttle/drop2/sulaco) "eu" = ( /turf/closed/shuttle/dropship2{ icon_state = "75" @@ -51,6 +69,14 @@ icon_state = "29" }, /area/shuttle/drop2/sulaco) +"ft" = ( +/obj/effect/attach_point/crew_weapon/dropship2/floor{ + attach_id = 8 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" + }, +/area/shuttle/drop2/sulaco) "fx" = ( /turf/closed/shuttle/dropship2{ icon_state = "69" @@ -63,7 +89,7 @@ /area/shuttle/drop2/sulaco) "fQ" = ( /obj/structure/shuttle/part/dropship2/left_inner_wing_connector, -/turf/open/space/basic, +/turf/template_noop, /area/shuttle/drop2/sulaco) "gD" = ( /turf/closed/shuttle/dropship2/transparent{ @@ -79,14 +105,6 @@ icon_state = "54" }, /area/shuttle/drop2/sulaco) -"gH" = ( -/obj/effect/attach_point/electronics/dropship2{ - dir = 1; - attach_id = 6 - }, -/obj/structure/shuttle/part/dropship2/transparent/inner_right_weapons, -/turf/template_noop, -/area/shuttle/drop2/sulaco) "gP" = ( /obj/structure/bed/chair/dropship/pilot{ dir = 1 @@ -95,12 +113,22 @@ icon_state = "rasputin15" }, /area/shuttle/drop2/sulaco) -"hn" = ( -/obj/effect/attach_point/crew_weapon/dropship2/floor{ - attach_id = 8 +"gV" = ( +/obj/effect/attach_point/fuel/dropship2{ + dir = 1; + attach_id = 10 + }, +/turf/closed/shuttle/dropship2/transparent{ + icon_state = "28" + }, +/area/shuttle/drop2/sulaco) +"he" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{ + dir = 1; + id = "starboard_door" }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3" + icon_state = "rasputin15" }, /area/shuttle/drop2/sulaco) "it" = ( @@ -118,7 +146,7 @@ /area/shuttle/drop2/sulaco) "iI" = ( /obj/structure/shuttle/part/dropship2/right_inner_wing_connector, -/turf/open/space/basic, +/turf/template_noop, /area/shuttle/drop2/sulaco) "jc" = ( /obj/item/device/radio/intercom/normandy{ @@ -151,6 +179,15 @@ icon_state = "26" }, /area/shuttle/drop2/sulaco) +"lj" = ( +/obj/structure/machinery/door/airlock/hatch/cockpit/two{ + dir = 1 + }, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/drop2/sulaco) "lz" = ( /obj/effect/attach_point/weapon/dropship2/right_fore, /obj/structure/shuttle/part/dropship2/transparent/outer_right_weapons, @@ -175,14 +212,6 @@ icon_state = "62" }, /area/shuttle/drop2/sulaco) -"mn" = ( -/obj/effect/attach_point/fuel/dropship2{ - attach_id = 10 - }, -/turf/closed/shuttle/dropship2/transparent{ - icon_state = "28" - }, -/area/shuttle/drop2/sulaco) "mz" = ( /obj/structure/machinery/camera/autoname/almayer/dropship_two{ dir = 4; @@ -200,15 +229,6 @@ icon_state = "rasputin15" }, /area/shuttle/drop2/sulaco) -"mA" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{ - id = "port_door"; - dir = 2 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/shuttle/drop2/sulaco) "nq" = ( /obj/effect/attach_point/weapon/dropship2/left_fore, /obj/structure/shuttle/part/dropship2/transparent/outer_left_weapons, @@ -216,7 +236,7 @@ /area/shuttle/drop2/sulaco) "nS" = ( /obj/structure/shuttle/part/dropship2/lower_left_wall, -/turf/open/space/basic, +/turf/template_noop, /area/shuttle/drop2/sulaco) "oc" = ( /obj/structure/shuttle/part/dropship2/transparent/nose_top_right, @@ -267,18 +287,26 @@ /obj/structure/shuttle/part/dropship2/transparent/upper_left_wing, /turf/template_noop, /area/shuttle/drop2/sulaco) -"vd" = ( +"ut" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{ + id = "port_door"; + dir = 2 + }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3" + icon_state = "rasputin15" }, /area/shuttle/drop2/sulaco) -"vh" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{ - dir = 1; - id = "starboard_door" +"uC" = ( +/obj/effect/attach_point/crew_weapon/dropship2/floor{ + attach_id = 9 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15" + icon_state = "rasputin3" + }, +/area/shuttle/drop2/sulaco) +"vd" = ( +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" }, /area/shuttle/drop2/sulaco) "wX" = ( @@ -325,14 +353,6 @@ icon_state = "56" }, /area/shuttle/drop2/sulaco) -"Bg" = ( -/obj/effect/attach_point/crew_weapon/dropship2/floor{ - attach_id = 7 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin3" - }, -/area/shuttle/drop2/sulaco) "Bi" = ( /turf/closed/shuttle/dropship2/transparent{ icon_state = "97" @@ -362,6 +382,14 @@ icon_state = "rasputin4" }, /area/shuttle/drop2/sulaco) +"Dq" = ( +/obj/effect/attach_point/electronics/dropship2{ + dir = 1; + attach_id = 6 + }, +/obj/structure/shuttle/part/dropship2/transparent/inner_right_weapons, +/turf/template_noop, +/area/shuttle/drop2/sulaco) "Dy" = ( /turf/closed/shuttle/dropship2/transparent{ icon_state = "35" @@ -477,14 +505,6 @@ /obj/structure/shuttle/part/dropship2/transparent/nose_top_left, /turf/template_noop, /area/shuttle/drop2/sulaco) -"MA" = ( -/obj/effect/attach_point/crew_weapon/dropship2/floor{ - attach_id = 9 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin3" - }, -/area/shuttle/drop2/sulaco) "ME" = ( /turf/closed/shuttle/dropship2/transparent{ icon_state = "96" @@ -514,16 +534,7 @@ /area/shuttle/drop2/sulaco) "NM" = ( /obj/structure/shuttle/part/dropship2/left_outer_wing_connector, -/turf/open/space/basic, -/area/shuttle/drop2/sulaco) -"Od" = ( -/obj/effect/attach_point/fuel/dropship2{ - pixel_x = -32; - attach_id = 11 - }, -/turf/closed/shuttle/dropship2/transparent{ - icon_state = "33" - }, +/turf/template_noop, /area/shuttle/drop2/sulaco) "Ov" = ( /obj/structure/shuttle/part/dropship2/transparent/right_inner_bottom_wing, @@ -587,7 +598,7 @@ /area/shuttle/drop2/sulaco) "QK" = ( /obj/structure/shuttle/part/dropship2/lower_right_wall, -/turf/open/space/basic, +/turf/template_noop, /area/shuttle/drop2/sulaco) "Rr" = ( /turf/template_noop, @@ -607,7 +618,7 @@ /area/shuttle/drop2/sulaco) "RJ" = ( /obj/structure/shuttle/part/dropship2/right_outer_wing_connector, -/turf/open/space/basic, +/turf/template_noop, /area/shuttle/drop2/sulaco) "SB" = ( /obj/structure/shuttle/part/dropship2/nose_front_left, @@ -672,13 +683,6 @@ icon_state = "25" }, /area/shuttle/drop2/sulaco) -"VW" = ( -/obj/structure/machinery/door/airlock/hatch/cockpit/two, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/shuttle/drop2/sulaco) "VZ" = ( /obj/item/device/radio/intercom/normandy{ layer = 3.5; @@ -715,7 +719,7 @@ Rr Rr BG SQ -mn +gV sk Xr Rr @@ -732,7 +736,7 @@ OI GE lJ PJ -mA +ut jc pU nS @@ -819,7 +823,7 @@ LY Bi MQ VZ -VW +lj GN bJ ZK @@ -828,11 +832,11 @@ Bb Iv rc vd -Bg +db vd -hn +ft vd -MA +uC PJ Rr Rr @@ -887,7 +891,7 @@ RJ Rr Rr Rr -gH +Dq yl SY it @@ -916,7 +920,7 @@ fI fx Tp PJ -vh +he gG RG QK @@ -945,7 +949,7 @@ Rr Rr yh UP -Od +ba zt Uu Rr diff --git a/maps/shuttles/escape_shuttle_e.dmm b/maps/shuttles/escape_shuttle_e.dmm index 0ba589df217e..65efffe43619 100644 --- a/maps/shuttles/escape_shuttle_e.dmm +++ b/maps/shuttles/escape_shuttle_e.dmm @@ -9,10 +9,10 @@ icon_state = "wall2" }, /area/shuttle/escape_pod) -"e" = ( -/obj/docking_port/mobile/crashable/escape_shuttle/e, -/turf/closed/shuttle/escapepod{ - icon_state = "wall9" +"f" = ( +/turf/open/shuttle/escapepod{ + icon_state = "floor0"; + dir = 8 }, /area/shuttle/escape_pod) "i" = ( @@ -53,10 +53,6 @@ icon_state = "wall13" }, /area/shuttle/escape_pod) -"z" = ( -/obj/structure/machinery/cryopod/evacuation, -/turf/open/shuttle/escapepod, -/area/shuttle/escape_pod) "E" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall10" @@ -67,16 +63,16 @@ icon_state = "wall11" }, /area/shuttle/escape_pod) -"L" = ( +"M" = ( /obj/structure/machinery/cryopod/evacuation, -/obj/structure/sign/safety/cryo{ - pixel_x = -18 +/turf/open/shuttle/escapepod{ + icon_state = "floor4" }, -/turf/open/shuttle/escapepod, /area/shuttle/escape_pod) -"N" = ( -/turf/open/shuttle/escapepod{ - icon_state = "floor10" +"O" = ( +/obj/docking_port/mobile/crashable/escape_shuttle/e, +/turf/closed/shuttle/escapepod{ + icon_state = "wall9" }, /area/shuttle/escape_pod) "Q" = ( @@ -87,6 +83,15 @@ icon_state = "floor0" }, /area/shuttle/escape_pod) +"T" = ( +/obj/structure/machinery/cryopod/evacuation, +/obj/structure/sign/safety/cryo{ + pixel_x = -18 + }, +/turf/open/shuttle/escapepod{ + icon_state = "floor4" + }, +/area/shuttle/escape_pod) "W" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall4" @@ -98,20 +103,20 @@ w t I E -e +O "} (2,1,1) = {" k -z -L -z +M +T +M s "} (3,1,1) = {" d Q o -N +f s "} (4,1,1) = {" diff --git a/maps/shuttles/escape_shuttle_e_cl.dmm b/maps/shuttles/escape_shuttle_e_cl.dmm index 490f0abdfa95..4b605503d7de 100644 --- a/maps/shuttles/escape_shuttle_e_cl.dmm +++ b/maps/shuttles/escape_shuttle_e_cl.dmm @@ -25,31 +25,24 @@ icon_state = "wall13" }, /area/shuttle/escape_pod) -"i" = ( -/obj/structure/machinery/cryopod/evacuation, -/obj/structure/sign/safety/cryo{ - pixel_x = -18 +"n" = ( +/turf/open/shuttle/escapepod{ + icon_state = "floor0"; + dir = 8 }, -/turf/open/shuttle/escapepod, /area/shuttle/escape_pod) "s" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall2" }, /area/shuttle/escape_pod) -"u" = ( +"z" = ( /obj/structure/machinery/cryopod/evacuation, -/turf/open/shuttle/escapepod, -/area/shuttle/escape_pod) -"v" = ( -/obj/structure/machinery/computer/shuttle/escape_pod_panel/liaison{ - pixel_y = 30 - }, /turf/open/shuttle/escapepod{ - icon_state = "floor0" + icon_state = "floor4" }, /area/shuttle/escape_pod) -"y" = ( +"D" = ( /obj/structure/machinery/door/airlock/evacuation/liaison{ name = "\improper Evacuation Airlock CL-1"; id_tag = "cl_evac" @@ -68,11 +61,6 @@ icon_state = "wall6" }, /area/shuttle/escape_pod) -"K" = ( -/turf/open/shuttle/escapepod{ - icon_state = "floor10" - }, -/area/shuttle/escape_pod) "O" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall4" @@ -88,11 +76,28 @@ icon_state = "wall12" }, /area/shuttle/escape_pod) +"T" = ( +/obj/structure/machinery/cryopod/evacuation, +/obj/structure/sign/safety/cryo{ + pixel_x = -18 + }, +/turf/open/shuttle/escapepod{ + icon_state = "floor4" + }, +/area/shuttle/escape_pod) "X" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall10" }, /area/shuttle/escape_pod) +"Z" = ( +/obj/structure/machinery/computer/shuttle/escape_pod_panel/liaison{ + pixel_y = 30 + }, +/turf/open/shuttle/escapepod{ + icon_state = "floor0" + }, +/area/shuttle/escape_pod) (1,1,1) = {" h @@ -103,22 +108,22 @@ a "} (2,1,1) = {" Q -u -i -u +z +T +z E "} (3,1,1) = {" s -v +Z b -K +n E "} (4,1,1) = {" g O O -y +D I "} diff --git a/maps/shuttles/escape_shuttle_n.dmm b/maps/shuttles/escape_shuttle_n.dmm index 71f8515daba8..a7a4e9a69252 100644 --- a/maps/shuttles/escape_shuttle_n.dmm +++ b/maps/shuttles/escape_shuttle_n.dmm @@ -1,23 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/closed/shuttle/escapepod{ - icon_state = "wall6" - }, -/area/shuttle/escape_pod) -"c" = ( -/obj/docking_port/mobile/crashable/escape_shuttle/n, -/turf/closed/shuttle/escapepod{ - icon_state = "wall9" - }, -/area/shuttle/escape_pod) -"f" = ( -/obj/structure/machinery/computer/shuttle/escape_pod_panel{ - pixel_y = 30 - }, -/turf/open/shuttle/escapepod{ - icon_state = "floor7" - }, -/area/shuttle/escape_pod) "g" = ( /turf/closed/shuttle/escapepod, /area/shuttle/escape_pod) @@ -26,11 +7,6 @@ icon_state = "wall1" }, /area/shuttle/escape_pod) -"j" = ( -/turf/open/shuttle/escapepod{ - icon_state = "floor9" - }, -/area/shuttle/escape_pod) "k" = ( /obj/structure/machinery/door/airlock/evacuation{ dir = 2; @@ -45,36 +21,64 @@ icon_state = "wall2" }, /area/shuttle/escape_pod) -"F" = ( -/turf/closed/shuttle/escapepod{ - icon_state = "wall3" +"n" = ( +/turf/open/shuttle/escapepod{ + icon_state = "floor0" }, /area/shuttle/escape_pod) -"H" = ( -/obj/structure/machinery/cryopod/evacuation, -/turf/open/shuttle/escapepod, +"p" = ( +/obj/structure/machinery/computer/shuttle/escape_pod_panel{ + pixel_y = 30 + }, +/turf/open/shuttle/escapepod{ + icon_state = "floor2" + }, /area/shuttle/escape_pod) -"L" = ( +"v" = ( +/obj/docking_port/mobile/crashable/escape_shuttle/n, /turf/closed/shuttle/escapepod{ - icon_state = "wall7" + icon_state = "wall9" }, /area/shuttle/escape_pod) -"Q" = ( -/turf/closed/shuttle/escapepod{ - icon_state = "wall11" +"x" = ( +/obj/structure/machinery/cryopod/evacuation, +/turf/open/shuttle/escapepod{ + icon_state = "floor4" }, /area/shuttle/escape_pod) -"V" = ( +"z" = ( /obj/structure/machinery/cryopod/evacuation, /obj/structure/sign/safety/cryo{ pixel_x = 8; pixel_y = -35 }, -/turf/open/shuttle/escapepod, +/turf/open/shuttle/escapepod{ + icon_state = "floor4" + }, /area/shuttle/escape_pod) -"W" = ( +"D" = ( /turf/open/shuttle/escapepod{ - icon_state = "floor8" + dir = 4 + }, +/area/shuttle/escape_pod) +"F" = ( +/turf/closed/shuttle/escapepod{ + icon_state = "wall3" + }, +/area/shuttle/escape_pod) +"K" = ( +/turf/closed/shuttle/escapepod{ + icon_state = "wall6" + }, +/area/shuttle/escape_pod) +"L" = ( +/turf/closed/shuttle/escapepod{ + icon_state = "wall7" + }, +/area/shuttle/escape_pod) +"Q" = ( +/turf/closed/shuttle/escapepod{ + icon_state = "wall11" }, /area/shuttle/escape_pod) "Y" = ( @@ -87,29 +91,29 @@ g Q Q -c +v "} (2,1,1) = {" i -f -H +p +x L "} (3,1,1) = {" k -W -V +D +z L "} (4,1,1) = {" l -j -H +n +x L "} (5,1,1) = {" F Y Y -a +K "} diff --git a/maps/shuttles/escape_shuttle_s.dmm b/maps/shuttles/escape_shuttle_s.dmm index 82391a5218d5..db3f602bdb5a 100644 --- a/maps/shuttles/escape_shuttle_s.dmm +++ b/maps/shuttles/escape_shuttle_s.dmm @@ -4,20 +4,29 @@ icon_state = "wall1" }, /area/shuttle/escape_pod) -"f" = ( +"c" = ( +/obj/structure/machinery/cryopod/evacuation, /turf/open/shuttle/escapepod{ - icon_state = "floor12" + icon_state = "floor4" }, /area/shuttle/escape_pod) -"g" = ( -/obj/structure/machinery/cryopod/evacuation, -/turf/open/shuttle/escapepod, -/area/shuttle/escape_pod) "n" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall2" }, /area/shuttle/escape_pod) +"o" = ( +/obj/docking_port/mobile/crashable/escape_shuttle/s, +/turf/closed/shuttle/escapepod{ + icon_state = "wall9" + }, +/area/shuttle/escape_pod) +"q" = ( +/turf/open/shuttle/escapepod{ + icon_state = "floor0"; + dir = 1 + }, +/area/shuttle/escape_pod) "v" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall15" @@ -33,11 +42,26 @@ icon_state = "wall6" }, /area/shuttle/escape_pod) +"B" = ( +/obj/structure/machinery/cryopod/evacuation, +/obj/structure/sign/safety/cryo{ + pixel_x = 8; + pixel_y = 28 + }, +/turf/open/shuttle/escapepod{ + icon_state = "floor4" + }, +/area/shuttle/escape_pod) "D" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall10" }, /area/shuttle/escape_pod) +"I" = ( +/turf/open/shuttle/escapepod{ + dir = 8 + }, +/area/shuttle/escape_pod) "J" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall14" @@ -48,9 +72,13 @@ icon_state = "wall4" }, /area/shuttle/escape_pod) -"P" = ( +"N" = ( +/obj/structure/machinery/computer/shuttle/escape_pod_panel{ + pixel_x = 30 + }, /turf/open/shuttle/escapepod{ - icon_state = "floor11" + icon_state = "floor0"; + dir = 8 }, /area/shuttle/escape_pod) "Q" = ( @@ -58,14 +86,6 @@ icon_state = "wall13" }, /area/shuttle/escape_pod) -"R" = ( -/obj/structure/machinery/computer/shuttle/escape_pod_panel{ - pixel_x = 30 - }, -/turf/open/shuttle/escapepod{ - icon_state = "floor2" - }, -/area/shuttle/escape_pod) "T" = ( /obj/structure/machinery/door/airlock/evacuation{ dir = 2; @@ -75,43 +95,29 @@ icon_state = "test_floor4" }, /area/shuttle/escape_pod) -"U" = ( -/obj/docking_port/mobile/crashable/escape_shuttle/s, -/turf/closed/shuttle/escapepod{ - icon_state = "wall9" - }, -/area/shuttle/escape_pod) -"V" = ( -/obj/structure/machinery/cryopod/evacuation, -/obj/structure/sign/safety/cryo{ - pixel_x = 8; - pixel_y = 28 - }, -/turf/open/shuttle/escapepod, -/area/shuttle/escape_pod) (1,1,1) = {" Q D D -U +o "} (2,1,1) = {" n -g -f +c +q v "} (3,1,1) = {" a -V -P +B +I T "} (4,1,1) = {" n -g -R +c +N J "} (5,1,1) = {" diff --git a/maps/shuttles/escape_shuttle_w.dmm b/maps/shuttles/escape_shuttle_w.dmm index 8f81c83b500b..b6b7452c798f 100644 --- a/maps/shuttles/escape_shuttle_w.dmm +++ b/maps/shuttles/escape_shuttle_w.dmm @@ -1,20 +1,25 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/obj/docking_port/mobile/crashable/escape_shuttle/w, -/turf/closed/shuttle/escapepod{ - icon_state = "wall9" - }, -/area/shuttle/escape_pod) "b" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall8" }, /area/shuttle/escape_pod) +"d" = ( +/turf/open/shuttle/escapepod{ + dir = 1 + }, +/area/shuttle/escape_pod) "e" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall6" }, /area/shuttle/escape_pod) +"g" = ( +/obj/docking_port/mobile/crashable/escape_shuttle/w, +/turf/closed/shuttle/escapepod{ + icon_state = "wall9" + }, +/area/shuttle/escape_pod) "j" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall7" @@ -30,6 +35,12 @@ icon_state = "wall2" }, /area/shuttle/escape_pod) +"r" = ( +/obj/structure/machinery/cryopod/evacuation, +/turf/open/shuttle/escapepod{ + icon_state = "floor4" + }, +/area/shuttle/escape_pod) "B" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall10" @@ -45,21 +56,19 @@ icon_state = "wall4" }, /area/shuttle/escape_pod) -"H" = ( +"N" = ( +/obj/structure/machinery/computer/shuttle/escape_pod_panel{ + pixel_y = 30 + }, /turf/open/shuttle/escapepod{ - icon_state = "floor5" + icon_state = "floor2" }, /area/shuttle/escape_pod) -"I" = ( -/obj/structure/machinery/cryopod/evacuation, -/obj/structure/sign/safety/cryo{ - pixel_x = 36 +"O" = ( +/turf/open/shuttle/escapepod{ + icon_state = "floor0"; + dir = 1 }, -/turf/open/shuttle/escapepod, -/area/shuttle/escape_pod) -"M" = ( -/obj/structure/machinery/cryopod/evacuation, -/turf/open/shuttle/escapepod, /area/shuttle/escape_pod) "P" = ( /turf/closed/shuttle/escapepod{ @@ -74,39 +83,35 @@ icon_state = "test_floor4" }, /area/shuttle/escape_pod) -"V" = ( -/obj/structure/machinery/computer/shuttle/escape_pod_panel{ - pixel_y = 30 +"T" = ( +/obj/structure/machinery/cryopod/evacuation, +/obj/structure/sign/safety/cryo{ + pixel_x = 36 }, /turf/open/shuttle/escapepod{ icon_state = "floor4" }, /area/shuttle/escape_pod) -"W" = ( -/turf/open/shuttle/escapepod{ - icon_state = "floor12" - }, -/area/shuttle/escape_pod) (1,1,1) = {" P B S B -a +g "} (2,1,1) = {" F -V -H -W +N +d +O b "} (3,1,1) = {" p -M -I -M +r +T +r j "} (4,1,1) = {" diff --git a/sound/weapons/gun_vulture_mark.ogg b/sound/weapons/gun_vulture_mark.ogg new file mode 100644 index 000000000000..6c7ae7b27797 Binary files /dev/null and b/sound/weapons/gun_vulture_mark.ogg differ diff --git a/strings/metatips.txt b/strings/metatips.txt index a28c90239593..00bb827de69f 100644 --- a/strings/metatips.txt +++ b/strings/metatips.txt @@ -12,6 +12,7 @@ As a mentor, you can become the imaginary friend of a new player to teach them! You shouldn't ignore what your allies are up to. Sometimes they can be organizing a flank in hivemind/radio, sometimes they can be walking up behind you with a slug-loaded shotgun. Either way, it pays to be alert to what they're doing, as much to as what the enemies are. The Wiki (https://cm-ss13.com/wiki) is a very useful repository of information about the game, such as weapons, equipment, xenomorph castes and their strains. It may not be fully up to date much of the time, but the basics are usually accurate. As an observer, you may see how much remaining hijack time is left in the status panel. +As an observer, you can quickly follow someone by ctrl-clicking on their sprite. You can always AdminHelp with the F1 key to question a member of staff regarding rules or game bugs. As ghost you are given extra tools for spectating the round: you can jump and follow specific players, get notifications about CAS and OB strikes, can see all health bars, and such. You can press ESC key to bring up the game pause menu. It allows you change settings, AdminHelp and MentorHelp, and even access the Web Maps of game by clicking at top right. diff --git a/tgui/docs/component-reference.md b/tgui/docs/component-reference.md index d814fc343a72..3789016447cc 100644 --- a/tgui/docs/component-reference.md +++ b/tgui/docs/component-reference.md @@ -250,6 +250,7 @@ A button with an extra confirmation step, using native button component. - See inherited props: [Button](#button) - `confirmContent: string` - Text to display after first click; defaults to "Confirm?" - `confirmColor: string` - Color to display after first click; defaults to "bad" +- `onConfirmChange: function` - Called when the clickedOnce state changes: When the element is clicked the first time or unfocused. ### `Button.Input` diff --git a/tgui/packages/common/ping.js b/tgui/packages/common/ping.js new file mode 100644 index 000000000000..e8f52882b6ae --- /dev/null +++ b/tgui/packages/common/ping.js @@ -0,0 +1,108 @@ +/** + * Adapted pinging library based on: + * @file https://www.jsdelivr.com/package/npm/ping.js + * @copyright 2021 Alfred Gutierrez + * @license MIT + */ + +/** + * Creates a Ping instance. + * @returns {Ping} + * @constructor + */ +export class Ping { + constructor(opt) { + this.opt = opt || {}; + this.favicon = this.opt.favicon || '/favicon.ico'; + this.timeout = this.opt.timeout || 10000; + this.logError = this.opt.logError || false; + this.abort = false; + } + + /** + * Pings source after a delay and triggers a callback when completed. + * @param source Source of the website or server, including protocol and port. + * @param callback Callback function to trigger when completed. Returns error and ping value. + * @param delay Optional number of milliseconds to wait before starting. + */ + ping(source, callback, delay = 1000) { + this.abort = false; + let timer; + if (delay > 0) { + timer = setTimeout(() => { + if (this.abort) { + return; + } + this.pingNow(source, callback); + }, delay); + return; + } + this.pingNow(source, callback); + } + + /** + * Pings source immediately and triggers a callback when completed. + * @param source Source of the website or server, including protocol and port. + * @param callback Callback function to trigger when completed. Returns error and ping value. + */ + pingNow(source, callback) { + let self = this; + self.abort = false; + self.wasSuccess = false; + self.img = new Image(); + self.img.onload = (e) => { + self.wasSuccess = true; + pingCheck.call(self, e); + }; + self.img.onerror = (e) => { + self.wasSuccess = false; + pingCheck.call(self, e); + }; + + let timer; + let start = new Date(); + + if (self.timeout) { + timer = setTimeout(() => { + self.wasSuccess = false; + pingCheck.call(self, undefined); + }, self.timeout); + } + + /** + * Times ping and triggers callback. + */ + const pingCheck = function (e) { + if (timer) { + clearTimeout(timer); + } + if (this.abort) { + return; + } + let pong = new Date() - start; + + if (typeof callback === 'function') { + // When operating in timeout mode, the timeout callback doesn't pass [event] as e. + // Notice [this] instead of [self], since .call() was used with context + if (!this.wasSuccess) { + if (self.logError) { + console.error('error loading resource: ' + e.error); + } + return callback(e ? 'Error' : 'Timed Out', pong); + } + return callback(null, pong); + } else { + throw new Error('Callback is not a function.'); + } + }; + + self.img.src = source + self.favicon + '?' + +new Date(); // Trigger image load with cache buster + } + + /** + * Aborts any pending ping request. + */ + cancel() { + this.abort = true; + } +} diff --git a/tgui/packages/tgui-panel/ping/PingIndicator.js b/tgui/packages/tgui-panel/ping/PingIndicator.js index b2355820e58a..4e64207d115c 100644 --- a/tgui/packages/tgui-panel/ping/PingIndicator.js +++ b/tgui/packages/tgui-panel/ping/PingIndicator.js @@ -6,11 +6,12 @@ import { Color } from 'common/color'; import { toFixed } from 'common/math'; -import { useSelector } from 'tgui/backend'; -import { Box } from 'tgui/components'; +import { useSelector, useBackend } from 'tgui/backend'; +import { Button, Box } from 'tgui/components'; import { selectPing } from './selectors'; export const PingIndicator = (props) => { + const { act } = useBackend(); const ping = useSelector(selectPing); const color = Color.lookup(ping.networkQuality, [ new Color(220, 40, 40), @@ -19,9 +20,19 @@ export const PingIndicator = (props) => { ]); const roundtrip = ping.roundtrip ? toFixed(ping.roundtrip) : '--'; return ( -
+
+ ); }; diff --git a/tgui/packages/tgui/components/Button.jsx b/tgui/packages/tgui/components/Button.jsx index 4264b0767115..dbffb6a72c95 100644 --- a/tgui/packages/tgui/components/Button.jsx +++ b/tgui/packages/tgui/components/Button.jsx @@ -172,6 +172,9 @@ export class ButtonConfirm extends Component { } else { window.removeEventListener('click', this.handleClick); } + if (this.props.onConfirmChange) { + this.props.onConfirmChange(clickedOnce); + } } render() { @@ -183,6 +186,7 @@ export class ButtonConfirm extends Component { color, content, onClick, + onConfirmChange, ...rest } = this.props; return ( diff --git a/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx b/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx index 2ae9a17fe35f..679b78efe843 100644 --- a/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx +++ b/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx @@ -3,9 +3,17 @@ import { Window } from '../layouts'; import { Box, Button, Flex, Icon, ProgressBar, Section, Stack } from '../components'; import { LaunchButton, CancelLaunchButton, DisabledScreen, InFlightCountdown, LaunchCountdown, NavigationProps, ShuttleRecharge, DockingPort } from './NavigationShuttle'; +const DoorStatusEnum = { + SHUTTLE_DOOR_BROKEN: -1, + SHUTTLE_DOOR_UNLOCKED: 0, + SHUTTLE_DOOR_LOCKED: 1, +} as const; + +type DoorStatusEnums = typeof DoorStatusEnum[keyof typeof DoorStatusEnum]; + interface DoorStatus { id: string; - value: 0 | 1; + value: DoorStatusEnums; } interface AutomatedControl { @@ -40,7 +48,7 @@ const DropshipDoorControl = () => { .filter((x) => x.id === 'all') .map((x) => ( <> - {x.value === 0 && ( + {x.value === DoorStatusEnum.SHUTTLE_DOOR_UNLOCKED && ( )} - {x.value === 1 && ( + {x.value === DoorStatusEnum.SHUTTLE_DOOR_LOCKED && ( + )} + {x.value === DoorStatusEnum.SHUTTLE_DOOR_UNLOCKED && ( )} - {x.value === 1 && ( + {x.value === DoorStatusEnum.SHUTTLE_DOOR_LOCKED && (