From 35d80bb68ec4e1fd52fccd5054cd5cdbe1e9e2fe Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Tue, 2 Apr 2024 08:27:34 -0700 Subject: [PATCH 001/431] Fixes carlarc's OP chocolate (#6003) # About the pull request Fixes #4695, The issue isn't inherently the attack speed, although it is quite fast, many small items also have a relatively fast attack speed. The problem is that when you combine the attack speed with a food item that somehow has a force of 35 you get a very effective weapon capable of destroying many different types of structures fairly easily, same issue with the scalpel. My solution here was to just decrease the amount of force the items have rather than lowering the attack speed. You shouldn't be able to use a scalpel or a box of chocolate to more effectively destroy weeds rather than a machete. I doubt these are the only two items that have this problem, I guess in the future when someone comes across a similar issue just link this pr so they can easily identify the exploit. # Changelog :cl: fix: lowers the scalpel and chunk box's ability to destroy various structures. add: chunk box is now a melee weapon /:cl: --------- Co-authored-by: Vicacrov <49321394+Vicacrov@users.noreply.github.com> Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> Co-authored-by: DOOM --- code/game/machinery/bots/bots.dm | 4 ++-- code/game/machinery/deployable.dm | 8 ++++---- code/game/objects/items.dm | 2 ++ .../items/reagent_containers/food/snacks.dm | 16 ++++++++++++---- code/game/objects/items/tools/surgery_tools.dm | 1 + .../objects/structures/barricade/barricade.dm | 2 +- code/game/objects/structures/barricade/misc.dm | 8 ++++---- code/game/objects/structures/displaycase.dm | 2 +- code/game/objects/structures/fence.dm | 4 ++-- code/game/objects/structures/lamarr_cage.dm | 4 ++-- code/game/objects/structures/mineral_doors.dm | 2 +- code/game/objects/structures/mirror.dm | 4 ++-- code/game/objects/structures/window.dm | 2 +- code/game/turfs/walls/wall_types.dm | 4 ++-- code/modules/cm_aliens/XenoStructures.dm | 4 ++-- code/modules/cm_aliens/weeds.dm | 2 +- code/modules/power/lighting.dm | 2 +- code/modules/vehicles/vehicle.dm | 6 +++--- 18 files changed, 44 insertions(+), 33 deletions(-) diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index 46050d2705b3..1f82d28dbbf8 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -84,9 +84,9 @@ if(hasvar(W,"force") && hasvar(W,"damtype")) switch(W.damtype) if("fire") - src.health -= W.force * fire_dam_coeff + health -= W.force * W.demolition_mod * fire_dam_coeff if("brute") - src.health -= W.force * brute_dam_coeff + health -= W.force * W.demolition_mod * brute_dam_coeff ..() healthcheck() else diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 687882d9d7ae..7907c9f28985 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -51,11 +51,11 @@ else switch(W.damtype) if("fire") - src.health -= W.force * 0.75 + health -= W.force * W.demolition_mod * 0.75 if("brute") - src.health -= W.force * 0.5 - if (src.health <= 0) - src.explode() + health -= W.force * W.demolition_mod * 0.5 + if (health <= 0) + explode() ..() /obj/structure/machinery/deployable/barrier/ex_act(severity) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index fcd431c33d26..f6aa2600f838 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -22,6 +22,8 @@ var/attack_speed = 11 //+3, Adds up to 10. Added an extra 4 removed from /mob/proc/do_click() ///Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]" var/list/attack_verb + /// A multiplier to an object's force when used against a stucture. + var/demolition_mod = 1 health = null diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index 112a8e40e85b..79a108d24bf1 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -55,7 +55,13 @@ return FALSE if(package) - to_chat(M, SPAN_WARNING("How do you expect to eat this with the package still on?")) + if(user.a_intent == INTENT_HARM) + return ..() // chunk box gaming + + if(user == M) + to_chat(M, SPAN_WARNING("How do you expect to eat this with the package still on?")) + else + to_chat(M, SPAN_WARNING("[user] made an endearing attempt to force feed you a snack with the packaging still on.")) return FALSE if(istype(M, /mob/living/carbon)) @@ -3289,8 +3295,11 @@ name = "CHUNK box" desc = "A bar of \"The CHUNK\" brand chocolate. \"The densest chocolate permitted to exist according to federal law. We are legally required to ask you not to use this blunt object for anything other than nutrition.\"" icon_state = "chunk" - force = 15 //LEGAL LIMIT OF CHOCOLATE + hitsound = "swing_hit" + force = 15 throwforce = 10 + attack_speed = 10 + demolition_mod = 0.3 bitesize = 2 wrapper = /obj/item/trash/chunk @@ -3304,8 +3313,7 @@ desc = "A 'crate', as the marketing called it, of \"The HUNK\" brand chocolate. An early version of the CHUNK box, the HUNK bar was hit by a class action lawsuit and forced to go into bankruptcy and get bought out by the Company when hundreds of customers had their teeth crack from simply attempting to eat the bar." icon_state = "hunk" w_class = SIZE_MEDIUM - hitsound = "swing_hit" - force = 35 //ILLEGAL LIMIT OF CHOCOLATE + force = 35 throwforce = 50 bitesize = 20 wrapper = /obj/item/trash/chunk/hunk diff --git a/code/game/objects/items/tools/surgery_tools.dm b/code/game/objects/items/tools/surgery_tools.dm index 7d354d8d8c1c..a1792b574eec 100644 --- a/code/game/objects/items/tools/surgery_tools.dm +++ b/code/game/objects/items/tools/surgery_tools.dm @@ -96,6 +96,7 @@ force = 10 sharp = IS_SHARP_ITEM_ACCURATE edge = 1 + demolition_mod = 0.1 w_class = SIZE_TINY throwforce = 5 flags_item = CAN_DIG_SHRAPNEL diff --git a/code/game/objects/structures/barricade/barricade.dm b/code/game/objects/structures/barricade/barricade.dm index 313067ca6a56..edb13ac16e5a 100644 --- a/code/game/objects/structures/barricade/barricade.dm +++ b/code/game/objects/structures/barricade/barricade.dm @@ -333,7 +333,7 @@ take_damage(dam * burn_flame_multiplier) /obj/structure/barricade/proc/hit_barricade(obj/item/item) - take_damage(item.force * 0.5 * brute_multiplier) + take_damage(item.force * item.demolition_mod * 0.5 * brute_multiplier) /obj/structure/barricade/proc/take_damage(damage) for(var/obj/structure/barricade/barricade in get_step(src,dir)) //discourage double-stacking barricades by removing health from opposing barricade diff --git a/code/game/objects/structures/barricade/misc.dm b/code/game/objects/structures/barricade/misc.dm index a0465de8f070..8fcf7cec41ad 100644 --- a/code/game/objects/structures/barricade/misc.dm +++ b/code/game/objects/structures/barricade/misc.dm @@ -50,9 +50,9 @@ /obj/structure/barricade/snow/hit_barricade(obj/item/I) switch(I.damtype) if("fire") - take_damage( I.force * 0.6 ) + take_damage( I.force * I.demolition_mod * 0.6 ) if("brute") - take_damage( I.force * 0.3 ) + take_damage( I.force * I.demolition_mod * 0.3 ) return @@ -106,6 +106,6 @@ /obj/structure/barricade/wooden/hit_barricade(obj/item/I) switch(I.damtype) if("fire") - take_damage( I.force * 1.5 ) + take_damage( I.force * I.demolition_mod * 1.5 ) if("brute") - take_damage( I.force * 0.75 ) + take_damage( I.force * I.demolition_mod * 0.75 ) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 8439a887e57f..bfc9bfa7833e 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -57,7 +57,7 @@ /obj/structure/displaycase/attackby(obj/item/W as obj, mob/user as mob) - src.health -= W.force + src.health -= W.force * W.demolition_mod src.healthcheck() ..() return diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm index db24dfdfebdd..60a8682a4930 100644 --- a/code/game/objects/structures/fence.dm +++ b/code/game/objects/structures/fence.dm @@ -170,9 +170,9 @@ else switch(W.damtype) if("fire") - health -= W.force + health -= W.force * W.demolition_mod if("brute") - health -= W.force * 0.1 + health -= W.force * W.demolition_mod * 0.1 healthcheck(1, 1, user, W) ..() diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index fbae7a387a63..3708b15b25e6 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -53,8 +53,8 @@ /obj/structure/lamarr/attackby(obj/item/W as obj, mob/user as mob) - src.health -= W.force - src.healthcheck() + health -= W.force * W.demolition_mod + healthcheck() ..() return diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 25dc0040e2ac..0fd22361c67b 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -102,7 +102,7 @@ Dismantle() else if(!(W.flags_item & NOBLUDGEON) && W.force) user.animation_attack_on(src) - hardness -= W.force/100 + hardness -= W.force/100 * W.demolition_mod to_chat(user, "You hit the [name] with your [W.name]!") CheckHardness() else diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index a8d76843313a..0ee7453782d9 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -121,10 +121,10 @@ playsound(loc, 'sound/effects/Glasshit.ogg', 25, 1) return if(shattered) - playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 25, 1) + playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 25, 1) user.visible_message(SPAN_WARNING("[user] hits [src] with [I], but it's already broken!"), SPAN_WARNING("You hit [src] with [I], but it's already broken!")) return - if(prob(I.force * 2)) + if(prob(I.force * I.demolition_mod * 2)) user.visible_message(SPAN_WARNING("[user] smashes [src] with [I]!"), SPAN_WARNING("You smash [src] with [I]!")) shatter() else diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 226045caaea6..81d7f24f054e 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -286,7 +286,7 @@ to_chat(user, (state ? SPAN_NOTICE("You have pried the window into the frame.") : SPAN_NOTICE("You have pried the window out of the frame."))) else if(!not_damageable) //Impossible to destroy - health -= W.force + health -= W.force * W.demolition_mod if(health <= 7 && !reinf && !static_frame && !not_deconstructable) anchored = FALSE update_nearby_icons() diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index 259e386825ff..7b26854737cc 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -1044,7 +1044,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) /obj/structure/alien/movable_wall/attackby(obj/item/W, mob/living/user) if(!(W.flags_item & NOBLUDGEON)) user.animation_attack_on(src) - take_damage(W.force*RESIN_MELEE_DAMAGE_MULTIPLIER, user) + take_damage(W.force*RESIN_MELEE_DAMAGE_MULTIPLIER*W.demolition_mod, user) playsound(src, "alien_resin_break", 25) else return attack_hand(user) @@ -1280,7 +1280,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) if(!(W.flags_item & NOBLUDGEON)) user.animation_attack_on(src) - take_damage(W.force*RESIN_MELEE_DAMAGE_MULTIPLIER, user) + take_damage(W.force*RESIN_MELEE_DAMAGE_MULTIPLIER*W.demolition_mod, user) playsound(src, "alien_resin_break", 25) else return attack_hand(user) diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm index c014fbf9c211..635bca03241f 100644 --- a/code/modules/cm_aliens/XenoStructures.dm +++ b/code/modules/cm_aliens/XenoStructures.dm @@ -118,7 +118,7 @@ /obj/effect/alien/resin/attackby(obj/item/W, mob/user) if(!(W.flags_item & NOBLUDGEON)) - var/damage = W.force * RESIN_MELEE_DAMAGE_MULTIPLIER + var/damage = W.force * W.demolition_mod * RESIN_MELEE_DAMAGE_MULTIPLIER health -= damage if(istype(src, /obj/effect/alien/resin/sticky)) playsound(loc, "alien_resin_move", 25) @@ -391,7 +391,7 @@ return // defer to item afterattack if(!(W.flags_item & NOBLUDGEON) && W.force) user.animation_attack_on(src) - health -= W.force*RESIN_MELEE_DAMAGE_MULTIPLIER + health -= W.force * RESIN_MELEE_DAMAGE_MULTIPLIER * W.demolition_mod to_chat(user, "You hit the [name] with your [W.name]!") playsound(loc, "alien_resin_move", 25) healthcheck() diff --git a/code/modules/cm_aliens/weeds.dm b/code/modules/cm_aliens/weeds.dm index d614d87bf9b9..2206bc528e82 100644 --- a/code/modules/cm_aliens/weeds.dm +++ b/code/modules/cm_aliens/weeds.dm @@ -377,7 +377,7 @@ else to_chat(user, SPAN_WARNING("You cut \the [src] away with \the [attacking_item].")) - var/damage = attacking_item.force / 3 + var/damage = (attacking_item.force * attacking_item.demolition_mod) / 3 playsound(loc, "alien_resin_break", 25) if(iswelder(attacking_item)) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 309fa583589c..c95fa6af5045 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -390,7 +390,7 @@ else if(status != LIGHT_BROKEN && status != LIGHT_EMPTY) - if(prob(1+W.force * 5)) + if(prob(1+W.force * W.demolition_mod * 5)) to_chat(user, "You hit the light, and it smashes!") for(var/mob/M as anything in viewers(src)) diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 014452426a3c..8632159b4f6d 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -84,10 +84,10 @@ else if(W.force) switch(W.damtype) if("fire") - health -= W.force * fire_dam_coeff + health -= W.force * W.demolition_mod * fire_dam_coeff if("brute") - health -= W.force * brute_dam_coeff - playsound(src.loc, "smash.ogg", 25, 1) + health -= W.force * W.demolition_mod * brute_dam_coeff + playsound(loc, "smash.ogg", 25, 1) user.visible_message(SPAN_DANGER("[user] hits [src] with [W]."),SPAN_DANGER("You hit [src] with [W].")) healthcheck() else From 8d8e164a4f6dbaf8f4e937e0b8d4e1b8e0521ce2 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 2 Apr 2024 16:32:47 +0100 Subject: [PATCH 002/431] Automatic changelog for PR #6003 [ci skip] --- html/changelogs/AutoChangeLog-pr-6003.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6003.yml diff --git a/html/changelogs/AutoChangeLog-pr-6003.yml b/html/changelogs/AutoChangeLog-pr-6003.yml new file mode 100644 index 000000000000..83f3cc6486f0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6003.yml @@ -0,0 +1,5 @@ +author: "vero5123" +delete-after: True +changes: + - bugfix: "lowers the scalpel and chunk box's ability to destroy various structures." + - rscadd: "chunk box is now a melee weapon" \ No newline at end of file From 0bfc13c1f51e2355ad54b7fda55ac2860e926e33 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 3 Apr 2024 01:08:08 +0000 Subject: [PATCH 003/431] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-6003.yml | 5 ----- html/changelogs/archive/2024-04.yml | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-6003.yml diff --git a/html/changelogs/AutoChangeLog-pr-6003.yml b/html/changelogs/AutoChangeLog-pr-6003.yml deleted file mode 100644 index 83f3cc6486f0..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6003.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "vero5123" -delete-after: True -changes: - - bugfix: "lowers the scalpel and chunk box's ability to destroy various structures." - - rscadd: "chunk box is now a melee weapon" \ No newline at end of file diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml index 83c879c13083..f595daee9f56 100644 --- a/html/changelogs/archive/2024-04.yml +++ b/html/changelogs/archive/2024-04.yml @@ -21,3 +21,7 @@ 2024-04-02: sleepynecrons: - imageadd: added missing backpack onmob states for "classic" gearset +2024-04-03: + vero5123: + - bugfix: lowers the scalpel and chunk box's ability to destroy various structures. + - rscadd: chunk box is now a melee weapon From 18eddb2cd10f71082d9cc014f6ca559751156fc9 Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Wed, 3 Apr 2024 02:28:29 +0100 Subject: [PATCH 004/431] Project ARES: Added Tech Unlock logs (#5006) # About the pull request As the title says, you can now view who unlocked techs in the ARES Interface (if you're senior command) I have also split the cameras in the core to an indivual network that is not shared with the rest of the ship, and placed a camera console to view this network in CIC, CO's Office, CE's Office and Brig Office # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: add: Added AI Core camera consoles to CE, CO and Brig offices, along with CIC and Lifeboat bubble. maptweak: Added Tech Control Console to ARES Core. add: Added Tech Unlock logs to ARES Interface /:cl: --- code/__DEFINES/ARES.dm | 1 + .../subsystem/objectives_controller.dm | 1 + code/game/machinery/ARES/ARES_interface.dm | 18 +++ .../machinery/ARES/ARES_interface_admin.dm | 14 ++ code/game/machinery/ARES/ARES_procs.dm | 12 ++ code/game/machinery/ARES/ARES_records.dm | 12 ++ code/game/machinery/camera/presets.dm | 2 +- code/modules/cm_tech/tech.dm | 13 +- .../cm_tech/techs/abstract/transitory.dm | 7 +- .../cm_tech/techs/marine/tier1/points.dm | 1 - .../techs/marine/tier2/orbital_ammo.dm | 2 - .../cm_tech/techs/marine/tier3/cryo_spec.dm | 1 - .../cm_tech/techs/marine/tier3/cryorine.dm | 1 - code/modules/cm_tech/trees/marine.dm | 2 +- maps/map_files/USS_Almayer/USS_Almayer.dmm | 110 +++++++++------ tgui/packages/tgui/interfaces/AresAdmin.js | 127 ++++++++++++++++++ .../tgui/interfaces/AresInterface.jsx | 127 +++++++++++++++++- 17 files changed, 400 insertions(+), 51 deletions(-) diff --git a/code/__DEFINES/ARES.dm b/code/__DEFINES/ARES.dm index db50ac05f2b9..7eee073aca51 100644 --- a/code/__DEFINES/ARES.dm +++ b/code/__DEFINES/ARES.dm @@ -28,6 +28,7 @@ #define ARES_RECORD_MAINTENANCE "Maintenance Ticket" #define ARES_RECORD_ACCESS "Access Ticket" #define ARES_RECORD_FLIGHT "Flight Record" +#define ARES_RECORD_TECH "Tech Control Record" /// Not by ARES logged through marine_announcement() #define ARES_LOG_NONE 0 diff --git a/code/controllers/subsystem/objectives_controller.dm b/code/controllers/subsystem/objectives_controller.dm index a858dff07475..38accda46004 100644 --- a/code/controllers/subsystem/objectives_controller.dm +++ b/code/controllers/subsystem/objectives_controller.dm @@ -96,6 +96,7 @@ SUBSYSTEM_DEF(objectives) ai_silent_announcement(message, ":v", TRUE) ai_silent_announcement(message, ":t", TRUE) + log_ares_tech(MAIN_AI_SYSTEM, FALSE, "TECH REPORT", "[round(tree.points, 0.1)] points available.", 0) tree.total_points_last_sitrep = tree.total_points next_sitrep = world.time + SITREP_INTERVAL diff --git a/code/game/machinery/ARES/ARES_interface.dm b/code/game/machinery/ARES/ARES_interface.dm index dd99240b2550..d6f58f371715 100644 --- a/code/game/machinery/ARES/ARES_interface.dm +++ b/code/game/machinery/ARES/ARES_interface.dm @@ -183,6 +183,17 @@ logged_orders += list(current_order) data["records_requisition"] = logged_orders + var/list/logged_techs = list() + for(var/datum/ares_record/tech/tech_unlock as anything in datacore.records_tech) + var/list/current_tech = list() + current_tech["time"] = tech_unlock.time + current_tech["details"] = tech_unlock.details + current_tech["user"] = tech_unlock.user + current_tech["tier_changer"] = tech_unlock.is_tier + current_tech["ref"] = "\ref[tech_unlock]" + logged_techs += list(current_tech) + data["records_tech"] = logged_techs + var/list/logged_convos = list() var/list/active_convo = list() var/active_ref @@ -317,6 +328,9 @@ if("page_deleted_1to1") last_menu = current_menu current_menu = "deleted_talks" + if("page_tech") + last_menu = current_menu + current_menu = "tech_log" // -- Delete Button -- // if("delete_record") @@ -345,6 +359,10 @@ new_title = "[record.title] at [record.time]" new_details = "[record.details] Launched by [record.user]." datacore.records_bombardment -= record + if(ARES_RECORD_TECH) + new_title = "[record.title] at [record.time]" + new_details = record.details + datacore.records_tech -= record new_delete.details = new_details new_delete.user = last_login diff --git a/code/game/machinery/ARES/ARES_interface_admin.dm b/code/game/machinery/ARES/ARES_interface_admin.dm index e388c0eb453d..5ca7a9ba171d 100644 --- a/code/game/machinery/ARES/ARES_interface_admin.dm +++ b/code/game/machinery/ARES/ARES_interface_admin.dm @@ -160,6 +160,17 @@ logged_orders += list(current_order) data["records_requisition"] = logged_orders + var/list/logged_techs = list() + for(var/datum/ares_record/tech/tech_unlock as anything in datacore.records_tech) + var/list/current_tech = list() + current_tech["time"] = tech_unlock.time + current_tech["details"] = tech_unlock.details + current_tech["user"] = tech_unlock.user + current_tech["tier_changer"] = tech_unlock.is_tier + current_tech["ref"] = "\ref[tech_unlock]" + logged_techs += list(current_tech) + data["records_tech"] = logged_techs + var/list/logged_convos = list() var/list/active_convo = list() var/active_ref @@ -307,6 +318,9 @@ if("page_deleted_1to1") admin_interface.last_menu = admin_interface.current_menu admin_interface.current_menu = "deleted_talks" + if("page_tech") + admin_interface.last_menu = admin_interface.current_menu + admin_interface.current_menu = "tech_log" if("page_access_management") admin_interface.last_menu = admin_interface.current_menu admin_interface.current_menu = "access_management" diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm index 90616add6d25..1212d1509a01 100644 --- a/code/game/machinery/ARES/ARES_procs.dm +++ b/code/game/machinery/ARES/ARES_procs.dm @@ -80,6 +80,8 @@ GLOBAL_LIST_INIT(maintenance_categories, list( var/list/records_security = list() /// Holds all (/datum/ares_record/flight)s var/list/records_flight = list() + /// Holds all (/datum/ares_record/tech)s + var/list/records_tech = list() /// Is nuke request usable or not? var/nuke_available = TRUE @@ -177,6 +179,16 @@ GLOBAL_LIST_INIT(maintenance_categories, list( return FALSE var/datum/ares_datacore/datacore = GLOB.ares_datacore datacore.records_flight.Add(new /datum/ares_record/flight(details, user_name)) + +/proc/log_ares_tech(user_name, tier_tech = FALSE, title, details, point_cost, current_points) + if(!ares_can_log()) + return FALSE + var/new_details = "[title] - [details]" + if(point_cost) + new_details += " - Used [point_cost] INT of [current_points]." + var/datum/ares_datacore/datacore = GLOB.ares_datacore + datacore.records_tech.Add(new /datum/ares_record/tech(title, new_details, user_name, tier_tech)) + // ------ End ARES Logging Procs ------ // // ------ ARES Interface Procs ------ // diff --git a/code/game/machinery/ARES/ARES_records.dm b/code/game/machinery/ARES/ARES_records.dm index e8dc11fa3995..5bfe50dce068 100644 --- a/code/game/machinery/ARES/ARES_records.dm +++ b/code/game/machinery/ARES/ARES_records.dm @@ -58,6 +58,18 @@ src.details = details src.user = user +/datum/ares_record/tech + record_name = ARES_RECORD_TECH + /// If this tech unlock changed the tier. + var/is_tier = FALSE + +/datum/ares_record/tech/New(title, details, user, tier_tech) + time = worldtime2text() + src.title = title + src.details = details + src.user = user + is_tier = tier_tech + /datum/ares_record/deletion record_name = ARES_RECORD_DELETED diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index 103e3f709afe..a1d7f00cf94a 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -97,7 +97,7 @@ /obj/structure/machinery/camera/autoname/almayer/containment/ares name = "ares core camera" - network = list(CAMERA_NET_ALMAYER, CAMERA_NET_ARES) + network = list(CAMERA_NET_ARES) //used by the landing camera dropship equipment. Do not place them right under where the dropship lands. //Should place them near each corner of your LZs. diff --git a/code/modules/cm_tech/tech.dm b/code/modules/cm_tech/tech.dm index dea505f3237a..1750f7e7dbbf 100644 --- a/code/modules/cm_tech/tech.dm +++ b/code/modules/cm_tech/tech.dm @@ -21,9 +21,11 @@ var/background_icon = "background" var/background_icon_locked = "marine" - var/announce_name + var/announce_name = "ALMAYER SPECIAL ASSETS AUTHORIZED" var/announce_message + var/is_tier_changer = FALSE + /datum/tech/proc/can_unlock(mob/M) SHOULD_CALL_PARENT(TRUE) @@ -58,6 +60,7 @@ return TRUE + /** Called when a tech is unlocked. Usually, benefits can be applied here * however, the purchase can still be cancelled by returning FALSE * @@ -69,11 +72,17 @@ unlocked = TRUE to_chat(user, SPAN_HELPFUL("You have purchased the '[name]' tech node.")) log_admin("[key_name_admin(user)] has bought '[name]' via tech points.") + if(!is_tier_changer) + var/log_details = announce_message + if(!log_details) + log_details = name + var/current_points = holder.points + log_ares_tech(user.real_name, is_tier_changer, announce_name, log_details, required_points, current_points) holder.spend_points(required_points) update_icon(node) if(!(tech_flags & TECH_FLAG_NO_ANNOUNCE) && announce_message && announce_name) - marine_announcement(announce_message, announce_name, 'sound/misc/notice2.ogg') + marine_announcement(announce_message, announce_name, 'sound/misc/notice2.ogg', logging = ARES_LOG_NONE) return TRUE diff --git a/code/modules/cm_tech/techs/abstract/transitory.dm b/code/modules/cm_tech/techs/abstract/transitory.dm index 7798b6053d0e..1737b6b21ee6 100644 --- a/code/modules/cm_tech/techs/abstract/transitory.dm +++ b/code/modules/cm_tech/techs/abstract/transitory.dm @@ -7,6 +7,7 @@ var/datum/tier/next var/techs_to_unlock = 0 + is_tier_changer = TRUE /datum/tech/transitory/check_tier_level(mob/M) if(before && before != holder.tier.type) @@ -22,7 +23,7 @@ return TRUE -/datum/tech/transitory/on_unlock() +/datum/tech/transitory/on_unlock(mob/user) . = ..() if(!next) return @@ -31,6 +32,10 @@ if(next_tier) holder.tier = next_tier holder.on_tier_change(previous_tier) + if(flags & TREE_FLAG_MARINE) + /// Due to calling parent, points will have already been spent by now. + var/current_points = holder.points + required_points + log_ares_tech(user.real_name, is_tier_changer, "ALMAYER DEFCON LEVEL INCREASED", "THREAT ASSESSMENT LEVEL INCREASED TO LEVEL [next_tier.tier].\n\nLEVEL [next_tier.tier] assets have been authorised to handle the situation.", required_points, current_points) /datum/tech/transitory/get_tier_overlay() if(!next) diff --git a/code/modules/cm_tech/techs/marine/tier1/points.dm b/code/modules/cm_tech/techs/marine/tier1/points.dm index d6bb5bace6fc..7768d8da2ab7 100644 --- a/code/modules/cm_tech/techs/marine/tier1/points.dm +++ b/code/modules/cm_tech/techs/marine/tier1/points.dm @@ -31,7 +31,6 @@ icon_state = "budget_ds" desc = "Distributes resources to the dropship fabricator." - announce_name = "ALMAYER SPECIAL ASSETS AUTHORIZED" announce_message = "Additional dropship part fabricator points have been authorised for this operation." required_points = 12 diff --git a/code/modules/cm_tech/techs/marine/tier2/orbital_ammo.dm b/code/modules/cm_tech/techs/marine/tier2/orbital_ammo.dm index 303ea6121734..51675ccd27f2 100644 --- a/code/modules/cm_tech/techs/marine/tier2/orbital_ammo.dm +++ b/code/modules/cm_tech/techs/marine/tier2/orbital_ammo.dm @@ -7,8 +7,6 @@ tier = /datum/tier/two - announce_name = "ALMAYER SPECIAL ASSETS AUTHORIZED" - var/type_to_give /datum/tech/repeatable/ob/on_unlock() 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 acee904af305..06770b1d6afe 100644 --- a/code/modules/cm_tech/techs/marine/tier3/cryo_spec.dm +++ b/code/modules/cm_tech/techs/marine/tier3/cryo_spec.dm @@ -3,7 +3,6 @@ desc = "Wakes up an additional specialist to fight against any threats." icon_state = "overshield" - announce_name = "ALMAYER SPECIAL ASSETS AUTHORIZED" announce_message = "An additional specialist is being taken out of cryo." required_points = 8 diff --git a/code/modules/cm_tech/techs/marine/tier3/cryorine.dm b/code/modules/cm_tech/techs/marine/tier3/cryorine.dm index 404fbd07c2ae..19200698db02 100644 --- a/code/modules/cm_tech/techs/marine/tier3/cryorine.dm +++ b/code/modules/cm_tech/techs/marine/tier3/cryorine.dm @@ -4,7 +4,6 @@ desc = "Wakes up additional troops to fight against any threats." icon_state = "cryotroops" - announce_name = "ALMAYER SPECIAL ASSETS AUTHORIZED" announce_message = "Additional troops are being taken out of cryo." required_points = 6 diff --git a/code/modules/cm_tech/trees/marine.dm b/code/modules/cm_tech/trees/marine.dm index aae057b90198..046712f9656b 100644 --- a/code/modules/cm_tech/trees/marine.dm +++ b/code/modules/cm_tech/trees/marine.dm @@ -174,4 +174,4 @@ GLOBAL_LIST_EMPTY(tech_controls_marine) return //No need to announce tier updates for tier 1 var/name = "ALMAYER DEFCON LEVEL INCREASED" var/input = "THREAT ASSESSMENT LEVEL INCREASED TO LEVEL [tier.tier].\n\nLEVEL [tier.tier] assets have been authorised to handle the situation." - marine_announcement(input, name, 'sound/AI/commandreport.ogg') + marine_announcement(input, name, 'sound/AI/commandreport.ogg', logging = ARES_LOG_NONE) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index dec4291668b1..7147e463a773 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -3928,10 +3928,10 @@ /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) "avM" = ( -/obj/structure/machinery/computer/cameras/almayer/ares{ +/obj/structure/machinery/computer/cameras/almayer{ dir = 8; pixel_x = 17; - pixel_y = 6 + pixel_y = 8 }, /obj/structure/surface/table/reinforced/almayer_B{ climbable = 0; @@ -3943,7 +3943,14 @@ pixel_y = 6 }, /obj/item/tool/pen, -/turf/open/floor/almayer/aicore/no_build, +/obj/structure/machinery/computer/cameras/almayer/ares{ + dir = 8; + pixel_x = 17; + pixel_y = -6 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, /area/almayer/command/airoom) "avN" = ( /obj/structure/machinery/telecomms/processor/preset_two, @@ -4624,7 +4631,13 @@ /obj/item/storage/belt/medical/full, /obj/structure/machinery/computer/working_joe{ dir = 8; - pixel_x = 17 + pixel_x = 17; + pixel_y = 8 + }, +/obj/structure/machinery/computer/cameras/almayer/ares{ + dir = 8; + pixel_x = 17; + pixel_y = -6 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -5971,13 +5984,13 @@ /area/almayer/living/grunt_rnr) "aDX" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/containment{ - dir = 4 - }, /obj/structure/sign/safety/terminal{ pixel_x = 8; pixel_y = 32 }, +/obj/structure/machinery/computer/cameras/almayer/ares{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -9207,7 +9220,8 @@ "aWb" = ( /obj/structure/machinery/computer/working_joe{ dir = 4; - pixel_x = -17 + pixel_x = -17; + pixel_y = 8 }, /obj/structure/machinery/door_control/brbutton{ id = "engie_store"; @@ -9216,6 +9230,11 @@ pixel_y = 26; req_one_access_txt = "6" }, +/obj/structure/machinery/computer/cameras/almayer/ares{ + dir = 4; + pixel_x = -17; + pixel_y = -6 + }, /turf/open/floor/almayer{ dir = 1; icon_state = "orangecorner" @@ -33301,6 +33320,11 @@ pixel_x = -1; pixel_y = 3 }, +/obj/item/reagent_container/spray/cleaner{ + layer = 3.04; + pixel_x = 5; + pixel_y = 22 + }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "hlH" = ( @@ -37753,13 +37777,14 @@ layer = 3.2; pixel_y = 4 }, -/obj/structure/machinery/computer/secure_data{ - dir = 4; - pixel_y = 23 - }, /obj/structure/machinery/light{ dir = 8 }, +/obj/structure/machinery/computer/secure_data{ + dir = 4; + pixel_y = 23; + layer = 2.99 + }, /turf/open/floor/almayer{ dir = 8; icon_state = "red" @@ -38468,15 +38493,6 @@ /obj/structure/machinery/light{ dir = 8 }, -/obj/item/clothing/mask/cigarette/pipe{ - layer = 2.8; - pixel_y = -7 - }, -/obj/item/reagent_container/spray/cleaner{ - layer = 3.04; - pixel_x = -4; - pixel_y = 7 - }, /obj/structure/machinery/door_control/brbutton{ id = "Brig Lockdown Shutters"; name = "Brig Lockdown"; @@ -38495,6 +38511,9 @@ pixel_x = 8; pixel_y = 26 }, +/obj/structure/machinery/computer/cameras/almayer/ares{ + dir = 4 + }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "jbO" = ( @@ -46010,6 +46029,14 @@ "lFp" = ( /turf/closed/wall/almayer, /area/almayer/engineering/lower/workshop/hangar) +"lFq" = ( +/obj/structure/pipes/vents/pump/no_boom{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_plates" + }, +/area/almayer/command/airoom) "lFr" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -50484,15 +50511,14 @@ /area/almayer/hallways/upper/starboard) "nkX" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 4; - layer = 2.8; - pixel_y = 5 - }, /obj/structure/sign/safety/terminal{ pixel_x = 8; pixel_y = 32 }, +/obj/structure/machinery/computer/cameras/almayer/ares{ + dir = 4; + pixel_y = 5 + }, /turf/open/floor/almayer{ dir = 9; icon_state = "red" @@ -51397,6 +51423,10 @@ pixel_x = -1; pixel_y = 2 }, +/obj/item/clothing/mask/cigarette/pipe{ + layer = 2.8; + pixel_x = 14 + }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "nCD" = ( @@ -56362,14 +56392,14 @@ }, /area/almayer/living/briefing) "pmV" = ( -/obj/structure/prop/server_equipment/yutani_server/broken{ - density = 0; - desc = "A powerful server tower housing various AI functions."; - name = "server tower"; - pixel_y = 16 - }, /obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/turf/open/floor/almayer/aicore/no_build, +/obj/structure/machinery/computer/tech_control{ + pixel_y = 16; + density = 0 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, /area/almayer/command/airoom) "pnh" = ( /obj/structure/ladder{ @@ -139811,7 +139841,7 @@ cqm gTH qit ebN -cxc +qQS gwn pfT jYR @@ -140622,8 +140652,8 @@ ebN ebN roH ebN -ebN -ebN +daz +daz daz wnh wnh @@ -141434,8 +141464,8 @@ ebN ebN gXs ebN -ebN -ebN +daz +daz daz wnh wnh @@ -141636,9 +141666,9 @@ ebN ebN gbg uVv -yit +lFq ebN -cxc +qQS kBy kBy gfu diff --git a/tgui/packages/tgui/interfaces/AresAdmin.js b/tgui/packages/tgui/interfaces/AresAdmin.js index 4f19cf452b17..3963ee87f3a4 100644 --- a/tgui/packages/tgui/interfaces/AresAdmin.js +++ b/tgui/packages/tgui/interfaces/AresAdmin.js @@ -18,6 +18,7 @@ const PAGES = { 'security': () => Security, 'requisitions': () => Requisitions, 'emergency': () => Emergency, + 'tech_log': () => TechLogs, 'admin_access_log': () => AdminAccessLogs, 'access_management': () => AccessManagement, 'maintenance_management': () => MaintManagement, @@ -255,6 +256,18 @@ const MainMenu = (props, context) => { onClick={() => act('page_requisitions')} /> + + + + {alternateAction !== undefined && ( + + )} + + + ); + })} + + + ))} + + + + ); +}; diff --git a/tgui/packages/tgui/styles/interfaces/StripMenu.scss b/tgui/packages/tgui/styles/interfaces/StripMenu.scss new file mode 100644 index 000000000000..d2c867c0aca1 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/StripMenu.scss @@ -0,0 +1,65 @@ +@use '../base.scss'; + +$background-color: rgba(0, 0, 0, 0.33) !default; + +.StripMenu__cornertext_left { + position: relative; + left: 2px; + text-align: left; + text-shadow: 1px 1px 1px #555; +} + +.StripMenu__cornertext_right { + position: relative; + left: -2px; + text-align: right; + text-shadow: 1px 1px 1px #555; +} + +.StripMenu__iconbox { + height: 100%; + width: 100%; + -ms-interpolation-mode: nearest-neighbor; + vertical-align: middle; +} + +.StripMenu__obscured { + text-align: center; + height: 100%; + width: 100%; +} + +.StripMenu__itembox { + position: relative; + width: 100%; + height: 100%; +} + +.StripMenu__contentbox { + position: relative; +} + +.StripMenu__itembutton { + position: relative; + width: 100%; + height: 100%; + padding: 0; +} + +.StripMenu__itemslot { + position: absolute; + width: 32px; + height: 32px; + left: 50%; + top: 50%; + transform: translateX(-50%) translateY(-50%) scale(0.8); + opacity: 0.7; +} + +.StripMenu__alternativeaction { + background: rgba(0, 0, 0, 0.6); + position: absolute; + bottom: 0; + right: 0; + z-index: 2; +} diff --git a/tgui/packages/tgui/styles/main.scss b/tgui/packages/tgui/styles/main.scss index f7a9ae4fbd7b..a76b1ef3d8e4 100644 --- a/tgui/packages/tgui/styles/main.scss +++ b/tgui/packages/tgui/styles/main.scss @@ -78,6 +78,7 @@ @include meta.load-css('./interfaces/common/Dpad.scss'); @include meta.load-css('./interfaces/common/ElectricalPanel.scss'); @include meta.load-css('./interfaces/TacticalMap.scss'); +@include meta.load-css('./interfaces/StripMenu.scss'); // Layouts @include meta.load-css('./layouts/Layout.scss'); From 1d854650fb80e7efadec15d2f263f36823d98a2d Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Mon, 15 Apr 2024 21:02:01 +0100 Subject: [PATCH 126/431] Automatic changelog for PR #5914 [ci skip] --- html/changelogs/AutoChangeLog-pr-5914.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5914.yml diff --git a/html/changelogs/AutoChangeLog-pr-5914.yml b/html/changelogs/AutoChangeLog-pr-5914.yml new file mode 100644 index 000000000000..f1cfe969c6b3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5914.yml @@ -0,0 +1,4 @@ +author: "ihatethisengine2" +delete-after: True +changes: + - rscadd: "ported stripping menu from TG" \ No newline at end of file From 8f5604b2fe4916f06fa9aa8505031d3dc01d4301 Mon Sep 17 00:00:00 2001 From: Drathek <76988376+Drulikar@users.noreply.github.com> Date: Mon, 15 Apr 2024 13:59:45 -0700 Subject: [PATCH 127/431] Verify Changelog Workflow (#6142) # About the pull request Malformed changelogs have been getting more frequent. This PR does the following: - Updates the labeler workflow to activate on edits and use github warning labeling for output - Adds changelog verification checking to the labeler workflow: If a changelog is missing it will pass but be labeled with "Missing Changelog", otherwise it will fail if its malformed. - Fixes the depreciation warning "Warning: The `set-output` command is deprecated and will be disabled soon. Please upgrade to using Environment Files." Testing performed in a separate repo. --- .github/add_labels.py | 158 +++++++++++++++++++--------------- .github/workflows/labeler.yml | 8 +- 2 files changed, 92 insertions(+), 74 deletions(-) diff --git a/.github/add_labels.py b/.github/add_labels.py index 3e903c362d82..764f90df0c50 100644 --- a/.github/add_labels.py +++ b/.github/add_labels.py @@ -1,19 +1,19 @@ import os, re -from github import Github +from github import Github, GithubException # Format - Key: Array[Label, [StringsToIgnore]] changelogToPrefix = { - 'fix': ["Fix", ["fixed a few things"]], - 'qol': ["Quality of Life", ["made something easier to use"]], - 'add': ["Feature", ["Added new mechanics or gameplay changes", "Added more things"]], - 'del': ["Removal", ["Removed old things"]], - 'spellcheck': ["Grammar and Formatting", ["fixed a few typos"]], - 'balance': ["Balance", ["rebalanced something"]], - 'code': ["Code Improvement", ["changed some code"]], - 'refactor': ["Refactor", ["refactored some code"]], - 'config': ["Config", ["changed some config setting"]], - 'admin': ["Admin", ["messed with admin stuff"]], - 'server': ["Server", ["something server ops should know"]], + 'fix': ["Fix", ["fixed a few things"]], + 'qol': ["Quality of Life", ["made something easier to use"]], + 'add': ["Feature", ["Added new mechanics or gameplay changes", "Added more things"]], + 'del': ["Removal", ["Removed old things"]], + 'spellcheck': ["Grammar and Formatting", ["fixed a few typos"]], + 'balance': ["Balance", ["rebalanced something"]], + 'code': ["Code Improvement", ["changed some code"]], + 'refactor': ["Refactor", ["refactored some code"]], + 'config': ["Config", ["changed some config setting"]], + 'admin': ["Admin", ["messed with admin stuff"]], + 'server': ["Server", ["something server ops should know"]], 'soundadd': ["Sound", ["added a new sound thingy"]], 'sounddel': ["Sound", ["removed an old sound thingy"]], 'imageadd': ["Sprites", ["added some icons and images"]], @@ -24,78 +24,96 @@ } fileToPrefix = { - 'wav': 'Sound', - 'ogg': 'Sound', + 'wav': 'Sound', + 'ogg': 'Sound', 'mp3': 'Sound', ## Can't believe they forgot about the best sound format - 'dmm': 'Mapping', + 'dmm': 'Mapping', - 'js': 'UI', - 'tsx': 'UI', - 'ts': 'UI', - 'jsx': 'UI', - 'scss': 'UI', + 'js': 'UI', + 'tsx': 'UI', + 'ts': 'UI', + 'jsx': 'UI', + 'scss': 'UI', - 'dmi': "Sprites", + 'dmi': "Sprites", } githubLabel = "Github" +missingLogLabel = "Missing Changelog" def get_labels(pr): - labels = {} - - files = pr.get_files() - for file in files: - prefix = file.filename.split(".")[-1] - if file.filename.startswith(".github"): - labels[githubLabel] = True - if not prefix in fileToPrefix: - continue - labels[fileToPrefix[prefix]] = True - - changelog_match = re.search(r"🆑(.*)/🆑", pr.body, re.S | re.M) - if changelog_match is None: - changelog_match = re.search(r":cl:(.*)/:cl:", pr.body, re.S | re.M) - if changelog_match is None: - return labels - lines = changelog_match.group(1).split('\n') - for line in lines: - line = line.strip() - if not line: - continue - - contentSplit = line.split(":") - - key = contentSplit.pop(0).strip() - content = ":".join(contentSplit).strip() - - if not key in changelogToPrefix: - continue - - if content in changelogToPrefix[key][1]: - continue - - labels[changelogToPrefix[key][0]] = True - - return list(labels) + labels = {} + failed = False + + files = pr.get_files() + for file in files: + prefix = file.filename.split(".")[-1] + if file.filename.startswith(".github"): + labels[githubLabel] = True + if not prefix in fileToPrefix: + continue + labels[fileToPrefix[prefix]] = True + + changelog_match = re.search(r"🆑(.*)/🆑", pr.body, re.S | re.M) + if changelog_match is None: + changelog_match = re.search(r":cl:(.*)/:cl:", pr.body, re.S | re.M) + if changelog_match is None: + print("::warning ::No changelog detected.") + labels[missingLogLabel] = True + return labels, False + + lines = changelog_match.group(1).split('\n') + failed = len(lines) <= 2 # Make sure its not an empty changelog + if failed: + print("::error ::Empty changelog.") + + for line in lines[1:-1]: # Skip first line with authors and last + line = line.strip() + if not line: + continue + + contentSplit = line.split(":") + + key = contentSplit.pop(0).strip() + content = ":".join(contentSplit).strip() + + if not key in changelogToPrefix: # Some key that we didn't expect + print(f"::error ::Invalid changelog entry: {line}") + failed = True + continue + + if content in changelogToPrefix[key][1]: # They left the template entry in + print(f"::error ::Invalid changelog entry: {line}") + failed = True + continue + + labels[changelogToPrefix[key][0]] = True + + return list(labels), failed def main(): - g = Github(os.environ["TOKEN"]) - repo = g.get_repo(os.environ['REPO']) + g = Github(os.environ["TOKEN"]) + repo = g.get_repo(os.environ['REPO']) - pr = repo.get_pull(int(os.environ["PR_NUMBER"])) - if not pr: - print("Not a PR.") - return + pr = repo.get_pull(int(os.environ["PR_NUMBER"])) + if not pr: + print("::warning ::Not a PR.") + return - labels = get_labels(pr) + labels, failed = get_labels(pr) - if labels is None: # no labels to add - print("No labels to add.") - return + if not missingLogLabel in labels: + try: + pr.remove_from_labels(missingLogLabel) + except GithubException as e: + if e.status == 404: + pass # 404 if we try to remove a label that isn't set - for label in labels: - pr.add_to_labels(label) + for label in labels: + pr.add_to_labels(label) + if failed: + exit(1) if __name__ == '__main__': - main() + main() diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 8a688f207f11..cdf7ce11784e 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -1,7 +1,7 @@ -name: Labeling +name: Labeling and Verification on: pull_request_target: - types: [opened] + types: [opened, edited] jobs: label: runs-on: ubuntu-latest @@ -13,7 +13,7 @@ jobs: run: | unset SECRET_EXISTS if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi - echo "::set-output name=ACTIONS_ENABLED::$SECRET_EXISTS" + echo "ACTIONS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT - name: Get The Script if: steps.value_holder.outputs.ACTIONS_ENABLED run: | @@ -29,7 +29,7 @@ jobs: python -m pip install --upgrade pip python -m pip install pygithub sudo apt-get install dos2unix - - name: Add Labels + - name: Add and verify labels if: steps.value_holder.outputs.ACTIONS_ENABLED run: | python add_labels.py From 292f1f5fb21c1c5718b67692df72550353ac0138 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Tue, 16 Apr 2024 01:08:46 +0000 Subject: [PATCH 128/431] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-5914.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6074.yml | 7 ------- html/changelogs/archive/2024-04.yml | 11 +++++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-5914.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6074.yml diff --git a/html/changelogs/AutoChangeLog-pr-5914.yml b/html/changelogs/AutoChangeLog-pr-5914.yml deleted file mode 100644 index f1cfe969c6b3..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5914.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "ihatethisengine2" -delete-after: True -changes: - - rscadd: "ported stripping menu from TG" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6074.yml b/html/changelogs/AutoChangeLog-pr-6074.yml deleted file mode 100644 index 5ba7f755eb85..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6074.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "Huffie56, Zenith, esselnek/sleepynecrons, samy/nauticall, drulikar." -delete-after: True -changes: - - rscadd: "Added fuel pump as machinery on the almayer sprite will change when power is on or off." - - rscadd: "Fuel pumps are animated when activated and have different state depending on how full the lifeboats are." - - imageadd: "added the fuel pump icon. updated by esselnek /sleepynecrons and Zenith, they where originally made by nauticall." - - maptweak: "added the fuel pump to the proper locations." \ No newline at end of file diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml index e9d315bff5e9..b19a3e201e6f 100644 --- a/html/changelogs/archive/2024-04.yml +++ b/html/changelogs/archive/2024-04.yml @@ -222,3 +222,14 @@ 2024-04-15: LTNTS: - maptweak: moves APC in Chance's Claim LZ1 to where it can actually be fixed +2024-04-16: + Huffie56, Zenith, esselnek/sleepynecrons, samy/nauticall, drulikar.: + - rscadd: Added fuel pump as machinery on the almayer sprite will change when power + is on or off. + - rscadd: Fuel pumps are animated when activated and have different state depending + on how full the lifeboats are. + - imageadd: added the fuel pump icon. updated by esselnek /sleepynecrons and Zenith, + they where originally made by nauticall. + - maptweak: added the fuel pump to the proper locations. + ihatethisengine2: + - rscadd: ported stripping menu from TG From 537b97e926ecbcefce4dc54ee46445123c334238 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Tue, 16 Apr 2024 09:35:48 -0400 Subject: [PATCH 129/431] no more buckling xenos into chairs (#6149) # About the pull request you can no longer buckle xenos into chairs # Explain why it's good for the game BUG BAD!!! I DIED TO THIS!!! SPEEDMERGE # Testing Photographs and Procedure it work # Changelog :cl: fix: You can no longer buckle xenos onto chairs /:cl: --- code/game/objects/objs.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index f589e9c5a52a..a3febb11dddb 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -303,9 +303,9 @@ if (M.mob_size <= MOB_SIZE_XENO) if ((M.stat == DEAD && istype(src, /obj/structure/bed/roller) || HAS_TRAIT(M, TRAIT_OPPOSABLE_THUMBS))) do_buckle(M, user) - else if ((M.mob_size > MOB_SIZE_HUMAN)) - to_chat(user, SPAN_WARNING("[M] is too big to buckle in.")) - return + if ((M.mob_size > MOB_SIZE_HUMAN)) + to_chat(user, SPAN_WARNING("[M] is too big to buckle in.")) + return do_buckle(M, user) // the actual buckling proc From fcaa65099019123972ed286a23a5c89d2569a3dc Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 16 Apr 2024 14:41:06 +0100 Subject: [PATCH 130/431] Automatic changelog for PR #6149 [ci skip] --- html/changelogs/AutoChangeLog-pr-6149.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6149.yml diff --git a/html/changelogs/AutoChangeLog-pr-6149.yml b/html/changelogs/AutoChangeLog-pr-6149.yml new file mode 100644 index 000000000000..8deaea969055 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6149.yml @@ -0,0 +1,4 @@ +author: "iloveloopers" +delete-after: True +changes: + - bugfix: "You can no longer buckle xenos onto chairs" \ No newline at end of file From 6fa8d55df35f5f9dd0ee9f04304c325689d92a79 Mon Sep 17 00:00:00 2001 From: usnpeepoo <72160946+usnpeepoo@users.noreply.github.com> Date: Tue, 16 Apr 2024 08:43:37 -0500 Subject: [PATCH 131/431] Increases berserker's rage lockout is back to 10 seconds (#6108) # About the pull request This PR reverts the rage lockout duration of Berserker back to 10 seconds. # Explain why it's good for the game Should help with punishing berserkers on their downtime, without decreasing their effectiveness # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: balance: Berserker's rage lock-out duration increased slightly /:cl: --- .../living/carbon/xenomorph/strains/castes/ravager/berserker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/berserker.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/berserker.dm index c12324aa5b2a..365304259ac8 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/berserker.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/berserker.dm @@ -41,7 +41,7 @@ // Eviscerate config var/rage_lock_duration = 10 SECONDS // 10 seconds of max rage - var/rage_cooldown_duration = 8 SECONDS // 8 seconds of NO rage. + var/rage_cooldown_duration = 10 SECONDS // 10 seconds of NO rage. // State for tracking rage var/rage = 0 From a1ec7ece978c88aaf922bd3f5e01e2f4b4e5760e Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 16 Apr 2024 14:48:33 +0100 Subject: [PATCH 132/431] Automatic changelog for PR #6108 [ci skip] --- html/changelogs/AutoChangeLog-pr-6108.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6108.yml diff --git a/html/changelogs/AutoChangeLog-pr-6108.yml b/html/changelogs/AutoChangeLog-pr-6108.yml new file mode 100644 index 000000000000..edfab650390a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6108.yml @@ -0,0 +1,4 @@ +author: "usnpeepoo" +delete-after: True +changes: + - balance: "Berserker's rage lock-out duration increased slightly" \ No newline at end of file From 0a7aadfcc7b7a4c2af5ab897a939d3d9bac3d0b3 Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Tue, 16 Apr 2024 14:52:38 +0100 Subject: [PATCH 133/431] Project ARES: Reception Remodel (#6117) # About the pull request Remodels the AI Core Reception Desk to be behind a window. Also adds item chutes to depost visitor weapons into a vault. # Explain why it's good for the game Being behind the window makes things a little more thematic. Further, the downstairs remodel gives a bit more space. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: maptweak: Remodelled the AI Core Reception and WJ spawn area. maptweak: Switches AI Core cameras over to manual naming. imageadd: Added sprites for AI Core windows on black Almayer frames. /:cl: --- code/game/objects/structures/window.dm | 22 + code/game/objects/structures/window_frame.dm | 5 + icons/turf/walls/windows.dmi | Bin 132174 -> 134118 bytes maps/map_files/USS_Almayer/USS_Almayer.dmm | 18262 +++++++++-------- 4 files changed, 9335 insertions(+), 8954 deletions(-) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 81d7f24f054e..341fcb657080 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -618,6 +618,28 @@ basestate = "w_ai_rwindow" window_frame = /obj/structure/window_frame/almayer/aicore/white +/obj/structure/window/framed/almayer/aicore/black + icon_state = "alm_ai_rwindow0" + basestate = "alm_ai_rwindow" + window_frame = /obj/structure/window_frame/almayer/aicore/black + +/obj/structure/window/framed/almayer/aicore/hull/black + icon_state = "alm_ai_rwindow0" + basestate = "alm_ai_rwindow" + window_frame = /obj/structure/window_frame/almayer/aicore/black + not_damageable = TRUE + not_deconstructable = TRUE + unslashable = TRUE + unacidable = TRUE + health = 1000000 //Failsafe, shouldn't matter + +/obj/structure/window/framed/almayer/aicore/hull/black/hijack_bustable //I exist to explode after hijack, that is all. + +/obj/structure/window/framed/almayer/aicore/hull/black/hijack_bustable/Initialize() + . = ..() + if(is_mainship_level(z)) + RegisterSignal(SSdcs, COMSIG_GLOB_HIJACK_IMPACTED, PROC_REF(deconstruct)) + /obj/structure/window/framed/almayer/aicore/white/hull name = "hull window" desc = "An ultra-reinforced window designed to protect the AI Core. Made out of exotic materials to prevent hull breaches, nothing will get through here." diff --git a/code/game/objects/structures/window_frame.dm b/code/game/objects/structures/window_frame.dm index 460a11af1000..ae40be1472ad 100644 --- a/code/game/objects/structures/window_frame.dm +++ b/code/game/objects/structures/window_frame.dm @@ -184,6 +184,11 @@ basestate = "w_ai_window" window_type = /obj/structure/window/framed/almayer/aicore/white +/obj/structure/window_frame/almayer/aicore/black + icon_state = "alm_window0_frame" + basestate = "alm_window" + window_type = /obj/structure/window/framed/almayer/aicore/black + /obj/structure/window_frame/almayer/requisitions/attackby(obj/item/W, mob/living/user) if(istype(W, sheet_type)) to_chat(user, SPAN_WARNING("You can't repair this window.")) diff --git a/icons/turf/walls/windows.dmi b/icons/turf/walls/windows.dmi index 2904c8d5fa9aea9000eebe3455fdf6c651850b2e..c162b83e661c5399b5be1ff15b562544da8456d2 100644 GIT binary patch delta 13740 zcmZ{Lby!qU`|VJY5+c$qqO^o`mkFYDcZYOyNRb99X#tgTK)SnIy1P4Ph+&3%@cZ5G z`Q1P6^PGoaW)6Grckg$vcdfM#Ltk(tMlyR^UsoV&doo3>4b&0IM-zO5JIPun!E)FtrsqC36mW^`~~vQ3RQ zp>iKPF|D0u5#>)aZ`2i=fmcfMr~TrbCS50R(pvk4EdHJhC|Z

LMiVv1;*qpo|x| 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 M$|=j1NgD?KA7*UbH2?qr diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 884535f34a0a..6a70a33c4e13 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -119,6 +119,16 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space) +"aaE" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "aaF" = ( /obj/structure/stairs{ dir = 1; @@ -208,12 +218,6 @@ /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, /area/almayer/lifeboat_pumps/north1) -"abz" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/upper/u_f_p) "abB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -508,9 +512,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) -"acB" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/upper/u_a_p) "acI" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -521,18 +522,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"acJ" = ( -/mob/living/silicon/decoy/ship_ai{ - layer = 2.98; - pixel_y = -16 - }, -/obj/structure/blocker/invisible_wall, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "acK" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 2 @@ -578,7 +567,7 @@ /area/almayer/shipboard/weapon_room) "acQ" = ( /turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_hallway) +/area/almayer/hallways/upper/aft_hallway) "acS" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -1045,15 +1034,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/offices/flight) -"afB" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/north1) "afE" = ( /obj/structure/machinery/vending/dinnerware, /obj/structure/machinery/firealarm{ @@ -1553,6 +1533,10 @@ allow_construction = 0 }, /area/almayer/stair_clone/upper) +"aiM" = ( +/obj/structure/surface/rack, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "aiQ" = ( /obj/structure/machinery/faxmachine, /obj/structure/surface/table/almayer, @@ -1730,6 +1714,12 @@ icon_state = "redcorner" }, /area/almayer/shipboard/weapon_room) +"akh" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "bluecorner" + }, +/area/almayer/hallways/upper/midship_hallway) "akn" = ( /obj/structure/machinery/light{ dir = 4 @@ -1862,15 +1852,6 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) -"ale" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) "alf" = ( /obj/structure/machinery/light{ dir = 8 @@ -1939,27 +1920,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) -"alF" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "Brig Lockdown Shutters"; - name = "\improper Brig Lockdown Shutter" - }, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - closeOtherId = "brigmaint_s"; - dir = 1; - name = "\improper Brig Maintenance" - }, -/obj/structure/machinery/door/poddoor/almayer/open{ - id = "perma_lockdown_2"; - name = "\improper Perma Lockdown Shutter" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/perma) "alL" = ( /turf/closed/wall/almayer, /area/almayer/command/telecomms) @@ -2009,14 +1969,6 @@ }, /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/aft_hallway) "amd" = ( /obj/structure/machinery/vending/cola{ density = 0; @@ -2385,6 +2337,23 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"aoz" = ( +/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/fore_hallway) "aoA" = ( /obj/structure/machinery/light, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -2758,13 +2727,6 @@ }, /turf/open/floor/plating, /area/almayer/engineering/upper_engineering) -"aqk" = ( -/obj/structure/sign/safety/escapepod{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) "aqm" = ( /obj/item/bedsheet/brown, /obj/structure/bed, @@ -3071,6 +3033,23 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) +"ary" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/structure/machinery/door_control{ + id = "OTStore"; + name = "Shutters"; + pixel_y = -24; + access_modified = 1; + req_one_access_txt = "35" + }, +/obj/structure/surface/rack, +/obj/item/reagent_container/glass/bucket/janibucket, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/engineering/lower/workshop/hangar) "arz" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -3182,11 +3161,6 @@ icon_state = "dark_sterile" }, /area/almayer/living/pilotbunks) -"ash" = ( -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/upper/fore_hallway) "asm" = ( /obj/structure/stairs{ dir = 4 @@ -3240,60 +3214,12 @@ /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{ - closeOtherId = "brignorth"; - name = "\improper Brig Lobby" - }, -/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{ - id = "ARES StairsUpper"; - name = "ARES Core Access"; - pixel_x = -24; - pixel_y = 24; - req_one_access_txt = "90;91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/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; - name = "\improper AI Reception"; - req_access = null; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/no_build{ - icon_state = "test_floor4" - }, -/area/almayer/command/airoom) -"asG" = ( -/obj/structure/surface/table/reinforced/almayer_B{ - climbable = 0; - indestructible = 1; - unacidable = 1; - unslashable = 1 - }, -/obj/item/desk_bell{ - pixel_x = -6; - pixel_y = 10; - anchored = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "asH" = ( /obj/structure/machinery/telecomms/bus/preset_three, /turf/open/floor/almayer{ @@ -3522,11 +3448,43 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) +"atz" = ( +/obj/structure/sign/safety/escapepod{ + pixel_y = 32 + }, +/obj/structure/sign/safety/east{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "atH" = ( /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hallways/lower/starboard_midship_hallway) +"atJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/hallways/upper/port) "atK" = ( /turf/open/floor/almayer{ dir = 10; @@ -3595,13 +3553,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/pilotbunks) -"aub" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) "auc" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -3618,12 +3569,6 @@ /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/closed/wall/almayer/aicore/hull, /area/almayer/command/airoom) -"aug" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "aui" = ( /obj/structure/machinery/telecomms/hub/preset, /turf/open/floor/almayer{ @@ -3780,6 +3725,16 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"ava" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/midship_hallway) "avc" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -3892,66 +3847,6 @@ icon_state = "test_floor4" }, /area/almayer/powered) -"avL" = ( -/obj/structure/machinery/door_control{ - id = "ARES StairsUpper"; - name = "ARES Core Access"; - pixel_x = -10; - pixel_y = -24; - req_one_access_txt = "91;92" - }, -/obj/structure/machinery/door_control{ - id = "ARES StairsLock"; - name = "ARES Exterior Lockdown"; - pixel_y = -24; - req_one_access_txt = "91;92" - }, -/obj/structure/surface/table/reinforced/almayer_B{ - climbable = 0; - indestructible = 1; - unacidable = 1; - unslashable = 1 - }, -/obj/structure/transmitter/rotary{ - name = "AI Reception Telephone"; - phone_category = "ARES"; - phone_color = "blue"; - phone_id = "AI Reception" - }, -/obj/structure/machinery/door_control{ - id = "ARES Emergency"; - name = "ARES Emergency Lockdown"; - pixel_x = 10; - pixel_y = -24; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) -"avM" = ( -/obj/structure/machinery/computer/cameras/almayer{ - dir = 8; - pixel_x = 17; - pixel_y = 8 - }, -/obj/structure/surface/table/reinforced/almayer_B{ - climbable = 0; - indestructible = 1; - unacidable = 1; - unslashable = 1 - }, -/obj/item/paper_bin/uscm{ - pixel_y = 6 - }, -/obj/item/tool/pen, -/obj/structure/machinery/computer/cameras/almayer/ares{ - dir = 8; - pixel_x = 17; - pixel_y = -6 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, -/area/almayer/command/airoom) "avN" = ( /obj/structure/machinery/telecomms/processor/preset_two, /turf/open/floor/almayer{ @@ -4262,10 +4157,6 @@ icon_state = "cargo" }, /area/almayer/living/pilotbunks) -"awY" = ( -/obj/effect/landmark/start/pilot/cas_pilot, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/pilotbunks) "awZ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/paper_bin/uscm{ @@ -4648,21 +4539,6 @@ icon_state = "silvercorner" }, /area/almayer/command/cic) -"ayt" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "CIC Lockdown"; - name = "\improper Combat Information Center Blast Door" - }, -/obj/structure/machinery/door/airlock/almayer/command/reinforced{ - closeOtherId = "ciclobby_n"; - name = "\improper Combat Information Center" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/command/cic) "ayu" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -5095,28 +4971,13 @@ icon_state = "silvercorner" }, /area/almayer/command/cic) -"aAl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/command/reinforced{ - closeOtherId = "ciclobby_n"; - id_tag = "cic_exterior"; - name = "\improper Combat Information Center" - }, -/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" +"aAn" = ( +/obj/structure/sign/safety/escapepod{ + pixel_x = 8; + pixel_y = -32 }, -/area/almayer/command/cic) +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "aAq" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -5523,15 +5384,6 @@ 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/upper/u_m_p) "aBR" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/ashtray/glass, @@ -6004,6 +5856,25 @@ icon_state = "test_floor4" }, /area/almayer/medical/upper_medical) +"aEf" = ( +/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 + }, +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_umbilical) "aEg" = ( /turf/open/floor/almayer{ icon_state = "redfull" @@ -6389,6 +6260,19 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) +"aGk" = ( +/obj/structure/machinery/door_control{ + id = "ARES Operations Left"; + name = "ARES Operations Shutter"; + pixel_x = -24; + pixel_y = -8; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/aicore/no_build{ + dir = 8; + icon_state = "ai_silver" + }, +/area/almayer/command/airoom) "aGm" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -6558,11 +6442,6 @@ /obj/structure/window/reinforced/tinted/frosted, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/numbertwobunks) -"aHo" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_f_s) "aHq" = ( /turf/closed/wall/almayer, /area/almayer/command/computerlab) @@ -6821,6 +6700,28 @@ /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/floor/grass, /area/almayer/living/starboard_garden) +"aIC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/transmitter/rotary{ + name = "Researcher Office Telephone"; + phone_category = "Almayer"; + phone_id = "Research"; + pixel_y = 6 + }, +/obj/item/reagent_container/glass/beaker{ + pixel_x = 6; + pixel_y = -1 + }, +/obj/item/reagent_container/glass/beaker/large{ + pixel_x = -6 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) "aID" = ( /obj/structure/machinery/light{ dir = 1 @@ -7317,11 +7218,6 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) -"aLh" = ( -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/upper/starboard) "aLp" = ( /obj/structure/sign/safety/cryo{ pixel_x = 8; @@ -7469,6 +7365,12 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) +"aMl" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "aMm" = ( /obj/structure/surface/table/almayer, /obj/item/tool/crowbar, @@ -7523,6 +7425,11 @@ icon_state = "plate" }, /area/almayer/squads/alpha_bravo_shared) +"aMy" = ( +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/starboard) "aMz" = ( /turf/open/floor/almayer, /area/almayer/squads/alpha) @@ -7669,12 +7576,30 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha_bravo_shared) +"aNE" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "aNI" = ( /obj/structure/machinery/door/airlock/almayer/marine/alpha/tl, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/squads/alpha) +"aNO" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/hallways/upper/port) "aNQ" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -7767,18 +7692,6 @@ 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/midship_hallway) "aOy" = ( /obj/structure/machinery/light{ dir = 1 @@ -7899,6 +7812,12 @@ "aOR" = ( /turf/open/floor/almayer, /area/almayer/living/chapel) +"aOS" = ( +/obj/structure/machinery/portable_atmospherics/canister/air, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/upper/u_a_s) "aOU" = ( /obj/structure/platform{ dir = 4 @@ -7932,6 +7851,14 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering) +"aOZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3" + }, +/area/almayer/command/airoom) "aPa" = ( /obj/structure/machinery/light{ dir = 8 @@ -7950,6 +7877,14 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) +"aPg" = ( +/obj/structure/surface/table/almayer, +/obj/item/frame/table, +/obj/item/storage/toolbox/electrical, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "aPi" = ( /obj/structure/machinery/vending/cola, /turf/open/floor/almayer{ @@ -8022,6 +7957,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{ @@ -8102,6 +8046,18 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) +"aPV" = ( +/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/upper/fore_hallway) "aQb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8152,6 +8108,13 @@ icon_state = "plate" }, /area/almayer/living/offices) +"aQx" = ( +/obj/structure/window/framed/almayer, +/obj/structure/curtain/open/shower{ + name = "hypersleep curtain" + }, +/turf/open/floor/plating, +/area/almayer/maint/upper/u_m_p) "aQy" = ( /obj/structure/transmitter{ dir = 8; @@ -8290,14 +8253,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering) -"aRl" = ( -/obj/structure/machinery/door_control/cl/office/door{ - pixel_y = -20 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/upper/midship_hallway) "aRo" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -8316,15 +8271,6 @@ 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/lifeboat_pumps/south2) "aRt" = ( /turf/open/floor/almayer{ dir = 8; @@ -8952,6 +8898,15 @@ icon_state = "plate" }, /area/almayer/living/captain_mess) +"aUB" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "aUC" = ( /obj/structure/machinery/light{ dir = 4 @@ -9113,6 +9068,16 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) +"aVK" = ( +/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/fore_hallway) "aVL" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -9342,6 +9307,12 @@ icon_state = "test_floor4" }, /area/almayer/living/offices) +"aWM" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "greencorner" + }, +/area/almayer/hallways/upper/fore_hallway) "aWT" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -9506,12 +9477,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_two) -"aYU" = ( -/obj/effect/landmark/yautja_teleport, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_a_s) "aZe" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -9904,6 +9869,19 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"bcg" = ( +/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/upper/u_m_p) "bcm" = ( /turf/closed/wall/almayer, /area/almayer/hallways/hangar) @@ -9925,6 +9903,12 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"bct" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/maint/upper/u_a_p) "bcw" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -10269,14 +10253,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/chemistry) -"bek" = ( -/obj/structure/machinery/cm_vending/sorted/medical/marinemed, -/obj/structure/medical_supply_link, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lower_medical_lobby) "ben" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -10385,6 +10361,18 @@ icon_state = "plate" }, /area/almayer/engineering/lower/engine_core) +"beN" = ( +/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/lifeboat_pumps/north2) "beP" = ( /obj/item/stack/catwalk, /obj/structure/disposalpipe/segment{ @@ -10454,15 +10442,6 @@ 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/fore_hallway) "bfl" = ( /turf/open/floor/almayer{ dir = 5; @@ -10625,12 +10604,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"bgh" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "silver" - }, -/area/almayer/hallways/upper/midship_hallway) "bgj" = ( /obj/structure/machinery/landinglight/ds1{ dir = 8 @@ -10797,6 +10770,25 @@ icon_state = "test_floor4" }, /area/almayer/living/chapel) +"bgM" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "orange" + }, +/area/almayer/hallways/upper/midship_hallway) +"bgN" = ( +/obj/structure/sign/safety/medical{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "bgO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -10845,6 +10837,25 @@ icon_state = "red" }, /area/almayer/squads/alpha) +"bha" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsLower"; + name = "ARES Core Lockdown"; + pixel_x = 24; + pixel_y = -8; + req_one_access_txt = "90;91;92" + }, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 8; + pixel_y = 2; + c_tag = "AI - Main Corridor"; + autoname = 0 + }, +/turf/open/floor/almayer/aicore/no_build{ + dir = 4; + icon_state = "ai_silver" + }, +/area/almayer/command/airoom) "bhf" = ( /obj/structure/machinery/light{ dir = 4 @@ -10925,6 +10936,15 @@ icon_state = "bluefull" }, /area/almayer/living/bridgebunks) +"bhR" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "bhT" = ( /obj/structure/cargo_container/lockmart/mid{ layer = 3.1; @@ -10952,23 +10972,6 @@ icon_state = "plate" }, /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/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/port) "biq" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/beaker/large, @@ -11016,15 +11019,6 @@ "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/midship_hallway) "biC" = ( /obj/structure/largecrate/random/case, /obj/structure/machinery/access_button/airlock_exterior, @@ -11075,13 +11069,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north2) -"biT" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/north1) "biV" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 8 @@ -11129,6 +11116,13 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"bjv" = ( +/obj/structure/disposalpipe/junction, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) "bjA" = ( /turf/open/floor/almayer{ dir = 9; @@ -11167,14 +11161,11 @@ }, /area/almayer/hallways/hangar) "bkb" = ( -/obj/structure/machinery/light{ - dir = 8 - }, /turf/open/floor/almayer{ dir = 4; icon_state = "red" }, -/area/almayer/hallways/upper/port) +/area/almayer/hallways/upper/aft_hallway) "bkd" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 8 @@ -11252,6 +11243,16 @@ }, /turf/open/floor/plating, /area/almayer/medical/operating_room_one) +"bkM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/maint/upper/u_m_p) "bkN" = ( /obj/item/storage/firstaid/toxin{ pixel_x = 6; @@ -11763,14 +11764,6 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/bravo) -"bnF" = ( -/obj/structure/machinery/cryopod{ - pixel_y = 6 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/maint/upper/u_m_p) "bnH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -11928,11 +11921,6 @@ icon_state = "mono" }, /area/almayer/squads/req) -"boU" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/weldingtool, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_s) "boV" = ( /obj/structure/cargo_container/wy/left, /obj/structure/prop/almayer/minigun_crate{ @@ -12274,12 +12262,6 @@ icon_state = "test_floor5" }, /area/almayer/squads/req) -"brm" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/upper/midship_hallway) "brn" = ( /obj/structure/machinery/door/airlock/almayer/marine/bravo/smart, /turf/open/floor/almayer{ @@ -12537,6 +12519,10 @@ icon_state = "plate" }, /area/almayer/squads/bravo) +"btb" = ( +/obj/structure/window/framed/almayer, +/turf/open/floor/plating, +/area/almayer/maint/upper/u_a_s) "btc" = ( /obj/structure/bed/chair{ dir = 8; @@ -12567,12 +12553,6 @@ icon_state = "plate" }, /area/almayer/living/gym) -"btu" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/north2) "btv" = ( /obj/structure/machinery/light, /obj/structure/disposalpipe/segment{ @@ -12988,15 +12968,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) -"bwN" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/aft_hallway) "bwP" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/almayer{ @@ -13076,14 +13047,6 @@ icon_state = "redfull" }, /area/almayer/living/cryo_cells) -"bxt" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/fore_hallway) "bxA" = ( /obj/structure/machinery/power/apc/almayer/hardened, /obj/effect/decal/warning_stripes{ @@ -13138,16 +13101,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower/workshop) -"bxV" = ( -/obj/structure/sign/safety/ladder{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/upper/midship_hallway) "bxY" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -13264,15 +13217,6 @@ icon_state = "silver" }, /area/almayer/living/cryo_cells) -"byH" = ( -/obj/structure/bed/sofa/south/white/right{ - pixel_y = 16 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "silver" - }, -/area/almayer/maint/upper/u_m_p) "bzg" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -13474,12 +13418,6 @@ icon_state = "plate" }, /area/almayer/living/auxiliary_officer_office) -"bBc" = ( -/obj/structure/surface/rack, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_p) "bBd" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -13591,6 +13529,11 @@ icon_state = "plate" }, /area/almayer/living/auxiliary_officer_office) +"bBH" = ( +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "bBN" = ( /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, @@ -13682,6 +13625,10 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_three) +"bCs" = ( +/obj/docking_port/stationary/escape_pod/cl, +/turf/open/floor/plating, +/area/almayer/command/corporateliaison) "bCu" = ( /obj/structure/bed/chair/comfy/alpha{ dir = 4 @@ -13804,11 +13751,6 @@ icon_state = "plate" }, /area/almayer/shipboard/weapon_room) -"bDi" = ( -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/fore_hallway) "bDn" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/closed/wall/almayer, @@ -14247,6 +14189,18 @@ icon_state = "plate" }, /area/almayer/squads/bravo) +"bEX" = ( +/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + access_modified = 1; + name = "\improper Security Vault"; + req_access = null; + req_one_access_txt = "91;92"; + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "bFa" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -15068,25 +15022,6 @@ /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{ - closeOtherId = "brignorth"; - dir = 2; - name = "\improper Brig Armoury"; - req_access = null; - req_one_access_txt = "1;3" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/starboard_hallway) "bKP" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -15099,11 +15034,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) -"bKU" = ( -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/upper/aft_hallway) "bKX" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/masks, @@ -15133,18 +15063,6 @@ 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/aft_hallway) "bLh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -15258,23 +15176,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/navigation) -"bLv" = ( -/obj/structure/machinery/door_control{ - id = "ARES StairsLower"; - name = "ARES Core Lockdown"; - pixel_x = 24; - pixel_y = -8; - req_one_access_txt = "90;91;92" - }, -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8; - pixel_y = 2 - }, -/turf/open/floor/almayer/aicore/no_build{ - dir = 4; - icon_state = "ai_silver" - }, -/area/almayer/command/airoom) "bLw" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light{ @@ -15322,6 +15223,21 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"bLF" = ( +/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{ + closeOtherId = "brigmaint_n"; + name = "\improper Brig" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/starboard_hallway) "bLH" = ( /turf/open/floor/almayer{ dir = 8; @@ -15375,12 +15291,6 @@ }, /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/midship_hallway) "bMq" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /obj/structure/machinery/light{ @@ -15530,19 +15440,12 @@ 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 +"bMZ" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_hallway) +/area/almayer/maint/upper/u_f_p) "bNa" = ( /obj/structure/surface/table/almayer, /obj/item/folder/black, @@ -15557,12 +15460,6 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"bNc" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orangecorner" - }, -/area/almayer/maint/upper/u_a_s) "bNe" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -15744,16 +15641,6 @@ }, /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/fore_hallway) "bNL" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -15796,15 +15683,6 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"bNT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/midship_hallway) "bOq" = ( /obj/structure/prop/almayer/cannon_cables, /turf/open/floor/almayer{ @@ -15999,6 +15877,11 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) +"bPi" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "bPk" = ( /obj/item/roller, /obj/item/roller, @@ -16062,27 +15945,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) -"bPB" = ( -/obj/structure/machinery/door/window/eastleft{ - req_one_access_txt = "2;21" - }, -/obj/structure/machinery/door/window/westright, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "ROlobby1"; - name = "\improper RO Line 1" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/surface/table/reinforced/almayer_blend/north, -/obj/item/desk_bell{ - pixel_x = -6; - pixel_y = -8; - anchored = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/req) "bPC" = ( /obj/structure/sign/nosmoking_2{ pixel_x = 28 @@ -16187,21 +16049,6 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) -"bQv" = ( -/obj/structure/sign/safety/ref_bio_storage{ - pixel_x = -17; - pixel_y = 7 - }, -/obj/structure/sign/safety/biohazard{ - pixel_x = -17; - pixel_y = -7 - }, -/obj/structure/medical_supply_link, -/obj/structure/machinery/cm_vending/sorted/medical/chemistry, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/medical/medical_science) "bQz" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -16359,6 +16206,15 @@ icon_state = "orangecorner" }, /area/almayer/hallways/lower/starboard_umbilical) +"bRO" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "bRP" = ( /obj/structure/machinery/body_scanconsole, /obj/structure/disposalpipe/segment{ @@ -16372,27 +16228,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"bRR" = ( -/obj/structure/machinery/door/window/eastleft{ - req_one_access_txt = "2;21" - }, -/obj/structure/machinery/door/window/westright, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "ROlobby2"; - name = "\improper RO Line 2" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/surface/table/reinforced/almayer_blend, -/obj/item/desk_bell{ - pixel_x = -6; - pixel_y = 10; - anchored = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/req) "bRV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -16624,12 +16459,6 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"bTD" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "greencorner" - }, -/area/almayer/hallways/upper/fore_hallway) "bTE" = ( /turf/open/floor/almayer{ dir = 4; @@ -16744,6 +16573,10 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/s_bow) +"bTY" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/port) "bUa" = ( /obj/structure/closet, /turf/open/floor/almayer{ @@ -16836,12 +16669,6 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"bUx" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating, -/area/almayer/command/airoom) "bUy" = ( /obj/structure/closet/crate/ammo, /obj/structure/machinery/light/small, @@ -16998,6 +16825,10 @@ icon_state = "plate" }, /area/almayer/engineering/lower/engine_core) +"bVR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_s) "bVU" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/port_point_defense) @@ -17092,11 +16923,6 @@ icon_state = "test_floor4" }, /area/almayer/living/chapel) -"bWx" = ( -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/upper/port) "bWJ" = ( /obj/structure/machinery/shower{ dir = 4 @@ -17129,6 +16955,18 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"bXc" = ( +/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/fore_hallway) "bXe" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) @@ -17267,6 +17105,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) +"bYL" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_a_s) "bYW" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/panic) @@ -17347,12 +17194,6 @@ /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/aft_hallway) "bZr" = ( /turf/open/floor/almayer{ dir = 1; @@ -17476,15 +17317,6 @@ icon_state = "green" }, /area/almayer/squads/req) -"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" - }, -/area/almayer/maint/upper/u_a_s) "caq" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, @@ -17633,12 +17465,14 @@ icon_state = "test_floor4" }, /area/almayer/medical/lower_medical_medbay) -"cbK" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "red" +"cbF" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + pixel_x = 1; + pixel_y = 17; + req_access = null }, -/area/almayer/hallways/upper/fore_hallway) +/turf/open/floor/almayer, +/area/almayer/living/numbertwobunks) "cbL" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -17659,27 +17493,6 @@ icon_state = "red" }, /area/almayer/living/cryo_cells) -"ccc" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/structure/machinery/door/airlock/almayer/research/reinforced{ - closeOtherId = "containment_n"; - dir = 8; - name = "\improper Containment Airlock" - }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/medical/containment) "ccd" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /turf/open/floor/almayer{ @@ -17722,6 +17535,16 @@ icon_state = "plate" }, /area/almayer/medical/morgue) +"ccx" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out" + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "ccG" = ( /obj/structure/largecrate/random/secure, /obj/effect/decal/warning_stripes{ @@ -17846,6 +17669,17 @@ icon_state = "plate" }, /area/almayer/squads/charlie) +"cdZ" = ( +/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/upper/u_m_s) "ceg" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -17877,6 +17711,18 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) +"ceV" = ( +/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/upper/midship_hallway) "ceY" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -18122,13 +17968,6 @@ /obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) -"chC" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) "chL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -18335,15 +18174,6 @@ 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/midship_hallway) "ciN" = ( /turf/open/floor/almayer{ dir = 6; @@ -18404,6 +18234,14 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cells) +"cjm" = ( +/obj/structure/surface/rack, +/obj/item/tool/wet_sign, +/obj/item/tool/wet_sign, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_p) "cjt" = ( /turf/open/floor/almayer{ icon_state = "orange" @@ -18576,6 +18414,14 @@ icon_state = "test_floor4" }, /area/almayer/engineering/lower/engine_core) +"cla" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "cle" = ( /turf/open/floor/almayer{ dir = 4; @@ -18914,38 +18760,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north2) -"cmI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/security/reinforced{ - access_modified = 1; - closeOtherId = "astroladder_n"; - name = "\improper Astronavigational Deck"; - req_access = null; - req_one_access_txt = "3;19" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/navigation) -"cmJ" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/almayer/security/reinforced{ - access_modified = 1; - closeOtherId = "astroladder_s"; - name = "\improper Astronavigational Deck"; - req_access = null; - req_one_access_txt = "3;19" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/navigation) "cmK" = ( /obj/structure/window/reinforced, /turf/open/floor/almayer{ @@ -18973,6 +18787,18 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_p) +"cmS" = ( +/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/fore_hallway) "cmV" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/almayer{ @@ -18989,6 +18815,12 @@ icon_state = "test_floor4" }, /area/almayer/powered) +"cnm" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_p) "cnn" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -19003,12 +18835,6 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"cnp" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "cnq" = ( /obj/structure/machinery/line_nexter{ id = "line1"; @@ -19346,13 +19172,6 @@ /obj/structure/window/framed/almayer/hull/hijack_bustable, /turf/open/floor/plating, /area/almayer/squads/req) -"cpQ" = ( -/obj/structure/sign/safety/autoopenclose{ - pixel_x = 7; - pixel_y = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_p) "cqd" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -19551,6 +19370,17 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"ctJ" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/machinery/cm_vending/sorted/medical/bolted, +/obj/structure/medical_supply_link, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lower_medical_medbay) "ctQ" = ( /turf/open/floor/almayer{ icon_state = "silver" @@ -19568,15 +19398,20 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cryo) -"cui" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 +"cup" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" +/obj/structure/platform{ + dir = 8 }, -/area/almayer/hallways/upper/aft_hallway) +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "cuq" = ( /obj/structure/machinery/computer/arcade, /turf/open/floor/wood/ship, @@ -19602,19 +19437,6 @@ "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/fore_hallway) "cuN" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -19635,15 +19457,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha) -"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/upper/u_m_s) "cvb" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -19659,12 +19472,6 @@ }, /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/upper/u_a_s) "cvx" = ( /turf/closed/wall/almayer, /area/almayer/maint/lower/cryo_cells) @@ -19693,16 +19500,6 @@ 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/fore_hallway) "cwo" = ( /obj/structure/largecrate/random/mini/chest{ pixel_x = 4 @@ -19719,14 +19516,6 @@ icon_state = "red" }, /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 = "orangecorner" - }, -/area/almayer/hallways/upper/aft_hallway) "cwS" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer/aicore/no_build, @@ -19768,6 +19557,14 @@ icon_state = "red" }, /area/almayer/shipboard/brig/starboard_hallway) +"cyh" = ( +/obj/structure/machinery/door/airlock/almayer/generic/glass{ + name = "\improper Passenger Cryogenics Bay" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_m_p) "cyo" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ @@ -19822,19 +19619,17 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"czJ" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/intercom{ - pixel_y = 32 +"czh" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" +/obj/structure/stairs{ + dir = 1 }, -/area/almayer/hallways/upper/midship_hallway) +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "czN" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -19854,6 +19649,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_midship_hallway) +"cAa" = ( +/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_f_p) "cAm" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -19892,6 +19697,21 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"cAQ" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/disposaloutlet{ + density = 0; + desc = "An outlet for the pneumatic delivery system."; + icon_state = "delivery_outlet"; + name = "take-ins"; + pixel_x = -1; + pixel_y = 28; + range = 0 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "cAR" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/mp_bunks) @@ -19927,21 +19747,6 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/port) -"cBm" = ( -/obj/effect/projector{ - name = "Almayer_AresUp"; - vector_x = -97; - vector_y = 65 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "cBs" = ( /obj/structure/bed/chair, /obj/effect/decal/warning_stripes{ @@ -20009,6 +19814,21 @@ }, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_s) +"cCO" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "cDb" = ( /obj/structure/closet/secure_closet/personal/cabinet{ req_access = null @@ -20074,12 +19894,27 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"cDI" = ( +/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/midship_hallway) "cDN" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) +"cDP" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silvercorner" + }, +/area/almayer/hallways/upper/midship_hallway) "cDZ" = ( /obj/structure/surface/table/almayer, /obj/item/paper, @@ -20144,6 +19979,12 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/charlie) +"cEG" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/fore_hallway) "cFh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -20172,18 +20013,6 @@ 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/midship_hallway) "cFP" = ( /obj/structure/sign/safety/outpatient{ pixel_x = -17; @@ -20209,6 +20038,12 @@ icon_state = "orange" }, /area/almayer/maint/hull/lower/l_m_s) +"cGO" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "cGR" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_m_s) @@ -20246,12 +20081,6 @@ 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_f_p) "cHu" = ( /turf/closed/wall/almayer/research/containment/wall/south, /area/almayer/medical/containment/cell/cl) @@ -20322,6 +20151,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_fore_hallway) +"cIS" = ( +/obj/structure/closet, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_f_s) "cIW" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ name = "\improper Engineering Engine Monitoring" @@ -20411,16 +20246,6 @@ 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/fore_hallway) "cKm" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/bucket/mopbucket{ @@ -20439,15 +20264,6 @@ }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) -"cKp" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/upper/fore_hallway) "cKJ" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -20463,6 +20279,14 @@ icon_state = "orangecorner" }, /area/almayer/engineering/upper_engineering/port) +"cLd" = ( +/obj/structure/closet, +/obj/item/clothing/glasses/mgoggles/prescription, +/obj/item/clothing/glasses/mbcg, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "cLl" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -20526,10 +20350,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/processing) +"cMx" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/upper/u_a_s) "cMz" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/port) +"cMH" = ( +/obj/structure/sink{ + pixel_y = 24 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_s) "cMN" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -20568,6 +20401,12 @@ icon_state = "orange" }, /area/almayer/hallways/lower/port_aft_hallway) +"cNC" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "cNH" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/containment{ id = "Containment Cell 4"; @@ -20626,6 +20465,12 @@ }, /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) +"cOe" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "cOh" = ( /obj/item/stool{ pixel_x = 15; @@ -20788,6 +20633,28 @@ "cQv" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/general_equipment) +"cQC" = ( +/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, +/area/almayer/hallways/upper/midship_hallway) +"cQF" = ( +/obj/structure/sign/safety/ladder{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "cQG" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/starboard_hallway) @@ -20854,6 +20721,21 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) +"cSh" = ( +/obj/effect/projector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "cSk" = ( /obj/structure/machinery/door/window/southleft, /turf/open/floor/almayer{ @@ -20868,10 +20750,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) -"cSp" = ( -/obj/structure/machinery/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) "cSx" = ( /obj/structure/bed/chair{ dir = 8 @@ -20895,12 +20773,18 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_midship_hallway) -"cSM" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" +"cSO" = ( +/obj/structure/surface/rack{ + density = 0; + pixel_y = 16 }, -/area/almayer/hallways/upper/midship_hallway) +/obj/structure/machinery/faxmachine/uscm/command{ + density = 0; + department = "AI Core"; + pixel_y = 32 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "cSP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -20972,6 +20856,11 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/s_bow) +"cUo" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/lifeboat_pumps/north1) "cVb" = ( /obj/structure/machinery/sentry_holder/almayer, /turf/open/floor/almayer{ @@ -21022,12 +20911,6 @@ icon_state = "plate" }, /area/almayer/living/gym) -"cVT" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "orange" - }, -/area/almayer/hallways/upper/midship_hallway) "cVZ" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -21054,15 +20937,6 @@ 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/upper/u_a_p) "cWr" = ( /obj/structure/machinery/photocopier{ density = 0; @@ -21120,17 +20994,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"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/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_s) "cXi" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -21152,6 +21015,35 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_m_s) +"cXq" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) +"cXz" = ( +/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_x = -2; + pixel_y = -11 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/command/combat_correspondent) "cXC" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -21280,6 +21172,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_p) +"cZq" = ( +/obj/item/tool/wet_sign, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_f_s) "cZB" = ( /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer{ @@ -21338,6 +21234,16 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"dan" = ( +/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/upper/u_a_s) "daz" = ( /turf/closed/wall/almayer/aicore/hull, /area/almayer/command/airoom) @@ -21347,6 +21253,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_p) +"daI" = ( +/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/upper/u_m_s) "dbc" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -21464,16 +21379,24 @@ icon_state = "red" }, /area/almayer/shipboard/brig/perma) +"dcR" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) "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_f_p) +"dcX" = ( +/obj/structure/machinery/light/small, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_p) "ddf" = ( /obj/structure/machinery/portable_atmospherics/canister/air, /turf/open/floor/almayer{ @@ -21493,12 +21416,6 @@ icon_state = "redfull" }, /area/almayer/living/briefing) -"ddp" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "ddw" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /obj/structure/sign/safety/terminal{ @@ -21514,16 +21431,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/weapon_room) -"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/upper/u_a_p) "ddL" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, @@ -21532,6 +21439,15 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall/almayer, /area/almayer/engineering/lower/workshop/hangar) +"ddO" = ( +/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/aft_hallway) "deg" = ( /obj/structure/platform_decoration{ dir = 1 @@ -21545,18 +21461,6 @@ icon_state = "plate" }, /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/maint/upper/u_f_s) "deD" = ( /obj/structure/machinery/prop/almayer/CICmap{ pixel_x = -5 @@ -21610,6 +21514,15 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cells) +"dfA" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "dfC" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -21650,17 +21563,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/chief_mp_office) -"dgI" = ( -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/hallways/upper/fore_hallway) -"dgP" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "dha" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -21700,6 +21602,16 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_p) +"dhA" = ( +/obj/structure/largecrate/supply/generator, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/maint/upper/u_a_p) "dhQ" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -21727,6 +21639,17 @@ icon_state = "test_floor4" }, /area/almayer/hallways/lower/starboard_midship_hallway) +"diw" = ( +/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/upper/fore_hallway) "diz" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ id_tag = "Boat1-D4"; @@ -21801,36 +21724,15 @@ icon_state = "red" }, /area/almayer/living/briefing) -"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 +"dkz" = ( +/obj/structure/pipes/vents/scrubber/no_boom{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/turf/open/floor/almayer/aicore/no_build{ + dir = 8; + icon_state = "ai_silver" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/command/airoom) "dkO" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down2"; @@ -21866,12 +21768,18 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) +"dlo" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/starboard) "dlT" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/upper/fore_hallway) +/area/almayer/hallways/upper/aft_hallway) "dmg" = ( /obj/structure/machinery/vending/coffee, /obj/structure/sign/safety/coffee{ @@ -21941,6 +21849,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +"dmU" = ( +/obj/structure/disposalpipe/up/almayer{ + dir = 8; + id = "ares_vault_out"; + name = "aicore" + }, +/turf/closed/wall/almayer/aicore/hull, +/area/almayer/command/airoom) "dmZ" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1 @@ -21960,22 +21876,14 @@ 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/midship_hallway) -"dnm" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/intelligence_officer, -/obj/structure/machinery/light{ - dir = 8 - }, +"dnh" = ( +/obj/structure/surface/rack, +/obj/item/book/manual/orbital_cannon_manual, /turf/open/floor/almayer{ - icon_state = "silverfull" + dir = 9; + icon_state = "red" }, -/area/almayer/command/computerlab) +/area/almayer/maint/upper/u_a_p) "dnC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -22038,6 +21946,13 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering) +"dop" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/closed/wall/almayer/aicore/hull, +/area/almayer/command/airoom) "doJ" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -22069,6 +21984,13 @@ /obj/structure/surface/rack, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) +"doX" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/hallways/upper/aft_hallway) "dpo" = ( /obj/structure/machinery/light{ dir = 1 @@ -22092,19 +22014,6 @@ icon_state = "plate" }, /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/midship_hallway) "dpO" = ( /obj/structure/machinery/cm_vending/clothing/marine/delta{ density = 0; @@ -22115,12 +22024,6 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/delta) -"dpS" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "bluecorner" - }, -/area/almayer/hallways/upper/midship_hallway) "dqb" = ( /obj/structure/sign/safety/security{ pixel_x = -16 @@ -22222,16 +22125,20 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/execution) -"dsS" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/fore_hallway) "dsY" = ( /turf/open/floor/almayer{ icon_state = "orangecorner" }, /area/almayer/hallways/lower/starboard_midship_hallway) +"dtu" = ( +/obj/structure/machinery/portable_atmospherics/canister/air, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/upper/u_a_s) "dtH" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -22244,25 +22151,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) -"dum" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/command/reinforced{ - closeOtherId = "ciclobby_s"; - id_tag = "cic_exterior"; - name = "\improper Combat Information Center" - }, -/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/command/cic) "duo" = ( /obj/structure/machinery/power/apc/almayer{ dir = 8 @@ -22315,14 +22203,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"duR" = ( -/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/upper/fore_hallway) "duT" = ( /obj/structure/bed, /obj/structure/machinery/flasher{ @@ -22405,6 +22285,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) +"dwu" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_f_s) "dwA" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/sign/safety/bathunisex{ @@ -22424,15 +22312,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) -"dwJ" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/north2) "dxu" = ( /obj/structure/sink{ dir = 1; @@ -22563,11 +22442,6 @@ icon_state = "plating" }, /area/almayer/squads/req) -"dyJ" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/upper/midship_hallway) "dyK" = ( /obj/structure/machinery/light{ dir = 8 @@ -22586,24 +22460,27 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/general_equipment) -"dzV" = ( -/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/upper/fore_hallway) "dzX" = ( /obj/structure/sign/safety/water{ pixel_x = -17 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_p) +"dAl" = ( +/obj/item/paper_bin/wy, +/obj/structure/surface/table/woodentable/fancy, +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/clicky, +/obj/structure/machinery/status_display{ + pixel_x = -32 + }, +/obj/item/desk_bell{ + anchored = 1; + pixel_x = -8; + pixel_y = 8 + }, +/turf/open/floor/carpet, +/area/almayer/command/corporateliaison) "dAm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22624,18 +22501,6 @@ 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/lifeboat_pumps/south2) "dAA" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -22767,25 +22632,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/execution) -"dCb" = ( -/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/upper/fore_hallway) "dCe" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -22854,22 +22700,6 @@ icon_state = "plate" }, /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/fore_hallway) "dDp" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -23020,11 +22850,6 @@ }, /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/fore_hallway) "dFk" = ( /turf/open/floor/almayer{ dir = 8; @@ -23044,6 +22869,13 @@ icon_state = "red" }, /area/almayer/shipboard/brig/starboard_hallway) +"dFB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "dFF" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" @@ -23089,20 +22921,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_m_s) -"dGl" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresUp"; - vector_x = -97; - vector_y = 65 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "dGr" = ( /obj/structure/pipes/vents/scrubber{ dir = 8 @@ -23267,18 +23085,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/p_bow) -"dJF" = ( -/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/lifeboat_pumps/south2) "dJG" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -23300,17 +23106,38 @@ "dJJ" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/execution_storage) +"dJO" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/door_control{ + id = "ARES Interior"; + indestructible = 1; + name = "ARES Chamber Lockdown"; + pixel_x = -24; + pixel_y = 8; + req_one_access_txt = "90;91;92" + }, +/obj/structure/machinery/door/poddoor/railing{ + closed_layer = 4; + density = 0; + id = "ARES Railing"; + layer = 2.1; + open_layer = 2.1; + unacidable = 0; + unslashable = 0 + }, +/turf/open/floor/almayer/aicore/no_build{ + dir = 8; + icon_state = "ai_silver" + }, +/area/almayer/command/airoom) "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/midship_hallway) "dKK" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -23381,17 +23208,31 @@ icon_state = "cargo" }, /area/almayer/lifeboat_pumps/south1) +"dMj" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_p) "dMB" = ( /turf/open/floor/almayer{ dir = 8; icon_state = "plating_striped" }, /area/almayer/living/cryo_cells) +"dME" = ( +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/fore_hallway) "dMK" = ( /turf/closed/wall/almayer/research/containment/wall/corner{ dir = 8 }, /area/almayer/medical/containment/cell) +"dNj" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/fore_hallway) "dNq" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -23414,6 +23255,18 @@ }, /turf/open/floor/plating, /area/almayer/living/cryo_cells) +"dNv" = ( +/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/upper/fore_hallway) "dNM" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/tabasco{ @@ -23478,11 +23331,6 @@ icon_state = "cargo_arrow" }, /area/almayer/hallways/lower/repair_bay) -"dOW" = ( -/turf/open/floor/almayer{ - icon_state = "silver" - }, -/area/almayer/hallways/upper/midship_hallway) "dPd" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp{ @@ -23503,12 +23351,6 @@ icon_state = "plate" }, /area/almayer/hallways/lower/starboard_umbilical) -"dPl" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/maint/upper/u_a_p) "dPm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -23525,6 +23367,19 @@ }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) +"dPB" = ( +/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/midship_hallway) "dPC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -23563,20 +23418,6 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/processing) -"dQl" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresUp"; - vector_x = -97; - vector_y = 65 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "dQp" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -23636,19 +23477,6 @@ icon_state = "dark_sterile" }, /area/almayer/shipboard/brig/mp_bunks) -"dRo" = ( -/obj/structure/sign/safety/bridge{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/west{ - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" - }, -/area/almayer/hallways/upper/fore_hallway) "dRs" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -23701,12 +23529,6 @@ }, /turf/open/floor/carpet, /area/almayer/command/corporateliaison) -"dRQ" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/north2) "dRT" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -23735,6 +23557,12 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"dSI" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "bluecorner" + }, +/area/almayer/hallways/upper/midship_hallway) "dSJ" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -23804,6 +23632,16 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"dUR" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "dUS" = ( /turf/open/floor/almayer{ icon_state = "dark_sterile" @@ -23988,20 +23826,6 @@ icon_state = "plate" }, /area/almayer/squads/req) -"dXH" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/camera_film{ - pixel_x = 4; - pixel_y = 1; - layer = 3.03 - }, -/obj/item/stack/sheet/cardboard/small_stack{ - pixel_x = -5; - pixel_y = 3; - layer = 3.02 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie_delta_shared) "dXI" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ name = "\improper Exterior Airlock"; @@ -24043,6 +23867,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_s) +"dYl" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/fore_hallway) "dYu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -24121,11 +23957,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) -"dZR" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) "dZZ" = ( /obj/structure/surface/rack, /obj/item/tool/weldpack, @@ -24164,12 +23995,6 @@ 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_f_p) "eas" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24238,12 +24063,6 @@ "ebN" = ( /turf/closed/wall/almayer/aicore/reinforced, /area/almayer/command/airoom) -"ebV" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_hallway) "ecb" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -24273,15 +24092,6 @@ "ecr" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/living/captain_mess) -"ecz" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/hallways/upper/midship_hallway) "ecS" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -24436,6 +24246,12 @@ icon_state = "plate" }, /area/almayer/engineering/lower) +"efE" = ( +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ + dir = 8 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "efJ" = ( /obj/item/tool/wet_sign, /obj/effect/decal/cleanable/blood, @@ -24475,6 +24291,14 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"efV" = ( +/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/midship_hallway) "egc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24520,27 +24344,6 @@ 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/upper/u_m_p) "ehc" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -24571,6 +24374,15 @@ "ehl" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/interrogation) +"ehm" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south2) "ehx" = ( /obj/effect/landmark/start/marine/tl/alpha, /obj/effect/landmark/late_join/alpha, @@ -24760,17 +24572,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_p) -"ekA" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/machinery/cm_vending/sorted/medical/bolted, -/obj/structure/medical_supply_link, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lower_medical_medbay) "ekM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -24930,6 +24731,16 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"emL" = ( +/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/upper/midship_hallway) "ene" = ( /turf/open/floor/almayer{ dir = 4; @@ -24944,25 +24755,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) -"enz" = ( -/obj/structure/sign/safety/bridge{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/sign/safety/west{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "blue" - }, -/area/almayer/hallways/upper/fore_hallway) -"enF" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_hallway) "enK" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -24992,6 +24784,17 @@ icon_state = "test_floor4" }, /area/almayer/maint/hull/lower/l_m_s) +"eol" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/midship_hallway) "eox" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, @@ -25004,17 +24807,6 @@ icon_state = "plate" }, /area/almayer/hallways/lower/port_midship_hallway) -"eoD" = ( -/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/upper/u_m_s) "eoE" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ @@ -25052,6 +24844,17 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/lobby) +"epG" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresDown2"; + vector_x = 102; + vector_y = -61 + }, +/turf/open/floor/plating, +/area/almayer/command/airoom) "epJ" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -25061,6 +24864,15 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) +"epT" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "eqb" = ( /obj/structure/surface/table/almayer, /obj/item/tool/stamp/denied{ @@ -25273,6 +25085,22 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_s) +"esn" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/multitool{ + desc = "A large handheld tool used to override various machine functions. Primarily used to pulse Airlock and APC wires on a shortwave frequency. It contains a small data buffer as well. This one is comically oversized. Made in Texas."; + icon_state = "multitool_big"; + name = "\improper Oversized Security Access Tuner"; + pixel_y = 11; + pixel_x = 4 + }, +/obj/item/stack/sheet/cardboard/medium_stack{ + pixel_y = -6; + pixel_x = -7; + layer = 3.01 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha_bravo_shared) "esC" = ( /obj/structure/toilet{ pixel_y = 13 @@ -25312,6 +25140,12 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/gym) +"esQ" = ( +/turf/open/floor/almayer{ + dir = 9; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "esT" = ( /turf/open/floor/almayer/uscm/directional{ dir = 9 @@ -25467,11 +25301,13 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/starboard) -"evG" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, +"evM" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, /turf/open/floor/almayer{ - icon_state = "mono" + dir = 1; + icon_state = "green" }, /area/almayer/hallways/upper/fore_hallway) "evR" = ( @@ -25517,18 +25353,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/execution) -"ewL" = ( -/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/fore_hallway) "ewO" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -25596,13 +25420,6 @@ 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/upper/u_m_p) "eyM" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ @@ -25681,6 +25498,22 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_umbilical) +"eAx" = ( +/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/fore_hallway) "eAC" = ( /obj/structure/machinery/light{ dir = 4 @@ -25854,12 +25687,6 @@ icon_state = "cargo" }, /area/almayer/engineering/lower/engine_core) -"eCC" = ( -/obj/structure/bed/chair, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/lifeboat_pumps/north1) "eCI" = ( /obj/structure/window/reinforced/ultra{ pixel_y = -12 @@ -25870,13 +25697,12 @@ icon_state = "plating" }, /area/almayer/shipboard/brig/execution) -"eDk" = ( -/obj/structure/surface/rack, -/obj/item/tool/weldpack, +"eDe" = ( +/obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/upper/u_a_p) +/area/almayer/maint/upper/u_m_s) "eDo" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -25909,6 +25735,21 @@ }, /turf/open/floor/almayer, /area/almayer/living/bridgebunks) +"eDT" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/intelligence_officer{ + density = 0; + pixel_x = -32 + }, +/obj/structure/machinery/light{ + dir = 8; + pixel_x = -32; + alpha = 0 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/command/computerlab) "eEc" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -25939,15 +25780,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) -"eEF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_hallway) "eFa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25982,17 +25814,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/chemistry) -"eFI" = ( -/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/upper/midship_hallway) "eFK" = ( /obj/structure/bed{ icon_state = "abed" @@ -26069,23 +25890,6 @@ }, /turf/open/floor/carpet, /area/almayer/command/corporateliaison) -"eGh" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/surgery/scalpel{ - pixel_x = -1; - pixel_y = 10 - }, -/obj/item/stack/cable_coil{ - pixel_y = 1; - pixel_x = 8 - }, -/obj/item/stack/sheet/cardboard/small_stack{ - pixel_y = 2; - pixel_x = -3; - layer = 3.01 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "eGq" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ @@ -26135,13 +25939,15 @@ icon_state = "plating_striped" }, /area/almayer/maint/hull/lower/l_a_p) -"eHz" = ( -/obj/structure/largecrate/supply/supplies/mre, +"eHX" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + req_one_access = null; + req_one_access_txt = "2;30;34" + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "red" + icon_state = "test_floor4" }, -/area/almayer/maint/upper/u_a_p) +/area/almayer/maint/upper/u_f_s) "eHY" = ( /obj/structure/surface/rack, /obj/item/device/taperecorder, @@ -26149,6 +25955,22 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"eIf" = ( +/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_f_s) "eIN" = ( /obj/item/tool/kitchen/utensil/pfork, /turf/open/floor/almayer{ @@ -26174,14 +25996,18 @@ icon_state = "plate" }, /area/almayer/hallways/lower/starboard_fore_hallway) -"eJj" = ( -/obj/structure/closet/crate, -/obj/item/ammo_box/magazine/l42a, -/obj/item/ammo_box/magazine/l42a, +"eIY" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) +"eJg" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "red" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/hallways/upper/aft_hallway) "eJQ" = ( /obj/structure/prop/invuln{ desc = "An inflated membrane. This one is puncture proof. Wow!"; @@ -26195,33 +26021,15 @@ icon_state = "outerhull_dir" }, /area/almayer/command/lifeboat) -"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/upper/u_m_s) -"eKa" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - closeOtherId = "briglobby"; - dir = 2; - name = "\improper Brig Lobby" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/processing) -"eKm" = ( -/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, +"eJU" = ( +/obj/structure/bed/chair, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/lower/starboard_umbilical) +/area/almayer/lifeboat_pumps/north1) +"eJX" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/ce_room) "eKy" = ( /obj/structure/pipes/standard/simple/visible{ dir = 6 @@ -26332,6 +26140,17 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) +"eLV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "eLX" = ( /obj/structure/bed/chair{ dir = 4 @@ -26341,16 +26160,12 @@ icon_state = "red" }, /area/almayer/shipboard/brig/mp_bunks) -"eMh" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Laundry Room"; - req_one_access = list(19,7); - req_access = list() - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"eMr" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 }, -/area/almayer/engineering/laundry) +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "eMx" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -26459,6 +26274,10 @@ icon_state = "orange" }, /area/almayer/hallways/lower/starboard_umbilical) +"ePz" = ( +/obj/structure/largecrate/supply/weapons/pistols, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_s) "ePM" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 32 @@ -26500,27 +26319,6 @@ icon_state = "cargo" }, /area/almayer/engineering/lower/workshop/hangar) -"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/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/midship_hallway) "eQm" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -26589,14 +26387,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/lower_medical_medbay) -"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/upper/u_a_s) "eRR" = ( /obj/item/clothing/head/helmet/marine{ pixel_x = 16; @@ -26613,15 +26403,6 @@ icon_state = "cargo_arrow" }, /area/almayer/engineering/lower/workshop/hangar) -"eSc" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/engineering/lower) "eSk" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -26673,6 +26454,15 @@ /obj/effect/landmark/crap_item, /turf/open/floor/almayer, /area/almayer/living/briefing) +"eTm" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "eTx" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -26682,6 +26472,14 @@ icon_state = "green" }, /area/almayer/hallways/lower/port_aft_hallway) +"eTC" = ( +/obj/structure/machinery/cm_vending/sorted/medical/bolted, +/obj/structure/medical_supply_link, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lockerroom) "eTD" = ( /obj/structure/bed/chair{ dir = 4 @@ -26690,6 +26488,14 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_s) +"eTY" = ( +/obj/structure/disposalpipe/down/almayer{ + dir = 2; + id = "ares_vault_out"; + name = "wycomms" + }, +/turf/closed/wall/almayer/outer, +/area/almayer/command/airoom) "eUe" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -26729,6 +26535,12 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/chemistry) +"eUw" = ( +/obj/structure/blocker/fuelpump, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south2) "eUA" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -26819,6 +26631,19 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"eWf" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "eWp" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/bed/chair/comfy/charlie{ @@ -26850,12 +26675,6 @@ icon_state = "test_floor4" }, /area/almayer/living/basketball) -"eWN" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/upper/midship_hallway) "eXb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26869,15 +26688,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"eXk" = ( -/obj/effect/landmark/late_join/working_joe, -/obj/effect/landmark/start/working_joe, -/obj/structure/machinery/light/small{ - dir = 8; - light_color = "#d69c46" - }, -/turf/open/floor/plating/plating_catwalk/aicore, -/area/almayer/command/airoom) "eXq" = ( /turf/closed/wall/almayer, /area/almayer/living/offices/flight) @@ -26896,6 +26706,24 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_m_s) +"eYf" = ( +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/effect/projector{ + name = "Almayer_AresUp2"; + vector_x = -102; + vector_y = 61 + }, +/obj/structure/machinery/door_control{ + id = "ARES ReceptStairs2"; + name = "ARES Reception Stairway Shutters"; + pixel_x = 24; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "eYj" = ( /obj/structure/machinery/light{ dir = 8 @@ -26947,16 +26775,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"eYz" = ( -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 1 - }, -/obj/structure/machinery/computer/working_joe{ - dir = 8; - pixel_x = 29 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "eYD" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -27155,6 +26973,17 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) +"fbr" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + closeOtherId = "briglobby"; + dir = 2; + name = "\improper Brig Lobby" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/processing) "fbu" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -27215,6 +27044,12 @@ icon_state = "plating" }, /area/almayer/hallways/lower/vehiclehangar) +"fbV" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/lifeboat_pumps/north2) "fca" = ( /obj/structure/disposalpipe/segment{ layer = 5.1; @@ -27283,22 +27118,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"fcX" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build{ - dir = 8; - icon_state = "ai_silver" - }, -/area/almayer/command/airoom) -"fdf" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "fdx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -27366,12 +27185,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"fes" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/aft_hallway) "feD" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -27580,10 +27393,6 @@ /obj/item/device/camera_film, /turf/open/floor/almayer, /area/almayer/command/corporateliaison) -"fiN" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_a_s) "fiQ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -27592,12 +27401,37 @@ icon_state = "plate" }, /area/almayer/engineering/lower) +"fje" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) +"fjo" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/north2) "fjz" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/maint/hull/upper/u_f_p) +"fjA" = ( +/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/midship_hallway) "fkK" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -27622,6 +27456,12 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/p_bow) +"flD" = ( +/obj/structure/largecrate/supply/supplies/water, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/maint/upper/u_a_p) "flW" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/light{ @@ -27664,12 +27504,6 @@ icon_state = "bluecorner" }, /area/almayer/living/pilotbunks) -"fmX" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_a_p) "fmZ" = ( /turf/open/floor/almayer{ dir = 8; @@ -27969,6 +27803,42 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"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/computer/working_joe{ + pixel_y = 16 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/shipboard/brig/warden_office) "frz" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ name = "\improper Exterior Airlock"; @@ -27986,13 +27856,6 @@ 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/midship_hallway) "frM" = ( /obj/effect/decal/warning_stripes{ icon_state = "S"; @@ -28004,12 +27867,6 @@ }, /turf/open/floor/almayer/aicore/glowing/no_build, /area/almayer/command/airoom) -"frV" = ( -/obj/structure/toilet{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_a_s) "fsf" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -28020,6 +27877,12 @@ icon_state = "orangecorner" }, /area/almayer/hallways/lower/port_umbilical) +"fsh" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "fsp" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -28030,18 +27893,6 @@ icon_state = "plate" }, /area/almayer/living/gym) -"fsu" = ( -/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/midship_hallway) "fsR" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -28064,38 +27915,6 @@ icon_state = "plating_striped" }, /area/almayer/living/cryo_cells) -"ftb" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/upper/midship_hallway) -"ftw" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_f_p) -"ftG" = ( -/obj/structure/sign/safety/life_support{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_a_s) -"ftZ" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "fuz" = ( /obj/structure/machinery/cm_vending/clothing/pilot_officer, /turf/open/floor/almayer{ @@ -28193,12 +28012,6 @@ icon_state = "redfull" }, /area/almayer/command/cic) -"fvE" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "bluecorner" - }, -/area/almayer/hallways/upper/midship_hallway) "fvN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28246,43 +28059,6 @@ icon_state = "redfull" }, /area/almayer/living/briefing) -"fwP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_f_s) -"fwW" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/item/storage/firstaid/o2{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/storage/firstaid/fire{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/storage/firstaid/adv{ - pixel_x = -6; - pixel_y = -2 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = 8; - pixel_y = -2 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/medical_science) "fwY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28340,10 +28116,6 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cryo) -"fyA" = ( -/obj/structure/blocker/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south2) "fyD" = ( /obj/structure/machinery/light, /obj/structure/ladder{ @@ -28381,12 +28153,6 @@ 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/aft_hallway) "fzq" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -28399,6 +28165,20 @@ icon_state = "test_floor4" }, /area/almayer/squads/charlie) +"fzt" = ( +/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_f_p) "fzx" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -28455,15 +28235,6 @@ /obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) -"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/midship_hallway) "fBi" = ( /turf/open/floor/almayer{ dir = 4; @@ -28478,18 +28249,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_s) -"fBA" = ( -/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/upper/fore_hallway) "fBO" = ( /obj/structure/machinery/chem_master{ vial_maker = 1 @@ -28536,12 +28295,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"fCP" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "fCT" = ( /obj/structure/surface/table/almayer, /obj/item/fuel_cell, @@ -28550,6 +28303,11 @@ icon_state = "cargo" }, /area/almayer/engineering/lower/engine_core) +"fCW" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/fore_hallway) "fDh" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -28573,13 +28331,22 @@ }, /area/almayer/medical/lower_medical_medbay) "fDk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + access_modified = 1; + name = "\improper AI Reception"; + req_access = null; + req_one_access_txt = "91;92"; + dir = 1 }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES ReceptStairs1"; + name = "\improper ARES Reception Shutters" }, -/area/almayer/hallways/upper/midship_hallway) +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "fDG" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light{ @@ -28651,12 +28418,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_midship_hallway) -"fEN" = ( -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 4 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "fER" = ( /obj/structure/machinery/autolathe, /turf/open/floor/almayer{ @@ -28678,14 +28439,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/morgue) -"fFs" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/upper/u_f_s) "fFD" = ( /obj/structure/window/reinforced{ dir = 4; @@ -28800,10 +28553,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_s) -"fGD" = ( -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/fore_hallway) "fHb" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/plating_catwalk, @@ -28830,10 +28579,10 @@ icon_state = "greenfull" }, /area/almayer/living/offices) -"fHM" = ( -/obj/docking_port/stationary/escape_pod/cl, -/turf/open/floor/plating, -/area/almayer/command/corporateliaison) +"fIK" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_s) "fIM" = ( /obj/effect/landmark/start/marine/tl/bravo, /obj/effect/landmark/late_join/bravo, @@ -28924,15 +28673,6 @@ icon_state = "green" }, /area/almayer/shipboard/brig/cells) -"fJY" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 4 - }, -/turf/open/floor/almayer/aicore/no_build{ - dir = 8; - icon_state = "ai_arrow" - }, -/area/almayer/command/airoom) "fKe" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -29097,19 +28837,6 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) -"fMl" = ( -/obj/structure/machinery/door_control{ - id = "ARES Operations Right"; - name = "ARES Operations Shutter"; - pixel_x = 24; - pixel_y = -8; - req_one_access_txt = "90;91;92" - }, -/turf/open/floor/almayer/aicore/no_build{ - dir = 4; - icon_state = "ai_silver" - }, -/area/almayer/command/airoom) "fMt" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES Interior"; @@ -29138,6 +28865,12 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) +"fME" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_p) "fMU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -29181,6 +28914,14 @@ icon_state = "cargo_arrow" }, /area/almayer/hallways/lower/starboard_midship_hallway) +"fNX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "fOk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -29299,13 +29040,20 @@ 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" +"fQi" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 }, -/area/almayer/maint/upper/u_a_p) +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "fQn" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -29402,6 +29150,16 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) +"fSx" = ( +/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/fore_hallway) "fSF" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight, @@ -29445,6 +29203,9 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) +"fUm" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/command/securestorage) "fUz" = ( /obj/structure/surface/rack, /obj/item/storage/box/cups{ @@ -29490,6 +29251,12 @@ "fVe" = ( /turf/closed/wall/almayer/outer, /area/almayer/maint/hull/upper/u_a_p) +"fVk" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_a_s) "fVo" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -29546,15 +29313,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"fXf" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/upper/fore_hallway) "fXg" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -29595,6 +29353,12 @@ /obj/effect/landmark/late_join/delta, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) +"fXO" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/north2) "fXP" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -29737,12 +29501,6 @@ icon_state = "test_floor4" }, /area/almayer/living/briefing) -"gar" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_hallway) "gaJ" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/cryo) @@ -29802,6 +29560,12 @@ icon_state = "ai_floor3" }, /area/almayer/command/airoom) +"gbm" = ( +/turf/open/floor/almayer/aicore/no_build{ + dir = 4; + icon_state = "ai_silver" + }, +/area/almayer/command/airoom) "gbs" = ( /obj/structure/surface/table/reinforced/black, /obj/item/ashtray/plastic{ @@ -29820,16 +29584,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"gbR" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/aft_hallway) "gcm" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -29906,6 +29660,21 @@ icon_state = "redfull" }, /area/almayer/living/offices/flight) +"gei" = ( +/obj/structure/sign/safety/ref_bio_storage{ + pixel_x = -17; + pixel_y = 7 + }, +/obj/structure/sign/safety/biohazard{ + pixel_x = -17; + pixel_y = -7 + }, +/obj/structure/medical_supply_link, +/obj/structure/machinery/cm_vending/sorted/medical/chemistry, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/medical/medical_science) "gek" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/fancy/cigarettes/wypacket, @@ -29997,13 +29766,6 @@ }, /turf/open/floor/almayer/aicore/glowing/no_build, /area/almayer/command/airoom) -"gfv" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/midship_hallway) -"gfE" = ( -/obj/structure/machinery/recharge_station, -/turf/open/floor/plating, -/area/almayer/command/airoom) "gfG" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -30021,6 +29783,12 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) +"gfQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "gfW" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/lockerroom) @@ -30137,6 +29905,12 @@ icon_state = "orange" }, /area/almayer/squads/bravo) +"giD" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_f_p) "giR" = ( /obj/structure/machinery/status_display{ pixel_y = -30 @@ -30150,6 +29924,12 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"giW" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "orange" + }, +/area/almayer/hallways/upper/midship_hallway) "gjg" = ( /obj/structure/sign/safety/escapepod{ pixel_x = -17; @@ -30164,6 +29944,18 @@ icon_state = "blue" }, /area/almayer/hallways/lower/port_midship_hallway) +"gji" = ( +/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/upper/fore_hallway) "gjm" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -30197,26 +29989,6 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"gjw" = ( -/obj/structure/machinery/faxmachine/uscm/command{ - density = 0; - department = "AI Core"; - pixel_y = 32 - }, -/obj/structure/surface/rack{ - density = 0; - pixel_y = 16 - }, -/obj/structure/machinery/computer/working_joe{ - dir = 8; - pixel_x = 17; - pixel_y = -6 - }, -/obj/item/storage/box/ids{ - pixel_x = -4 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "gjB" = ( /obj/structure/machinery/light{ dir = 1 @@ -30258,24 +30030,6 @@ icon_state = "plate" }, /area/almayer/command/cic) -"gkV" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/fore_hallway) -"glc" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/upper/midship_hallway) "gll" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -30362,12 +30116,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"gmZ" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "orange" - }, -/area/almayer/hallways/upper/midship_hallway) "gnu" = ( /obj/structure/surface/table/almayer, /obj/item/facepaint/green, @@ -30385,6 +30133,13 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/repair_bay) +"gnK" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "gnM" = ( /obj/structure/surface/rack, /obj/item/frame/table, @@ -30466,6 +30221,20 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_p) +"goN" = ( +/obj/structure/platform{ + dir = 4 + }, +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "goY" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/panic) @@ -30485,6 +30254,17 @@ icon_state = "test_floor4" }, /area/almayer/hallways/hangar) +"gpp" = ( +/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/fore_hallway) "gpI" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -30496,23 +30276,52 @@ "gpO" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/lower/s_bow) +"gpT" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "gpY" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/lifeboat_pumps/north1) -"gqf" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_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" = ( +"gqx" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "silver" + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) +"gqz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/midship_hallway) +"gqH" = ( +/turf/open/floor/almayer{ + dir = 10; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) +"gqI" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" }, /area/almayer/hallways/upper/midship_hallway) "gqP" = ( @@ -30545,6 +30354,12 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_p) +"gre" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "greencorner" + }, +/area/almayer/hallways/upper/fore_hallway) "grv" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -30669,12 +30484,32 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) +"gsJ" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "gsM" = ( /obj/structure/machinery/portable_atmospherics/powered/pump, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/almayer/engineering/lower/engine_core) +"gsV" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "gsZ" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 2; @@ -30687,6 +30522,16 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"gtg" = ( +/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/starboard) "gtp" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ @@ -30710,6 +30555,11 @@ icon_state = "test_floor4" }, /area/almayer/hallways/lower/starboard_aft_hallway) +"gtI" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_f_s) "gtQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -30739,16 +30589,6 @@ icon_state = "redfull" }, /area/almayer/lifeboat_pumps/south2) -"gur" = ( -/obj/item/tool/mop{ - pixel_x = -6; - pixel_y = 24 - }, -/obj/item/reagent_container/glass/bucket, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_f_s) "guK" = ( /obj/effect/projector{ name = "Almayer_Up3"; @@ -30757,12 +30597,29 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_fore_hallway) +"guP" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orangecorner" + }, +/area/almayer/maint/upper/u_a_s) "guS" = ( /obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) +"guU" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "guW" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/sign/prop3{ @@ -30791,6 +30648,12 @@ icon_state = "silver" }, /area/almayer/command/cic) +"gvu" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "gvK" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -30805,6 +30668,15 @@ icon_state = "green" }, /area/almayer/squads/req) +"gwh" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "gwj" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -30881,6 +30753,17 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) +"gxk" = ( +/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 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_s) "gxm" = ( /turf/closed/wall/almayer/outer, /area/almayer/maint/hull/upper/stairs) @@ -30919,12 +30802,6 @@ dir = 8 }, /area/almayer/medical/containment/cell) -"gxR" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) "gxU" = ( /obj/structure/surface/table/almayer, /obj/item/toy/deck, @@ -30933,16 +30810,18 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"gyb" = ( -/obj/structure/sign/safety/medical{ - pixel_x = 8; - pixel_y = 32 +"gyh" = ( +/obj/structure/machinery/cm_vending/gear/executive_officer{ + density = 0; + pixel_y = 30 + }, +/obj/structure/machinery/power/apc/almayer{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" + icon_state = "plate" }, -/area/almayer/hallways/upper/midship_hallway) +/area/almayer/living/numbertwobunks) "gym" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/mp_bunks) @@ -31036,6 +30915,16 @@ /obj/item/reagent_container/hypospray/autoinjector/skillless, /turf/open/floor/almayer, /area/almayer/command/lifeboat) +"gzH" = ( +/obj/structure/machinery/cm_vending/clothing/intelligence_officer{ + density = 0; + pixel_x = -32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/command/computerlab) "gzI" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -31080,16 +30969,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"gAe" = ( -/obj/structure/machinery/door_control{ - id = "ARES JoeCryo"; - name = "Working Joe Cryogenics Lockdown"; - pixel_x = 24; - pixel_y = 8; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "gAj" = ( /obj/structure/bed/chair/comfy/charlie{ dir = 1 @@ -31123,6 +31002,25 @@ "gAA" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha_bravo_shared) +"gAO" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldpack, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_p) +"gAP" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/obj/structure/closet, +/obj/item/clothing/head/bearpelt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/port_emb) "gAS" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -31180,12 +31078,6 @@ 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/lifeboat_pumps/north2) "gCf" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ @@ -31228,12 +31120,15 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"gCQ" = ( -/obj/structure/machinery/portable_atmospherics/canister/air, +"gDk" = ( +/obj/structure/sign/safety/stairs{ + pixel_x = -15 + }, /turf/open/floor/almayer{ - icon_state = "cargo" + dir = 8; + icon_state = "green" }, -/area/almayer/maint/upper/u_a_s) +/area/almayer/hallways/upper/fore_hallway) "gDp" = ( /obj/structure/machinery/light{ dir = 4 @@ -31257,25 +31152,33 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"gDF" = ( -/obj/structure/largecrate/random/case{ - layer = 2.98 +"gDu" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/platform{ + dir = 8 }, -/area/almayer/maint/upper/u_a_s) +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + pixel_x = -24; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "gDH" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 }, /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/midship_hallway) "gDW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -31339,24 +31242,6 @@ 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/midship_hallway) -"gFN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/hallways/upper/fore_hallway) "gFP" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/stern_point_defense) @@ -31430,10 +31315,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"gGB" = ( -/obj/structure/blocker/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) "gGI" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/light{ @@ -31493,17 +31374,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"gHX" = ( -/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/upper/fore_hallway) "gHZ" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -31553,13 +31423,6 @@ 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/midship_hallway) "gIO" = ( /obj/structure/bed/chair/bolted{ dir = 8 @@ -31590,6 +31453,12 @@ }, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_s) +"gJg" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_s) "gJp" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -31599,6 +31468,15 @@ icon_state = "plate" }, /area/almayer/hallways/lower/repair_bay) +"gJC" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "gJE" = ( /obj/structure/machinery/door_control{ id = "Interrogation Shutters"; @@ -31638,20 +31516,6 @@ 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_f_p) "gKd" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -31738,6 +31602,9 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/hydroponics) +"gLl" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/upper/u_f_s) "gLm" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer{ @@ -31825,10 +31692,6 @@ }, /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/upper/u_m_s) "gMN" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -31921,6 +31784,11 @@ icon_state = "plating" }, /area/almayer/hallways/lower/vehiclehangar) +"gNI" = ( +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/maint/upper/u_a_s) "gNN" = ( /obj/structure/bed/chair/office/dark, /turf/open/floor/plating/plating_catwalk, @@ -31934,49 +31802,31 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"gNQ" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_a_s) "gNZ" = ( /obj/structure/machinery/light/small{ dir = 1 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/p_bow) +"gOa" = ( +/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/fore_hallway) "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"; - pixel_y = 1 - }, -/obj/structure/machinery/door_control{ - id = "ARES Interior"; - indestructible = 1; - name = "ARES Chamber Lockdown"; - pixel_x = 24; - pixel_y = 8; - req_one_access_txt = "90;91;92" - }, -/obj/structure/machinery/door/poddoor/railing{ - closed_layer = 4; - density = 0; - id = "ARES Railing"; - layer = 2.1; - open_layer = 2.1; - unacidable = 0; - unslashable = 0 - }, -/turf/open/floor/almayer/aicore/no_build{ - dir = 4; - icon_state = "ai_silver" - }, -/area/almayer/command/airoom) "gOC" = ( /obj/structure/machinery/recharge_station, /turf/open/floor/almayer{ @@ -32006,17 +31856,16 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"gPr" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresUp"; - vector_x = -97; - vector_y = 65 +"gPA" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, -/obj/structure/stairs{ - dir = 1 +/turf/open/floor/almayer{ + dir = 5; + icon_state = "silver" }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) +/area/almayer/hallways/upper/midship_hallway) "gPS" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -32202,20 +32051,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/p_bow) -"gTV" = ( -/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/upper/midship_hallway) "gUf" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /turf/open/floor/almayer{ @@ -32235,13 +32070,6 @@ /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/midship_hallway) "gUn" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/plating/plating_catwalk, @@ -32279,15 +32107,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/bridgebunks) -"gUN" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 4 - }, -/turf/open/floor/almayer/aicore/no_build{ - dir = 4; - icon_state = "ai_arrow" - }, -/area/almayer/command/airoom) "gUS" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -32335,6 +32154,18 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) +"gVz" = ( +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/effect/projector{ + name = "Almayer_AresUp2"; + vector_x = -102; + vector_y = 61 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "gVA" = ( /obj/structure/disposalpipe/down/almayer{ dir = 8; @@ -32348,6 +32179,20 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) +"gVW" = ( +/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/upper/port) "gWm" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -32390,6 +32235,12 @@ }, /turf/open/floor/plating, /area/almayer/medical/upper_medical) +"gWN" = ( +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3"; + light_range = 4 + }, +/area/almayer/command/airoom) "gXl" = ( /obj/structure/closet/secure_closet/personal/cabinet{ req_access_txt = "5" @@ -32477,6 +32328,17 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"gYp" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" + }, +/area/almayer/maint/upper/u_m_p) "gYt" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -32781,6 +32643,12 @@ icon_state = "green" }, /area/almayer/squads/req) +"hdP" = ( +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/hallways/upper/aft_hallway) "hdQ" = ( /obj/structure/closet/secure_closet{ name = "\improper Execution Firearms" @@ -32879,14 +32747,13 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/engine_core) -"hfc" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ +"hft" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ dir = 8; - icon_state = "red" + icon_state = "pipe-c" }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/aft_hallway) "hfv" = ( /obj/structure/reagent_dispensers/fueltank, @@ -32915,6 +32782,19 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"hfZ" = ( +/obj/structure/machinery/disposal/delivery{ + density = 0; + desc = "A pneumatic delivery unit."; + icon_state = "delivery_engi"; + name = "Returns"; + pixel_y = 28 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "hgg" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -32958,18 +32838,6 @@ 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/midship_hallway) "hgB" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/intel, @@ -33003,17 +32871,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"hgO" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/prop/almayer/computer/PC{ - dir = 4 - }, -/obj/item/tool/stamp/approved{ - pixel_x = -3; - pixel_y = -11 - }, -/turf/open/floor/almayer, -/area/almayer/squads/req) "hgZ" = ( /obj/structure/machinery/door_control{ dir = 1; @@ -33114,12 +32971,6 @@ 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/upper/u_a_s) "hji" = ( /obj/structure/bed/chair{ dir = 4 @@ -33276,6 +33127,14 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"hlj" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/midship_hallway) "hlH" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -33286,6 +33145,27 @@ icon_state = "plate" }, /area/almayer/engineering/lower) +"hlI" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/recharger, +/obj/structure/transmitter/rotary{ + name = "Brig Wardens's Office Telephone"; + phone_category = "MP Dept."; + phone_id = "Brig Warden's Office"; + pixel_x = 15 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/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"; @@ -33376,16 +33256,6 @@ "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/midship_hallway) "hmC" = ( /obj/structure/machinery/cm_vending/sorted/marine_food{ density = 0; @@ -33522,15 +33392,26 @@ icon_state = "mono" }, /area/almayer/hallways/lower/vehiclehangar) -"hog" = ( -/obj/structure/machinery/light/small, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"hoo" = ( +/obj/structure/blocker/invisible_wall, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer{ - icon_state = "plate" +/mob/living/silicon/decoy/ship_ai{ + layer = 2.98; + pixel_y = -16 }, -/area/almayer/maint/upper/u_a_p) +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) +"hoq" = ( +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 1; + c_tag = "AI - Reception Interior"; + autoname = 0 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "hoK" = ( /turf/open/floor/almayer{ dir = 8; @@ -33631,18 +33512,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_p) -"hqx" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/aft_hallway) "hqW" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ name = "\improper Medical Bay"; @@ -33814,6 +33683,15 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_fore_hallway) +"hto" = ( +/obj/structure/largecrate/random/barrel/red, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_f_s) "htq" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -33823,16 +33701,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_f_p) -"htF" = ( -/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/upper/midship_hallway) "htG" = ( /obj/item/tool/soap, /obj/structure/machinery/light/small{ @@ -33861,26 +33729,6 @@ icon_state = "greenfull" }, /area/almayer/living/offices) -"htS" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/upper/u_m_s) -"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/port) "huD" = ( /obj/structure/machinery/light{ dir = 1 @@ -33926,15 +33774,6 @@ "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/upper/u_m_s) "hvv" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -33984,6 +33823,15 @@ "hvH" = ( /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"hwB" = ( +/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/fore_hallway) "hwC" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -34090,6 +33938,16 @@ "hyQ" = ( /turf/closed/wall/almayer, /area/almayer/living/synthcloset) +"hyT" = ( +/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/upper/midship_hallway) "hyV" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -34125,16 +33983,6 @@ /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_f_s) "hzs" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -34161,24 +34009,6 @@ }, /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{ - dir = 4; - id = "CIC Lockdown"; - name = "\improper Combat Information Center Blast Door" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/command/reinforced{ - closeOtherId = "ciclobby_s"; - name = "\improper Combat Information Center" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/command/cic) "hzN" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, @@ -34256,14 +34086,6 @@ 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/midship_hallway) "hBc" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -34287,15 +34109,6 @@ 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/fore_hallway) "hBz" = ( /obj/item/mortar_kit, /turf/open/floor/almayer{ @@ -34363,12 +34176,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"hCF" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/hallways/upper/midship_hallway) "hCS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin/uscm{ @@ -34464,12 +34271,6 @@ 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/upper/u_a_s) "hEl" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -34511,12 +34312,6 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"hFt" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_a_p) "hFw" = ( /obj/structure/machinery/disposal/broken, /turf/open/floor/almayer{ @@ -34542,15 +34337,15 @@ icon_state = "test_floor4" }, /area/almayer/medical/morgue) -"hGo" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 +"hGb" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "green" + dir = 4; + icon_state = "orangecorner" }, -/area/almayer/hallways/upper/fore_hallway) +/area/almayer/hallways/upper/aft_hallway) "hGG" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -34671,12 +34466,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_p) -"hJe" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/upper/u_a_p) "hJg" = ( /obj/structure/pipes/trinary/mixer{ dir = 4; @@ -34731,18 +34520,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"hKJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/hallways/upper/midship_hallway) "hKO" = ( /obj/structure/largecrate/random/barrel/green, /obj/structure/sign/safety/maint{ @@ -34753,28 +34530,27 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_f_s) -"hLs" = ( -/obj/structure/sign/safety/autodoc{ - pixel_x = 20; - pixel_y = -32 +"hLr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/structure/machinery/cm_vending/sorted/medical/bolted, -/obj/structure/medical_supply_link/green, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 }, -/area/almayer/medical/lower_medical_medbay) -"hLt" = ( -/obj/structure/sign/poster{ - desc = "It says DRUG."; - icon_state = "poster2"; - pixel_y = 30 +/obj/structure/machinery/door/airlock/almayer/research/reinforced{ + closeOtherId = "containment_s"; + dir = 8; + name = "\improper Containment Airlock" }, -/obj/structure/pipes/standard/simple/hidden/supply{ +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_a_p) +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/containment) "hLu" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -34895,6 +34671,18 @@ icon_state = "red" }, /area/almayer/shipboard/brig/chief_mp_office) +"hOd" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) +"hOn" = ( +/turf/open/floor/almayer{ + dir = 9; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "hOu" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -34933,14 +34721,6 @@ icon_state = "silver" }, /area/almayer/living/auxiliary_officer_office) -"hPr" = ( -/obj/structure/machinery/status_display{ - pixel_y = -30 - }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/aft_hallway) "hPu" = ( /obj/structure/largecrate/supply, /obj/item/tool/crowbar, @@ -34960,6 +34740,12 @@ "hPI" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/brig/perma) +"hPL" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_p) "hPN" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -34972,6 +34758,16 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/hydroponics) +"hPZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "hQc" = ( /obj/structure/window/reinforced{ dir = 4; @@ -35110,20 +34906,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_f_p) -"hSj" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - closeOtherId = "brigmaint_n"; - dir = 1; - name = "\improper Brig" - }, -/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) @@ -35203,6 +34985,12 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/processing) +"hTB" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "hTF" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm{ isopen = 1; @@ -35282,6 +35070,17 @@ icon_state = "orange" }, /area/almayer/engineering/lower/engine_core) +"hUu" = ( +/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/upper/midship_hallway) "hUz" = ( /obj/structure/largecrate/supply/supplies/mre{ desc = "A supply crate containing everything you need to stop a CLF uprising."; @@ -35355,6 +35154,15 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_f_p) +"hWa" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) "hWq" = ( /obj/structure/platform{ layer = 3.1 @@ -35438,12 +35246,16 @@ icon_state = "blue" }, /area/almayer/command/cichallway) -"hWV" = ( +"hWP" = ( /obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/plating/almayer{ - allow_construction = 0 +/obj/structure/platform_decoration{ + dir = 1 }, -/area/almayer/hallways/upper/fore_hallway) +/turf/open/floor/almayer/aicore/no_build{ + dir = 8; + icon_state = "ai_silver" + }, +/area/almayer/command/airoom) "hXb" = ( /turf/open/floor/almayer{ dir = 1; @@ -35522,6 +35334,12 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_s) +"hYj" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_p) "hYn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -35561,28 +35379,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) -"hZf" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/transmitter/rotary{ - name = "Researcher Office Telephone"; - phone_category = "Almayer"; - phone_id = "Research"; - pixel_y = 6 - }, -/obj/item/reagent_container/glass/beaker{ - pixel_x = 6; - pixel_y = -1 - }, -/obj/item/reagent_container/glass/beaker/large{ - pixel_x = -6 - }, -/obj/structure/surface/table/almayer, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "hZj" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -35690,6 +35486,15 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"iaO" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/hallways/upper/port) "iaR" = ( /obj/structure/machinery/light{ dir = 4 @@ -35714,6 +35519,14 @@ icon_state = "plate" }, /area/almayer/maint/lower/s_bow) +"ibN" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_plates" + }, +/area/almayer/command/airoom) "ibP" = ( /obj/structure/sign/safety/maint{ pixel_x = -19; @@ -35726,12 +35539,6 @@ }, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_s) -"icn" = ( -/obj/structure/machinery/power/apc/almayer, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_p) "icp" = ( /turf/open/floor/almayer{ dir = 8; @@ -35758,6 +35565,18 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"icQ" = ( +/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/fore_hallway) "icZ" = ( /obj/structure/closet/secure_closet/brig, /turf/open/floor/almayer{ @@ -35789,21 +35608,12 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_f_p) -"idM" = ( -/turf/open/floor/plating, -/area/almayer/command/corporateliaison) "idX" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ 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/aft_hallway) "ied" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -35876,18 +35686,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_lobby) -"ieF" = ( -/obj/effect/projector{ - name = "Almayer_AresUp"; - vector_x = -97; - vector_y = 65 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "ieX" = ( /obj/structure/surface/table/almayer, /obj/structure/sign/safety/distribution_pipes{ @@ -35956,6 +35754,13 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_m_s) +"igC" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "igS" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -35979,6 +35784,13 @@ icon_state = "test_floor4" }, /area/almayer/maint/lower/constr) +"ihw" = ( +/obj/structure/machinery/cm_vending/sorted/medical/blood, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/lower_medical_medbay) "ihI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36021,23 +35833,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/bravo) -"iis" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - closeOtherId = "brigcells"; - dir = 1; - name = "\improper Brig Prison Yard And Offices" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/processing) "iit" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -36056,12 +35851,38 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) +"iiU" = ( +/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/upper/fore_hallway) "iiZ" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer{ icon_state = "bluefull" }, /area/almayer/command/cichallway) +"ijd" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/midship_hallway) "ijf" = ( /obj/structure/surface/table/almayer, /obj/item/cell/crap, @@ -36071,14 +35892,6 @@ 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/midship_hallway) "ijr" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -36087,6 +35900,25 @@ icon_state = "redfull" }, /area/almayer/living/briefing) +"ijQ" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door_control{ + id = "SEA Office Shutters"; + name = "SEA Office Shutters"; + pixel_y = 12 + }, +/obj/item/ashtray/plastic{ + pixel_x = 8; + pixel_y = -4 + }, +/obj/structure/transmitter/rotary{ + name = "Senior Enlisted Advisor Office Telephone"; + phone_category = "Offices"; + phone_id = "Senior Enlisted Advisor's Office"; + pixel_x = -3 + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/sea_office) "ikl" = ( /turf/open/floor/almayer{ icon_state = "cargo_arrow" @@ -36118,13 +35950,28 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/s_bow) -"ikC" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +"ikH" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/disposal/delivery{ + density = 0; + desc = "A pneumatic delivery unit."; + icon_state = "delivery_engi"; + name = "Security Vault"; + pixel_y = 28; + pixel_x = -24 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_a_s) +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + pixel_x = -32; + pixel_y = 40; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "ikQ" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/tool/stamp/hop{ @@ -36180,6 +36027,12 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"iml" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "imo" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -36204,12 +36057,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/offices/flight) -"imM" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/hallways/upper/midship_hallway) "inh" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -36220,6 +36067,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) +"inm" = ( +/obj/structure/machinery/fuelpump, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south2) "ins" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -36233,6 +36084,16 @@ }, /turf/open/floor/plating, /area/almayer/engineering/upper_engineering) +"inI" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door_control{ + id = "ARES ReceptStairs1"; + name = "ARES Reception Shutters"; + pixel_y = -24; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "inL" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -36319,16 +36180,6 @@ 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/upper/u_m_s) "ipB" = ( /obj/structure/surface/rack, /obj/item/tool/kitchen/rollingpin, @@ -36468,6 +36319,12 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop) +"iso" = ( +/turf/open/floor/almayer{ + dir = 9; + icon_state = "orange" + }, +/area/almayer/hallways/upper/midship_hallway) "isq" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -36477,26 +36334,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_m_p) -"isB" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_s) -"isC" = ( -/obj/effect/projector{ - name = "Almayer_AresDown"; - vector_x = 97; - vector_y = -65 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "isI" = ( /obj/structure/sign/nosmoking_2{ pixel_x = 32 @@ -36519,33 +36356,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/morgue) -"itf" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/door_control{ - id = "ARES Interior"; - indestructible = 1; - name = "ARES Chamber Lockdown"; - pixel_x = -24; - pixel_y = 8; - req_one_access_txt = "90;91;92" - }, -/obj/structure/machinery/door/poddoor/railing{ - closed_layer = 4; - density = 0; - id = "ARES Railing"; - layer = 2.1; - open_layer = 2.1; - unacidable = 0; - unslashable = 0 - }, -/turf/open/floor/almayer/aicore/no_build{ - dir = 8; - icon_state = "ai_silver" - }, -/area/almayer/command/airoom) "ito" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -36590,12 +36400,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/p_bow) -"iuh" = ( -/obj/structure/largecrate/random/barrel, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_p) "iun" = ( /obj/effect/spawner/random/tool, /turf/open/floor/plating/plating_catwalk, @@ -36699,6 +36503,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) +"iwg" = ( +/obj/structure/surface/table/reinforced/almayer_B{ + indestructible = 1; + unacidable = 1; + unslashable = 1 + }, +/obj/item/paper_bin/uscm{ + pixel_y = 6 + }, +/obj/item/tool/pen, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "iwB" = ( /obj/structure/machinery/washing_machine, /obj/structure/machinery/washing_machine{ @@ -36843,16 +36659,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"iyH" = ( -/obj/structure/surface/table/reinforced/almayer_B{ - climbable = 0; - desc = "A square metal surface resting on its fat metal bottom. You can't flip something that doesn't have legs. This one has a metal rail running above it, preventing something large passing over. Like you."; - indestructible = 1; - unacidable = 1; - unslashable = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "iyS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36874,12 +36680,6 @@ icon_state = "plate" }, /area/almayer/living/offices) -"izu" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/north2) "izG" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -36937,6 +36737,12 @@ icon_state = "plate" }, /area/almayer/engineering/lower/engine_core) +"iAI" = ( +/obj/structure/machinery/portable_atmospherics/hydroponics, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "iBl" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -36962,6 +36768,22 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"iCf" = ( +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 8; + autoname = 0; + c_tag = "AI - Core Chamber" + }, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3" + }, +/area/almayer/command/airoom) +"iCg" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silvercorner" + }, +/area/almayer/hallways/upper/midship_hallway) "iCu" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -37002,6 +36824,22 @@ icon_state = "green" }, /area/almayer/living/offices) +"iCT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) +"iDa" = ( +/obj/structure/largecrate/supply/supplies/tables_racks, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/maint/upper/u_a_p) "iDk" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer{ @@ -37209,6 +37047,14 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cells) +"iIb" = ( +/obj/structure/machinery/cryopod{ + pixel_y = 6 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/maint/upper/u_m_p) "iIj" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -37230,20 +37076,6 @@ icon_state = "kitchen" }, /area/almayer/living/grunt_rnr) -"iIH" = ( -/obj/structure/largecrate/supply/medicine/medivend{ - pixel_x = 3 - }, -/obj/structure/largecrate/random/mini/med{ - density = 1; - pixel_x = 3; - pixel_y = 11 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lower_medical_medbay) "iIP" = ( /obj/structure/toilet{ pixel_y = 16 @@ -37258,15 +37090,6 @@ }, /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/aft_hallway) "iIR" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -37278,6 +37101,13 @@ }, /turf/open/floor/almayer, /area/almayer/squads/bravo) +"iIU" = ( +/obj/structure/largecrate/random/barrel/red, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "iJB" = ( /obj/structure/sign/safety/galley{ pixel_x = 8; @@ -37334,6 +37164,12 @@ icon_state = "cargo" }, /area/almayer/squads/alpha) +"iKy" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "iKD" = ( /obj/structure/surface/table/almayer, /obj/item/clipboard, @@ -37389,6 +37225,10 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"iLe" = ( +/obj/structure/blocker/fuelpump, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north2) "iLf" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/disk_reader, @@ -37443,6 +37283,12 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) +"iLL" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "iLO" = ( /turf/open/floor/almayer{ dir = 4; @@ -37467,6 +37313,23 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) +"iMD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) +"iMI" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/obj/structure/machinery/cm_vending/sorted/medical, +/obj/structure/medical_supply_link, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lower_medical_medbay) "iNh" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -37529,12 +37392,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"iOP" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/hallways/upper/aft_hallway) "iOX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37586,17 +37443,6 @@ 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{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/midship_hallway) "iPN" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/station_alert, @@ -37618,14 +37464,6 @@ 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/fore_hallway) "iQd" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -37709,12 +37547,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"iQG" = ( -/obj/structure/largecrate/random/barrel/red, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_a_s) "iQJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37725,15 +37557,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_s) -"iRi" = ( -/obj/structure/sign/safety/distribution_pipes{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "iRp" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -37763,6 +37586,75 @@ dir = 4 }, /area/almayer/medical/containment/cell) +"iRU" = ( +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/effect/projector{ + name = "Almayer_AresUp2"; + vector_x = -102; + vector_y = 61 + }, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3" + }, +/area/almayer/command/airoom) +"iSd" = ( +/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 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_s) "iSm" = ( /obj/structure/pipes/vents/pump, /obj/structure/mirror{ @@ -37809,15 +37701,15 @@ icon_state = "dark_sterile" }, /area/almayer/living/port_emb) -"iSu" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +"iSx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 }, /turf/open/floor/almayer{ - icon_state = "orangecorner" + icon_state = "silvercorner" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/midship_hallway) "iSB" = ( /obj/structure/platform_decoration{ dir = 8 @@ -37848,12 +37740,6 @@ /obj/item/facepaint/black, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) -"iTc" = ( -/obj/structure/blocker/fuelpump, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south2) "iTd" = ( /obj/structure/machinery/sentry_holder/almayer, /turf/open/floor/almayer{ @@ -37883,6 +37769,20 @@ /obj/structure/curtain/red, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_s) +"iTt" = ( +/obj/structure/largecrate/supply/medicine/medivend{ + pixel_x = 3 + }, +/obj/structure/largecrate/random/mini/med{ + density = 1; + pixel_x = 3; + pixel_y = 11 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lower_medical_medbay) "iTw" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -37909,6 +37809,25 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_m_s) +"iTW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + access_modified = 1; + closeOtherId = "astroladder_n"; + name = "\improper Astronavigational Deck"; + req_access = null; + req_one_access_txt = "3;19" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/navigation) "iUh" = ( /obj/structure/sign/safety/bulkhead_door{ pixel_x = -16 @@ -37969,11 +37888,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/shipboard/brig/medical) -"iUV" = ( -/turf/open/floor/almayer{ - icon_state = "bluecorner" - }, -/area/almayer/hallways/upper/midship_hallway) "iUW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -38006,6 +37920,29 @@ icon_state = "silvercorner" }, /area/almayer/command/cichallway) +"iVz" = ( +/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" + }, +/area/almayer/maint/upper/u_a_s) +"iVD" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + closeOtherId = "brigmaint_n"; + dir = 1; + name = "\improper Brig" + }, +/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) "iVE" = ( /obj/structure/sign/safety/bathunisex{ pixel_x = 32 @@ -38049,6 +37986,10 @@ }, /turf/open/floor/almayer, /area/almayer/squads/delta) +"iWn" = ( +/obj/item/paper/almayer_storage, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_p) "iWx" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -38059,6 +38000,13 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"iWB" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "iWH" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -38203,25 +38151,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"iZw" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresUp"; - vector_x = -97; - vector_y = 65 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) -"iZz" = ( -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/aft_hallway) "iZE" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /obj/effect/decal/warning_stripes{ @@ -38268,12 +38197,6 @@ 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/aft_hallway) "jaf" = ( /obj/structure/bed/chair/comfy/bravo{ dir = 4 @@ -38307,7 +38230,7 @@ dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_hallway) +/area/almayer/hallways/upper/aft_hallway) "jas" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -38378,10 +38301,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) -"jaW" = ( -/obj/effect/landmark/start/reporter, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_p) "jbq" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -38451,6 +38370,17 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/shipboard/brig/processing) +"jcu" = ( +/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/fore_hallway) "jcE" = ( /obj/structure/machinery/vending/coffee{ density = 0; @@ -38465,6 +38395,14 @@ icon_state = "plating_striped" }, /area/almayer/engineering/upper_engineering/starboard) +"jdl" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/platform_decoration, +/turf/open/floor/almayer/aicore/no_build{ + dir = 4; + icon_state = "ai_silver" + }, +/area/almayer/command/airoom) "jdm" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -38763,12 +38701,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/mp_bunks) -"jgS" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/hallways/upper/aft_hallway) "jhb" = ( /obj/structure/sign/safety/cryo{ pixel_x = -6; @@ -38779,12 +38711,6 @@ "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/aft_hallway) "jhn" = ( /turf/open/floor/almayer{ dir = 1; @@ -38842,6 +38768,15 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_p) +"jhQ" = ( +/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/upper/u_a_s) "jhR" = ( /obj/structure/reagent_dispensers/water_cooler/stacks{ density = 0; @@ -38914,24 +38849,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/vehiclehangar) -"jjn" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door/window/eastright{ - dir = 8; - req_access_txt = "8" - }, -/obj/structure/machinery/door/window/eastleft{ - req_access_txt = "8" - }, -/obj/item/desk_bell{ - pixel_x = -6; - pixel_y = 10; - anchored = 1 - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green" - }, -/area/almayer/medical/lower_medical_medbay) "jjS" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -39031,18 +38948,21 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"jkL" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/midship_hallway) "jkN" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_s) +"jkT" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "jkY" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -39114,13 +39034,6 @@ /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer/research/containment/entrance, /area/almayer/medical/containment/cell) -"jlK" = ( -/obj/structure/machinery/cm_vending/sorted/medical/bolted, -/obj/structure/medical_supply_link/green, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lockerroom) "jlN" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -39132,12 +39045,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"jlO" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/upper/aft_hallway) "jlQ" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -39260,12 +39167,6 @@ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/port) -"jnx" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_hallway) "jnD" = ( /turf/open/floor/almayer{ dir = 1; @@ -39288,31 +39189,6 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/command/cic) -"jof" = ( -/obj/structure/blocker/fuelpump, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north1) -"jok" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/door_control{ - id = "SEA Office Shutters"; - name = "SEA Office Shutters"; - pixel_y = 12 - }, -/obj/item/ashtray/plastic{ - pixel_x = 8; - pixel_y = -4 - }, -/obj/structure/transmitter/rotary{ - name = "Senior Enlisted Advisor Office Telephone"; - phone_category = "Offices"; - phone_id = "Senior Enlisted Advisor's Office"; - pixel_x = -3 - }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/sea_office) "joG" = ( /obj/structure/machinery/washing_machine, /obj/structure/sign/poster{ @@ -39329,6 +39205,29 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"jpl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 + }, +/obj/structure/machinery/door/airlock/almayer/research/reinforced{ + closeOtherId = "containment_n"; + dir = 8; + name = "\improper Containment Airlock" + }, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/medical_science) "jpn" = ( /obj/structure/stairs{ icon_state = "ramptop" @@ -39363,6 +39262,27 @@ }, /turf/open/floor/almayer, /area/almayer/living/gym) +"jpD" = ( +/obj/structure/machinery/door/window/eastleft{ + req_one_access_txt = "2;21" + }, +/obj/structure/machinery/door/window/westright, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "ROlobby2"; + name = "\improper RO Line 2" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/surface/table/reinforced/almayer_blend, +/obj/item/desk_bell{ + pixel_x = -6; + pixel_y = 10; + anchored = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/req) "jpW" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -39395,6 +39315,12 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/execution) +"jrc" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/midship_hallway) "jre" = ( /obj/structure/closet/secure_closet/cargotech, /obj/item/clothing/accessory/storage/webbing, @@ -39434,6 +39360,12 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/p_stern) +"jrC" = ( +/obj/structure/machinery/vending/hydronutrients, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "jrI" = ( /obj/structure/filingcabinet{ density = 0; @@ -39469,6 +39401,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_fore_hallway) +"jsd" = ( +/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" + }, +/area/almayer/hallways/upper/fore_hallway) "jss" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -39551,6 +39496,18 @@ icon_state = "emerald" }, /area/almayer/hallways/lower/port_midship_hallway) +"juj" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/aft_hallway) "juo" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_fore_hallway) @@ -39561,15 +39518,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/port_emb) -"juG" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_a_p) -"juM" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/upper/fore_hallway) "juS" = ( /obj/structure/machinery/gear{ id = "vehicle_elevator_gears" @@ -39643,12 +39591,6 @@ }, /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/midship_hallway) "jvB" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/aicore/no_build{ @@ -39751,12 +39693,6 @@ 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/upper/u_m_p) "jwP" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -39771,6 +39707,13 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"jxq" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/north2) "jxu" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = -25 @@ -39833,6 +39776,27 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) +"jyY" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Brig Lockdown Shutters"; + name = "\improper Brig Lockdown Shutter" + }, +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + closeOtherId = "brigmaint_s"; + dir = 1; + name = "\improper Brig Maintenance" + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "perma_lockdown_2"; + name = "\improper Perma Lockdown Shutter" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/perma) "jzD" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ icon_state = "almayer_pdoor"; @@ -39942,6 +39906,17 @@ /obj/docking_port/stationary/escape_pod/south, /turf/open/floor/plating, /area/almayer/maint/hull/lower/l_m_s) +"jCm" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 4 + }, +/obj/item/tool/stamp/approved{ + pixel_x = -3; + pixel_y = -11 + }, +/turf/open/floor/almayer, +/area/almayer/squads/req) "jCn" = ( /obj/structure/surface/table/almayer, /obj/item/tool/screwdriver, @@ -40022,27 +39997,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) -"jDV" = ( -/obj/effect/projector{ - name = "Almayer_AresDown"; - vector_x = 97; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/obj/structure/machinery/door_control{ - id = "ARES StairsUpper"; - name = "ARES Core Access"; - pixel_x = 24; - req_one_access_txt = "90;91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "jEA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -40158,6 +40112,17 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_m_s) +"jFM" = ( +/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/upper/u_m_s) "jFY" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -40242,13 +40207,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) -"jHX" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_p) "jIC" = ( /obj/structure/machinery/computer/working_joe{ dir = 4; @@ -40259,6 +40217,10 @@ icon_state = "orange" }, /area/almayer/maint/upper/mess) +"jIF" = ( +/obj/structure/blocker/fuelpump, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "jIJ" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/almayer{ @@ -40310,6 +40272,27 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"jKD" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + pixel_x = 24; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "jKF" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -40437,15 +40420,6 @@ /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 = "blue" - }, -/area/almayer/hallways/upper/midship_hallway) "jMQ" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -40536,14 +40510,6 @@ "jNT" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/execution) -"jOc" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - pixel_x = 1; - pixel_y = 17; - req_access = null - }, -/turf/open/floor/almayer, -/area/almayer/living/numbertwobunks) "jOi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -40705,20 +40671,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) -"jRg" = ( -/obj/effect/landmark/crap_item, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_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/fore_hallway) "jRp" = ( /obj/structure/largecrate/supply/supplies/water, /obj/item/toy/deck{ @@ -41063,6 +41015,24 @@ icon_state = "test_floor4" }, /area/almayer/medical/lower_medical_medbay) +"jXk" = ( +/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/upper/u_m_s) +"jXN" = ( +/obj/docking_port/stationary/escape_pod/south, +/turf/open/floor/plating, +/area/almayer/maint/upper/u_m_s) "jXR" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -41074,6 +41044,12 @@ allow_construction = 0 }, /area/almayer/hallways/lower/starboard_fore_hallway) +"jYa" = ( +/obj/structure/machinery/vending/hydroseeds, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "jYc" = ( /obj/item/bedsheet/blue{ layer = 3.2 @@ -41144,7 +41120,9 @@ layer = 3.3 }, /obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 4 + dir = 4; + c_tag = "AI - Primary Processors"; + autoname = 0 }, /turf/open/floor/almayer/aicore/glowing/no_build, /area/almayer/command/airoom) @@ -41166,23 +41144,6 @@ }, /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/upper/u_a_p) -"jZl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/fore_hallway) "jZo" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/effect/step_trigger/clone_cleaner, @@ -41243,16 +41204,6 @@ }, /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/midship_hallway) "jZY" = ( /obj/structure/closet/l3closet/virology, /turf/open/floor/almayer{ @@ -41267,6 +41218,18 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/s_bow) +"kaj" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) +"kak" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "kam" = ( /obj/item/tool/screwdriver{ layer = 2.9; @@ -41302,6 +41265,16 @@ icon_state = "red" }, /area/almayer/squads/alpha) +"kaE" = ( +/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/midship_hallway) "kaI" = ( /obj/structure/bed/chair{ dir = 4 @@ -41310,6 +41283,15 @@ icon_state = "bluefull" }, /area/almayer/squads/charlie_delta_shared) +"kaO" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "kaQ" = ( /obj/structure/disposalpipe/junction, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -41343,6 +41325,21 @@ icon_state = "test_floor4" }, /area/almayer/squads/bravo) +"kbl" = ( +/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/fore_hallway) "kbv" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/starboard) @@ -41368,20 +41365,6 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering) -"kbH" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresDown"; - vector_x = 97; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "kbJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -41393,16 +41376,6 @@ 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/midship_hallway) "kbV" = ( /obj/structure/platform{ dir = 1 @@ -41440,34 +41413,27 @@ "kcp" = ( /turf/closed/wall/almayer, /area/almayer/living/auxiliary_officer_office) -"kcq" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/reagentgrinder{ - pixel_y = 8 - }, -/obj/item/stack/sheet/mineral/phoron{ - amount = 25; - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/device/reagent_scanner{ - pixel_x = -16; - pixel_y = 5 - }, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/medical_science) "kcs" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_p) +"kcx" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "CIC Lockdown"; + name = "\improper Combat Information Center Blast Door" + }, +/obj/structure/machinery/door/airlock/almayer/command/reinforced{ + closeOtherId = "ciclobby_n"; + name = "\improper Combat Information Center" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/command/cic) "kcA" = ( /obj/structure/machinery/light{ dir = 1 @@ -41534,13 +41500,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"keE" = ( -/obj/structure/largecrate/random/barrel/red, -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_a_s) "keG" = ( /obj/structure/machinery/door/airlock/almayer/security{ dir = 2; @@ -41566,25 +41525,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) -"kfo" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "red" - }, -/area/almayer/hallways/upper/port) "kfB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ @@ -41667,6 +41607,33 @@ icon_state = "plate" }, /area/almayer/hallways/lower/vehiclehangar) +"kgV" = ( +/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/aft_hallway) "khd" = ( /obj/structure/bed/chair{ dir = 4 @@ -41718,7 +41685,9 @@ layer = 3.3 }, /obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8 + dir = 8; + autoname = 0; + c_tag = "AI - Secondary Processors" }, /turf/open/floor/almayer/aicore/glowing/no_build, /area/almayer/command/airoom) @@ -41729,6 +41698,15 @@ /obj/item/storage/belt/utility, /turf/open/floor/almayer, /area/almayer/hallways/lower/repair_bay) +"kin" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/hallways/upper/port) "kio" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -41741,15 +41719,6 @@ 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/fore_hallway) "kiy" = ( /obj/structure/machinery/light{ dir = 8 @@ -41876,12 +41845,6 @@ icon_state = "cargo" }, /area/almayer/hallways/lower/port_midship_hallway) -"kjX" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/upper/aft_hallway) "kjY" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -41943,12 +41906,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"klr" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" - }, -/area/almayer/hallways/upper/midship_hallway) "klH" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -41957,6 +41914,14 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) +"klK" = ( +/obj/structure/machinery/cryopod/right{ + dir = 4 + }, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_cargo" + }, +/area/almayer/command/airoom) "klT" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, @@ -41989,6 +41954,25 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north2) +"kmT" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) +"knb" = ( +/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/fore_hallway) "kng" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -42010,6 +41994,20 @@ "knm" = ( /turf/open/floor/almayer, /area/almayer/hallways/lower/port_fore_hallway) +"knD" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "knH" = ( /obj/structure/machinery/vending/coffee, /obj/structure/sign/safety/coffee{ @@ -42032,6 +42030,20 @@ icon_state = "cargo" }, /area/almayer/lifeboat_pumps/south2) +"knU" = ( +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/hallways/upper/aft_hallway) +"kon" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_p) "kow" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -42059,10 +42071,6 @@ icon_state = "plate" }, /area/almayer/squads/bravo) -"kpc" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, -/area/almayer/command/airoom) "kph" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ @@ -42085,6 +42093,15 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) +"kpL" = ( +/obj/structure/sign/safety/life_support{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "kpQ" = ( /obj/structure/machinery/door_control{ id = "engidorm"; @@ -42097,6 +42114,13 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"kqa" = ( +/obj/structure/closet, +/obj/item/clothing/glasses/welding, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "kqb" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -42120,6 +42144,19 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/repair_bay) +"kqo" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/cm_vending/sorted/medical/bolted, +/obj/structure/medical_supply_link/green, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/medical_science) "kqt" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -42242,6 +42279,14 @@ icon_state = "plating" }, /area/almayer/squads/req) +"krO" = ( +/obj/structure/machinery/cm_vending/sorted/medical, +/obj/structure/medical_supply_link, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/shipboard/brig/medical) "krS" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -42343,6 +42388,15 @@ icon_state = "silver" }, /area/almayer/hallways/lower/repair_bay) +"ktQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/aicore/no_build{ + dir = 8; + icon_state = "ai_arrow" + }, +/area/almayer/command/airoom) "ktR" = ( /obj/item/trash/crushed_cup, /turf/open/floor/almayer{ @@ -42545,6 +42599,27 @@ icon_state = "red" }, /area/almayer/shipboard/brig/mp_bunks) +"kya" = ( +/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/upper/u_m_p) "kyh" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -42702,25 +42777,6 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) -"kzR" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) -"kzT" = ( -/obj/structure/machinery/door_control{ - id = "ARES StairsLower"; - name = "ARES Core Lockdown"; - pixel_x = -24; - pixel_y = -8; - req_one_access_txt = "90;91;92" - }, -/turf/open/floor/almayer/aicore/no_build{ - dir = 8; - icon_state = "ai_silver" - }, -/area/almayer/command/airoom) "kAh" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17 @@ -42744,56 +42800,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) -"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." - }, -/obj/structure/machinery/light/small{ - dir = 4; - icon_state = "bulb-burned"; - status = 3 - }, -/obj/effect/decal/cleanable/blood, -/obj/item/prop{ - desc = "A blood bag with a hole in it. The rats must have gotten to it first."; - icon = 'icons/obj/items/bloodpack.dmi'; - icon_state = "bloodpack"; - name = "blood bag" - }, -/obj/item/prop{ - desc = "A blood bag with a hole in it. The rats must have gotten to it first."; - icon = 'icons/obj/items/bloodpack.dmi'; - icon_state = "bloodpack"; - name = "blood bag" - }, -/obj/item/prop{ - desc = "A blood bag with a hole in it. The rats must have gotten to it first."; - icon = 'icons/obj/items/bloodpack.dmi'; - icon_state = "bloodpack"; - name = "blood bag" - }, -/obj/item/prop{ - desc = "The words \"Cloning Pod\" are scrawled onto it. It appears to be heavily damaged."; - icon = 'icons/obj/items/circuitboards.dmi'; - icon_state = "id_mod"; - layer = 2.78; - name = "circuit board"; - pixel_x = 8; - pixel_y = 10 - }, -/obj/item/prop{ - desc = "The words \"Cloning Scanner\" are scrawled onto it. It appears to be heavily damaged."; - icon = 'icons/obj/items/circuitboards.dmi'; - icon_state = "id_mod"; - layer = 2.79; - name = "circuit board"; - pixel_x = 8; - pixel_y = 7 - }, -/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, @@ -42863,6 +42869,36 @@ icon_state = "test_floor4" }, /area/almayer/medical/hydroponics) +"kCl" = ( +/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/upper/u_m_s) "kCm" = ( /obj/structure/sign/safety/fire_haz{ pixel_x = 15; @@ -42999,10 +43035,14 @@ icon_state = "redfull" }, /area/almayer/living/briefing) -"kED" = ( -/obj/structure/closet/firecloset, +"kEA" = ( +/obj/effect/projector{ + name = "Almayer_Down3"; + vector_x = 1; + vector_y = -102 + }, /turf/open/floor/almayer{ - icon_state = "cargo" + allow_construction = 0 }, /area/almayer/hallways/upper/fore_hallway) "kEE" = ( @@ -43105,7 +43145,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/upper/midship_hallway) +/area/almayer/hallways/upper/aft_hallway) "kHd" = ( /obj/structure/machinery/computer/arcade, /obj/item/prop/helmetgarb/spacejam_tickets{ @@ -43251,21 +43291,6 @@ icon_state = "test_floor4" }, /area/almayer/living/grunt_rnr) -"kKv" = ( -/obj/effect/projector{ - name = "Almayer_AresUp"; - vector_x = -97; - vector_y = 65 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "kKB" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -43312,10 +43337,6 @@ }, /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/upper/u_m_s) "kLE" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/almayer{ @@ -43340,13 +43361,6 @@ 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/upper/u_a_s) "kMa" = ( /obj/structure/platform_decoration, /turf/open/floor/almayer{ @@ -43406,6 +43420,13 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_p) +"kMV" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/starboard) "kMW" = ( /obj/structure/closet/secure_closet/personal/cabinet{ req_access = null @@ -43529,12 +43550,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) -"kON" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "blue" - }, -/area/almayer/hallways/upper/midship_hallway) "kOR" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -43558,6 +43573,12 @@ icon_state = "plate" }, /area/almayer/squads/req) +"kPa" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "greencorner" + }, +/area/almayer/hallways/upper/fore_hallway) "kPx" = ( /obj/structure/surface/table/almayer, /obj/item/device/mass_spectrometer, @@ -43670,21 +43691,6 @@ 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/upper/u_m_s) "kRD" = ( /obj/item/reagent_container/glass/bucket/janibucket, /obj/structure/machinery/light{ @@ -43702,13 +43708,6 @@ 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/upper/u_a_p) "kRP" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/item/prop/magazine/dirty/torn, @@ -43771,6 +43770,13 @@ icon_state = "test_floor4" }, /area/almayer/hallways/lower/port_fore_hallway) +"kSC" = ( +/obj/structure/machinery/cm_vending/sorted/medical/bolted, +/obj/structure/medical_supply_link/green, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lower_medical_medbay) "kSH" = ( /obj/structure/sign/prop1{ pixel_y = 32 @@ -43783,18 +43789,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) -"kSL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/hallways/upper/port) "kSU" = ( /obj/structure/transmitter/no_dnd{ name = "Requisition Telephone"; @@ -43861,15 +43855,6 @@ icon_state = "test_floor4" }, /area/almayer/living/pilotbunks) -"kUs" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "kUA" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, @@ -43883,6 +43868,23 @@ icon_state = "green" }, /area/almayer/hallways/lower/starboard_midship_hallway) +"kUJ" = ( +/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 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_f_s) "kUL" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -43912,19 +43914,10 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"kVX" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/machinery/cm_vending/sorted/medical/bolted, -/obj/structure/medical_supply_link/green, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/medical_science) +"kVW" = ( +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/fore_hallway) "kVZ" = ( /obj/structure/machinery/door/window/brigdoor/southright{ id = "Cell 2"; @@ -43935,14 +43928,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"kWc" = ( -/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/upper/aft_hallway) "kWk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -44027,12 +44012,6 @@ icon_state = "silver" }, /area/almayer/command/computerlab) -"kXj" = ( -/turf/open/floor/almayer/aicore/no_build{ - dir = 4; - icon_state = "ai_silver" - }, -/area/almayer/command/airoom) "kXm" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -44067,6 +44046,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"kXD" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "kXN" = ( /obj/item/clothing/glasses/sunglasses/aviator{ pixel_x = -1; @@ -44076,6 +44061,15 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"kYb" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "kYl" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -44106,6 +44100,14 @@ icon_state = "plate" }, /area/almayer/living/port_emb) +"kYF" = ( +/obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_f_s) "kYL" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -44139,6 +44141,12 @@ icon_state = "plate" }, /area/almayer/living/offices) +"kZc" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "kZN" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -44176,6 +44184,25 @@ icon_state = "emerald" }, /area/almayer/living/gym) +"lat" = ( +/obj/structure/toilet{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_s) +"laD" = ( +/obj/docking_port/stationary/escape_pod/north, +/turf/open/floor/plating, +/area/almayer/maint/upper/u_m_p) +"laI" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/hallways/upper/port) "laM" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -44197,13 +44224,6 @@ }, /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/upper/u_a_s) "laQ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -44238,23 +44258,6 @@ }, /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/fore_hallway) "lbf" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -44283,6 +44286,12 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"lbO" = ( +/obj/structure/surface/rack, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) "lbX" = ( /obj/structure/bed/chair{ dir = 4 @@ -44294,6 +44303,21 @@ icon_state = "plate" }, /area/almayer/squads/charlie) +"lce" = ( +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/effect/projector{ + name = "Almayer_AresDown2"; + vector_x = 102; + vector_y = -61 + }, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3"; + light_range = 3 + }, +/area/almayer/command/airoom) "lcg" = ( /obj/structure/machinery/ares/substrate, /turf/open/floor/almayer/no_build{ @@ -44351,16 +44375,6 @@ 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/midship_hallway) "ldt" = ( /obj/structure/machinery/conveyor{ dir = 8; @@ -44371,12 +44385,6 @@ icon_state = "plate" }, /area/almayer/living/gym) -"ldz" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_s) "ldC" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -44452,9 +44460,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"lfc" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/upper/u_f_s) "lft" = ( /obj/structure/surface/table/almayer, /obj/item/storage/firstaid/fire, @@ -44479,6 +44484,16 @@ icon_state = "blue" }, /area/almayer/living/basketball) +"lfZ" = ( +/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_f_s) "lgk" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -44622,33 +44637,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"lin" = ( -/obj/effect/projector{ - name = "Almayer_AresDown"; - vector_x = 97; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) -"liF" = ( -/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/upper/u_a_s) "liJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -44844,15 +44832,22 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"llt" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 8 +"lla" = ( +/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/upper/u_a_p) +"llo" = ( /turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" + dir = 4; + icon_state = "green" }, -/area/almayer/hallways/upper/midship_hallway) +/area/almayer/hallways/upper/fore_hallway) "llK" = ( /obj/structure/platform_decoration{ dir = 4 @@ -44881,17 +44876,6 @@ icon_state = "mono" }, /area/almayer/medical/upper_medical) -"lmj" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/obj/structure/machinery/cm_vending/sorted/medical, -/obj/structure/medical_supply_link, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lower_medical_medbay) "lml" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -44899,6 +44883,15 @@ }, /turf/open/floor/almayer, /area/almayer/squads/bravo) +"lmp" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3"; + light_range = 3 + }, +/area/almayer/command/airoom) "lmq" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -44928,9 +44921,20 @@ icon_state = "plate" }, /area/almayer/living/numbertwobunks) -"lmK" = ( -/turf/closed/wall/almayer/reinforced, -/area/almayer/command/securestorage) +"lmG" = ( +/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/upper/fore_hallway) "lne" = ( /obj/structure/bed/chair, /turf/open/floor/almayer{ @@ -44960,10 +44964,6 @@ icon_state = "silvercorner" }, /area/almayer/shipboard/brig/cic_hallway) -"lnD" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/maint/upper/u_a_s) "lnP" = ( /obj/structure/machinery/vending/cola, /obj/structure/window/reinforced, @@ -45057,12 +45057,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"loz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/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) @@ -45147,13 +45141,6 @@ icon_state = "test_floor4" }, /area/almayer/powered/agent) -"lpJ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) "lql" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -45176,6 +45163,16 @@ icon_state = "emerald" }, /area/almayer/hallways/hangar) +"lqL" = ( +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/hallways/upper/aft_hallway) "lqN" = ( /obj/item/device/assembly/mousetrap/armed, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -45186,15 +45183,6 @@ icon_state = "orange" }, /area/almayer/living/port_emb) -"lrd" = ( -/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/upper/midship_hallway) "lrq" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/armory) @@ -45236,15 +45224,6 @@ }, /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/upper/u_a_s) "lsn" = ( /obj/structure/surface/table/almayer, /obj/item/paper{ @@ -45326,14 +45305,6 @@ icon_state = "sterile_green" }, /area/almayer/medical/containment) -"ltt" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/midship_hallway) "ltv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -45400,6 +45371,18 @@ icon_state = "test_floor4" }, /area/almayer/living/commandbunks) +"lup" = ( +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/effect/projector{ + name = "Almayer_AresDown2"; + vector_x = 102; + vector_y = -61 + }, +/turf/open/floor/plating, +/area/almayer/command/airoom) "luE" = ( /obj/structure/sign/poster{ pixel_y = 32 @@ -45469,6 +45452,20 @@ icon_state = "blue" }, /area/almayer/living/pilotbunks) +"lvB" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "lwh" = ( /obj/structure/machinery/light{ dir = 8 @@ -45523,6 +45520,21 @@ icon_state = "test_floor4" }, /area/almayer/maint/hull/upper/u_f_p) +"lwZ" = ( +/obj/effect/projector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "lxd" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /turf/open/floor/almayer{ @@ -45548,11 +45560,6 @@ icon_state = "cargo" }, /area/almayer/living/commandbunks) -"lxJ" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_a_p) "lxW" = ( /obj/structure/sign/prop2{ pixel_y = 29 @@ -45561,6 +45568,23 @@ icon_state = "plate" }, /area/almayer/living/auxiliary_officer_office) +"lyh" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/surgery/scalpel{ + pixel_x = -1; + pixel_y = 10 + }, +/obj/item/stack/cable_coil{ + pixel_y = 1; + pixel_x = 8 + }, +/obj/item/stack/sheet/cardboard/small_stack{ + pixel_y = 2; + pixel_x = -3; + layer = 3.01 + }, +/turf/open/floor/almayer, +/area/almayer/squads/alpha_bravo_shared) "lyk" = ( /obj/structure/sign/safety/storage{ pixel_x = -17 @@ -45650,6 +45674,21 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) +"lzt" = ( +/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/upper/u_m_s) "lzA" = ( /obj/structure/machinery/sleep_console{ dir = 8 @@ -45658,13 +45697,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"lzF" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/fore_hallway) "lAa" = ( /obj/structure/surface/table/almayer, /obj/item/device/lightreplacer{ @@ -45714,13 +45746,10 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) -"lBf" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/hallways/upper/aft_hallway) +"lAW" = ( +/obj/docking_port/stationary/escape_pod/east, +/turf/open/floor/plating, +/area/almayer/maint/upper/u_m_p) "lBg" = ( /obj/structure/bedsheetbin, /turf/open/floor/almayer{ @@ -45745,46 +45774,16 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) -"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/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_f_s) -"lCc" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) -"lCf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"lCg" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, +/obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer{ - icon_state = "orangecorner" + dir = 8; + icon_state = "green" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/hallways/upper/fore_hallway) "lCm" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -45858,6 +45857,10 @@ }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) +"lDH" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "lDL" = ( /obj/structure/machinery/light{ dir = 4 @@ -45973,12 +45976,19 @@ icon_state = "blue" }, /area/almayer/living/port_emb) -"lFm" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" +"lFj" = ( +/obj/structure/machinery/door_control{ + id = "ARES Operations Right"; + name = "ARES Operations Shutter"; + pixel_x = 24; + pixel_y = -8; + req_one_access_txt = "90;91;92" }, -/area/almayer/command/securestorage) +/turf/open/floor/almayer/aicore/no_build{ + dir = 4; + icon_state = "ai_silver" + }, +/area/almayer/command/airoom) "lFn" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" @@ -45991,14 +46001,6 @@ "lFp" = ( /turf/closed/wall/almayer, /area/almayer/engineering/lower/workshop/hangar) -"lFq" = ( -/obj/structure/pipes/vents/pump/no_boom{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build{ - icon_state = "ai_plates" - }, -/area/almayer/command/airoom) "lFr" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -46042,29 +46044,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) -"lFJ" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - closeOtherId = "brigcells"; - name = "\improper Brig Prisoner Yard" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/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/processing) "lFK" = ( /obj/structure/machinery/light{ dir = 8 @@ -46091,6 +46070,15 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop/hangar) +"lGh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/midship_hallway) "lHk" = ( /obj/structure/closet/firecloset, /obj/effect/decal/warning_stripes{ @@ -46170,6 +46158,17 @@ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/port) +"lIY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/hallways/upper/starboard) "lJu" = ( /obj/structure/barricade/metal{ dir = 1 @@ -46298,6 +46297,12 @@ icon_state = "greencorner" }, /area/almayer/hallways/lower/port_fore_hallway) +"lLt" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/midship_hallway) "lLC" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer, @@ -46360,6 +46365,28 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/starboard) +"lMF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/command/reinforced{ + closeOtherId = "ciclobby_n"; + id_tag = "cic_exterior"; + name = "\improper Combat Information Center" + }, +/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/command/cic) "lMO" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -46398,6 +46425,16 @@ icon_state = "plate" }, /area/almayer/squads/charlie) +"lNL" = ( +/obj/item/tool/mop{ + pixel_x = -6; + pixel_y = 24 + }, +/obj/item/reagent_container/glass/bucket, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_f_s) "lNR" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -46411,7 +46448,7 @@ dir = 4 }, /turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/midship_hallway) +/area/almayer/hallways/upper/aft_hallway) "lOr" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -46494,10 +46531,12 @@ icon_state = "silver" }, /area/almayer/command/securestorage) -"lPW" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_p) +"lPY" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "lQa" = ( /obj/structure/machinery/light{ dir = 8 @@ -46522,16 +46561,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_f_p) -"lQl" = ( -/obj/structure/sign/safety/rewire{ - pixel_x = 32 - }, -/obj/structure/machinery/power/apc/almayer, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "orange" - }, -/area/almayer/hallways/lower/port_aft_hallway) "lQz" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/almayer{ @@ -46564,6 +46593,12 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/operating_room_three) +"lRh" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "bluecorner" + }, +/area/almayer/hallways/upper/midship_hallway) "lRs" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -46636,6 +46671,23 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/s_bow) +"lSN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/fore_hallway) +"lST" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_f_p) "lSX" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -46661,18 +46713,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/chapel) -"lUm" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ - closeOtherId = "briglobby"; - name = "\improper Brig Cells" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/shipboard/brig/processing) "lUA" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -46778,6 +46818,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/mess) +"lWS" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_f_s) "lWY" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -46803,6 +46851,12 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) +"lXl" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "lXO" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -46817,6 +46871,15 @@ icon_state = "green" }, /area/almayer/living/offices) +"lXR" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "lYg" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, @@ -46855,6 +46918,15 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"lYS" = ( +/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/fore_hallway) "lZb" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -46900,6 +46972,12 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_m_p) +"lZJ" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) "lZM" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/maint{ @@ -46926,15 +47004,6 @@ icon_state = "red" }, /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/fore_hallway) "maI" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -47019,6 +47088,9 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/vehiclehangar) +"mdm" = ( +/turf/closed/wall/almayer, +/area/almayer/hallways/upper/midship_hallway) "mdo" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer{ @@ -47034,6 +47106,12 @@ icon_state = "emerald" }, /area/almayer/hallways/lower/port_midship_hallway) +"mdG" = ( +/obj/structure/blocker/fuelpump, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north1) "mdW" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/effect/decal/warning_stripes{ @@ -47095,13 +47173,6 @@ "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{ - icon_state = "mono" - }, -/area/almayer/hallways/upper/midship_hallway) "meT" = ( /obj/structure/machinery/door/poddoor/almayer/open{ id = "Hangar Lockdown"; @@ -47119,15 +47190,18 @@ damage_cap = 15000 }, /area/almayer/squads/alpha) -"mfH" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 +"mfL" = ( +/obj/item/reagent_container/glass/bucket/janibucket{ + pixel_x = -1; + pixel_y = 13 + }, +/obj/structure/sign/safety/water{ + pixel_x = -17 }, -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/maint/upper/u_a_s) +/area/almayer/maint/upper/u_f_s) "mfM" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/map_item, @@ -47141,22 +47215,22 @@ icon_state = "silver" }, /area/almayer/living/briefing) +"mfO" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/midship_hallway) "mfQ" = ( /turf/open/floor/almayer{ allow_construction = 0; 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_f_s) "mgb" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) @@ -47273,6 +47347,9 @@ icon_state = "plate" }, /area/almayer/squads/alpha) +"mis" = ( +/turf/open/floor/plating, +/area/almayer/maint/upper/u_f_s) "miy" = ( /obj/structure/machinery/optable, /obj/structure/sign/safety/medical{ @@ -47331,9 +47408,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_p) -"mjR" = ( -/turf/open/floor/plating, -/area/almayer/maint/upper/u_f_s) "mjS" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -47563,6 +47637,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_umbilical) +"mnf" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "mng" = ( /turf/open/floor/almayer{ icon_state = "redcorner" @@ -47574,33 +47654,18 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"mnC" = ( +"mnB" = ( +/obj/structure/surface/rack, +/obj/item/clothing/glasses/meson, /turf/open/floor/almayer{ - dir = 8; - icon_state = "greencorner" + icon_state = "red" }, -/area/almayer/hallways/upper/fore_hallway) +/area/almayer/maint/upper/u_a_p) "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/fore_hallway) "mnW" = ( /obj/structure/surface/table/almayer, /obj/item/device/reagent_scanner{ @@ -47632,15 +47697,6 @@ 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/upper/u_f_p) "mor" = ( /obj/structure/machinery/light{ dir = 8 @@ -47738,12 +47794,6 @@ }, /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/midship_hallway) "mqg" = ( /obj/structure/bed/chair{ dir = 4 @@ -47821,6 +47871,19 @@ icon_state = "green" }, /area/almayer/squads/req) +"mrO" = ( +/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/upper/midship_hallway) "msg" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/waterhazard{ @@ -47869,6 +47932,17 @@ icon_state = "orange" }, /area/almayer/squads/bravo) +"mss" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES ReceptStairs2"; + name = "\improper ARES Reception Shutters"; + plane = -7 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "msC" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -47885,6 +47959,12 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) +"msS" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/north2) "msZ" = ( /obj/structure/barricade/handrail{ dir = 8 @@ -47903,14 +47983,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"mtq" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_s) "mtr" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -48010,6 +48082,11 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"muW" = ( +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/midship_hallway) "mvg" = ( /obj/docking_port/stationary/escape_pod/west, /turf/open/floor/plating, @@ -48101,15 +48178,31 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/stair_clone/upper) -"mxg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"mxo" = ( +/obj/docking_port/stationary/escape_pod/south, +/turf/open/floor/plating, +/area/almayer/maint/upper/u_f_p) +"mxq" = ( +/obj/structure/machinery/door_control/cl/office/door{ + pixel_y = -20 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, /area/almayer/hallways/upper/midship_hallway) +"mxs" = ( +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3"; + light_range = 3 + }, +/area/almayer/command/airoom) +"mxB" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "mxT" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, @@ -48193,30 +48286,17 @@ 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{ - closeOtherId = "brigmaint_n"; - name = "\improper Brig" - }, -/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) -"mzj" = ( -/obj/structure/blocker/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north2) +"mzn" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/fore_hallway) "mzq" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -48337,25 +48417,38 @@ icon_state = "dark_sterile" }, /area/almayer/living/pilotbunks) -"mBp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"mBk" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/pill/happy{ + pixel_x = 6; + pixel_y = -4 }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/item/prop/helmetgarb/prescription_bottle{ + pixel_x = 9 }, -/obj/structure/machinery/door/airlock/almayer/security/reinforced{ - access_modified = 1; - closeOtherId = "astroladder_n"; - name = "\improper Astronavigational Deck"; - req_access = null; - req_one_access_txt = "3;19" +/obj/item/tool/surgery/bonegel/empty{ + pixel_x = 4; + pixel_y = 15 + }, +/obj/item/tool/surgery/bonegel/empty{ + pixel_x = -8; + pixel_y = 13 + }, +/obj/item/tool/surgery/bonegel/empty{ + layer = 3.01; + pixel_x = -5; + pixel_y = 19 + }, +/obj/item/storage/box/gloves{ + layer = 3.2; + pixel_x = -5; + pixel_y = 2 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 1; + icon_state = "sterile_green_corner" }, -/area/almayer/shipboard/navigation) +/area/almayer/medical/lower_medical_medbay) "mBx" = ( /obj/structure/machinery/firealarm{ dir = 4; @@ -48382,6 +48475,11 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) +"mCg" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_p) "mCo" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -48398,6 +48496,10 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_p) +"mCJ" = ( +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_f_p) "mCL" = ( /obj/structure/sign/safety/fire_haz{ pixel_x = 8; @@ -48421,13 +48523,6 @@ 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/upper/u_a_s) "mDJ" = ( /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/starboard) @@ -48483,6 +48578,33 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_fore_hallway) +"mEs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/door_control{ + id = "ARES Interior"; + indestructible = 1; + name = "ARES Chamber Lockdown"; + pixel_x = 24; + pixel_y = 8; + req_one_access_txt = "90;91;92" + }, +/obj/structure/machinery/door/poddoor/railing{ + closed_layer = 4; + density = 0; + id = "ARES Railing"; + layer = 2.1; + open_layer = 2.1; + unacidable = 0; + unslashable = 0 + }, +/turf/open/floor/almayer/aicore/no_build{ + dir = 4; + icon_state = "ai_silver" + }, +/area/almayer/command/airoom) "mEE" = ( /obj/structure/platform{ dir = 4; @@ -48577,23 +48699,27 @@ "mFQ" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/maint/hull/lower/s_bow) +"mGb" = ( +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/fore_hallway) "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/midship_hallway) "mGu" = ( /turf/open/floor/almayer{ dir = 4; icon_state = "silver" }, /area/almayer/command/securestorage) +"mGL" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/hallways/upper/midship_hallway) "mGT" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -48661,12 +48787,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"mHE" = ( -/turf/open/floor/almayer/aicore/no_build{ - dir = 8; - icon_state = "ai_silver" - }, -/area/almayer/command/airoom) "mHF" = ( /obj/structure/surface/rack, /obj/item/clothing/head/headband/red{ @@ -48685,6 +48805,20 @@ icon_state = "mono" }, /area/almayer/living/pilotbunks) +"mHT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "orange" + }, +/area/almayer/maint/upper/u_a_s) +"mHY" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/midship_hallway) "mId" = ( /obj/structure/closet, /obj/item/clothing/suit/armor/riot/marine/vintage_riot, @@ -48729,6 +48863,16 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/upper_engineering/port) +"mIR" = ( +/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/midship_hallway) "mJa" = ( /obj/structure/closet/crate/trashcart, /obj/item/trash/boonie, @@ -48766,15 +48910,6 @@ /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/fore_hallway) "mJu" = ( /turf/open/floor/almayer/uscm/directional, /area/almayer/command/cic) @@ -48808,12 +48943,6 @@ icon_state = "orange" }, /area/almayer/squads/bravo) -"mJX" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/south2) "mKb" = ( /obj/structure/flora/pottedplant{ desc = "It is made of Fiberbush(tm). It contains asbestos."; @@ -48885,15 +49014,6 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) -"mKG" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/fore_hallway) "mKJ" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -48926,6 +49046,10 @@ icon_state = "plate" }, /area/almayer/living/port_emb) +"mKN" = ( +/obj/effect/landmark/start/pilot/cas_pilot, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/pilotbunks) "mLe" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -48952,9 +49076,6 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) -"mLE" = ( -/turf/open/floor/plating, -/area/almayer/command/airoom) "mLF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49045,20 +49166,6 @@ 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/upper/u_m_s) "mNX" = ( /turf/open/floor/almayer_hull{ dir = 4; @@ -49088,12 +49195,6 @@ "mOi" = ( /turf/closed/wall/almayer/outer, /area/almayer/command/airoom) -"mOw" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "mOE" = ( /obj/structure/sign/safety/water{ pixel_x = -17 @@ -49102,15 +49203,12 @@ 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, +"mOZ" = ( +/obj/structure/closet/firecloset, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, -/area/almayer/maint/upper/u_f_s) +/area/almayer/hallways/upper/midship_hallway) "mPc" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -49154,23 +49252,6 @@ /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_x = -17; - pixel_y = 7 - }, -/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" @@ -49224,11 +49305,6 @@ "mQC" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/port_atmos) -"mQF" = ( -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/midship_hallway) "mQY" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -49306,6 +49382,12 @@ icon_state = "test_floor4" }, /area/almayer/maint/hull/upper/u_a_s) +"mRJ" = ( +/turf/open/floor/almayer{ + dir = 9; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "mRQ" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -49334,6 +49416,21 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"mSl" = ( +/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/upper/u_a_s) +"mSo" = ( +/obj/structure/surface/rack, +/obj/item/facepaint/sniper, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_s) "mSr" = ( /obj/effect/landmark/crap_item, /turf/open/floor/almayer, @@ -49404,16 +49501,6 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) -"mTo" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/hallways/upper/midship_hallway) "mTp" = ( /obj/structure/window/reinforced{ dir = 4; @@ -49461,7 +49548,13 @@ /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/cameras/almayer/ares{ dir = 8; - pixel_x = 17 + pixel_x = 17; + pixel_y = 7 + }, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + pixel_x = 17; + pixel_y = -6 }, /turf/open/floor/almayer/aicore/glowing/no_build{ icon_state = "ai_floor3" @@ -49473,14 +49566,6 @@ 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/upper/u_a_s) "mUY" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -49583,6 +49668,20 @@ icon_state = "cargo" }, /area/almayer/living/bridgebunks) +"mWJ" = ( +/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 + }, +/area/almayer/hallways/upper/fore_hallway) "mWQ" = ( /obj/structure/flora/pottedplant{ desc = "It is made of Fiberbush(tm). It contains asbestos."; @@ -49622,19 +49721,6 @@ /obj/item/tool/wrench, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/p_bow) -"mYd" = ( -/obj/structure/sign/safety/escapepod{ - pixel_y = 32 - }, -/obj/structure/sign/safety/east{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "mYt" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -49650,6 +49736,12 @@ }, /turf/closed/wall/almayer, /area/almayer/squads/req) +"mYA" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "mZb" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -49707,12 +49799,6 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) -"mZv" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/south2) "mZF" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ icon_state = "almayer_pdoor"; @@ -49783,12 +49869,23 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) -"naj" = ( -/obj/structure/machinery/light, +"nah" = ( +/obj/structure/machinery/status_display{ + pixel_x = 32 + }, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/obj/item/desk_bell{ + anchored = 1 + }, /turf/open/floor/almayer{ - icon_state = "silver" + dir = 6; + icon_state = "red" }, -/area/almayer/hallways/upper/midship_hallway) +/area/almayer/shipboard/brig/lobby) "nar" = ( /obj/structure/toilet{ dir = 4 @@ -49859,23 +49956,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_midship_hallway) -"nbW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +"nbH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/hallways/upper/midship_hallway) -"nbY" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/almayer/hallways/upper/aft_hallway) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) "ncf" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -49905,6 +49994,16 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"ncx" = ( +/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/upper/u_a_s) "ncE" = ( /obj/structure/machinery/light{ dir = 8 @@ -49932,13 +50031,6 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"ncV" = ( -/obj/structure/closet, -/obj/item/clothing/glasses/welding, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_a_s) "ndl" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -49986,6 +50078,12 @@ icon_state = "plate" }, /area/almayer/hallways/lower/vehiclehangar) +"ner" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south2) "new" = ( /obj/item/reagent_container/glass/bucket/janibucket, /obj/item/reagent_container/glass/bucket/janibucket{ @@ -50038,6 +50136,31 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"neT" = ( +/obj/structure/transmitter/rotary{ + name = "CL Office Telephone"; + phone_category = "Offices"; + phone_id = "CL Office" + }, +/obj/structure/surface/table/woodentable/fancy, +/turf/open/floor/carpet, +/area/almayer/command/corporateliaison) +"neZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/hallways/upper/port) "nff" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -50048,6 +50171,13 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) +"nfC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "ngf" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -50127,15 +50257,6 @@ icon_state = "plate" }, /area/almayer/squads/bravo) -"ngF" = ( -/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) "ngI" = ( /turf/open/floor/almayer{ dir = 8; @@ -50259,6 +50380,13 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"nhN" = ( +/obj/structure/sign/safety/autoopenclose{ + pixel_x = 7; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_p) "nhV" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -50273,6 +50401,14 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"nii" = ( +/obj/structure/machinery/status_display{ + pixel_y = -30 + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "nik" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -50419,6 +50555,12 @@ icon_state = "test_floor4" }, /area/almayer/engineering/lower/engine_core) +"nkc" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "nkj" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -50500,6 +50642,14 @@ icon_state = "cargo_arrow" }, /area/almayer/living/briefing) +"nlI" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_f_s) "nlW" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/largecrate/random/barrel/green, @@ -50608,18 +50758,6 @@ 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/upper/u_m_s) "nnL" = ( /obj/structure/toilet{ dir = 8 @@ -50632,6 +50770,12 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"noe" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/upper/aft_hallway) "noj" = ( /obj/structure/largecrate, /obj/structure/prop/server_equipment/laptop{ @@ -50642,6 +50786,19 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) +"noo" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + access_modified = 1; + closeOtherId = "astroladder_s"; + name = "\improper Astronavigational Deck"; + req_access = null; + req_one_access_txt = "3;19" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/navigation) "nop" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber, /turf/open/floor/almayer{ @@ -50688,6 +50845,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_aft_hallway) +"noO" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "noP" = ( /obj/structure/machinery/light{ dir = 1 @@ -50733,6 +50897,20 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) +"npE" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES JoeCryo"; + name = "\improper ARES WorkingJoe Bay Shutters"; + plane = -7; + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "npO" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -50760,13 +50938,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) -"nqG" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) "nqO" = ( /obj/structure/closet/secure_closet/fridge/fish/stock, /turf/open/floor/almayer{ @@ -50857,6 +51028,19 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/repair_bay) +"nsr" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) +"nsH" = ( +/turf/open/floor/almayer{ + dir = 10; + icon_state = "orange" + }, +/area/almayer/hallways/upper/midship_hallway) "nsQ" = ( /obj/structure/sink{ dir = 4; @@ -50973,12 +51157,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/starboard_hallway) -"nvd" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "silver" - }, -/area/almayer/maint/upper/u_m_p) "nve" = ( /obj/structure/janitorialcart, /obj/item/tool/mop, @@ -50986,6 +51164,12 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_m_p) +"nvz" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south2) "nvG" = ( /obj/structure/machinery/light{ dir = 8 @@ -51060,40 +51244,12 @@ 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/fore_hallway) -"nww" = ( -/turf/open/floor/almayer{ - dir = 6; - icon_state = "silver" - }, -/area/almayer/hallways/upper/midship_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/upper/u_a_p) "nwD" = ( /turf/open/floor/almayer{ dir = 1; @@ -51117,10 +51273,6 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) -"nwT" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_a_s) "nwU" = ( /obj/structure/machinery/light{ dir = 4 @@ -51202,6 +51354,11 @@ icon_state = "test_floor4" }, /area/almayer/living/briefing) +"nyK" = ( +/turf/open/floor/almayer{ + icon_state = "greencorner" + }, +/area/almayer/hallways/upper/fore_hallway) "nyQ" = ( /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) @@ -51244,6 +51401,18 @@ }, /turf/open/floor/almayer, /area/almayer/squads/req) +"nzT" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + closeOtherId = "brignorth"; + name = "\improper Brig Lobby" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/starboard_hallway) "nAd" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -51254,6 +51423,13 @@ /obj/effect/landmark/yautja_teleport, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_s) +"nAv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "nAY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -51451,6 +51627,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) +"nDH" = ( +/obj/structure/machinery/light/small{ + dir = 1; + pixel_y = 20 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "nDM" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -51626,12 +51811,6 @@ icon_state = "cargo" }, /area/almayer/lifeboat_pumps/north2) -"nGZ" = ( -/obj/structure/largecrate/supply/supplies/water, -/turf/open/floor/almayer{ - icon_state = "red" - }, -/area/almayer/maint/upper/u_a_p) "nHu" = ( /obj/structure/largecrate/random/barrel/yellow, /obj/structure/machinery/light{ @@ -51690,6 +51869,15 @@ icon_state = "redcorner" }, /area/almayer/shipboard/starboard_missiles) +"nIB" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/almayer/aicore/no_build{ + dir = 4; + icon_state = "ai_silver" + }, +/area/almayer/command/airoom) "nID" = ( /obj/structure/machinery/light{ dir = 8 @@ -51724,13 +51912,6 @@ 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/midship_hallway) "nIG" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -51839,15 +52020,6 @@ icon_state = "plating" }, /area/almayer/engineering/upper_engineering) -"nLM" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/upper/midship_hallway) "nMe" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -51881,6 +52053,21 @@ /obj/item/bedsheet/red, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) +"nNk" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "nNt" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -51918,12 +52105,6 @@ icon_state = "emeraldcorner" }, /area/almayer/living/briefing) -"nNI" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_s) "nNT" = ( /obj/item/tool/weldingtool, /turf/open/floor/plating/plating_catwalk, @@ -51974,6 +52155,15 @@ icon_state = "plate" }, /area/almayer/command/corporateliaison) +"nOp" = ( +/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/upper/midship_hallway) "nOx" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/plating_catwalk, @@ -52116,14 +52306,6 @@ icon_state = "plating_striped" }, /area/almayer/squads/req) -"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/upper/u_a_s) "nQA" = ( /turf/open/floor/carpet, /area/almayer/command/corporateliaison) @@ -52198,6 +52380,13 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/shipboard/brig/execution) +"nSw" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "nSG" = ( /obj/structure/machinery/door_control{ id = "tcomms"; @@ -52216,10 +52405,6 @@ }, /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_f_p) "nTl" = ( /turf/open/floor/almayer{ dir = 1; @@ -52399,20 +52584,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"nVA" = ( -/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 - }, -/area/almayer/hallways/upper/fore_hallway) "nVB" = ( /turf/open/floor/almayer, /area/almayer/command/securestorage) @@ -52454,6 +52625,22 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/starboard) +"nWf" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) +"nWC" = ( +/obj/structure/blocker/fuelpump, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north2) "nWN" = ( /obj/structure/surface/table/almayer, /turf/open/floor/wood/ship, @@ -52473,6 +52660,15 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_s) +"nXG" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south2) "nXO" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/storage/fancy/cigar{ @@ -52510,6 +52706,15 @@ icon_state = "test_floor4" }, /area/almayer/squads/req) +"nXV" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "nYc" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -52529,12 +52734,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) -"nYf" = ( -/obj/structure/machinery/cm_vending/clothing/intelligence_officer, -/turf/open/floor/almayer{ - icon_state = "silverfull" - }, -/area/almayer/command/securestorage) "nYi" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -52578,6 +52777,29 @@ icon_state = "plate" }, /area/almayer/hallways/lower/starboard_aft_hallway) +"nZf" = ( +/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/upper/midship_hallway) +"nZm" = ( +/obj/structure/machinery/door_control{ + id = "OTStore"; + name = "Shutters"; + pixel_y = 24; + access_modified = 1; + req_one_access_txt = "35" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/almayer/engineering/lower/workshop/hangar) "nZy" = ( /obj/structure/surface/table/almayer, /obj/structure/disposalpipe/segment{ @@ -52593,13 +52815,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_p) "nZK" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/area/almayer/maint/upper/u_f_p) +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "nZR" = ( /obj/structure/machinery/power/apc/almayer{ dir = 8 @@ -52646,6 +52866,18 @@ icon_state = "plating_striped" }, /area/almayer/maint/hull/lower/l_a_p) +"oaP" = ( +/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/upper/u_a_s) "oaW" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer{ @@ -52659,6 +52891,10 @@ }, /turf/closed/wall/almayer, /area/almayer/squads/req) +"obw" = ( +/obj/structure/machinery/fuelpump, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north2) "oby" = ( /obj/structure/surface/table/almayer, /obj/item/trash/plate{ @@ -52684,14 +52920,6 @@ 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/upper/u_a_s) "obQ" = ( /obj/structure/bed/chair{ dir = 8 @@ -52746,22 +52974,6 @@ }, /turf/open/floor/almayer/aicore/glowing/no_build, /area/almayer/command/airoom) -"ocI" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/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/fore_hallway) "odb" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -52847,10 +53059,6 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/sea_office) -"odS" = ( -/obj/structure/machinery/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south2) "odV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -52916,12 +53124,6 @@ icon_state = "silver" }, /area/almayer/command/computerlab) -"oeN" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/hallways/upper/fore_hallway) "oeZ" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/medical) @@ -52956,6 +53158,16 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) +"ogD" = ( +/obj/structure/machinery/cm_vending/clothing/intelligence_officer{ + density = 0; + pixel_x = -32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/command/securestorage) "ogK" = ( /obj/structure/bed/bedroll{ desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on."; @@ -52970,6 +53182,35 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"ogT" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) +"ogU" = ( +/obj/structure/surface/table/reinforced/almayer_B{ + indestructible = 1; + unacidable = 1; + unslashable = 1 + }, +/obj/structure/transmitter/rotary{ + name = "AI Reception Telephone"; + phone_category = "ARES"; + phone_color = "blue"; + phone_id = "AI Reception" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) +"ohi" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south2) "ohj" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ @@ -53129,6 +53370,22 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/warden_office) +"oiz" = ( +/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{ + closeOtherId = "brigwarden"; + dir = 1; + name = "\improper Warden's Office" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/warden_office) "oiL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -53202,6 +53459,9 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) +"ojX" = ( +/turf/open/floor/plating, +/area/almayer/maint/upper/u_f_p) "ojZ" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -53233,19 +53493,6 @@ 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/upper/u_a_p) -"okx" = ( -/turf/open/floor/almayer{ - dir = 9; - icon_state = "blue" - }, -/area/almayer/hallways/upper/midship_hallway) "okD" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer6" @@ -53265,15 +53512,12 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/s_bow) -"olC" = ( -/obj/structure/largecrate/random/barrel/red, -/obj/structure/machinery/light/small{ - dir = 8 - }, +"olF" = ( +/obj/structure/closet/emcloset, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo" }, -/area/almayer/maint/upper/u_f_s) +/area/almayer/hallways/upper/midship_hallway) "olM" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -53348,16 +53592,6 @@ /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" - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "omt" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -53395,18 +53629,6 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) -"onh" = ( -/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/upper/midship_hallway) "onn" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -53501,6 +53723,12 @@ icon_state = "test_floor5" }, /area/almayer/hallways/lower/port_midship_hallway) +"opu" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/north2) "opC" = ( /obj/structure/machinery/door/airlock/almayer/command/reinforced{ name = "\improper Combat Information Center" @@ -53532,24 +53760,6 @@ /obj/docking_port/stationary/emergency_response/external/port4, /turf/open/space/basic, /area/space) -"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 = "test_floor4" - }, -/area/almayer/hallways/upper/fore_hallway) "opV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -53675,22 +53885,32 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"orq" = ( -/obj/item/storage/toolbox/mechanical{ - pixel_y = 13 +"orx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" }, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 +/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 = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/maint/upper/u_a_s) "orH" = ( /turf/open/floor/almayer/uscm/directional{ dir = 10 }, /area/almayer/command/lifeboat) +"orI" = ( +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 8; + autoname = 0; + c_tag = "AI - SecVault" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "orN" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -53701,9 +53921,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop/hangar) -"orV" = ( -/turf/open/floor/almayer, -/area/almayer/hallways/upper/fore_hallway) "osc" = ( /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, /obj/structure/machinery/light{ @@ -53711,23 +53928,15 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) -"osn" = ( -/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 - }, -/obj/structure/machinery/light/small{ - dir = 8 +"osr" = ( +/obj/structure/largecrate/random/case/double, +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/maint/upper/u_f_s) +/area/almayer/maint/upper/u_f_p) "osx" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -53740,14 +53949,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"osy" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/platform_decoration, -/turf/open/floor/almayer/aicore/no_build{ - dir = 4; - icon_state = "ai_silver" - }, -/area/almayer/command/airoom) "osz" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -54022,15 +54223,6 @@ }, /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/midship_hallway) "oxi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -54079,6 +54271,15 @@ /obj/structure/machinery/photocopier, /turf/open/floor/almayer, /area/almayer/command/lifeboat) +"oyB" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "oyC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -54181,15 +54382,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/lower/port_umbilical) -"oAp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/aft_hallway) "oAB" = ( /obj/structure/platform{ dir = 8; @@ -54225,17 +54417,6 @@ 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/fore_hallway) "oBq" = ( /obj/structure/bed, /obj/structure/machinery/flasher{ @@ -54250,6 +54431,12 @@ "oBr" = ( /turf/closed/wall/almayer, /area/almayer/maint/hull/lower/l_a_s) +"oBv" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3" + }, +/area/almayer/command/airoom) "oBA" = ( /obj/structure/sign/safety/conference_room{ pixel_x = -17; @@ -54319,6 +54506,12 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) +"oDa" = ( +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "oDh" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/p_bow) @@ -54336,6 +54529,13 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"oDm" = ( +/obj/structure/sign/safety/life_support{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "oDv" = ( /turf/open/floor/almayer{ dir = 9; @@ -54442,6 +54642,18 @@ icon_state = "test_floor4" }, /area/almayer/lifeboat_pumps/north1) +"oEn" = ( +/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/midship_hallway) "oEo" = ( /obj/effect/landmark/start/marine/medic/delta, /obj/effect/landmark/late_join/delta, @@ -54471,6 +54683,17 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) +"oEA" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/weapon/gun/shotgun/pump{ + starting_attachment_types = list(/obj/item/attachable/stock/shotgun); + pixel_y = 9 + }, +/obj/item/stack/sheet/cardboard/small_stack{ + layer = 3.01 + }, +/turf/open/floor/almayer, +/area/almayer/squads/charlie_delta_shared) "oEE" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -54519,14 +54742,10 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_s) -"oFU" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/upper/u_a_p) +"oFz" = ( +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) "oFV" = ( /obj/structure/sign/poster{ pixel_x = -32; @@ -54601,6 +54820,14 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/repair_bay) +"oGI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "oGJ" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -54625,6 +54852,14 @@ icon_state = "orange" }, /area/almayer/living/port_emb) +"oGW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/fore_hallway) "oGY" = ( /obj/item/device/flashlight/lamp/green{ pixel_x = 5; @@ -54732,29 +54967,19 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"oIr" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 1 - }, -/obj/structure/machinery/door/airlock/almayer/research/reinforced{ - closeOtherId = "containment_n"; - dir = 8; - name = "\improper Containment Airlock" - }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ +"oIn" = ( +/obj/effect/landmark/start/liaison, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_p) +"oIp" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/medical/medical_science) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) "oIt" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -54764,6 +54989,12 @@ "oIB" = ( /turf/closed/wall/almayer, /area/almayer/command/combat_correspondent) +"oIY" = ( +/obj/structure/largecrate/random/barrel, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) "oJj" = ( /obj/structure/machinery/light{ dir = 8 @@ -54793,6 +55024,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"oJK" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/lifeboat_pumps/south2) "oJL" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -54809,27 +55048,6 @@ icon_state = "plate" }, /area/almayer/hallways/lower/port_fore_hallway) -"oJR" = ( -/obj/effect/projector{ - name = "Almayer_AresDown"; - vector_x = 97; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/obj/structure/machinery/door_control{ - id = "ARES StairsUpper"; - name = "ARES Core Access"; - pixel_x = -24; - req_one_access_txt = "90;91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "oKb" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -54879,24 +55097,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_fore_hallway) -"oLm" = ( -/obj/structure/machinery/door_control{ - id = "ARES StairsLower"; - name = "ARES Core Lockdown"; - pixel_x = -24; - pixel_y = 8; - req_one_access_txt = "90;91;92" - }, -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 4; - pixel_y = -8 - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer/aicore/no_build{ - dir = 8; - icon_state = "ai_silver" - }, -/area/almayer/command/airoom) "oLF" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -54974,10 +55174,6 @@ /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/midship_hallway) "oNb" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -55014,6 +55210,12 @@ icon_state = "plating" }, /area/almayer/medical/upper_medical) +"oNK" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_s) "oNM" = ( /obj/structure/largecrate/random/barrel, /turf/open/floor/almayer{ @@ -55030,6 +55232,23 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"oNW" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 4 + }, +/obj/structure/sign/safety/storage{ + pixel_x = -17; + pixel_y = 7 + }, +/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) "oNY" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_18"; @@ -55040,15 +55259,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"oOi" = ( -/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/upper/midship_hallway) "oOp" = ( /obj/structure/surface/table/almayer, /obj/item/tool/wirecutters, @@ -55086,6 +55296,15 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"oOZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "red" + }, +/area/almayer/hallways/upper/aft_hallway) "oPf" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -55168,6 +55387,11 @@ icon_state = "cargo_arrow" }, /area/almayer/living/briefing) +"oQI" = ( +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/port) "oQJ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, @@ -55214,6 +55438,17 @@ icon_state = "test_floor4" }, /area/almayer/maint/hull/upper/u_f_s) +"oRy" = ( +/obj/structure/sign/safety/autodoc{ + pixel_x = 20; + pixel_y = -32 + }, +/obj/structure/machinery/cm_vending/sorted/medical/bolted, +/obj/structure/medical_supply_link/green, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lower_medical_medbay) "oRJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -55337,12 +55572,6 @@ 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/upper/u_a_s) "oTe" = ( /obj/item/prop/almayer/box, /obj/item/prop{ @@ -55441,12 +55670,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"oUO" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_hallway) "oUZ" = ( /obj/structure/surface/rack, /obj/item/tool/crowbar, @@ -55489,6 +55712,11 @@ allow_construction = 0 }, /area/almayer/hallways/lower/port_fore_hallway) +"oVo" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "oVY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -55605,6 +55833,17 @@ icon_state = "orange" }, /area/almayer/engineering/lower) +"oXP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/midship_hallway) "oXY" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -55673,12 +55912,6 @@ 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/upper/u_m_p) "oZp" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light, @@ -55730,6 +55963,15 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"oZI" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/north2) "oZV" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/roller, @@ -55887,6 +56129,11 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) +"pcs" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) "pcv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -55933,25 +56180,20 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/mess) +"pdo" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/north2) "pdp" = ( /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/maint/hull/upper/p_bow) -"pdy" = ( -/obj/structure/machinery/door_control{ - id = "OTStore"; - name = "Shutters"; - pixel_y = 24; - access_modified = 1; - req_one_access_txt = "35" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer, -/area/almayer/engineering/lower/workshop/hangar) "pdK" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -55978,19 +56220,9 @@ "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 = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/hallways/upper/midship_hallway) +"pep" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_f_p) "peM" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -56040,12 +56272,6 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/starboard_hallway) -"pfe" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/south2) "pfp" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Up4"; @@ -56092,6 +56318,15 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) +"pga" = ( +/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/upper/u_m_p) "pgw" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -56104,21 +56339,6 @@ "pgD" = ( /turf/closed/wall/almayer, /area/almayer/lifeboat_pumps/south1) -"pgH" = ( -/obj/effect/projector{ - name = "Almayer_AresDown"; - vector_x = 97; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "pgJ" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -56225,6 +56445,15 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/brig/perma) +"piQ" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "pje" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -56279,12 +56508,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_aft_hallway) -"pjQ" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "silver" - }, -/area/almayer/hallways/upper/midship_hallway) "pjR" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -56310,9 +56533,32 @@ icon_state = "orange" }, /area/almayer/engineering/lower) +"pld" = ( +/obj/item/book/manual/medical_diagnostics_manual, +/obj/structure/surface/rack, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "red" + }, +/area/almayer/maint/upper/u_a_p) +"plh" = ( +/obj/structure/machinery/cm_vending/sorted/medical/marinemed, +/obj/structure/sign/safety/medical{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/structure/medical_supply_link, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/panic) "plv" = ( /turf/open/floor/plating, /area/almayer/maint/hull/lower/l_m_p) +"plK" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) "pmd" = ( /obj/structure/machinery/light, /obj/structure/disposalpipe/segment{ @@ -56420,27 +56666,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_f_p) -"pow" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger, -/obj/structure/transmitter/rotary{ - name = "Brig Wardens's Office Telephone"; - phone_category = "MP Dept."; - phone_id = "Brig Warden's Office"; - pixel_x = 15 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = 32 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/shipboard/brig/warden_office) "poA" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/bucket/mopbucket, @@ -56451,6 +56676,15 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop/hangar) +"poD" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "ppe" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -56518,13 +56752,6 @@ /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/aft_hallway) "pqw" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -56573,18 +56800,16 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) -"pqR" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_f_p) "pqX" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/living/gym) +"pqY" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "prf" = ( /obj/structure/sign/safety/storage{ pixel_x = -17 @@ -56636,12 +56861,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) -"prV" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/upper/aft_hallway) "prX" = ( /obj/structure/ladder{ height = 2; @@ -56664,6 +56883,15 @@ icon_state = "bluefull" }, /area/almayer/living/bridgebunks) +"psk" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "psK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56772,6 +57000,15 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) +"pub" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 32 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "pum" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -56801,28 +57038,24 @@ }, /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_f_s) "puO" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) +"puP" = ( +/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/upper/midship_hallway) "puT" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -56838,13 +57071,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/living/port_emb) -"pvE" = ( -/obj/structure/machinery/light{ - dir = 1 - }, +"pvi" = ( /turf/open/floor/almayer{ - dir = 4; - icon_state = "orangecorner" + dir = 6; + icon_state = "red" }, /area/almayer/hallways/upper/aft_hallway) "pvI" = ( @@ -56896,12 +57126,17 @@ icon_state = "redcorner" }, /area/almayer/shipboard/starboard_missiles) -"pwd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"pwl" = ( +/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 = "mono" + dir = 6; + icon_state = "blue" }, /area/almayer/hallways/upper/fore_hallway) "pwx" = ( @@ -57087,6 +57322,16 @@ icon_state = "redfull" }, /area/almayer/hallways/lower/starboard_midship_hallway) +"pzw" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "pzG" = ( /obj/docking_port/stationary/emergency_response/port1, /turf/open/floor/almayer{ @@ -57125,14 +57370,6 @@ /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 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/midship_hallway) "pBG" = ( /turf/closed/wall/almayer, /area/almayer/command/corporateliaison) @@ -57153,17 +57390,6 @@ icon_state = "plate" }, /area/almayer/squads/req) -"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 = "plate" - }, -/area/almayer/maint/upper/u_m_s) "pDh" = ( /obj/structure/machinery/power/monitor{ name = "Core Power Monitoring" @@ -57229,6 +57455,19 @@ icon_state = "plate" }, /area/almayer/squads/charlie) +"pDQ" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3" + }, +/area/almayer/command/airoom) "pDW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -57260,14 +57499,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"pEA" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/fore_hallway) "pEB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -57317,14 +57548,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_p) -"pFJ" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/upper/u_a_s) "pGh" = ( /obj/effect/decal/cleanable/cobweb{ pixel_x = -9; @@ -57338,6 +57561,25 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_s) +"pGE" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/hand_labeler{ + pixel_x = 7 + }, +/obj/item/paper_bin/uscm{ + pixel_y = 5 + }, +/obj/item/tool/pen, +/obj/structure/machinery/computer/working_joe{ + dir = 8; + pixel_x = 17 + }, +/obj/item/device/megaphone, +/obj/item/book/manual/medical_diagnostics_manual, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lower_medical_medbay) "pGG" = ( /obj/effect/landmark/start/doctor, /obj/structure/sign/safety/maint{ @@ -57381,12 +57623,6 @@ icon_state = "green" }, /area/almayer/hallways/lower/port_midship_hallway) -"pHj" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_p) "pHp" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/perma) @@ -57431,21 +57667,6 @@ /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/upper/u_a_s) "pIo" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -57525,19 +57746,13 @@ icon_state = "dark_sterile" }, /area/almayer/living/port_emb) -"pJR" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresUp"; - vector_x = -97; - vector_y = 65 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/glowing/no_build{ - icon_state = "ai_floor3" +"pJS" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 32 }, -/area/almayer/command/airoom) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_s) "pKh" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -57546,13 +57761,6 @@ /obj/effect/landmark/late_join/nurse, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices) -"pKx" = ( -/obj/structure/machinery/cm_vending/sorted/medical/chemistry, -/obj/structure/medical_supply_link, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/almayer/medical/chemistry) "pKB" = ( /obj/structure/surface/rack, /obj/item/circuitboard/firealarm, @@ -57562,6 +57770,26 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/s_stern) +"pKH" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) +"pKL" = ( +/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/upper/u_m_s) "pKU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -57616,6 +57844,28 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) +"pLE" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) +"pLH" = ( +/obj/structure/surface/table/reinforced/almayer_B{ + indestructible = 1; + unacidable = 1; + unslashable = 1 + }, +/obj/structure/machinery/computer/working_joe{ + layer = 3.3; + dir = 4; + pixel_y = 6 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "pLO" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -57736,18 +57986,6 @@ 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/port) "pOD" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -58012,13 +58250,6 @@ icon_state = "plate" }, /area/almayer/hallways/lower/starboard_fore_hallway) -"pSN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_hallway) "pSQ" = ( /obj/structure/reagent_dispensers/fueltank{ anchored = 1 @@ -58042,16 +58273,37 @@ icon_state = "silvercorner" }, /area/almayer/command/computerlab) -"pTt" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "ARES JoeCryo"; - name = "\improper ARES Core Shutters"; - plane = -7 +"pTH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer/no_build{ - icon_state = "test_floor4" +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 8; + pixel_y = 2; + autoname = 0; + c_tag = "AI - Reception Exterior" }, -/area/almayer/command/airoom) +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) +"pTI" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) +"pTS" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/hallways/upper/fore_hallway) "pTX" = ( /obj/structure/largecrate/random/barrel/red, /obj/structure/sign/safety/fire_haz{ @@ -58062,6 +58314,21 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_f_p) +"pTY" = ( +/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/upper/u_a_s) "pUd" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ @@ -58130,13 +58397,13 @@ icon_state = "redfull" }, /area/almayer/shipboard/brig/processing) -"pUL" = ( -/obj/structure/surface/table/almayer, -/obj/item/weapon/gun/rifle/m41a, -/turf/open/floor/almayer{ - icon_state = "plate" +"pVh" = ( +/obj/structure/machinery/light/small{ + dir = 1 }, -/area/almayer/maint/upper/u_m_s) +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_s) "pVr" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -58194,16 +58461,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/corporateliaison) -"pVI" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out" - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "pWb" = ( /obj/effect/landmark/start/marine/tl/delta, /obj/effect/landmark/late_join/delta, @@ -58311,15 +58568,6 @@ icon_state = "red" }, /area/almayer/hallways/lower/starboard_midship_hallway) -"pYi" = ( -/obj/structure/pipes/vents/pump/no_boom{ - dir = 8 - }, -/turf/open/floor/almayer/aicore/no_build{ - dir = 4; - icon_state = "ai_silver" - }, -/area/almayer/command/airoom) "pYo" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -58449,6 +58697,9 @@ icon_state = "red" }, /area/almayer/living/briefing) +"qbw" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_s) "qbx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -58483,6 +58734,22 @@ icon_state = "blue" }, /area/almayer/living/pilotbunks) +"qbP" = ( +/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/upper/u_m_s) +"qbU" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "qbZ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/glass{ dir = 1; @@ -58508,13 +58775,6 @@ icon_state = "plate" }, /area/almayer/living/auxiliary_officer_office) -"qcL" = ( -/obj/structure/sign/safety/intercom{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_hallway) "qdk" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -58582,6 +58842,15 @@ icon_state = "kitchen" }, /area/almayer/living/captain_mess) +"qdJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "qdQ" = ( /obj/structure/bed/sofa/vert/grey/top{ pixel_y = 11 @@ -58746,6 +59015,13 @@ icon_state = "test_floor4" }, /area/almayer/living/starboard_garden) +"qgn" = ( +/obj/item/stool, +/obj/effect/landmark/yautja_teleport, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_f_s) "qgr" = ( /obj/item/trash/plate{ pixel_x = 9; @@ -58802,6 +59078,12 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"qhg" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_f_s) "qhx" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -58856,6 +59138,11 @@ }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) +"qhT" = ( +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "qhU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -58897,9 +59184,6 @@ icon_state = "test_floor4" }, /area/almayer/living/tankerbunks) -"qii" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_a_s) "qim" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -58955,16 +59239,6 @@ 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/upper/u_m_s) "qjV" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -58973,6 +59247,27 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"qjY" = ( +/obj/structure/machinery/door/window/eastleft{ + req_one_access_txt = "2;21" + }, +/obj/structure/machinery/door/window/westright, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; + id = "ROlobby1"; + name = "\improper RO Line 1" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/surface/table/reinforced/almayer_blend/north, +/obj/item/desk_bell{ + pixel_x = -6; + pixel_y = -8; + anchored = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/req) "qjZ" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/stern_point_defense) @@ -59149,6 +59444,15 @@ icon_state = "dark_sterile" }, /area/almayer/medical/medical_science) +"qmK" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/hallways/upper/fore_hallway) "qmM" = ( /obj/structure/bed/chair{ dir = 8 @@ -59186,6 +59490,12 @@ /obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) +"qmW" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "qmY" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -59199,15 +59509,6 @@ }, /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/lifeboat_pumps/north2) "qnh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59255,6 +59556,18 @@ icon_state = "test_floor4" }, /area/almayer/living/pilotbunks) +"qnH" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/hallways/upper/midship_hallway) +"qnX" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south2) "qom" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/chem_dispenser/soda{ @@ -59300,6 +59613,14 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop/hangar) +"qoM" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) "qoN" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -59331,13 +59652,6 @@ 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/aft_hallway) "qpQ" = ( /obj/item/reagent_container/glass/beaker/bluespace, /obj/structure/machinery/chem_dispenser/medbay, @@ -59355,15 +59669,12 @@ }, /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{ - dir = 9; - icon_state = "blue" +"qqa" = ( +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/plating/almayer{ + allow_construction = 0 }, -/area/almayer/hallways/upper/midship_hallway) +/area/almayer/hallways/upper/fore_hallway) "qqf" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -59460,22 +59771,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/engineering/ce_room) -"qtj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - layer = 2.5 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/hallways/upper/port) "qtv" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -59509,17 +59804,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/cryo_tubes) -"quy" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 8; - pixel_y = -32 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "quJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -59558,6 +59842,16 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"qvh" = ( +/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/midship_hallway) "qvC" = ( /obj/structure/machinery/power/apc/almayer{ dir = 4 @@ -59582,6 +59876,18 @@ icon_state = "red" }, /area/almayer/shipboard/brig/starboard_hallway) +"qvF" = ( +/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/upper/u_a_s) "qvI" = ( /obj/structure/sign/safety/maint{ pixel_x = -17 @@ -59603,13 +59909,6 @@ 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/fore_hallway) "qwo" = ( /obj/structure/machinery/washing_machine, /obj/structure/machinery/washing_machine{ @@ -59643,19 +59942,18 @@ icon_state = "plate" }, /area/almayer/living/offices) -"qwJ" = ( -/obj/structure/machinery/door_control{ - id = "ARES Operations Left"; - name = "ARES Operations Shutter"; - pixel_x = -24; - pixel_y = -8; - req_one_access_txt = "90;91;92" +"qwU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" }, -/turf/open/floor/almayer/aicore/no_build{ - dir = 8; - icon_state = "ai_silver" +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = -17 }, -/area/almayer/command/airoom) +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/hallways/upper/port) "qwY" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/almayer{ @@ -59751,12 +60049,6 @@ /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/fore_hallway) "qxL" = ( /obj/structure/machinery/medical_pod/autodoc, /turf/open/floor/almayer{ @@ -59776,6 +60068,13 @@ dir = 4 }, /area/almayer/medical/containment/cell) +"qxS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_f_s) "qyi" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -59880,12 +60179,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/p_bow) -"qzQ" = ( -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/upper/u_a_s) "qAs" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -59948,6 +60241,50 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_p) +"qAT" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/reagentgrinder{ + pixel_y = 8 + }, +/obj/item/stack/sheet/mineral/phoron{ + amount = 25; + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/device/reagent_scanner{ + pixel_x = -16; + pixel_y = 5 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/medical_science) +"qBa" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES StairsUpper"; + name = "\improper ARES Core Shutters"; + plane = -7 + }, +/obj/structure/machinery/door/poddoor/almayer/blended/open{ + id = "ARES Emergency"; + name = "ARES Emergency Lockdown"; + open_layer = 1.9; + plane = -7 + }, +/obj/structure/disposalpipe/up/almayer{ + id = "ares_vault_in"; + name = "aicore"; + dir = 2 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "qBl" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ @@ -60076,16 +60413,6 @@ icon_state = "test_floor4" }, /area/almayer/maint/hull/upper/u_a_p) -"qDN" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/machinery/cm_vending/sorted/medical/marinemed, -/obj/structure/medical_supply_link, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "qDP" = ( /obj/structure/machinery/light{ dir = 4 @@ -60104,13 +60431,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_p) -"qDX" = ( -/turf/closed/wall/almayer, -/area/almayer/hallways/upper/aft_hallway) -"qEc" = ( -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/fore_hallway) "qEk" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -60207,18 +60527,6 @@ icon_state = "test_floor4" }, /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 = "dark_sterile" - }, -/area/almayer/maint/upper/u_a_s) "qFi" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 @@ -60310,27 +60618,12 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_two) -"qGP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/midship_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/midship_hallway) "qHg" = ( /turf/open/floor/almayer{ dir = 1; @@ -60347,15 +60640,13 @@ icon_state = "test_floor4" }, /area/almayer/powered) -"qHu" = ( -/obj/structure/machinery/light{ - dir = 1 +"qHD" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer, -/area/almayer/hallways/upper/midship_hallway) -"qHA" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/upper/u_a_s) +/area/almayer/hallways/upper/aft_hallway) "qHG" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -60374,6 +60665,13 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) +"qHT" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_p) "qIa" = ( /obj/structure/platform{ dir = 4 @@ -60402,6 +60700,16 @@ icon_state = "test_floor4" }, /area/almayer/command/corporateliaison) +"qIF" = ( +/obj/structure/sign/safety/rewire{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "qIL" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/camera/autoname/almayer{ @@ -60564,15 +60872,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_p) -"qKU" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) "qKY" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -60605,6 +60904,15 @@ icon_state = "dark_sterile" }, /area/almayer/medical/containment) +"qLk" = ( +/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/upper/u_a_p) "qLs" = ( /obj/effect/landmark/start/maint, /turf/open/floor/plating/plating_catwalk, @@ -60691,6 +60999,20 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"qNc" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsLower"; + name = "ARES Core Lockdown"; + pixel_x = 24; + pixel_y = 8; + req_one_access_txt = "90;91;92" + }, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer/aicore/no_build{ + dir = 4; + icon_state = "ai_silver" + }, +/area/almayer/command/airoom) "qNd" = ( /obj/structure/machinery/cryopod, /obj/structure/machinery/light{ @@ -60700,15 +61022,6 @@ icon_state = "cargo" }, /area/almayer/squads/delta) -"qNe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/fore_hallway) "qNI" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -60796,13 +61109,6 @@ 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/midship_hallway) "qPD" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) @@ -60858,6 +61164,9 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"qQu" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/upper/fore_hallway) "qQy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60865,13 +61174,19 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) -"qQG" = ( -/obj/structure/largecrate/supply/floodlights, +"qQD" = ( +/obj/structure/sign/safety/distribution_pipes{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/intercom{ + pixel_y = 32 + }, /turf/open/floor/almayer{ - dir = 6; - icon_state = "red" + dir = 1; + icon_state = "blue" }, -/area/almayer/maint/upper/u_a_p) +/area/almayer/hallways/upper/midship_hallway) "qQS" = ( /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) @@ -60917,21 +61232,29 @@ 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/fore_hallway) "qSm" = ( /obj/structure/pipes/vents/pump{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/shipboard/port_point_defense) +"qSp" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) +"qSA" = ( +/obj/structure/bed/chair/comfy/ares{ + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "plating" + }, +/area/almayer/command/airoom) "qSE" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/cholula, @@ -60968,6 +61291,14 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"qTi" = ( +/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/upper/u_m_s) "qTu" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -60976,6 +61307,12 @@ icon_state = "plate" }, /area/almayer/hallways/lower/port_umbilical) +"qTA" = ( +/obj/structure/largecrate/random/case, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_f_p) "qTQ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -60984,6 +61321,13 @@ icon_state = "red" }, /area/almayer/shipboard/brig/chief_mp_office) +"qTS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "qTY" = ( /obj/structure/machinery/gibber, /turf/open/floor/plating/plating_catwalk, @@ -61015,6 +61359,12 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/charlie_delta_shared) +"qUu" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/hallways/upper/fore_hallway) "qUx" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -61035,26 +61385,11 @@ 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_x = -2; - pixel_y = -11 - }, +"qUK" = ( /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "blue" }, -/area/almayer/command/combat_correspondent) +/area/almayer/hallways/upper/fore_hallway) "qUL" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 4 @@ -61178,38 +61513,18 @@ dir = 4 }, /area/almayer/medical/containment/cell/cl) -"qWS" = ( -/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_x = 4; - pixel_y = 15 - }, -/obj/item/tool/surgery/bonegel/empty{ - pixel_x = -8; - pixel_y = 13 - }, -/obj/item/tool/surgery/bonegel/empty{ - layer = 3.01; - pixel_x = -5; - pixel_y = 19 +"qXh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/item/storage/box/gloves{ - layer = 3.2; - pixel_x = -5; - pixel_y = 2 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_corner" + dir = 6; + icon_state = "orange" }, -/area/almayer/medical/lower_medical_medbay) +/area/almayer/hallways/upper/midship_hallway) "qXk" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -61288,6 +61603,12 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"qYd" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/south2) "qYq" = ( /turf/open/floor/almayer{ dir = 5; @@ -61316,6 +61637,14 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"qYz" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_s) "qYC" = ( /obj/structure/disposalpipe/down/almayer{ dir = 4; @@ -61442,13 +61771,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower/engine_core) -"rao" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/south2) "raE" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -61571,6 +61893,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_p) +"rcR" = ( +/obj/structure/surface/table/reinforced/almayer_B{ + indestructible = 1; + unacidable = 1; + unslashable = 1 + }, +/obj/structure/machinery/computer/secure_data{ + dir = 4 + }, +/obj/structure/machinery/door_control{ + id = "ARES ReceptStairs1"; + name = "ARES Reception Shutters"; + pixel_y = 24; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "rcS" = ( /obj/structure/machinery/computer/cryopod/eng{ dir = 8 @@ -61591,18 +61930,6 @@ }, /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/fore_hallway) "rdt" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -61612,6 +61939,25 @@ }, /turf/open/floor/almayer/research/containment/corner4, /area/almayer/medical/containment/cell) +"rdz" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/command/reinforced{ + closeOtherId = "ciclobby_s"; + id_tag = "cic_exterior"; + name = "\improper Combat Information Center" + }, +/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/command/cic) "rdA" = ( /obj/structure/sign/safety/maint{ pixel_x = -17; @@ -61668,6 +62014,9 @@ icon_state = "plate" }, /area/almayer/hallways/lower/port_fore_hallway) +"rdZ" = ( +/turf/open/floor/plating, +/area/almayer/command/corporateliaison) "rec" = ( /obj/structure/bed/chair/comfy/bravo{ dir = 1 @@ -61833,6 +62182,13 @@ "rgL" = ( /turf/open/floor/plating, /area/almayer/maint/upper/u_m_p) +"rgO" = ( +/obj/structure/disposalpipe/junction, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/midship_hallway) "rgW" = ( /turf/open/floor/almayer{ icon_state = "emeraldcorner" @@ -61844,6 +62200,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_s) +"rho" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/hallways/upper/midship_hallway) "rht" = ( /obj/structure/machinery/vending/cola, /turf/open/floor/almayer{ @@ -61947,12 +62310,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"riK" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silvercorner" - }, -/area/almayer/hallways/upper/midship_hallway) "riP" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/rewire{ @@ -61978,6 +62335,11 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"rjr" = ( +/turf/open/floor/almayer{ + icon_state = "silvercorner" + }, +/area/almayer/hallways/upper/midship_hallway) "rjF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -62043,6 +62405,15 @@ icon_state = "blue" }, /area/almayer/living/port_emb) +"rjX" = ( +/obj/structure/sign/safety/hvac_old{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north2) "rka" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -62161,6 +62532,18 @@ icon_state = "red" }, /area/almayer/shipboard/brig/starboard_hallway) +"rmo" = ( +/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/lifeboat_pumps/south2) "rmx" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger, @@ -62176,11 +62559,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_fore_hallway) -"rmB" = ( -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/hallways/upper/midship_hallway) "rmD" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -62204,18 +62582,6 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) -"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/fore_hallway) "rnF" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -62240,6 +62606,15 @@ }, /turf/open/floor/almayer/aicore/glowing/no_build, /area/almayer/command/airoom) +"rnM" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "rnN" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/sign/nosmoking_2{ @@ -62300,15 +62675,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) -"roY" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - dir = 9; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/south2) "rpp" = ( /obj/effect/landmark/start/executive, /turf/open/floor/plating/plating_catwalk, @@ -62330,10 +62696,15 @@ icon_state = "plate" }, /area/almayer/command/cichallway) -"rpP" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/fore_hallway) +"rpV" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "rqb" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 32 @@ -62454,13 +62825,6 @@ 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/aft_hallway) "rrK" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -62514,11 +62878,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) -"rsN" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/fore_hallway) "rsO" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, @@ -62592,14 +62951,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) -"rtK" = ( -/obj/structure/machinery/cm_vending/sorted/medical/bolted, -/obj/structure/medical_supply_link, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lockerroom) "rtV" = ( /obj/structure/surface/table/almayer, /obj/item/pizzabox{ @@ -62707,19 +63058,6 @@ }, /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{ - dir = 1; - icon_state = "silver" - }, -/area/almayer/hallways/upper/midship_hallway) "rwj" = ( /turf/open/floor/almayer{ dir = 4; @@ -62785,12 +63123,13 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/navigation) -"rxO" = ( -/obj/structure/machinery/cm_vending/clothing/intelligence_officer, -/turf/open/floor/almayer{ - icon_state = "silverfull" +"rxQ" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/almayer/command/computerlab) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) "ryt" = ( /obj/structure/pipes/standard/manifold/visible, /turf/open/floor/almayer{ @@ -62803,6 +63142,14 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) +"ryJ" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_a_p) "ryR" = ( /obj/structure/machinery/cm_vending/clothing/staff_officer_armory, /turf/open/floor/almayer{ @@ -62841,6 +63188,9 @@ icon_state = "bluecorner" }, /area/almayer/living/briefing) +"rAd" = ( +/turf/closed/wall/almayer/aicore/white/hull, +/area/space) "rAo" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -62905,6 +63255,10 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"rAS" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_s) "rBa" = ( /obj/structure/machinery/cm_vending/clothing/synth, /obj/structure/prop/invuln/overhead_pipe{ @@ -62951,6 +63305,13 @@ icon_state = "test_floor4" }, /area/almayer/maint/upper/u_m_p) +"rBY" = ( +/obj/structure/machinery/shower{ + pixel_y = 16 + }, +/obj/item/tool/soap, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_s) "rCh" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -62962,7 +63323,9 @@ /area/almayer/maint/hull/lower/l_m_p) "rCi" = ( /obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8 + dir = 8; + autoname = 0; + c_tag = "AI - SynthBay" }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) @@ -62976,20 +63339,6 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"rCw" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresDown"; - vector_x = 97; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "rCD" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -63012,6 +63361,10 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) +"rCZ" = ( +/obj/docking_port/stationary/escape_pod/east, +/turf/open/floor/plating, +/area/almayer/maint/upper/u_m_s) "rDb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -63048,11 +63401,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /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/midship_hallway) "rDr" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer{ @@ -63159,11 +63507,6 @@ icon_state = "outerhull_dir" }, /area/space) -"rEs" = ( -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/maint/upper/u_a_s) "rEt" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ @@ -63196,12 +63539,6 @@ }, /turf/open/floor/plating/plating_catwalk, /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) "rEY" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -63232,6 +63569,16 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) +"rFt" = ( +/obj/structure/machinery/cryopod/right{ + layer = 3.1; + pixel_y = 13; + dir = 4 + }, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_cargo" + }, +/area/almayer/command/airoom) "rFy" = ( /turf/open/floor/almayer{ dir = 1; @@ -63251,15 +63598,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) -"rGc" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/north2) "rGj" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -63327,13 +63665,6 @@ 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/fore_hallway) "rHo" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ layer = 1.9 @@ -63430,17 +63761,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"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 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_s) "rIH" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -63550,14 +63870,6 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/living/briefing) -"rJY" = ( -/obj/item/book/manual/medical_diagnostics_manual, -/obj/structure/surface/rack, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/maint/upper/u_a_p) "rKd" = ( /turf/open/floor/almayer/uscm/directional{ dir = 5 @@ -63576,6 +63888,16 @@ icon_state = "rasputin15" }, /area/almayer/powered/agent) +"rKt" = ( +/obj/structure/sign/safety/rewire{ + pixel_x = 32 + }, +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/hallways/lower/port_aft_hallway) "rKA" = ( /obj/structure/bed{ can_buckle = 0 @@ -63660,6 +63982,13 @@ dir = 8 }, /area/almayer/medical/containment/cell/cl) +"rMh" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/north1) "rMj" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ @@ -63729,13 +64058,6 @@ icon_state = "dark_sterile" }, /area/almayer/living/port_emb) -"rNF" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "rNK" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ @@ -63801,17 +64123,6 @@ "rPt" = ( /turf/open/floor/wood/ship, /area/almayer/engineering/ce_room) -"rPB" = ( -/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/upper/fore_hallway) "rPE" = ( /obj/structure/bed/chair{ dir = 8; @@ -63853,6 +64164,10 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) +"rQl" = ( +/obj/structure/machinery/fuelpump, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "rQs" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -63916,21 +64231,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"rRb" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_s) -"rRf" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/hallways/upper/port) "rRq" = ( /turf/closed/wall/almayer, /area/almayer/lifeboat_pumps/south2) @@ -63941,6 +64241,11 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"rRT" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/upper/midship_hallway) "rRU" = ( /obj/structure/machinery/light{ dir = 8 @@ -64017,6 +64322,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +"rSH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "rSR" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/sign/safety/cryo{ @@ -64024,16 +64336,12 @@ }, /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, +"rSW" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/upper/u_f_p) +/area/almayer/hallways/upper/fore_hallway) "rTk" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -64096,6 +64404,11 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"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; @@ -64201,6 +64514,12 @@ icon_state = "cargo" }, /area/almayer/living/cryo_cells) +"rXq" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_a_p) "rXv" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/structure/disposalpipe/segment{ @@ -64271,15 +64590,17 @@ icon_state = "cargo" }, /area/almayer/maint/hull/lower/l_f_s) -"rXV" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" +"rYc" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES ReceptStairs2"; + name = "\improper ARES Reception Stairway Shutters"; + plane = -7 }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" }, -/area/almayer/hallways/upper/aft_hallway) +/area/almayer/command/airoom) "rYh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -64314,15 +64635,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/starboard) -"rYG" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "rYI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64341,6 +64653,12 @@ icon_state = "plate" }, /area/almayer/living/offices/flight) +"rYU" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "rZt" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -64368,15 +64686,6 @@ 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/midship_hallway) "rZP" = ( /obj/structure/surface/table/almayer, /obj/item/tool/weldpack, @@ -64385,6 +64694,17 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) +"rZZ" = ( +/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/upper/u_a_p) "sab" = ( /obj/effect/landmark/start/doctor, /obj/effect/landmark/late_join/doctor, @@ -64405,13 +64725,6 @@ icon_state = "test_floor4" }, /area/almayer/command/corporateliaison) -"saT" = ( -/obj/structure/disposalpipe/junction, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/fore_hallway) "sbq" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ icon_state = "almayer_pdoor"; @@ -64453,6 +64766,26 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cryo) +"sbZ" = ( +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, +/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 = "plate" + }, +/area/almayer/hallways/lower/starboard_umbilical) "sco" = ( /obj/structure/sign/prop1{ layer = 3.1 @@ -64540,6 +64873,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) +"sdd" = ( +/obj/item/tool/wirecutters/clippers, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "sdf" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -64550,16 +64889,6 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) -"sdl" = ( -/obj/structure/surface/rack{ - density = 0; - pixel_y = 16 - }, -/obj/item/tool/wet_sign, -/obj/item/tool/wet_sign, -/obj/item/tool/wet_sign, -/turf/open/floor/plating, -/area/almayer/command/airoom) "sdn" = ( /obj/structure/sink{ dir = 4; @@ -64613,6 +64942,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_fore_hallway) +"sfz" = ( +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "sfT" = ( /turf/open/floor/almayer, /area/almayer/hallways/upper/port) @@ -64719,6 +65054,12 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cells) +"sgH" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "sgL" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; @@ -64790,6 +65131,12 @@ "sht" = ( /turf/open/floor/almayer, /area/almayer/living/pilotbunks) +"shC" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/midship_hallway) "shL" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/electrical, @@ -64801,6 +65148,11 @@ icon_state = "cargo" }, /area/almayer/engineering/lower/engine_core) +"sin" = ( +/turf/open/floor/almayer{ + icon_state = "bluecorner" + }, +/area/almayer/hallways/upper/midship_hallway) "sir" = ( /obj/structure/machinery/door/airlock/almayer/maint{ req_access = null; @@ -64868,15 +65220,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower) -"siS" = ( -/obj/structure/sign/safety/maint{ - pixel_x = 32 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/south2) "siT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64929,16 +65272,6 @@ 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/upper/u_m_p) "sjz" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -64948,6 +65281,20 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) +"sjG" = ( +/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/aft_hallway) +"sjM" = ( +/obj/effect/landmark/start/reporter, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_p) "skj" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -65343,18 +65690,6 @@ 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/midship_hallway) "sqa" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -65390,16 +65725,6 @@ 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_f_s) "sqW" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/tomatoseed, @@ -65474,20 +65799,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_m_p) -"ssF" = ( -/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/upper/port) "ssU" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/almayer{ @@ -65519,15 +65830,6 @@ /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/fore_hallway) "str" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down3"; @@ -65547,12 +65849,6 @@ 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/upper/u_a_s) "stO" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/faxmachine/uscm/brig, @@ -65646,6 +65942,12 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"svq" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_s) "svt" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -65672,17 +65974,14 @@ 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 +"swn" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = -25 }, -/obj/item/weapon/gun/rifle/l42a, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "orangecorner" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/hallways/upper/aft_hallway) "swt" = ( /turf/open/floor/almayer{ icon_state = "greencorner" @@ -65776,12 +66075,37 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"syg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/airlock/almayer/security/reinforced{ + access_modified = 1; + closeOtherId = "astroladder_n"; + name = "\improper Astronavigational Deck"; + req_access = null; + req_one_access_txt = "3;19" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/navigation) "syj" = ( /obj/structure/sign/safety/escapepod{ pixel_y = 32 }, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_fore_hallway) +"syp" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/maint/upper/u_m_p) "syH" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 @@ -65791,12 +66115,9 @@ }, /turf/open/floor/almayer, /area/almayer/squads/delta) -"szb" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, +"syO" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer, /area/almayer/hallways/upper/midship_hallway) "szf" = ( /obj/structure/disposalpipe/segment{ @@ -65904,14 +66225,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/general_equipment) -"sBK" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/lifeboat_pumps/south2) "sBL" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/structure/machinery/light, @@ -65919,6 +66232,26 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"sBQ" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + closeOtherId = "briglobby"; + name = "\improper Brig Cells" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/processing) +"sBR" = ( +/obj/structure/disposalpipe/down/almayer{ + dir = 4; + id = "ares_vault_in"; + name = "aicore" + }, +/turf/closed/wall/almayer/aicore/hull, +/area/almayer/command/airoom) "sBY" = ( /obj/item/tool/wet_sign, /obj/structure/disposalpipe/segment, @@ -65994,33 +66327,6 @@ /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/aft_hallway) "sDu" = ( /obj/item/clothing/under/marine/dress, /turf/open/floor/almayer{ @@ -66278,6 +66584,21 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop) +"sHC" = ( +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) +"sHI" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "sHM" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ @@ -66292,17 +66613,6 @@ icon_state = "red" }, /area/almayer/squads/alpha) -"sIf" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresDown"; - vector_x = 97; - vector_y = -65 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "sIr" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -66388,6 +66698,12 @@ icon_state = "cargo" }, /area/almayer/engineering/lower/workshop/hangar) +"sJN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) "sJY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -66403,6 +66719,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/morgue) +"sKf" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, +/area/almayer/engineering/lower) "sKM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -66621,6 +66946,26 @@ icon_state = "redfull" }, /area/almayer/medical/upper_medical) +"sPa" = ( +/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/upper/u_m_s) +"sPb" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/hallways/upper/starboard) "sPc" = ( /obj/structure/machinery/light{ dir = 1 @@ -66633,12 +66978,6 @@ icon_state = "plate" }, /area/almayer/living/offices) -"sPk" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "blue" - }, -/area/almayer/hallways/upper/fore_hallway) "sPF" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -66665,14 +67004,6 @@ }, /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/fore_hallway) "sQF" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -66684,6 +67015,15 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"sRC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/aft_hallway) "sRM" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -66692,12 +67032,17 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_s) -"sRP" = ( +"sRZ" = ( +/obj/effect/projector{ + name = "Almayer_Down2"; + vector_x = 1; + vector_y = -100 + }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + allow_construction = 0; + icon_state = "plate" }, -/area/almayer/maint/upper/u_a_p) +/area/almayer/hallways/upper/fore_hallway) "sSa" = ( /obj/structure/machinery/door/airlock/almayer/marine/requisitions{ dir = 2; @@ -66719,19 +67064,21 @@ icon_state = "tcomms" }, /area/almayer/shipboard/weapon_room) +"sSj" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "red" + }, +/area/almayer/lifeboat_pumps/north1) "sSl" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) -"sSB" = ( -/obj/structure/machinery/cm_vending/sorted/medical/bolted, -/obj/structure/medical_supply_link/green, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lower_medical_medbay) "sSC" = ( /turf/open/floor/almayer{ dir = 6; @@ -66867,6 +67214,14 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"sUS" = ( +/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/upper/fore_hallway) "sVc" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/orangeseed, @@ -66875,15 +67230,13 @@ icon_state = "green" }, /area/almayer/shipboard/brig/cells) -"sVA" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, +"sVv" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 8; - icon_state = "green" + dir = 1; + icon_state = "red" }, -/area/almayer/hallways/upper/fore_hallway) +/area/almayer/hallways/upper/aft_hallway) "sVT" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/mechanical, @@ -66904,6 +67257,16 @@ "sVV" = ( /turf/open/floor/almayer, /area/almayer/hallways/upper/starboard) +"sWb" = ( +/obj/effect/projector{ + name = "Almayer_Down2"; + vector_x = 1; + vector_y = -100 + }, +/turf/open/floor/almayer{ + allow_construction = 0 + }, +/area/almayer/hallways/upper/fore_hallway) "sWp" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -66921,10 +67284,6 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_s) -"sWz" = ( -/obj/structure/machinery/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north2) "sWC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -67095,6 +67454,18 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/medical/upper_medical) +"sYU" = ( +/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/midship_hallway) "sZc" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -67167,6 +67538,16 @@ icon_state = "blue" }, /area/almayer/living/port_emb) +"sZV" = ( +/obj/structure/machinery/cm_vending/gear/intelligence_officer{ + density = 0; + pixel_x = -32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/command/computerlab) "tab" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/box/flashbangs{ @@ -67259,17 +67640,6 @@ icon_state = "plate" }, /area/almayer/hallways/upper/starboard) -"tbD" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/midship_hallway) -"tbF" = ( -/turf/open/floor/almayer{ - icon_state = "silvercorner" - }, -/area/almayer/hallways/upper/midship_hallway) "tcd" = ( /obj/structure/surface/table/almayer, /obj/item/device/radio{ @@ -67426,21 +67796,6 @@ }, /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{ - starting_attachment_types = list(/obj/item/attachable/stock/shotgun); - pixel_y = 9 - }, -/obj/item/stack/sheet/cardboard/small_stack{ - layer = 3.01 - }, -/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_f_s) "tez" = ( /obj/effect/landmark/ert_spawns/distress_cryo, /obj/effect/landmark/late_join, @@ -67464,6 +67819,19 @@ icon_state = "plate" }, /area/almayer/command/cic) +"teZ" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsLower"; + name = "ARES Core Lockdown"; + pixel_x = -24; + pixel_y = -8; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/aicore/no_build{ + dir = 8; + icon_state = "ai_silver" + }, +/area/almayer/command/airoom) "tfb" = ( /turf/open/floor/almayer{ dir = 8; @@ -67487,6 +67855,12 @@ icon_state = "plate" }, /area/almayer/shipboard/brig/execution_storage) +"tfF" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "orange" + }, +/area/almayer/hallways/upper/midship_hallway) "tfH" = ( /obj/structure/machinery/light/containment, /obj/effect/decal/warning_stripes{ @@ -67644,13 +68018,13 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"tic" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +"tie" = ( +/obj/structure/largecrate/supply/floodlights, /turf/open/floor/almayer{ - dir = 1; + dir = 6; icon_state = "red" }, -/area/almayer/lifeboat_pumps/north2) +/area/almayer/maint/upper/u_a_p) "tig" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/tabasco{ @@ -67721,12 +68095,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"tiO" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/south2) "tiR" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ @@ -67768,10 +68136,6 @@ 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/midship_hallway) "tjj" = ( /turf/open/floor/almayer{ dir = 5; @@ -67796,16 +68160,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/tankerbunks) -"tjz" = ( -/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/upper/u_m_s) "tjH" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/radio/headset/almayer/mt, @@ -67820,6 +68174,16 @@ icon_state = "orange" }, /area/almayer/maint/hull/lower/l_m_s) +"tkd" = ( +/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/midship_hallway) "tkg" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 8; @@ -67847,6 +68211,15 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/weapon_room) +"tkF" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "tkN" = ( /obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{ req_access = null; @@ -67921,6 +68294,11 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"tlM" = ( +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/maint/upper/u_a_s) "tmg" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/hypospray, @@ -67960,23 +68338,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/execution) -"tmI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) -"tmK" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1; - req_one_access = null; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/no_build{ - icon_state = "test_floor4" - }, -/area/almayer/command/airoom) "tmQ" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -68023,6 +68384,12 @@ "tob" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_m_s) +"tof" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "tos" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -68100,6 +68467,24 @@ icon_state = "test_floor4" }, /area/almayer/hallways/lower/starboard_fore_hallway) +"toS" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/door/window/eastright{ + dir = 8; + req_access_txt = "8" + }, +/obj/structure/machinery/door/window/eastleft{ + req_access_txt = "8" + }, +/obj/item/desk_bell{ + pixel_x = -6; + pixel_y = 10; + anchored = 1 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green" + }, +/area/almayer/medical/lower_medical_medbay) "tpa" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/structure/window/reinforced{ @@ -68116,20 +68501,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"tpj" = ( -/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/upper/fore_hallway) "tpn" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/evidence_storage) @@ -68253,12 +68624,56 @@ icon_state = "orangecorner" }, /area/almayer/engineering/lower) +"tru" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) +"trx" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/hallways/upper/midship_hallway) "trB" = ( /turf/open/floor/almayer{ dir = 10; icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"trF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/item/storage/firstaid/o2{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/storage/firstaid/fire{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/storage/firstaid/adv{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/storage/firstaid/toxin{ + pixel_x = 8; + pixel_y = -2 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/medical_science) "trU" = ( /obj/structure/surface/table/almayer, /obj/item/tool/pen/blue/clicky{ @@ -68289,6 +68704,9 @@ /obj/item/clothing/suit/chef/classic, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) +"tsn" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/midship_hallway) "tsr" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/maint/upper/mess) @@ -68368,14 +68786,6 @@ }, /turf/open/floor/plating, /area/almayer/powered/agent) -"tty" = ( -/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/upper/u_a_s) "ttB" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, @@ -68395,6 +68805,19 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) +"ttT" = ( +/obj/structure/machinery/door_control{ + id = "ARES JoeCryo"; + name = "ARES WorkingJoe Bay Shutters"; + req_one_access_txt = "91;92"; + pixel_x = 24 + }, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + autoname = 0; + c_tag = "AI - Comms" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "ttX" = ( /obj/structure/surface/table/almayer, /obj/item/storage/firstaid/regular{ @@ -68496,6 +68919,10 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) +"tuX" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/fore_hallway) "tuZ" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -68510,15 +68937,6 @@ }, /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/upper/u_a_s) "tvt" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -68579,10 +68997,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"tvS" = ( -/obj/docking_port/stationary/escape_pod/south, -/turf/open/floor/plating, -/area/almayer/maint/upper/u_m_s) "twp" = ( /obj/structure/ladder{ height = 1; @@ -68594,25 +69008,6 @@ }, /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{ - pixel_x = 7 - }, -/obj/item/paper_bin/uscm{ - pixel_y = 5 - }, -/obj/item/tool/pen, -/obj/structure/machinery/computer/working_joe{ - dir = 8; - pixel_x = 17 - }, -/obj/item/device/megaphone, -/obj/item/book/manual/medical_diagnostics_manual, -/turf/open/floor/almayer{ - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lower_medical_medbay) "twB" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer2" @@ -68661,19 +69056,30 @@ }, /turf/open/floor/almayer, /area/almayer/living/port_emb) -"txd" = ( +"txf" = ( /obj/structure/disposalpipe/segment{ - dir = 1; + dir = 2; icon_state = "pipe-c" }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_s) +"txh" = ( +/obj/structure/surface/table/reinforced/almayer_B{ + indestructible = 1; + unacidable = 1; + unslashable = 1 }, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "orange" +/obj/item/desk_bell{ + pixel_y = 14; + pixel_x = -5; + anchored = 1 }, -/area/almayer/hallways/upper/midship_hallway) +/obj/structure/machinery/computer/working_joe{ + layer = 3.3; + dir = 8 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "txp" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/plating_catwalk, @@ -68736,6 +69142,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +"tyC" = ( +/obj/structure/sign/safety/medical{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "tyD" = ( /turf/open/floor/almayer/research/containment/corner_var1{ dir = 4 @@ -68779,7 +69194,7 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/almayer/hallways/upper/midship_hallway) +/area/almayer/hallways/upper/aft_hallway) "tzL" = ( /obj/structure/sign/safety/waterhazard{ pixel_x = 8; @@ -68790,6 +69205,13 @@ icon_state = "test_floor5" }, /area/almayer/medical/hydroponics) +"tzO" = ( +/obj/structure/machinery/cm_vending/sorted/medical/chemistry, +/obj/structure/medical_supply_link, +/turf/open/floor/almayer{ + icon_state = "dark_sterile" + }, +/area/almayer/medical/chemistry) "tzP" = ( /obj/structure/barricade/handrail/medical, /turf/open/floor/almayer{ @@ -68931,25 +69353,25 @@ icon_state = "test_floor4" }, /area/almayer/hallways/upper/port) -"tCC" = ( +"tCH" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "orange" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/area/almayer/maint/upper/u_a_s) -"tCD" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{ + closeOtherId = "brignorth"; + dir = 2; + name = "\improper Brig Armoury"; + req_access = null; + req_one_access_txt = "1;3" }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" + icon_state = "test_floor4" }, -/area/almayer/hallways/upper/midship_hallway) +/area/almayer/shipboard/brig/starboard_hallway) "tCT" = ( /obj/structure/bed/chair/comfy/blue{ dir = 8 @@ -69015,6 +69437,18 @@ icon_state = "emeraldfull" }, /area/almayer/living/briefing) +"tEM" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "tEO" = ( /obj/effect/landmark/start/marine/medic/charlie, /obj/effect/landmark/late_join/charlie, @@ -69041,6 +69475,20 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) +"tFJ" = ( +/obj/structure/largecrate/supply/supplies/mre, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/maint/upper/u_a_p) +"tFO" = ( +/obj/structure/largecrate/supply/supplies/flares, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "red" + }, +/area/almayer/maint/upper/u_a_p) "tFS" = ( /obj/structure/machinery/computer/supplycomp, /obj/structure/sign/safety/terminal{ @@ -69132,12 +69580,6 @@ }, /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/upper/aft_hallway) "tHk" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -69288,6 +69730,11 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) +"tJm" = ( +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "tJq" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -69300,15 +69747,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"tJN" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/almayer/aicore/no_build{ - icon_state = "ai_cargo" - }, -/area/almayer/command/airoom) "tJR" = ( /obj/structure/machinery/vending/cigarette, /obj/structure/sign/safety/medical{ @@ -69399,13 +69837,27 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop/hangar) -"tMT" = ( -/obj/item/tool/weldingtool, -/obj/structure/surface/rack, +"tMi" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, /turf/open/floor/almayer{ - icon_state = "red" + dir = 8; + icon_state = "green" }, -/area/almayer/maint/upper/u_a_p) +/area/almayer/hallways/upper/fore_hallway) +"tMu" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp2"; + vector_x = -102; + vector_y = 61 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "tMU" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -69455,6 +69907,12 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha) +"tNY" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "tOr" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -69542,20 +70000,6 @@ 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/fore_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/fore_hallway) "tPI" = ( /obj/structure/bed/chair{ dir = 4 @@ -69589,27 +70033,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cryo) -"tQA" = ( -/obj/structure/machinery/door/airlock/almayer/maint/reinforced{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/upper/u_f_s) "tQL" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"tQO" = ( -/obj/structure/sign/safety/restrictedarea{ - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "tQV" = ( /turf/closed/wall/almayer/outer, /area/almayer/lifeboat_pumps/south1) @@ -69663,6 +70091,40 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"tSI" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "ARES StairsLock"; + name = "ARES Exterior Lockdown" + }, +/obj/effect/step_trigger/ares_alert/access_control, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/disposaloutlet{ + density = 0; + desc = "An outlet for the pneumatic delivery system."; + icon_state = "delivery_outlet"; + name = "returns outlet"; + pixel_y = 28; + range = 0; + pixel_x = -7 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) +"tSX" = ( +/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/upper/u_m_s) "tTk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -69701,13 +70163,6 @@ icon_state = "kitchen" }, /area/almayer/living/captain_mess) -"tTE" = ( -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_p) "tTG" = ( /obj/structure/sign/safety/terminal{ pixel_x = 8; @@ -69722,6 +70177,11 @@ icon_state = "red" }, /area/almayer/shipboard/brig/starboard_hallway) +"tTZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) "tUh" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -69800,12 +70260,6 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha) -"tVs" = ( -/obj/structure/closet, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_f_s) "tVx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -69821,15 +70275,6 @@ /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/fore_hallway) "tWi" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -69874,10 +70319,6 @@ 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_f_s) "tWY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -69898,6 +70339,17 @@ icon_state = "test_floor4" }, /area/almayer/medical/upper_medical) +"tXa" = ( +/obj/item/storage/toolbox/mechanical{ + pixel_y = 13 + }, +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_s) "tXb" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/bed/chair/comfy/charlie{ @@ -69982,6 +70434,16 @@ icon_state = "plate" }, /area/almayer/living/port_emb) +"tYb" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door_control{ + id = "ARES ReceptStairs2"; + name = "ARES Reception Stairway Shutters"; + pixel_x = 24; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "tYi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -70057,12 +70519,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/upper/port) -"tZM" = ( -/obj/structure/sink{ - pixel_y = 24 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_a_s) "tZZ" = ( /obj/structure/machinery/cryopod, /obj/effect/decal/warning_stripes{ @@ -70159,6 +70615,14 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/command/computerlab) +"ubv" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/fore_hallway) "ubA" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -70166,6 +70630,10 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) +"ubB" = ( +/obj/structure/window/framed/almayer/aicore/hull/black/hijack_bustable, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "ubI" = ( /obj/structure/surface/table/almayer, /obj/item/folder/black_random{ @@ -70188,18 +70656,6 @@ }, /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/fore_hallway) "ucp" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -70240,13 +70696,6 @@ icon_state = "plate" }, /area/almayer/command/cic) -"ucU" = ( -/obj/structure/machinery/cm_vending/sorted/medical/blood, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_corner" - }, -/area/almayer/medical/lower_medical_medbay) "udf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -70281,6 +70730,15 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"udv" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "udx" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/almayer{ @@ -70358,6 +70816,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_p) +"uey" = ( +/obj/structure/machinery/cm_vending/sorted/medical/bolted, +/obj/structure/medical_supply_link/green, +/turf/open/floor/almayer{ + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lockerroom) "ueG" = ( /obj/item/bedsheet/orange, /obj/structure/bed{ @@ -70382,6 +70847,10 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"ueY" = ( +/obj/structure/machinery/light, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_s) "ueZ" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/alpha{ @@ -70428,6 +70897,16 @@ icon_state = "orange" }, /area/almayer/maint/hull/lower/l_m_s) +"ugo" = ( +/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/upper/u_m_s) "ugu" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer, @@ -70505,11 +70984,6 @@ /obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) -"uhI" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/fore_hallway) "uhM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -70524,6 +70998,12 @@ icon_state = "cargo_arrow" }, /area/almayer/living/offices) +"uig" = ( +/obj/structure/largecrate/supply/floodlights, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) "uiC" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -70573,12 +71053,6 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) -"ujf" = ( -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_f_s) "ujz" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -70706,22 +71180,12 @@ 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/fore_hallway) "umI" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/almayer/hallways/upper/fore_hallway) +/area/almayer/hallways/upper/aft_hallway) "umS" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -70841,6 +71305,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/p_bow) +"upK" = ( +/obj/structure/blocker/fuelpump, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south2) "upM" = ( /obj/structure/machinery/light{ dir = 4 @@ -70855,11 +71323,6 @@ icon_state = "cargo_arrow" }, /area/almayer/living/offices) -"upQ" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/lifeboat_pumps/north1) "upR" = ( /obj/structure/machinery/light{ dir = 1 @@ -70877,6 +71340,13 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_m_p) +"upW" = ( +/obj/structure/sign/safety/intercom{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "uqd" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/warning_stripes{ @@ -70926,6 +71396,17 @@ "uqo" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) +"uqs" = ( +/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/upper/u_m_s) "uqA" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -70942,15 +71423,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"uqJ" = ( -/turf/open/floor/almayer{ - icon_state = "orangecorner" - }, -/area/almayer/maint/upper/u_a_s) -"urg" = ( -/obj/docking_port/stationary/escape_pod/east, -/turf/open/floor/plating, -/area/almayer/maint/upper/u_m_p) "urk" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -70961,12 +71433,6 @@ icon_state = "orangecorner" }, /area/almayer/hallways/lower/starboard_umbilical) -"urs" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "orange" - }, -/area/almayer/hallways/upper/midship_hallway) "ury" = ( /obj/structure/bed/chair{ dir = 8 @@ -70979,23 +71445,6 @@ icon_state = "plate" }, /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_f_s) "urM" = ( /obj/structure/machinery/light{ dir = 8 @@ -71010,9 +71459,6 @@ /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) -"usi" = ( -/turf/open/floor/almayer, -/area/almayer/hallways/upper/aft_hallway) "usm" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/waterhazard{ @@ -71036,6 +71482,15 @@ icon_state = "redfull" }, /area/almayer/shipboard/panic) +"usu" = ( +/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_f_s) "usy" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -71047,10 +71502,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"usL" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/almayer, -/area/almayer/hallways/upper/port) "usX" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -71092,15 +71543,9 @@ 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/upper/u_a_s) +"utp" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_f_s) "utK" = ( /obj/structure/machinery/light{ dir = 4 @@ -71131,6 +71576,18 @@ }, /turf/open/floor/almayer, /area/almayer/squads/bravo) +"uul" = ( +/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/lifeboat_pumps/south2) "uun" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -71240,18 +71697,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/s_bow) -"uvq" = ( -/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/upper/midship_hallway) "uvt" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -71304,10 +71749,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/cells) -"uwf" = ( -/obj/structure/machinery/light, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_a_s) "uws" = ( /obj/structure/machinery/light{ dir = 4 @@ -71382,12 +71823,6 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) -"uxs" = ( -/obj/structure/machinery/pipedispenser/orderable, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_a_s) "uxC" = ( /obj/structure/machinery/light{ dir = 4 @@ -71417,12 +71852,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"uxW" = ( -/obj/structure/largecrate/random/case/small, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_a_s) "uxX" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer, @@ -71450,6 +71879,14 @@ "uyH" = ( /turf/closed/wall/almayer/research/containment/wall/divide, /area/almayer/medical/containment/cell) +"uyQ" = ( +/obj/structure/largecrate/random/case{ + layer = 2.98 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "uzv" = ( /obj/structure/bed/chair{ dir = 8; @@ -71471,37 +71908,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/ce_room) -"uzH" = ( -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - closeOtherId = "brigmed"; - name = "\improper Brig Medbay"; - req_access = null; - req_one_access = null; - req_one_access_txt = "20;3" - }, -/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/midship_hallway) "uAj" = ( /obj/structure/bed/chair, /obj/effect/decal/cleanable/dirt, @@ -71564,6 +71976,20 @@ /obj/item/toy/plush/farwa, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) +"uAP" = ( +/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/upper/midship_hallway) "uAW" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -71589,10 +72015,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_midship_hallway) -"uBs" = ( -/obj/effect/landmark/start/pilot/dropship_pilot, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/pilotbunks) "uBx" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -71617,6 +72039,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_m_p) +"uBG" = ( +/obj/item/tool/weldingtool, +/obj/structure/surface/rack, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/maint/upper/u_a_p) "uBM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -71645,12 +72074,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) -"uCg" = ( -/obj/structure/blocker/fuelpump, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north2) "uCh" = ( /obj/structure/reagent_dispensers/watertank, /obj/structure/sign/safety/water{ @@ -71853,6 +72276,15 @@ icon_state = "green" }, /area/almayer/hallways/lower/port_midship_hallway) +"uGi" = ( +/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/lower/starboard_umbilical) "uGN" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -71872,42 +72304,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_f_p) -"uHd" = ( -/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/computer/working_joe{ - pixel_y = 16 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "red" - }, -/area/almayer/shipboard/brig/warden_office) "uHk" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/light{ @@ -71931,11 +72327,6 @@ icon_state = "plate" }, /area/almayer/maint/lower/s_bow) -"uIa" = ( -/turf/open/floor/almayer{ - icon_state = "greencorner" - }, -/area/almayer/hallways/upper/fore_hallway) "uIv" = ( /turf/open/floor/almayer{ icon_state = "orange" @@ -71988,6 +72379,10 @@ icon_state = "outerhull_dir" }, /area/space) +"uJA" = ( +/obj/structure/machinery/fuelpump, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "uJM" = ( /obj/structure/sign/safety/medical{ pixel_x = 8; @@ -72034,22 +72429,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_s) -"uKv" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/multitool{ - desc = "A large handheld tool used to override various machine functions. Primarily used to pulse Airlock and APC wires on a shortwave frequency. It contains a small data buffer as well. This one is comically oversized. Made in Texas."; - icon_state = "multitool_big"; - name = "\improper Oversized Security Access Tuner"; - pixel_y = 11; - pixel_x = 4 - }, -/obj/item/stack/sheet/cardboard/medium_stack{ - pixel_y = -6; - pixel_x = -7; - layer = 3.01 - }, -/turf/open/floor/almayer, -/area/almayer/squads/alpha_bravo_shared) "uKH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -72208,44 +72587,41 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"uOi" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/lifeboat_pumps/south2) -"uOE" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 +"uOh" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/upper/u_a_p) +/area/almayer/hallways/upper/fore_hallway) +"uOi" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/lifeboat_pumps/south2) "uOJ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "mono" }, /area/almayer/living/pilotbunks) +"uPg" = ( +/obj/structure/machinery/door_control{ + id = "ARES JoeCryo"; + name = "ARES WorkingJoe Bay Shutters"; + req_one_access_txt = "91;92"; + pixel_x = -24 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "uPr" = ( /turf/open/floor/almayer{ dir = 5; icon_state = "blue" }, /area/almayer/living/basketball) -"uPB" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/hallways/upper/midship_hallway) "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/upper/u_a_s) "uPP" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -72277,11 +72653,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_aft_hallway) -"uQi" = ( -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "uQm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -72386,6 +72757,15 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) +"uSk" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "uSH" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/reagent_dispensers/water_cooler{ @@ -72421,20 +72801,17 @@ 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/midship_hallway) "uTk" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/plating, /area/almayer/maint/lower/constr) +"uTl" = ( +/obj/structure/surface/table/almayer, +/obj/item/weapon/gun/rifle/m41a, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_s) "uTs" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -72454,12 +72831,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/bravo) -"uTD" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/hallways/upper/fore_hallway) "uTE" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -72618,15 +72989,6 @@ 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/fore_hallway) "uVh" = ( /obj/structure/filingcabinet/seeds, /turf/open/floor/almayer{ @@ -72679,18 +73041,27 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) -"uVZ" = ( +"uVY" = ( +/obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ - dir = 5; - icon_state = "green" + icon_state = "plate" }, -/area/almayer/hallways/upper/fore_hallway) +/area/almayer/maint/upper/u_m_p) "uWc" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer{ icon_state = "emeraldfull" }, /area/almayer/living/briefing) +"uWk" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 9; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "uWm" = ( /obj/effect/projector{ name = "Almayer_Up4"; @@ -72777,6 +73148,13 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/interrogation) +"uXE" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/upper/midship_hallway) "uXL" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -72866,12 +73244,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"uZI" = ( -/turf/open/floor/almayer{ - dir = 8; - icon_state = "bluecorner" - }, -/area/almayer/hallways/upper/midship_hallway) "uZV" = ( /obj/structure/reagent_dispensers/fueltank/gas/methane{ anchored = 1 @@ -72903,25 +73275,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_fore_hallway) -"vaM" = ( -/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 - }, -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/lower/starboard_umbilical) "vaQ" = ( /obj/structure/machinery/door/airlock/almayer/medical{ dir = 1; @@ -72962,16 +73315,29 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"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{ +"vbo" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + closeOtherId = "brigcells"; + name = "\improper Brig Prisoner Yard" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 8 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; - icon_state = "orange" + id = "courtyard_cells"; + name = "\improper Courtyard Lockdown Shutter" }, -/area/almayer/maint/upper/u_a_s) +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/processing) "vbB" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) @@ -73024,6 +73390,15 @@ icon_state = "plate" }, /area/almayer/medical/morgue) +"vbU" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "vbV" = ( /obj/structure/bed/chair/wheelchair{ dir = 1 @@ -73076,6 +73451,14 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south2) +"vcG" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "vcI" = ( /obj/effect/decal/cleanable/blood/oil/streak, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -73083,6 +73466,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_s) +"vcM" = ( +/obj/effect/projector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "vdl" = ( /obj/structure/window/reinforced/ultra{ pixel_y = -12 @@ -73130,14 +73525,15 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"vdT" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 +"vdR" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -17 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 9; + icon_state = "red" }, -/area/almayer/maint/upper/u_f_s) +/area/almayer/lifeboat_pumps/south2) "ven" = ( /obj/structure/bed/chair, /turf/open/floor/almayer{ @@ -73160,27 +73556,6 @@ icon_state = "emeraldfull" }, /area/almayer/living/briefing) -"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) -"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/upper/u_m_p) "vfa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -73261,10 +73636,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"vgt" = ( -/obj/structure/machinery/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) "vgv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -73322,6 +73693,12 @@ "vgO" = ( /turf/closed/wall/almayer/research/containment/wall/east, /area/almayer/medical/containment/cell) +"vhb" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "red" + }, +/area/almayer/maint/upper/u_a_p) "vhe" = ( /obj/structure/filingcabinet{ density = 0; @@ -73431,6 +73808,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +"viv" = ( +/obj/structure/bed/sofa/south/white/right{ + pixel_y = 16 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "silver" + }, +/area/almayer/maint/upper/u_m_p) "viB" = ( /obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 1 @@ -73468,13 +73854,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) -"vjd" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "vjg" = ( /obj/structure/prop/almayer/missile_tube{ icon_state = "missiletubesouth" @@ -73485,26 +73864,6 @@ icon_state = "plating" }, /area/almayer/shipboard/port_missiles) -"vjk" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/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 = "plate" - }, -/area/almayer/hallways/lower/starboard_umbilical) "vjv" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -73655,12 +74014,6 @@ icon_state = "plate" }, /area/almayer/maint/lower/s_bow) -"vkQ" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "orange" - }, -/area/almayer/hallways/upper/midship_hallway) "vkR" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -73671,15 +74024,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"vkV" = ( -/obj/effect/landmark/start/liaison, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_p) -"vle" = ( -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_a_s) "vlk" = ( /obj/structure/closet/emcloset, /obj/item/clothing/mask/gas, @@ -73748,13 +74092,6 @@ 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/midship_hallway) "vlX" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /turf/open/floor/almayer{ @@ -73780,12 +74117,6 @@ "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/upper/u_a_p) "vmE" = ( /turf/open/floor/almayer{ icon_state = "orangecorner" @@ -73842,16 +74173,13 @@ "vnY" = ( /turf/open/floor/almayer, /area/almayer/hallways/lower/repair_bay) -"vnZ" = ( -/obj/structure/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, +"voj" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - icon_state = "orange" + icon_state = "mono" }, -/area/almayer/hallways/upper/midship_hallway) +/area/almayer/hallways/upper/fore_hallway) "vop" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -73868,6 +74196,77 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_m_p) +"vou" = ( +/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; + icon_state = "bulb-burned"; + status = 3 + }, +/obj/effect/decal/cleanable/blood, +/obj/item/prop{ + desc = "A blood bag with a hole in it. The rats must have gotten to it first."; + icon = 'icons/obj/items/bloodpack.dmi'; + icon_state = "bloodpack"; + name = "blood bag" + }, +/obj/item/prop{ + desc = "A blood bag with a hole in it. The rats must have gotten to it first."; + icon = 'icons/obj/items/bloodpack.dmi'; + icon_state = "bloodpack"; + name = "blood bag" + }, +/obj/item/prop{ + desc = "A blood bag with a hole in it. The rats must have gotten to it first."; + icon = 'icons/obj/items/bloodpack.dmi'; + icon_state = "bloodpack"; + name = "blood bag" + }, +/obj/item/prop{ + desc = "The words \"Cloning Pod\" are scrawled onto it. It appears to be heavily damaged."; + icon = 'icons/obj/items/circuitboards.dmi'; + icon_state = "id_mod"; + layer = 2.78; + name = "circuit board"; + pixel_x = 8; + pixel_y = 10 + }, +/obj/item/prop{ + desc = "The words \"Cloning Scanner\" are scrawled onto it. It appears to be heavily damaged."; + icon = 'icons/obj/items/circuitboards.dmi'; + icon_state = "id_mod"; + layer = 2.79; + name = "circuit board"; + pixel_x = 8; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + icon_state = "sterile_green_corner" + }, +/area/almayer/medical/lower_medical_medbay) +"voV" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/structure/machinery/door/airlock/almayer/research/reinforced{ + closeOtherId = "containment_n"; + dir = 8; + name = "\improper Containment Airlock" + }, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/containment) "vpe" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/engineering/reinforced/OT{ @@ -73883,12 +74282,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_m_p) -"vpi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/aft_hallway) "vpn" = ( /turf/open/floor/almayer{ dir = 9; @@ -73947,9 +74340,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/processing) -"vqh" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_f_s) "vqz" = ( /obj/structure/machinery/light{ dir = 4 @@ -73977,6 +74367,20 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"vqI" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/camera_film{ + pixel_x = 4; + pixel_y = 1; + layer = 3.03 + }, +/obj/item/stack/sheet/cardboard/small_stack{ + pixel_x = -5; + pixel_y = 3; + layer = 3.02 + }, +/turf/open/floor/almayer, +/area/almayer/squads/charlie_delta_shared) "vqK" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer{ @@ -74226,16 +74630,6 @@ 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/starboard) "vuF" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ access_modified = 1; @@ -74376,6 +74770,12 @@ icon_state = "dark_sterile" }, /area/almayer/living/port_emb) +"vwj" = ( +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) "vwC" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -74405,13 +74805,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) -"vwJ" = ( -/obj/structure/largecrate/random/case/double, -/obj/structure/machinery/light/small, +"vwT" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 4; + icon_state = "blue" }, -/area/almayer/maint/upper/u_m_p) +/area/almayer/hallways/upper/midship_hallway) "vwU" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -74433,22 +74832,6 @@ /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{ - closeOtherId = "brigwarden"; - dir = 1; - name = "\improper Warden's Office" - }, -/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{ @@ -74557,6 +74940,51 @@ "vyB" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/vehiclehangar) +"vyE" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/aicore/no_build{ + dir = 4; + icon_state = "ai_arrow" + }, +/area/almayer/command/airoom) +"vyG" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + pixel_x = -10; + pixel_y = -24; + req_one_access_txt = "91;92" + }, +/obj/structure/machinery/door_control{ + id = "ARES StairsLock"; + name = "ARES Exterior Lockdown"; + pixel_y = -24; + req_one_access_txt = "91;92" + }, +/obj/structure/surface/table/reinforced/almayer_B{ + indestructible = 1; + unacidable = 1; + unslashable = 1 + }, +/obj/structure/machinery/door_control{ + id = "ARES Emergency"; + name = "ARES Emergency Lockdown"; + pixel_x = 10; + pixel_y = -24; + req_one_access_txt = "91;92" + }, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 4; + pixel_y = 12 + }, +/obj/structure/machinery/computer/cameras/almayer/ares{ + dir = 4; + pixel_y = -1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "vyH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -74624,15 +75052,6 @@ "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_f_s) "vzP" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/cups, @@ -74728,15 +75147,6 @@ icon_state = "mono" }, /area/almayer/medical/medical_science) -"vAU" = ( -/obj/structure/pipes/vents/scrubber/no_boom{ - dir = 4 - }, -/turf/open/floor/almayer/aicore/no_build{ - dir = 8; - icon_state = "ai_silver" - }, -/area/almayer/command/airoom) "vBp" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -74794,6 +75204,18 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/hydroponics) +"vCt" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) +"vCv" = ( +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/midship_hallway) "vCx" = ( /obj/structure/machinery/status_display{ pixel_y = -30 @@ -74848,13 +75270,6 @@ }, /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_f_s) "vDz" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -74868,14 +75283,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) -"vDR" = ( -/obj/structure/surface/rack, -/obj/item/tool/wet_sign, -/obj/item/tool/wet_sign, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_a_p) "vEf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -74938,6 +75345,12 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_s) +"vER" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "red" + }, +/area/almayer/hallways/upper/aft_hallway) "vEV" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -74979,19 +75392,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) -"vFy" = ( -/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" - }, -/area/almayer/hallways/upper/fore_hallway) "vFH" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -75011,6 +75411,16 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_f_p) +"vGi" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/aft_hallway) "vGn" = ( /turf/open/floor/almayer{ dir = 1; @@ -75039,6 +75449,15 @@ icon_state = "dark_sterile" }, /area/almayer/living/numbertwobunks) +"vGQ" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "vHa" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/ares_console{ @@ -75158,6 +75577,16 @@ icon_state = "containment_corner_variant_2" }, /area/almayer/medical/containment/cell) +"vHP" = ( +/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_f_s) "vHW" = ( /obj/structure/surface/rack, /obj/item/tool/extinguisher, @@ -75184,20 +75613,22 @@ 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{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/upper/fore_hallway) +"vIo" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/upper/u_f_p) "vIu" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/command/cichallway) +"vIZ" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "vJc" = ( /turf/open/floor/almayer{ dir = 4; @@ -75267,6 +75698,23 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"vKr" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + closeOtherId = "brigcells"; + dir = 1; + name = "\improper Brig Prison Yard And Offices" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/shipboard/brig/processing) "vKB" = ( /obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, /obj/structure/machinery/light/small{ @@ -75325,14 +75773,6 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/charlie) -"vLM" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_m_p) "vMb" = ( /obj/item/stool{ pixel_x = -15; @@ -75347,6 +75787,12 @@ /obj/effect/landmark/start/otech, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/offices) +"vMt" = ( +/turf/open/floor/almayer/aicore/no_build{ + dir = 8; + icon_state = "ai_silver" + }, +/area/almayer/command/airoom) "vMA" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -75409,10 +75855,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"vMQ" = ( -/obj/docking_port/stationary/escape_pod/north, -/turf/open/floor/plating, -/area/almayer/maint/upper/u_m_p) "vMU" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -75423,6 +75865,13 @@ icon_state = "redcorner" }, /area/almayer/hallways/lower/port_fore_hallway) +"vNo" = ( +/obj/structure/largecrate/random/case/double, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) "vNp" = ( /obj/structure/sign/safety/three{ pixel_x = -17 @@ -75459,6 +75908,12 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) +"vOp" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 6 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "vOu" = ( /obj/structure/surface/table/almayer, /obj/item/weapon/gun/energy/taser, @@ -75617,6 +76072,12 @@ icon_state = "redfull" }, /area/almayer/engineering/lower/workshop/hangar) +"vPT" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_s) "vPW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -75650,6 +76111,14 @@ /obj/item/device/camera, /turf/open/floor/almayer, /area/almayer/command/computerlab) +"vQN" = ( +/obj/structure/sign/safety/restrictedarea{ + pixel_y = -32 + }, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "vQR" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/wood/ship, @@ -75695,16 +76164,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"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 = "test_floor4" - }, -/area/almayer/maint/upper/u_a_s) "vRR" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -75833,6 +76292,14 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) +"vTE" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_a_s) "vTM" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -75855,23 +76322,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) -"vTV" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/obj/structure/machinery/door_control{ - id = "OTStore"; - name = "Shutters"; - pixel_y = -24; - access_modified = 1; - req_one_access_txt = "35" - }, -/obj/structure/surface/rack, -/obj/item/reagent_container/glass/bucket/janibucket, -/turf/open/floor/almayer{ - icon_state = "orange" - }, -/area/almayer/engineering/lower/workshop/hangar) "vTX" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_y = -32 @@ -75901,6 +76351,20 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/command/lifeboat) +"vUn" = ( +/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/port) "vUI" = ( /obj/structure/bed/chair/comfy/orange{ dir = 8 @@ -75922,15 +76386,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_p) -"vUO" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "vUP" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/cic_hallway) @@ -76187,6 +76642,28 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/vehiclehangar) +"vYi" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ + closeOtherId = "brigwarden"; + name = "\improper Warden's Office" + }, +/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) "vYm" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, @@ -76272,26 +76749,24 @@ "vZw" = ( /turf/open/floor/almayer/research/containment/floor2, /area/almayer/medical/containment/cell/cl) -"vZF" = ( -/obj/structure/blocker/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) -"vZU" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/cell_charger, -/obj/structure/sign/safety/high_rad{ - pixel_x = 32; - pixel_y = -8 +"vZI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/sign/safety/hazard{ - pixel_x = 32; - pixel_y = 7 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ dir = 4; - icon_state = "orange" + icon_state = "blue" }, -/area/almayer/engineering/lower) +/area/almayer/hallways/upper/midship_hallway) +"vZJ" = ( +/turf/open/floor/almayer{ + dir = 6; + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "wac" = ( /obj/structure/window/reinforced{ dir = 8; @@ -76323,17 +76798,12 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"waV" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, +"waP" = ( +/obj/structure/closet/firecloset, /turf/open/floor/almayer{ - dir = 8; - icon_state = "red" + icon_state = "cargo" }, -/area/almayer/hallways/upper/starboard) +/area/almayer/hallways/upper/fore_hallway) "wbu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname/almayer{ @@ -76498,25 +76968,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"wdo" = ( -/obj/structure/machinery/door/airlock/almayer/research/reinforced{ - closeOtherId = "containment_s"; - dir = 8; - name = "\improper Containment Airlock" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/medical/medical_science) "wdv" = ( /obj/structure/machinery/door/airlock/almayer/maint{ name = "\improper Core Hatch" @@ -76537,6 +76988,14 @@ /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) +"wdE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/midship_hallway) "wdF" = ( /turf/open/floor/almayer{ allow_construction = 0 @@ -76610,17 +77069,6 @@ 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 - }, -/obj/structure/medical_supply_link, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/panic) "wex" = ( /obj/structure/sign/safety/bathunisex{ pixel_x = 8; @@ -76732,6 +77180,16 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) +"whc" = ( +/obj/structure/sign/safety/medical{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "whm" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -76758,6 +77216,10 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"whO" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_s) "whQ" = ( /obj/structure/closet/secure_closet/personal/cabinet{ req_access = null @@ -76873,29 +77335,11 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) -"wjE" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/hallways/upper/starboard) "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/upper/u_a_s) "wjQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/prop/invuln/overhead_pipe{ @@ -76941,6 +77385,15 @@ icon_state = "sterile_green" }, /area/almayer/medical/lockerroom) +"wks" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_s) "wky" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -77046,12 +77499,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) -"wlB" = ( -/obj/structure/largecrate/random/case/small, +"wlr" = ( /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "silver" }, -/area/almayer/maint/upper/u_m_p) +/area/almayer/hallways/upper/midship_hallway) "wlD" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /obj/effect/decal/warning_stripes{ @@ -77097,6 +77550,19 @@ icon_state = "red" }, /area/almayer/shipboard/starboard_missiles) +"wmo" = ( +/obj/structure/sign/safety/bridge{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/west{ + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "wmz" = ( /obj/structure/bed/chair/comfy/bravo{ dir = 1 @@ -77105,12 +77571,6 @@ 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/midship_hallway) "wmK" = ( /obj/structure/surface/table/almayer, /obj/item/clipboard, @@ -77144,6 +77604,18 @@ icon_state = "cargo" }, /area/almayer/living/bridgebunks) +"wnb" = ( +/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/upper/u_m_s) "wnh" = ( /obj/structure/window/framed/almayer/aicore/hull, /turf/open/floor/plating, @@ -77214,21 +77686,24 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) -"wph" = ( -/obj/item/paper_bin/wy, -/obj/structure/surface/table/woodentable/fancy, -/obj/item/tool/pen/clicky, -/obj/item/tool/pen/clicky, -/obj/structure/machinery/status_display{ - pixel_x = -32 +"wpt" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "CIC Lockdown"; + name = "\improper Combat Information Center Blast Door" }, -/obj/item/desk_bell{ - anchored = 1; - pixel_x = -8; - pixel_y = 8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/carpet, -/area/almayer/command/corporateliaison) +/obj/structure/machinery/door/airlock/almayer/command/reinforced{ + closeOtherId = "ciclobby_s"; + name = "\improper Combat Information Center" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/command/cic) "wpu" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/flashlight/lamp{ @@ -77243,30 +77718,6 @@ icon_state = "mono" }, /area/almayer/medical/upper_medical) -"wpw" = ( -/obj/structure/bed/chair/comfy/ares{ - dir = 1 - }, -/obj/structure/pipes/vents/pump/no_boom{ - desc = "Has a valve and pump attached to it, connected to multiple gas tanks."; - name = "Security Vent" - }, -/turf/open/floor/almayer/no_build{ - icon_state = "plating" - }, -/area/almayer/command/airoom) -"wpz" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/structure/closet, -/obj/item/clothing/head/bearpelt, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/port_emb) "wpI" = ( /turf/open/floor/almayer{ dir = 4; @@ -77283,12 +77734,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower) -"wpT" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_a_s) "wqc" = ( /obj/structure/sign/poster{ pixel_y = 32 @@ -77370,6 +77815,11 @@ }, /turf/open/floor/almayer, /area/almayer/living/gym) +"wrI" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_f_p) "wrN" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/camera/autoname/almayer{ @@ -77385,13 +77835,6 @@ allow_construction = 0 }, /area/almayer/hallways/lower/port_fore_hallway) -"wrQ" = ( -/obj/structure/sign/safety/storage{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) "wrT" = ( /obj/structure/surface/table/almayer, /obj/item/device/radio/marine, @@ -77579,6 +78022,28 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_p) +"wui" = ( +/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/upper/u_m_p) +"wuk" = ( +/obj/structure/sign/safety/maint{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "wup" = ( /obj/structure/supply_drop/echo, /turf/open/floor/almayer, @@ -77601,6 +78066,15 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop) +"wuS" = ( +/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/upper/u_a_s) "wuT" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -77668,15 +78142,19 @@ icon_state = "cargo" }, /area/almayer/living/synthcloset) -"wwi" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"wvX" = ( +/obj/structure/sign/safety/analysis_lab{ + pixel_y = 26 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/sign/safety/terminal{ + pixel_x = 15; + pixel_y = 26 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/fore_hallway) +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "wwr" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -77805,9 +78283,6 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"wyc" = ( -/turf/open/floor/plating, -/area/almayer/maint/upper/u_f_p) "wyt" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/microwave{ @@ -77824,16 +78299,6 @@ }, /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/midship_hallway) "wyG" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/airlock/almayer/maint{ @@ -77865,18 +78330,6 @@ /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 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "wzZ" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass{ dir = 1; @@ -77890,29 +78343,20 @@ icon_state = "test_floor4" }, /area/almayer/medical/lower_medical_medbay) +"wAE" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/fore_hallway) "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 - }, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/obj/item/desk_bell{ - anchored = 1 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "red" - }, -/area/almayer/shipboard/brig/lobby) "wBw" = ( /obj/structure/pipes/vents/pump, /obj/structure/machinery/status_display{ @@ -77930,6 +78374,12 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/upper/starboard) +"wCe" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "wCk" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/wooden_tv/ot{ @@ -77937,6 +78387,14 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) +"wCn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/hallways/upper/fore_hallway) "wCs" = ( /obj/structure/machinery/vending/security, /obj/structure/machinery/power/apc/almayer{ @@ -77952,20 +78410,6 @@ icon_state = "redcorner" }, /area/almayer/living/briefing) -"wCT" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresDown"; - vector_x = 97; - vector_y = -65 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "wDg" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -78093,6 +78537,10 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) +"wEw" = ( +/obj/effect/landmark/start/pilot/dropship_pilot, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/pilotbunks) "wEI" = ( /obj/structure/surface/table/reinforced/black, /obj/item/tool/pen, @@ -78121,6 +78569,17 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) +"wET" = ( +/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/upper/u_m_s) "wFb" = ( /turf/open/floor/almayer{ dir = 4; @@ -78263,6 +78722,32 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"wHr" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/aft_hallway) +"wHX" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsLower"; + name = "ARES Core Lockdown"; + pixel_x = -24; + pixel_y = 8; + req_one_access_txt = "90;91;92" + }, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 4; + pixel_y = -8; + autoname = 0; + c_tag = "AI - Main Staircase" + }, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer/aicore/no_build{ + dir = 8; + icon_state = "ai_silver" + }, +/area/almayer/command/airoom) "wIr" = ( /obj/structure/machinery/cm_vending/clothing/senior_officer{ req_access = list(); @@ -78329,12 +78814,6 @@ "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/midship_hallway) "wJh" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -78354,12 +78833,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/upper_medical) -"wJB" = ( -/obj/structure/machinery/cryopod/right, -/turf/open/floor/almayer/aicore/no_build{ - icon_state = "ai_cargo" - }, -/area/almayer/command/airoom) "wJC" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/plating/plating_catwalk, @@ -78429,6 +78902,25 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"wKL" = ( +/obj/structure/machinery/door/airlock/almayer/research/reinforced{ + closeOtherId = "containment_s"; + dir = 8; + name = "\improper Containment Airlock" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/medical/medical_science) "wKN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -78487,6 +78979,40 @@ dir = 1 }, /area/almayer/medical/containment/cell) +"wLC" = ( +/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 = "test_floor4" + }, +/area/almayer/hallways/upper/fore_hallway) +"wLF" = ( +/obj/structure/machinery/door/airlock/almayer/medical/glass{ + closeOtherId = "brigmed"; + name = "\improper Brig Medbay"; + req_access = null; + req_one_access = null; + req_one_access_txt = "20;3" + }, +/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) "wLG" = ( /obj/item/bedsheet/blue{ layer = 3.2 @@ -78552,15 +79078,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/starboard_hallway) -"wLT" = ( -/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/aft_hallway) "wMl" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -78596,9 +79113,6 @@ icon_state = "test_floor5" }, /area/almayer/hallways/lower/starboard_midship_hallway) -"wMD" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_f_p) "wMF" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -78674,6 +79188,14 @@ allow_construction = 0 }, /area/almayer/hallways/lower/starboard_midship_hallway) +"wNC" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/upper/midship_hallway) "wNG" = ( /obj/effect/projector{ name = "Almayer_Up2"; @@ -78717,6 +79239,16 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"wOT" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/machinery/cm_vending/sorted/medical/marinemed, +/obj/structure/medical_supply_link, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "wPa" = ( /obj/structure/platform{ dir = 4 @@ -78747,18 +79279,6 @@ 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/lifeboat_pumps/north2) "wPz" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -78785,15 +79305,6 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) -"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/upper/u_a_s) "wQu" = ( /obj/effect/projector{ name = "Almayer_Up3"; @@ -78818,6 +79329,16 @@ icon_state = "orange" }, /area/almayer/engineering/lower/engine_core) +"wQI" = ( +/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_f_s) "wRf" = ( /obj/structure/machinery/light/small, /obj/structure/sign/safety/nonpress_0g{ @@ -78831,6 +79352,13 @@ icon_state = "test_floor4" }, /area/almayer/hallways/lower/port_umbilical) +"wRk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "wRN" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/goldappleseed, @@ -78903,6 +79431,9 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_p) +"wSB" = ( +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_p) "wSQ" = ( /turf/open/floor/almayer{ dir = 1; @@ -79308,30 +79839,6 @@ }, /turf/open/floor/plating, /area/almayer/engineering/ce_room) -"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/fore_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/aft_hallway) "wZv" = ( /obj/structure/prop/invuln{ desc = "An inflated membrane. This one is puncture proof. Wow!"; @@ -79366,6 +79873,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/lifeboat) +"xac" = ( +/obj/structure/sign/safety/ladder{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/hallways/upper/midship_hallway) "xad" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -79466,35 +79983,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_m_s) -"xbN" = ( -/obj/structure/surface/rack{ - density = 0; - pixel_y = 16 - }, -/obj/structure/janitorialcart, -/obj/item/tool/mop, -/turf/open/floor/plating, -/area/almayer/command/airoom) -"xci" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/starboard) -"xcs" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/obj/structure/machinery/door/airlock/almayer/maint, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/maint/upper/u_a_s) "xcI" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -79514,16 +80002,6 @@ 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/fore_hallway) "xdf" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -79600,38 +80078,25 @@ icon_state = "plate" }, /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/aft_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, +"xeU" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Laundry Room"; + req_one_access = list(19,7); + req_access = list() + }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/maint/upper/u_m_s) +/area/almayer/engineering/laundry) "xfm" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/living/cafeteria_officer) -"xfo" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "blue" - }, -/area/almayer/hallways/upper/midship_hallway) "xfq" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -79687,17 +80152,9 @@ 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/upper/u_m_s) +"xga" = ( +/turf/closed/wall/almayer, +/area/almayer/hallways/upper/aft_hallway) "xgh" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -79730,16 +80187,6 @@ }, /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/midship_hallway) "xgJ" = ( /obj/structure/machinery/light{ dir = 1 @@ -79839,6 +80286,14 @@ /obj/structure/window/reinforced, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +"xin" = ( +/obj/structure/machinery/cm_vending/sorted/medical/marinemed, +/obj/structure/medical_supply_link, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lower_medical_lobby) "xiH" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ @@ -79868,6 +80323,12 @@ "xiV" = ( /turf/closed/wall/almayer/outer, /area/almayer/maint/hull/upper/p_bow) +"xiW" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_a_p) "xjb" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ access_modified = 1; @@ -79920,12 +80381,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"xjI" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/hallways/upper/aft_hallway) "xjK" = ( /obj/structure/sign/safety/hazard{ pixel_y = 32 @@ -79967,16 +80422,6 @@ "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/fore_hallway) "xkB" = ( /obj/structure/bed/chair/comfy/charlie{ dir = 1 @@ -80000,14 +80445,6 @@ icon_state = "greencorner" }, /area/almayer/hallways/lower/starboard_fore_hallway) -"xkO" = ( -/obj/structure/machinery/cm_vending/sorted/medical, -/obj/structure/medical_supply_link, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/shipboard/brig/medical) "xlk" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer, @@ -80069,6 +80506,15 @@ icon_state = "plate" }, /area/almayer/living/port_emb) +"xmP" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "orangecorner" + }, +/area/almayer/hallways/upper/aft_hallway) "xmT" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -80080,18 +80526,14 @@ icon_state = "cargo" }, /area/almayer/medical/lower_medical_medbay) -"xns" = ( -/obj/structure/machinery/door_control{ - id = "ARES JoeCryo"; - name = "Working Joe Cryogenics Lockdown"; - pixel_x = -24; - pixel_y = -8; - req_one_access_txt = "91;92" +"xnh" = ( +/obj/structure/closet, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/glasses/regular/hipster, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/effect/landmark/late_join/working_joe, -/obj/effect/landmark/start/working_joe, -/turf/open/floor/plating/plating_catwalk/aicore, -/area/almayer/command/airoom) +/area/almayer/maint/upper/u_a_s) "xnz" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -80106,21 +80548,14 @@ /obj/effect/landmark/start/requisition, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) -"xnR" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer{ +"xnX" = ( +/obj/structure/machinery/power/apc/almayer{ dir = 1 }, -/obj/structure/machinery/door/airlock/almayer/maint{ - access_modified = 1; - dir = 1; - name = "\improper Engineering Storage"; - req_one_access = null; - req_one_access_txt = "2;7" - }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/engineering/upper_engineering) +/area/almayer/maint/upper/u_a_s) "xoe" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -80136,16 +80571,6 @@ 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/fore_hallway) "xoj" = ( /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop) @@ -80250,6 +80675,11 @@ icon_state = "plating" }, /area/almayer/engineering/lower/engine_core) +"xqh" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/weldingtool, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/upper/u_m_s) "xqp" = ( /obj/structure/machinery/body_scanconsole{ dir = 8; @@ -80433,13 +80863,6 @@ /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/hallways/upper/aft_hallway) "xtM" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -80447,17 +80870,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) -"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/fore_hallway) "xub" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -80537,9 +80949,6 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) -"xvB" = ( -/turf/closed/wall/almayer, -/area/almayer/maint/upper/u_f_p) "xvE" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/charlie{ @@ -80549,30 +80958,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/charlie) -"xvM" = ( -/obj/structure/machinery/door_control{ - id = "ARES StairsLower"; - name = "ARES Core Lockdown"; - pixel_x = 24; - pixel_y = 8; - req_one_access_txt = "90;91;92" - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer/aicore/no_build{ - dir = 4; - icon_state = "ai_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/midship_hallway) "xvQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/sentencing{ @@ -80653,15 +81038,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"xwU" = ( -/obj/structure/sign/safety/medical{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer{ - icon_state = "green" - }, -/area/almayer/hallways/upper/fore_hallway) "xwX" = ( /turf/open/floor/almayer{ dir = 9; @@ -80807,15 +81183,18 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/carpet, /area/almayer/living/commandbunks) -"xyn" = ( -/obj/structure/transmitter/rotary{ - name = "CL Office Telephone"; - phone_category = "Offices"; - phone_id = "CL Office" +"xyp" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/obj/structure/surface/table/woodentable/fancy, -/turf/open/floor/carpet, -/area/almayer/command/corporateliaison) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "xyt" = ( /obj/structure/surface/table/almayer, /obj/item/storage/toolbox/mechanical{ @@ -80898,6 +81277,14 @@ "xzh" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_m_p) +"xzx" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_s) "xzB" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_s) @@ -80999,6 +81386,23 @@ icon_state = "plate" }, /area/almayer/squads/req) +"xBW" = ( +/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_f_s) "xBY" = ( /turf/open/floor/almayer, /area/almayer/engineering/laundry) @@ -81022,6 +81426,12 @@ }, /turf/open/floor/carpet, /area/almayer/command/corporateliaison) +"xCs" = ( +/turf/open/floor/almayer{ + dir = 10; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "xCy" = ( /obj/structure/sign/safety/maint{ pixel_x = -19; @@ -81033,14 +81443,15 @@ }, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_p) -"xCS" = ( -/obj/structure/disposalpipe/segment{ +"xCB" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "orangecorner" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/almayer/hallways/upper/aft_hallway) +/turf/open/floor/almayer, +/area/almayer/hallways/upper/fore_hallway) "xDe" = ( /obj/effect/projector{ name = "Almayer_Down4"; @@ -81057,6 +81468,12 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"xDy" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/upper/u_f_p) "xDC" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer/aicore/no_build, @@ -81068,15 +81485,6 @@ 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/upper/u_a_s) "xDV" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -81120,18 +81528,19 @@ "xFt" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_p) +"xFx" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/open/floor/almayer{ + icon_state = "green" + }, +/area/almayer/hallways/upper/fore_hallway) "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/midship_hallway) "xFZ" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -81191,6 +81600,19 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_f_p) +"xGI" = ( +/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) "xGJ" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -81241,17 +81663,21 @@ icon_state = "orange" }, /area/almayer/squads/alpha_bravo_shared) -"xHD" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 +"xHt" = ( +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/machinery/door/airlock/almayer/maint{ + access_modified = 1; + dir = 1; + name = "\improper Engineering Storage"; + req_one_access = null; + req_one_access_txt = "2;7" }, /turf/open/floor/almayer{ - dir = 10; - icon_state = "silver" + icon_state = "test_floor4" }, -/area/almayer/maint/upper/u_m_p) +/area/almayer/engineering/upper_engineering) "xHS" = ( /obj/structure/reagent_dispensers/fueltank/oxygentank{ anchored = 1 @@ -81281,6 +81707,9 @@ icon_state = "cargo" }, /area/almayer/squads/req) +"xIj" = ( +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "xIk" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -81313,6 +81742,10 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"xIM" = ( +/obj/structure/blocker/fuelpump, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "xIQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -81383,6 +81816,22 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +"xJV" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/cell_charger, +/obj/structure/sign/safety/high_rad{ + pixel_x = 32; + pixel_y = -8 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = 32; + pixel_y = 7 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "orange" + }, +/area/almayer/engineering/lower) "xKG" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -81441,12 +81890,6 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/general_equipment) -"xLm" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/maint/upper/u_a_s) "xLn" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -81457,6 +81900,11 @@ /obj/structure/largecrate/random/barrel/red, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_m_s) +"xLw" = ( +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "xLX" = ( /obj/structure/disposalpipe/junction{ dir = 4; @@ -81621,12 +82069,6 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) -"xNl" = ( -/turf/open/floor/almayer{ - dir = 4; - icon_state = "blue" - }, -/area/almayer/hallways/upper/midship_hallway) "xNu" = ( /obj/structure/toilet{ dir = 1 @@ -81735,12 +82177,6 @@ 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/upper/u_a_p) "xPZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -81848,12 +82284,6 @@ icon_state = "silver" }, /area/almayer/command/computerlab) -"xRn" = ( -/turf/open/floor/almayer{ - dir = 1; - icon_state = "greencorner" - }, -/area/almayer/hallways/upper/fore_hallway) "xRw" = ( /turf/open/floor/almayer/uscm/directional{ dir = 1 @@ -81879,16 +82309,6 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) -"xSl" = ( -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "red" - }, -/area/almayer/hallways/upper/aft_hallway) "xSw" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -81969,27 +82389,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"xTL" = ( -/obj/structure/machinery/cm_vending/gear/executive_officer{ - density = 0; - pixel_y = 30 - }, -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/numbertwobunks) -"xTO" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/hallways/upper/fore_hallway) "xTR" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -82100,12 +82499,6 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) -"xVg" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "red" - }, -/area/almayer/lifeboat_pumps/north2) "xVk" = ( /turf/open/space, /area/space/almayer/lifeboat_dock) @@ -82198,6 +82591,12 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"xXd" = ( +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silvercorner" + }, +/area/almayer/hallways/upper/midship_hallway) "xXh" = ( /turf/closed/wall/almayer/research/containment/wall/west, /area/almayer/medical/containment/cell) @@ -82291,12 +82690,6 @@ }, /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/midship_hallway) "xZk" = ( /obj/item/prop/helmetgarb/gunoil{ layer = 4.2; @@ -82324,10 +82717,22 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"xZz" = ( -/obj/item/paper/almayer_storage, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_a_p) +"xZt" = ( +/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/fore_hallway) "xZG" = ( /obj/structure/machinery/light{ dir = 4 @@ -82390,6 +82795,9 @@ icon_state = "plate" }, /area/almayer/hallways/lower/starboard_fore_hallway) +"yat" = ( +/turf/closed/wall/almayer, +/area/almayer/maint/upper/u_a_p) "yaz" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor{ name = "\improper Officer's Study" @@ -82442,9 +82850,6 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) -"ybk" = ( -/turf/closed/wall/almayer, -/area/almayer/hallways/upper/midship_hallway) "ybm" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/head/hardhat{ @@ -82529,6 +82934,18 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"ycA" = ( +/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/aft_hallway) "ycH" = ( /obj/structure/surface/table/almayer, /obj/item/pizzabox/margherita{ @@ -82556,9 +82973,6 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"yde" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/upper/fore_hallway) "ydf" = ( /obj/structure/platform{ dir = 1 @@ -82646,6 +83060,28 @@ icon_state = "plate" }, /area/almayer/command/lifeboat) +"yeg" = ( +/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/fore_hallway) +"yei" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/upper/midship_hallway) "yeH" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -82714,6 +83150,12 @@ icon_state = "plate" }, /area/almayer/squads/delta) +"yfn" = ( +/obj/structure/machinery/pipedispenser/orderable, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_a_s) "yfy" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -82733,41 +83175,6 @@ }, /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/upper/u_m_p) -"yfO" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ - closeOtherId = "brigwarden"; - name = "\improper Warden's Office" - }, -/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{ @@ -82830,6 +83237,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +"yhi" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 8; + autoname = 0; + c_tag = "AI - Records" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "yht" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -82875,12 +83291,15 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_m_s) -"yit" = ( -/obj/structure/pipes/vents/pump/no_boom{ - dir = 1 +"yiu" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/upper/midship_hallway) "yiW" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -82921,6 +83340,10 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/notunnel) +"yjr" = ( +/obj/docking_port/stationary/escape_pod/north, +/turf/open/floor/plating, +/area/almayer/maint/upper/u_f_s) "yjE" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -82991,82 +83414,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) -"ykY" = ( -/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 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/upper/u_m_s) -"ylc" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1 - }, -/obj/structure/machinery/door/airlock/almayer/research/reinforced{ - closeOtherId = "containment_s"; - dir = 8; - name = "\improper Containment Airlock" - }, -/obj/structure/machinery/door/poddoor/almayer/biohazard/white{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/medical/containment) "yle" = ( /obj/effect/landmark/start/marine/engineer/delta, /obj/effect/landmark/late_join/delta, @@ -83080,6 +83427,13 @@ icon_state = "test_floor5" }, /area/almayer/engineering/lower/engine_core) +"ylL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/closed/wall/almayer/aicore/hull, +/area/almayer/command/airoom) "ylN" = ( /obj/structure/sign/safety/galley{ pixel_x = 8; @@ -91458,7 +91812,7 @@ cth gkr xkc oGj -hSj +iVD xkc mph nlh @@ -91475,9 +91829,9 @@ qPD qPD quJ rdA -alF +jyY sql -alF +jyY rwe pdp hZw @@ -91867,7 +92221,7 @@ hvd hvd hvd hvd -mze +bLF eyD naB kry @@ -95120,7 +95474,7 @@ ksm bxE cmM oeZ -uzH +wLF oeZ oeZ ptq @@ -95531,7 +95885,7 @@ aIY oeZ cFC oIh -lUm +sBQ skj tXc cqM @@ -95631,9 +95985,9 @@ bIy alU alU alU -cmI +syg alU -cmJ +noo alU alU alU @@ -95728,7 +96082,7 @@ cQv kYU tUK kTp -xkO +krO nWS glG oeZ @@ -95929,14 +96283,14 @@ cQv tlk cQv uhA -bKN +tCH oeZ oeZ -uzH +wLF oeZ oeZ mFc -eKa +fbr emp lze wSm @@ -95952,7 +96306,7 @@ cHk rkV rkV cHk -yfO +vYi cHk pRs pdp @@ -96148,11 +96502,11 @@ emp emp emp emp -lFJ +vbo emp emp cHk -pow +hlI ekZ kvL oix @@ -96240,9 +96594,9 @@ kcp alU alU alU -mBp +iTW alU -cmJ +noo alU alU alU @@ -96355,7 +96709,7 @@ ksg oIh iTl cHk -uHd +frt vUI tgJ wVh @@ -96539,7 +96893,7 @@ oJm cQG cQG hzG -asC +nzT tff cDN oFY @@ -96550,14 +96904,14 @@ jcf bju cMW qEy -iis +vKr rQc oDy oDy wsq vxK gwj -vxh +oiz csy csy bWQ @@ -96748,7 +97102,7 @@ uFq wsl wSu xIW -wBd +nah emp gbw oRk @@ -98454,12 +98808,12 @@ aaa fwK elY uaG -vjk +sbZ lxd dPk nBV dyq -eKm +uGi uaG lYN byr @@ -99469,7 +99823,7 @@ aaa fwK jru uaG -vaM +aEf lxd cif jaz @@ -101093,7 +101447,7 @@ aaa sGw xzB bfs -wes +plh qxI dKO ykv @@ -103657,7 +104011,7 @@ wlE gvq wVW lrW -qDN +wOT vHW wVW ccg @@ -104867,11 +105221,11 @@ wVW wVW wVW aCf -ayt +kcx aCf wVW aCf -hzL +wpt aCf wVW wVW @@ -105883,13 +106237,13 @@ awX wVW wVW wVW -aAl +lMF jnX -dum +rdz wVW wVW wVW -jOc +cbF aGZ awF cST @@ -106081,14 +106435,14 @@ aiX wbO avU avU -awY -uBs +mKN +wEw kOB awZ aiX -opN -bDi -vIr +wLC +mGb +uOh awF aEM aGV @@ -106289,9 +106643,9 @@ pXx jrm evg aiX -dCb -dDc -rdo +iiU +eAx +cmS awF aFg aGY @@ -106492,9 +106846,9 @@ wWC auZ aiX aiX -mJp -jZl -cbK +qmK +oIp +pTS awF hRk aGY @@ -106695,11 +107049,11 @@ pQV apq ana aiX -cKp -jZl -dgI +gwh +oIp +qUK awF -xTL +gyh lmA rvA aqm @@ -106876,7 +107230,7 @@ add fsU aHU aTm -vgt +uJA aTm jgF fsU @@ -106898,9 +107252,9 @@ xQg wWC szO aiX -xTO -jZl -iPU +jkT +oIp +fNX awF awF aEW @@ -106922,7 +107276,7 @@ aJU gBW ouQ iun -cSp +rQl vPm qys gBW @@ -107079,7 +107433,7 @@ awW auK aIr aTm -jof +mdG aTm juX scu @@ -107101,10 +107455,10 @@ yjM qbO aqw hnI -ash -jZl -gFN -kED +dME +oIp +oGI +waP awF nvG vGI @@ -107125,7 +107479,7 @@ baw lRE tuf vbB -gGB +jIF vbB mlz sOy @@ -107282,7 +107636,7 @@ awW avc aIv aTm -jof +mdG cbM jzZ sLo @@ -107304,10 +107658,10 @@ aqy nBE pOD bZa -evG -duR -gFN -oeN +voj +sUS +oGI +qUu awF aHn szU @@ -107328,7 +107682,7 @@ baw hJk yac vbB -gGB +jIF vbB fDS iLd @@ -107485,7 +107839,7 @@ add fsU aHU aTm -vZF +xIM aTm jgF fsU @@ -107507,9 +107861,9 @@ aiX aiX aiX aiX -rPB -jZl -sQu +diw +oIp +wCn tsr tsr tsr @@ -107531,7 +107885,7 @@ aJU gBW ouQ vbB -gGB +jIF tBq qys gBW @@ -107710,9 +108064,9 @@ aiX aKG amb aiX -juM -jZl -dgI +hOd +oIp +qUK tsr sOL jIC @@ -107913,9 +108267,9 @@ aqz aKH and aiX -umD -jZl -ash +aaE +oIp +dME fyT xIV xIV @@ -108116,9 +108470,9 @@ aiX aiX aiX aiX -cwi -jZl -fBA +qIF +oIp +aPV tsr iPN dbX @@ -108319,9 +108673,9 @@ aqz mBe atT aiX -fXf -jZl -sPk +bhR +oIp +mYA tsr tsr vOY @@ -108522,9 +108876,9 @@ aiX asf atT aiX -juM -qNe -dgI +hOd +lSN +qUK lIj tBY gkE @@ -108621,7 +108975,7 @@ arX vSG iag nvM -bek +xin qjN gGJ ham @@ -108725,9 +109079,9 @@ aiX aiX aiX aiX -dRo -ewL -enz +wmo +icQ +pwl lIj lIj dvZ @@ -108820,11 +109174,11 @@ kLE bkA bcC bej -pKx +tzO fVG qpQ nvM -bek +xin qjN sld ham @@ -108832,11 +109186,11 @@ ham qjN oDY omo -rtK +eTC fdZ ixj fdZ -jlK +uey gfW kSA tpB @@ -108903,12 +109257,12 @@ adq aei aka aWn -lfc -lfc -lfc -lfc -lfc -lfc +gLl +gLl +gLl +gLl +gLl +gLl oGC awW acW @@ -108917,31 +109271,31 @@ awW awW fSm hiy -ddp -fCP -fCP -stk -fCP -ash -ash -sVA -fCP -vUO -fCP -fCP -wzL -fCP -fCP -vUO -pwd -sVA -fCP -fCP -fCP -fCP -stk -fCP -uVg +esQ +iKy +iKy +oyB +iKy +dME +dME +gJC +iKy +udv +iKy +iKy +gji +iKy +iKy +udv +oGW +gJC +iKy +iKy +iKy +iKy +oyB +iKy +kmT pEY jsP baw @@ -108950,12 +109304,12 @@ baw sgU baw baw -xvB -xvB -xvB -xvB -xvB -xvB +vIo +vIo +vIo +vIo +vIo +vIo gnv yhI tTu @@ -109027,7 +109381,7 @@ qpx bet bgu nvM -bek +xin qjN gGJ ham @@ -109106,12 +109460,12 @@ adq afr akc apg -lfc -mjR -mjR -mjR -tWM -lfc +gLl +mis +mis +mis +yjr +gLl aea oGC xjD @@ -109120,31 +109474,31 @@ ajf ajf oAO pIZ -qwf -jRm -dsS -dsS -dsS -rsN -dsS -dsS -dFd -uhI -uhI -dsS -saT -dsS -rsN -rsN -bxt -tPz -tPz -rpP -tPz -tPz -tPz -jRm -rHn +nsr +fSx +tTZ +tTZ +tTZ +dNj +tTZ +tTZ +pcs +fCW +fCW +tTZ +bjv +tTZ +dNj +dNj +ubv +plK +plK +tuX +plK +plK +plK +fSx +xFx tFW dGC aZz @@ -109153,12 +109507,12 @@ aZz nsc baw cxk -xvB -wyc -wyc -wyc -nTc -xvB +vIo +ojX +ojX +ojX +mxo +vIo crh csI qhb @@ -109306,15 +109660,15 @@ aaa aaa abs adq -aub +nfC akt awW -lfc -mjR -mjR -mjR -mjR -lfc +gLl +mis +mis +mis +mis +gLl oGC sHp oGC @@ -109323,31 +109677,31 @@ awW awW aSJ isI -dgP -mKG -uIa -qxK -rYG -qxK -qxK -iRi -qxK -qxK -qxK -qxK -xcY -qxK -iRi -qxK -qxK -qxK -qxK -qxK -rYG -qxK -bTD -mKG -uQi +gvu +xCB +nyK +llo +epT +llo +llo +pub +llo +llo +llo +llo +aVK +llo +pub +llo +llo +llo +llo +llo +epT +llo +aWM +xCB +tJm dCD aXe baw @@ -109356,15 +109710,15 @@ baw mnA baw baw -xvB -wyc -wyc -wyc -wyc -xvB +vIo +ojX +ojX +ojX +ojX +vIo baw sMM -nqG +rSH pgD tQV aaa @@ -109513,22 +109867,22 @@ avd akt awW qHq -mjR -mjR -mjR -mjR -lfc -vzO -lfc -lfc -lfc -lfc -lfc -lfc -lfc -dgP -mKG -uQi +mis +mis +mis +mis +gLl +eHX +gLl +gLl +gLl +gLl +gLl +gLl +gLl +gvu +xCB +tJm aoe aoe aoe @@ -109548,22 +109902,22 @@ aoe aoe aoe aoe -maF -mKG -mOw -xvB -xvB -xvB -xvB -xvB -xvB -abz -xvB -xvB -wyc -wyc -wyc -wyc +hwB +xCB +kaj +vIo +vIo +vIo +vIo +vIo +vIo +xDy +vIo +vIo +ojX +ojX +ojX +ojX eOM baw sMM @@ -109715,23 +110069,23 @@ adq aGP aka aWu -lfc -mjR -mjR -mjR -mjR -lfc -gur -osn -vDt -puJ -deA -olC -ujf -lfc -xky -mKG -uQi +gLl +mis +mis +mis +mis +gLl +lNL +kUJ +qgn +eIf +mfL +hto +qhg +gLl +pzw +xCB +tJm aoe aoh jHQ @@ -109751,23 +110105,23 @@ cnV isN cnZ aoe -dgP -mKG -uQi -xvB -cHn -cHn -ftw -nZK -ftw -wMD -dcZ -xvB -wyc -wyc -wyc -wyc -xvB +gvu +xCB +tJm +vIo +giD +giD +wrI +lST +wrI +pep +mCJ +vIo +ojX +ojX +ojX +ojX +vIo hWB yhI qSX @@ -109863,9 +110217,9 @@ aId vjv gOR aId -vTV +ary nmY -pdy +nZm smW prP xXl @@ -109918,23 +110272,23 @@ adq aGQ akc apg -lfc -mjR -mjR -mjR -mjR -lfc -aHo -vqh -tey -urL -tey -vqh -aHo -tQA -ash -wwi -uQi +gLl +mis +mis +mis +mis +gLl +gtI +utp +cZq +xBW +cZq +utp +gtI +kYF +dME +nbH +tJm aoe vbS arb @@ -109954,23 +110308,23 @@ cnW aEi coa aoe -tWf -wwi -ash -nZK -ftw -wMD -wMD -xvB -gJY -ftw -ftw -xvB -wyc -wyc -wyc -wyc -xvB +lXR +nbH +dME +lST +wrI +pep +pep +vIo +fzt +wrI +wrI +vIo +ojX +ojX +ojX +ojX +vIo wvj csI iPH @@ -110121,11 +110475,11 @@ aee avd akt qWI -lfc -lfc -lfc -lfc -lfc +gLl +gLl +gLl +gLl +gLl gxm gxm gxm @@ -110135,9 +110489,9 @@ gxm gxm gxm gxm -tWf -wwi -uQi +lXR +nbH +tJm aoe qQc fXg @@ -110157,9 +110511,9 @@ jBy aEi fFh aoe -dgP -wwi -uQi +gvu +nbH +tJm gxm gxm gxm @@ -110169,11 +110523,11 @@ gxm gxm gxm gxm -xvB -xvB -xvB -xvB -xvB +vIo +vIo +vIo +vIo +vIo ehj irS ilJ @@ -110248,7 +110602,7 @@ mKw rcx kan ojZ -jjn +toS ojZ kan leY @@ -110321,26 +110675,26 @@ aaa aaa abs adq -lpJ +nAv akt awW -lfc -mfR -sqP -tVs -tVs +gLl +vHP +wQI +cIS +cIS gxm -tPB -tPB -tPB +sWb +sWb +sWb dkO aps aps aps gxm -xtO -mKG -uQi +gpp +xCB +tJm aoe vbS koB @@ -110360,26 +110714,26 @@ aoe hFF aoe aoe -dgP -mKG -uQi +gvu +xCB +tJm gxm aiJ aiJ aiJ qYr -cJV -cJV -cJV +kEA +kEA +kEA gxm -ear -pqR -wMD -ear -xvB +qTA +bMZ +pep +qTA +vIo baw sMM -tmI +noO pgD tQV aaa @@ -110527,23 +110881,23 @@ adq aWm aka kyY -lfc -hzl -vdT -aHo -aHo +gLl +lfZ +lWS +gtI +gtI gxm -tPB -tPB -tPB +sWb +sWb +sWb vQe aps aps aps gxm -hGo -wwi -uQi +sHC +nbH +tJm aoe aop koB @@ -110563,23 +110917,23 @@ uRt aQz aRJ ajl -dgP -wwi -uQi +gvu +nbH +tJm gxm aiJ aiJ aiJ str -cJV -cJV -cJV +kEA +kEA +kEA gxm -pqR -wMD -wMD -moq -xvB +bMZ +pep +pep +osr +vIo rQW yhI rRz @@ -110653,9 +111007,9 @@ tlA nyj vVW vhX -ekA +ctJ rlZ -twq +pGE vhX jCK nyj @@ -110730,23 +111084,23 @@ adq afr akc apg -lfc -lfc -lBB -vqh -mOR +gLl +gLl +nlI +utp +usu gxm -gHX -gHX -gHX +sRZ +sRZ +sRZ vQe aps aps aps gxm -dgP -hBy -dlT +gvu +lYS +mzn hSI pMp gzK @@ -110766,23 +111120,23 @@ akw aQz aRK ajl -kUs -wwi -uQi +aUB +nbH +tJm gxm aiJ aiJ aiJ str -oAY -oAY -oAY +jcu +jcu +jcu gxm -rTe -wMD -ftw -xvB -xvB +cAa +pep +wrI +vIo +vIo vpn csI goL @@ -110929,27 +111283,27 @@ aaf aaf aaf abw -eCC +eJU awW akt awW -upQ -fFs -vqh -fwP -mOR +cUo +dwu +utp +qxS +usu gxm -tpj -tpj -tpj +lmG +lmG +lmG gxm asm asm asm gxm -dgP -qNe -mnV +gvu +lSN +xZt aoe pjF wUd @@ -110969,22 +111323,22 @@ akw fOL aRS ajl -hGo -mKG -uQi +sHC +xCB +tJm gxm alW alW alW gxm -nVA -nVA -nVA +mWJ +mWJ +mWJ gxm -pqR -ear -ftw -nZK +bMZ +qTA +wrI +lST aJU baw sMM @@ -111132,27 +111486,27 @@ aag aag aag abw -eCC +eJU awW akt -wrQ -lfc -lfc -lfc -lfc -lfc +vCt +gLl +gLl +gLl +gLl +gLl gxm -tpj -tpj -tpj +lmG +lmG +lmG gxm asm asm asm gxm -dgP -wwi -tQO +gvu +nbH +vQN sqf sqf sqf @@ -111172,23 +111526,23 @@ upM akw alD vEx -ash -wwi -uQi +dME +nbH +tJm gxm alW alW alW gxm -nVA -nVA -nVA +mWJ +mWJ +mWJ gxm -xvB -xvB -xvB -xvB -xvB +vIo +vIo +vIo +vIo +vIo nTH sMM baw @@ -111254,10 +111608,10 @@ qPk hKe qPk kan -qWS +mBk oDJ vaQ -iIH +iTt rlZ buu rlZ @@ -111339,23 +111693,23 @@ adq aeZ aka aoI -lfc -mjR -mjR -mjR -tWM +gLl +mis +mis +mis +yjr gxm -tpj -tpj -tpj +lmG +lmG +lmG gxm asm asm asm gxm -dgP -wwi -uQi +gvu +nbH +tJm sqf anp wjz @@ -111375,23 +111729,23 @@ ajl onQ alD ajl -bNI -wwi -uQi +bgN +nbH +tJm gxm alW alW alW gxm -nVA -nVA -nVA +mWJ +mWJ +mWJ gxm -wyc -wyc -wyc -nTc -xvB +ojX +ojX +ojX +mxo +vIo gnv yhI tTu @@ -111457,7 +111811,7 @@ qPk hKe qPk kan -kAp +vou dYU kan cWm @@ -111542,23 +111896,23 @@ adq afr akc apg -lfc -mjR -mjR -mjR -mjR +gLl +mis +mis +mis +mis gxm -lbc -tpj -tpj +aoz +lmG +lmG gxm asm asm asm gxm -dgP -mKG -uQi +gvu +xCB +tJm sqf sOZ oNJ @@ -111578,23 +111932,23 @@ ajl aCp alD ajl -kiq -mKG -uQi +evM +xCB +tJm gxm alW alW alW gxm -nVA -nVA -wZk +mWJ +mWJ +kbl gxm -wyc -wyc -wyc -wyc -xvB +ojX +ojX +ojX +ojX +vIo vpn csI goL @@ -111741,27 +112095,27 @@ aag aag aag abw -eCC +eJU awW akt awW avJ -mjR -mjR -mjR -mjR +mis +mis +mis +mis gxm -tpj -tpj -tpj +lmG +lmG +lmG gxm asm asm asm gxm -dgP -qNe -mOw +gvu +lSN +kaj sqf anq awn @@ -111781,22 +112135,22 @@ fQu akx alD gWG -dgP -mKG -uQi +gvu +xCB +tJm gxm alW alW alW gxm -nVA -nVA -nVA +mWJ +mWJ +mWJ gxm -wyc -wyc -wyc -wyc +ojX +ojX +ojX +ojX qxz baw sMM @@ -111944,27 +112298,27 @@ aag aag aag abw -eCC +eJU awW akt -aqk -lfc -mjR -mjR -mjR -mjR +aAn +gLl +mis +mis +mis +mis gxm -tpj -tpj -tpj +lmG +lmG +lmG gxm asm asm asm gxm -dgP -mKG -uQi +gvu +xCB +tJm sqf anr awn @@ -111984,23 +112338,23 @@ fQu akx alD gWG -dgP -mKG -uQi +gvu +xCB +tJm gxm alW alW alW gxm -nVA -nVA -nVA +mWJ +mWJ +mWJ gxm -wyc -wyc -wyc -wyc -xvB +ojX +ojX +ojX +ojX +vIo xuY sMM baw @@ -112151,23 +112505,23 @@ adq aeZ aka aoI -lfc -mjR -mjR -mjR -mjR +gLl +mis +mis +mis +mis gxm -tpj -tpj -tpj +lmG +lmG +lmG gxm asm asm asm gxm -maF -mKG -uQi +hwB +xCB +tJm sqf sqf awp @@ -112187,23 +112541,23 @@ ajl hVz alD ajl -tWf -mKG -uQi +lXR +xCB +tJm gxm alW alW alW gxm -nVA -nVA -nVA +mWJ +mWJ +mWJ gxm -wyc -wyc -wyc -wyc -xvB +ojX +ojX +ojX +ojX +vIo gnv yhI tTu @@ -112351,26 +112705,26 @@ aag aag abs adq -afB +sSj akc -biT -lfc -lfc -lfc -lfc -lfc +rMh +gLl +gLl +gLl +gLl +gLl gxm -hWV -hWV -hWV +qqa +qqa +qqa gxm gxm gxm gxm gxm -mYd -wwi -xwU +atz +nbH +tyC ajl qhx akw @@ -112390,23 +112744,23 @@ ajl nMV vIf ajl -maF -wwi -nwu +hwB +nbH +yeg gxm gxm gxm gxm gxm -hWV -hWV -hWV +qqa +qqa +qqa gxm -xvB -xvB -xvB -xvB -xvB +vIo +vIo +vIo +vIo +vIo crh csI qhb @@ -112553,27 +112907,27 @@ aag aag aag abw -eCC +eJU awW awW awW -pEA -fCP -fCP -fCP -fCP -omp -ocX -xog -xog -vFy -fCP -fCP -vUO -fCP -xRn -wwi -ash +wAE +iKy +iKy +iKy +iKy +tMi +lCg +knb +knb +jsd +iKy +iKy +udv +iKy +gre +nbH +dME bVE aos akw @@ -112593,23 +112947,23 @@ ans aos alE bVE -ash -wwi -mnC -fCP -qRx -fCP -fCP -cuI -ocX -ocX -ocX -pVI -fCP -fCP -fCP -fCP -pEA +dME +nbH +kPa +iKy +gDk +iKy +iKy +gOa +lCg +lCg +lCg +ccx +iKy +iKy +iKy +iKy +wAE baw baw qYC @@ -112756,27 +113110,27 @@ aag aag aag abw -eCC +eJU awW aTm awW -pEA -orV -orV -orV -orV -fGD -fGD -qEc -qEc -qEc -orV -yde -yde -yde -yde -gkV -uTD +wAE +qQu +qQu +qQu +qQu +kVW +kVW +oFz +oFz +oFz +qQu +dcR +dcR +dcR +dcR +hWa +cEG aEe akA akA @@ -112796,23 +113150,23 @@ akA oap aSb aEe -uTD -lzF -yde -yde -yde -yde -orV -qEc -qEc -qEc -fGD -fGD -orV -orV -orV -orV -pEA +cEG +rxQ +dcR +dcR +dcR +dcR +qQu +oFz +oFz +oFz +kVW +kVW +qQu +qQu +qQu +qQu +wAE baw vbB ley @@ -112886,7 +113240,7 @@ bst cjW rlZ rlZ -hLs +oRy kan biy boX @@ -112961,25 +113315,25 @@ aah abs abs awW -ale +vGQ ajE -pEA -ash -rYG -ash -xcY -qxK -qxK -qxK -qxK -rYG -qxK -qxK -qxK -qxK -bTD -qNe -uQi +wAE +dME +epT +dME +aVK +llo +llo +llo +llo +epT +llo +llo +llo +llo +aWM +lSN +tJm vOy vOy vOy @@ -112999,23 +113353,23 @@ vOy wMO wky sqf -bNI -qNe -uIa -qxK -rYG -qxK -qxK -qxK -qxK -qxK -qxK -rYG -qxK -ash -ftZ -qxK -pEA +bgN +lSN +nyK +llo +epT +llo +llo +llo +llo +llo +llo +epT +llo +dME +bRO +llo +wAE baw dBp gVA @@ -113081,7 +113435,7 @@ qPk wKN qPk kan -ucU +ihw beW lkW biF @@ -113180,9 +113534,9 @@ abE abE abE abE -bff -rnd -fdf +cXq +bXc +vZJ vOy nos fcy @@ -113196,15 +113550,15 @@ vAQ qIL ncE vWt -bQv +gei vOy ayX kXw pxo sqf -uVZ -rnd -fdf +lPY +bXc +vZJ pBG pBG pBG @@ -113284,7 +113638,7 @@ qPk hKe qPk kan -lmj +iMI rlZ rlZ rlZ @@ -113383,9 +113737,9 @@ gwo aed aeG abE -umI -dzV -umI +rSW +dNv +rSW vOy oNp aSn @@ -113405,15 +113759,15 @@ niL kXw pxo sqf -umI -uch -umI +rSW +dYl +rSW pBG -idM -idM -idM -idM -fHM +rdZ +rdZ +rdZ +rdZ +bCs pBG rLp ttX @@ -113586,9 +113940,9 @@ adF aef dWw agA -okx -hgA -xfo +mRJ +fjA +gqH vOy anz vgx @@ -113608,15 +113962,15 @@ aCC kXw pxo asn -okx -cFH -xfo +mRJ +oEn +gqH pBG -idM -idM -idM -idM -idM +rdZ +rdZ +rdZ +rdZ +rdZ pBG jZU jAe @@ -113698,7 +114052,7 @@ xMs cjW rlZ rlZ -sSB +kSC kan quv rZB @@ -113789,9 +114143,9 @@ adF aef aef uZZ -kGS -bNT -rmB +muW +lGh +bBH vOy awQ oLU @@ -113805,21 +114159,21 @@ oiY ueJ ueJ oDi -fwW +trF lJv edv kXw pxo asn -eWN -lOn -rmB +lXl +yiu +bBH pBG -idM -idM -idM -idM -idM +rdZ +rdZ +rdZ +rdZ +rdZ pBG cVq nOb @@ -113992,9 +114346,9 @@ adF bls aeH agq -nIF -ijn -rmB +ijd +efV +bBH vOy hng dnC @@ -114008,21 +114362,21 @@ lMv dVu eSo qmD -hZf +aIC lJv aCt kXw pxo asn -eWN -jao -hCF +lXl +poD +qmW pBG -idM -idM -idM -idM -idM +rdZ +rdZ +rdZ +rdZ +rdZ pBG dzp ngV @@ -114195,9 +114549,9 @@ adF aef kqN agA -eWN -mxg -hCF +lXl +qdJ +qmW vOy xyt wiW @@ -114211,15 +114565,15 @@ tjn aCC kXw pQP -kcq +qAT vOy vOy mFq vqW sqf -jMP -jao -rmB +rnM +poD +bBH pBG pBG pBG @@ -114398,9 +114752,9 @@ aef aef tRD abE -ciI -mxg -rmB +tkF +qdJ +bBH vOy iYf bIM @@ -114420,15 +114774,15 @@ hPe sdu btC vLj -nIF -ijn -rmB -dyJ +ijd +efV +bBH +rRT pBG gqQ cHG nQA -wph +dAl pyx lKO pBG @@ -114601,9 +114955,9 @@ adF aef afs agA -eWN -lOn -rmB +lXl +yiu +bBH vOy mTp wiW @@ -114623,10 +114977,10 @@ lON dVu oDR vOP -kGS -fAW -vlR -qPv +muW +cDI +tru +uXE qvL wmP wmP @@ -114804,9 +115158,9 @@ adD sOw afs agA -eWN -lOn -rmB +lXl +yiu +bBH vOy axn dRh @@ -114826,10 +115180,10 @@ vOy aRd aIo vOy -gyb -lOn -rmB -aRl +whc +yiu +bBH +mxq pBG lvb eAN @@ -115007,9 +115361,9 @@ adF aef afs agA -eWN -lOn -rmB +lXl +yiu +bBH vOy aAr pGK @@ -115029,16 +115383,16 @@ aCD hFC qmy vOy -eWN -lOn -rmB +lXl +yiu +bBH pBG pBG hEl eAN fQS oGY -xyn +neT eAN xqQ cNH @@ -115210,9 +115564,9 @@ aef aef pHG abE -ciI -jao -rmB +tkF +poD +bBH vOy aID gLc @@ -115221,9 +115575,9 @@ iit kZV vOy vOy -oIr +jpl vOy -wdo +wKL vOy vOy vOy @@ -115232,9 +115586,9 @@ aoM aoM vgB kgs -eWN -jao -rmB +lXl +poD +bBH bvX ojQ eAN @@ -115413,9 +115767,9 @@ adF aef aGS agA -eWN -jao -rmB +lXl +poD +bBH vOy aMd pGK @@ -115435,9 +115789,9 @@ prx fpT eVT kgs -eWN -jao -rmB +lXl +poD +bBH bvX kVV vQR @@ -115616,9 +115970,9 @@ adF aef nIS uZZ -kGS -jao -rmB +muW +poD +bBH vOy aMg aSo @@ -115638,9 +115992,9 @@ ger aoM aFf mmN -eWN -jao -rmB +lXl +poD +bBH bvX maO lPm @@ -115819,9 +116173,9 @@ adF aef nIS eWF -kGS -jao -rmB +muW +poD +bBH vOy aQZ bkT @@ -115839,11 +116193,11 @@ ggl jjS qMP kBP -kVX +kqo vOy -ciI -jao -hCF +tkF +poD +qmW pBG pBG pBG @@ -116022,9 +116376,9 @@ adF aef kqN agA -eWN -lOn -rmB +lXl +yiu +bBH vOy dVd lea @@ -116044,9 +116398,9 @@ vti vti aEZ vOy -eWN -lOn -rmB +lXl +yiu +bBH fKh gQk trU @@ -116225,9 +116579,9 @@ fcE aef uNN abE -ftb -lOn -rmB +dfA +yiu +bBH vOy vOy vOy @@ -116236,9 +116590,9 @@ mSK mSK vOy vOy -ccc +voV wKP -ylc +hLr vOy vOy rhO @@ -116247,9 +116601,9 @@ nPE oqZ uaI vOy -eFI -lOn -rmB +hUu +yiu +bBH fKh iuG sOv @@ -116428,11 +116782,11 @@ aeI eva xzf abE -ciI -jao -uZI -cSM -xfo +tkF +poD +dSI +iLL +gqH vOy vOy vOy @@ -116450,9 +116804,9 @@ vOy vOy vOy vOy -czJ -jao -rmB +qQD +poD +bBH fKh ubI nQA @@ -116631,11 +116985,11 @@ aNi aNi aNi aNi -eFI -jao -gfv -gfv -rmB +hUu +poD +tsn +tsn +bBH vOy elR xXh @@ -116653,9 +117007,9 @@ dMK vOy vOy vOy -eWN -jao -rmB +lXl +poD +bBH pBG mGT nQA @@ -116834,11 +117188,11 @@ bhx vif aOR bsw -eWN -uSZ -rDm -ldq -rmB +lXl +hPZ +bPi +ava +bBH vOy wWz vHO @@ -116854,11 +117208,11 @@ ruc xOY wTM vOy -qqb -cSM -fvE -jao -hCF +uWk +iLL +lRh +poD +qmW pBG tGT nQA @@ -117037,11 +117391,11 @@ aco aco dYu bsw -kON -xNl -dpS -jao -hCF +cOe +vwT +akh +poD +qmW vOy wWz anw @@ -117057,11 +117411,11 @@ wLy eiE wTM vOy -eWN -gFL -gDQ -xgE -rmB +lXl +mfO +mHY +yei +bBH fKh eYn nQA @@ -117242,9 +117596,9 @@ cCa aNi aNi aNi -jMP -mxg -rmB +rnM +qdJ +bBH vOy wWz ovG @@ -117260,11 +117614,11 @@ gxP aOe wTM vOy -nLM -lOn -acQ -acQ -rmB +piQ +yiu +xIj +xIj +bBH fKh wvo nQA @@ -117445,9 +117799,9 @@ qiy ahR ahR egt -tzF -gIN -rmB +shC +vIZ +bBH vOy woh vgO @@ -117463,11 +117817,11 @@ qxm vgO xAe vOy -oxg -jao -iUV -xNl -xZf +psk +poD +sin +vwT +gsJ fKh lDa eAN @@ -117648,9 +118002,9 @@ hpY aOR aOR bgK -kGS -mxg -rmB +muW +qdJ +bBH vOy vOy vOy @@ -117666,9 +118020,9 @@ aoK vOy vOy vOy -glc -jao -rmB +pLE +poD +bBH mRU mRU pBG @@ -117851,9 +118205,9 @@ aOR aOR agr aNi -eWN -bNT -rmB +lXl +lGh +bBH vOy vOy vOy @@ -117869,9 +118223,9 @@ vOy vOy vOy vOy -kbT -bNT -rmB +mIR +lGh +bBH mRU vpf pBG @@ -118054,9 +118408,9 @@ aNi aNi aNi aNi -glc -bNT -rmB +pLE +lGh +bBH bPF aqG ata @@ -118072,9 +118426,9 @@ vOy jyJ niF bPF -ciI -lOn -rmB +tkF +yiu +bBH mRU vpf pBG @@ -118257,9 +118611,9 @@ hoT tob tob fkK -kGS -bNT -kGS +muW +lGh +muW cbg aqG atb @@ -118275,9 +118629,9 @@ vOy sLk niF cbg -kGS -lOn -kGS +muW +yiu +muW rXF jtU jtU @@ -118460,9 +118814,9 @@ aej aej aej aej -jZW -bNT -rZC +gpT +lGh +cQF vOy vOy vOy @@ -118478,9 +118832,9 @@ vOy vOy vOy vOy -bxV -lOn -uAi +xac +yiu +vbU nIN nIN nIN @@ -118652,20 +119006,20 @@ rWz rWz rWz rWz -kLB +rCZ rWz rWz rWz rWz -kLB +rCZ aej aeO afG ags aej -eWN -bNT -rmB +lXl +lGh +bBH vOy elR xXh @@ -118681,24 +119035,24 @@ xXh xXh dMK vOy -eWN -lOn -rmB +lXl +yiu +bBH nIN -bnF -lBw -bnF +iIb +wui +iIb nIN rgL rgL rgL rgL -urg +lAW rgL rgL rgL rgL -urg +lAW nIN jtU nVE @@ -118866,9 +119220,9 @@ aeP agI aia yaz -kGS -mxg -rmB +muW +qdJ +bBH vOy wWz vHO @@ -118884,13 +119238,13 @@ uXj rdt wTM vOy -eWN -jao -rmB -eyI +lXl +poD +bBH +aQx xzh -jaW -vkV +sjM +oIn nIN rgL rgL @@ -119069,9 +119423,9 @@ aeQ agK agu eup -kGS -mxg -rmB +muW +qdJ +bBH vOy wWz uwZ @@ -119087,13 +119441,13 @@ coZ sNz wTM vOy -eWN -jao -rmB -eyI -yfL -sjw -xHD +lXl +poD +bBH +aQx +bcg +bkM +gYp nIN rgL rgL @@ -119146,7 +119500,7 @@ vvH bwG bwG nsY -wpz +gAP oEX irT tyb @@ -119272,9 +119626,9 @@ aeR agK agu aej -ftb -mxg -hCF +dfA +qdJ +qmW vOy wWz pEJ @@ -119290,13 +119644,13 @@ xQm tfH wTM vOy -nLM -jao -rmB -eyI -byH +piQ +poD +bBH +aQx +viv xzh -nvd +syp nIN rgL rgL @@ -119475,9 +119829,9 @@ aej agO aid aej -kON -fsu -xZf +cOe +vZI +gsJ vOy wWz uwZ @@ -119493,12 +119847,12 @@ vfP sNz wTM vOy -kON -fsu -xZf +cOe +vZI +gsJ nIN nIN -veW +cyh nIN nIN nIN @@ -119663,8 +120017,8 @@ fTj jOD oOw cPK -wjE -loz +sPb +dlo sAz jZC uyd @@ -119672,15 +120026,15 @@ ito cuN cQW lQa -wjE -vuE +sPb +gtg ilq -aLh -aLh -ltt -bgh -spW -pjQ +aMy +aMy +wNC +hOn +sYU +xCs vOy wWz qxP @@ -119696,15 +120050,15 @@ gxP nMe wTM vOy -bgh -spW -pjQ -ltt -bkb -bWx -rRf -pOC -qtj +hOn +sYU +xCs +wNC +kin +oQI +laI +qwU +neZ fpA qUx gUS @@ -119880,10 +120234,10 @@ sVV sVV sVV sVV -ltt -klr -bNT -dOW +wNC +sfz +lGh +xLw vOy woh vgO @@ -119899,10 +120253,10 @@ vgO vgO xAe vOy -gTV -mGk -xFW -lrd +uAP +rgO +kak +nOp cMz cMz cMz @@ -119916,7 +120270,7 @@ cMz cMz gsC cMz -usL +bTY qLg iup ryY @@ -120070,7 +120424,7 @@ dVn vwC fbR xMz -xci +kMV eON gxn vEV @@ -120079,14 +120433,14 @@ sdv xMO wDg xMz -waV +lIY gxn -aLh -aLh -ltt -gqv -hKJ -nww +aMy +aMy +wNC +wlr +xyp +mnf vOy vOy vOy @@ -120102,15 +120456,15 @@ vOy vOy vOy vOy -xvO -peu -nww -ltt -ssF -bWx -bij -hux -kfo +gPA +eWf +mnf +wNC +gVW +oQI +iaO +vUn +atJ rCl ePM pzd @@ -120279,7 +120633,7 @@ sVV oON njn njn -cva +daI njn njn ael @@ -120287,27 +120641,27 @@ ael agQ aih ael -htF -bNT -jvz -uPB -uPB -uPB -ecz -uPB -uPB -uPB -uPB -uPB -llt -uPB -ecz -uPB -uPB -uPB -riK -bNT -hmB +hyT +lGh +iCg +cGO +cGO +cGO +rpV +cGO +cGO +cGO +cGO +cGO +kaO +cGO +rpV +cGO +cGO +cGO +cDP +lGh +tkd nIN nIN rBD @@ -120475,60 +120829,60 @@ njn rWz rWz rWz -tvS +jXN njn xVe sVV mbx njn -orq -rRb -qjT -kRk +tXa +gJg +tSX +lzt ael afE agT agT ael -qHu -lOn -acQ -acQ -acQ -gfv -gfv -gfv -acQ -gfv -gfv -gfv -acQ -gfv -gfv -gfv -jRg -acQ -acQ -bNT -oNa +ogT +yiu +xIj +xIj +xIj +tsn +tsn +tsn +xIj +tsn +tsn +tsn +xIj +tsn +tsn +tsn +xIj +xIj +xIj +lGh +syO nIN aGm gNo aGm nIN -jwM +uig xzh xzh -jHX +fje nIN -kSL +aNO sfT hGV nIN rgL rgL rgL -vMQ +laD nIN upS jtU @@ -120684,45 +121038,45 @@ hHe gxn ioH njn -mNS +jXk cGR -hvq -pCQ +wks +jFM ael afH agV ain ael -bMV -jao -tbF -imM -imM -tbF -imM -eQh -mTo -tCD -tCD -tCD -mTo -wyE -imM -dKD -imM -imM -dKD -bNT -enF +cQC +poD +rjr +aMl +aMl +rjr +aMl +iSx +dUR +kaE +kaE +kaE +pTH +qvh +aMl +xXd +aMl +aMl +xXd +lGh +iMD nIN nIN xzh -wlB +uVY nIN -bBc +lbO gNo xzh -bBc +lbO nIN uRY pMA @@ -120887,25 +121241,25 @@ aGA kbv fZo njn -nnH +pKL jsA jsA -eJj +qTi ael afI agY oxi xfm -tiZ -gIN -jvz +lDH +vIZ +iCg mOi mOi mOi mOi mOi -mOi -auc +eTY +tSI auc hyE aqU @@ -120914,10 +121268,10 @@ aHq aHq aHq aHq -klr -mxg -qGZ -bMi +sfz +qdJ +nZK +mOZ nIN xzh gNo @@ -121090,25 +121444,25 @@ mAF ilq pjj njn -dkt +kCl cGR jsA -xfW +uqs ael afJ agY aiq ajJ -acQ -mxg -acQ +xIj +qdJ +xIj mOi -rCw -rCw -lin -oJR -tFe -asD +cup +cup +cCO +gDu +qBa +ikH xQV qQS aqU @@ -121117,18 +121471,18 @@ dgg xRk bti aHq -rwf -mxg -qGZ -mqd +wvX +qdJ +nZK +olF nIN xzh -pHj +lZJ nIN -bBc +lbO gNo xzh -icn +vwj nIN gfN efj @@ -121293,43 +121647,43 @@ hZE kbv mbx njn -gMJ +ePz cGR jsA -xfW +uqs ael afK ahc air ael -gar -mxg -acQ +sgH +qdJ +xIj mOi -wCT -sIf -isC -isC +knD +czh +tEM +tEM tFe xQV -xQV -rNF +mxs +hoq aqU qjF oqv iqd rUy cnS -klr -mxg -pSN +sfz +qdJ +qTS nIN nIN xzh -iuh +oIY nIN aGm -vLM +qoM xzh gNo nIN @@ -121496,40 +121850,40 @@ laM kbv nkH njn -eJZ -rRb -cXd -xew +bVR +gJg +sPa +mSo ael afL ahe aij ael -acQ -lOn -acQ +xIj +yiu +xIj mOi -kbH -kbH -pgH -jDV +fQi +fQi +nNk +jKD tFe xVc xQV -eYz +txh aqU gjB wDy aGN dxv cnS -riK -mxg -kGS +cDP +qdJ +muW aZv gNo gNo -aBQ +pga nIN nIN nIN @@ -121693,13 +122047,13 @@ njn rWz rWz rWz -tvS +jXN njn hZE kbv mbx njn -cva +daI njn njn njn @@ -121708,36 +122062,36 @@ adO adO adO adO -frI -lOn -oNa +iWB +yiu +syO mOi mOi mOi mOi mOi mOi -asF -asG -iyH +ubB +ubB +ubB aqU jVE nTs pje pje cnT -meS -gUk -naj +trx +gnK +aNE nIN nIN nIN nIN nIN -jwM -oZn +uig +hPL xzh -lPW +dMj nIN aDS aPT @@ -121746,7 +122100,7 @@ nIN rgL rgL rgL -vMQ +laD nIN wUJ vpf @@ -121796,9 +122150,9 @@ hfa jwK wnY cLC -eGh +lyh rtA -uKv +esn nFK lEO xWd @@ -121842,7 +122196,7 @@ lzq nyQ nhx eiq -teu +oEA wXH xBQ mSU @@ -121904,34 +122258,34 @@ gKd njn jsA jsA -svV -rIE +wET +gxk adO afM fpR ahf adO -dni -jao -acQ +oDm +poD +xIj +mOi +epG +epG +lce +inI aqU -sdl -mLE -bUx -mLE -tmK -qQS -aug -avL +rcR +pLH +vyG aqU lyE rsO aGN rbB cnS -dKD -mxg -jvz +xXd +qdJ +iCg aUH aXx jKI @@ -122105,36 +122459,36 @@ hmj kbv fZo njn -ykY +iSd jsA jsA -tjz +qbP adO afN ahh aiw ahG -kGS -mxg -acQ -aqU -xbN -gfE -gfE -kpc -aqU -gjw -cnp -avM +muW +qdJ +xIj +mOi +epG +epG +lup +xQV +fDk +qQS +lmp +ogU aqU wmK liJ pTj cnq cnS -klr -jao -acQ +sfz +poD +xIj aUH oyE mMP @@ -122308,36 +122662,36 @@ mAF ilq pjj njn -boU -nNI +xqh +svq jsA -veO +xGI adO afO ahh aiw adO -acQ -mxg -acQ -lmK -lmK -lmK -lmK -lmK -ntj -ntj -ntj -ntj -ntj +xIj +qdJ +xIj +fUm +fUm +fUm +fUm +fUm +mOi +cSO +qQS +iwg +aqU aHq cnH kzk cnR aHq -acQ -mxg -acQ +xIj +qdJ +xIj aUH sIA gSj @@ -122346,7 +122700,7 @@ nIN xzh gNo xzh -bBc +lbO nIN gfN efj @@ -122449,7 +122803,7 @@ bNE wDJ ivs nyQ -dXH +vqI vWB bSK nyQ @@ -122511,36 +122865,36 @@ xXT sVV tkR njn -ipr -pUL +ugo +uTl cGR -eQd +wnb adO jkj ahh aiw adO -ebV -bNT -acQ +eMr +lGh +xIj ioU pvK qPE xqD -nYf -rEL -dnm -rEL -rxO -aHq +ioU +ntj +ntj +ntj +ntj +ntj cnE liJ hgB cbn aHq -ebV -qGP -tzF +eMr +gqz +shC aUd ckK iKM @@ -122548,8 +122902,8 @@ aHM nIN xzh gNo -lPW -vwJ +dMj +vNo nIN nme sfT @@ -122716,34 +123070,34 @@ chb njn njn njn -htS +eDe njn njn lFt ahh aiw adO -qHu -lOn -acQ +ogT +yiu +xIj ioU qyZ wTd cmK -lFm -kXu -kXu -kXu -kXu +ogD +sZV +eDT +sZV +gzH kXu jHC liJ qmP uoH aHq -acQ -bNT -acQ +xIj +lGh +xIj aUH dbv lII @@ -122917,18 +123271,18 @@ cSa aeA sjz hbl -isB +qYz cGR cGR jsA -eoD +cdZ aiw ahh aiw nph -acQ -jao -acQ +xIj +poD +xIj ioU mSz nIG @@ -122944,9 +123298,9 @@ iKf aGN qrv aHq -hBa -mxg -acQ +vcG +qdJ +xIj aGz ckd mQC @@ -122954,8 +123308,8 @@ aHM aZv xzh xzh -egQ -vLM +kya +qoM aZv wcm lJY @@ -123129,9 +123483,9 @@ afP ahh aiw nph -acQ -lOn -acQ +xIj +yiu +xIj ioU ioU ioU @@ -123147,15 +123501,15 @@ aGN aGN pSU aHq -qcL -mxg -acQ +upW +qdJ +xIj aGz drk mQC mkG nIN -tTE +qHT nIN nIN nIN @@ -123239,9 +123593,9 @@ bdl bdl bGo bGo -bPB +qjY pCr -bRR +jpD cpK cpK bdl @@ -123332,9 +123686,9 @@ afQ aiw aiw nph -acQ -lOn -acQ +xIj +yiu +xIj ioU lPO vJg @@ -123350,15 +123704,15 @@ eEo aGN rub aHq -gar -mxg -acQ +sgH +qdJ +xIj aGz eqB obC hcf nIN -cpQ +nhN nIN lJY lJY @@ -123529,15 +123883,15 @@ amF kmE aeA njn -mtq +xzx njn ahJ ahJ ahJ adO -acQ -jao -acQ +xIj +poD +xIj ioU dnS viN @@ -123553,15 +123907,15 @@ aRi aGN qrv aHq -oUO -mxg -acQ +fsh +qdJ +xIj aUH aGz aGz aGz nIN -pHj +lZJ nIN lJY qbx @@ -123732,15 +124086,15 @@ vOh gUX ily njn -htS +eDe njn aeC aeC aeC -ybk -acQ -jao -acQ +mdm +xIj +poD +xIj ioU pPM qKz @@ -123756,10 +124110,10 @@ xNv iLO bUa aHq -qHu -bNT -acQ -ybk +ogT +lGh +xIj +mdm vcE vcE vcE @@ -123936,14 +124290,14 @@ ajs aeC mzS aeC -rGc -izu -izu -dRQ -pBg -gmZ -dpN -txd +oZI +fjo +fjo +opu +hlj +iso +dPB +mrO alL alL alL @@ -123959,14 +124313,14 @@ jvY alL alL alL -gmZ -onh -wJd -pBg -pfe -tiO -tiO -roY +iso +ceV +nsH +hlj +nvz +ner +ner +vdR uHr nuM vcE @@ -124130,23 +124484,23 @@ aeC wXh ayn atr -sWz +obw aex ciw wXh aeC ydz ayb -tic -gBZ -btu +jxq +fbV +msS asA asA -btu -oOi -szb -tiZ -vnZ +msS +nZf +rho +lDH +emL jvY jvY jvY @@ -124162,23 +124516,23 @@ jvY jvY jvY jvY -urs -eEF -wmH -oOi -rao +gqI +iCT +qnH +nZf +ohi yeH yeH -rao -sBK -mZv +ohi +oJK +qnX sSl kkx vcE kpo iMx tGi -odS +inm bXe eyG kpo @@ -124333,23 +124687,23 @@ aeA asY ayQ atr -uCg +nWC atr ciD ngl aeA ajk aeA -xVg +fXO aeC -dwJ +pdo nBK nBK wYa -pBg -vkQ -brm -aOw +hlj +giW +mGL +qXh jvY arg atf @@ -124365,23 +124719,23 @@ jvY aMm aOq jvY -biB -uvq -cVT -pBg +bgM +puP +tfF +hlj xwX uHr uHr -siS -aRr -mJX +ehm +nXG +qYd lJY xVS lJY ttS wEO faO -iTc +eUw bXe deg wLu @@ -124453,7 +124807,7 @@ mCo iwZ jFy bKA -mPK +oNW dmF pXV bNP @@ -124536,23 +124890,23 @@ aeA atp ayR atr -uCg +nWC atr cji nqV aeA ajk ily -qHA -qzQ -qHA -qnf +cMx +fVk +cMx +rjX aeC -wPm -ybk -jkL -acQ -nbW +beN +mdm +lLt +xIj +oXP jvY arh atm @@ -124568,23 +124922,23 @@ jvY nSG aOs jvY -jkL -jao -mQF -ybk -dJF +lLt +poD +vCv +mdm +rmo vcE -dAr -acB -cWo -acB +uul +yat +qLk +yat cBb xVS lJY hlX umh bXe -iTc +eUw tGi pfH wlF @@ -124739,23 +125093,23 @@ aeC wXh ayn atr -mzj +iLe bXz ciw wXh aeC ajs qon -qHA -obJ +cMx +gqx aep ggQ ggQ aME aep -jkL -jnx -iPK +lLt +kXD +eol jvY ari aoP @@ -124771,23 +125125,23 @@ axo atm aOr jvY -jkL -jao -mQF +lLt +poD +vCv aep aME ggQ aME aep -hog -acB +dcX +yat dHe kUV vcE kpo iMx bXe -fyA +upK mzF eyG kpo @@ -124949,16 +125303,16 @@ aeC aeC ajs aeC -qHA -qii +cMx +qbw aep afj afk agM aep -jkL -tbD -fDk +lLt +jrc +wdE jvY arj atm @@ -124974,16 +125328,16 @@ bzD atm aOs jvY -jkL -lOn -mQF +lLt +yiu +vCv aep aHS afk sHo aep -vmu -acB +cnm +yat vcE kUV vcE @@ -125152,16 +125506,16 @@ aeC aeA ajk aeA -qHA -qii +cMx +qbw aep afk afk afk aep -jkL -tbD -fDk +lLt +jrc +wdE jvY ark atm @@ -125177,16 +125531,16 @@ axo atm thv jvY -jkL -lOn -mQF +lLt +yiu +vCv aep afk aHl afk aep -hLt -acB +rZZ +yat lJY itR kKR @@ -125355,16 +125709,16 @@ asA amF ohL aeA -qHA -vle +cMx +oVo aep aep aep aep aep -nbY -wLT -oAp +umI +ddO +sRC jvY alL atk @@ -125380,16 +125734,16 @@ jvY aAy alL jvY -nbY -hqx -nbY +umI +juj +umI aep aep aep aep aep -ddF -acB +lla +yat lJY ucw dcp @@ -125558,16 +125912,16 @@ ntI aeA aeC puO -qHA -qii -eRG +cMx +qbw +xnh aep aep aep aep -fes -vpi -xCS +sHI +cNC +cla jvY arl atm @@ -125583,16 +125937,16 @@ alL aMo aOt jvY -fes -qKU -jhm +sHI +lOn +wCe oIB jgr -qUG +cXz rtc oIB -vmu -acB +cnm +yat lJY uxC lJY @@ -125755,22 +126109,22 @@ atr aeC atr aeC -qHA -qHA -qHA -qHA +cMx +cMx +cMx +cMx mRI -qHA -qHA -qii -hja -qHA -qHA -qHA -qHA -fes -vpi -xCS +cMx +cMx +qbw +rYU +cMx +cMx +cMx +cMx +sHI +cNC +cla jvY abF atm @@ -125786,17 +126140,17 @@ aIT atm aVF jvY -fes -wZp -amc +sHI +aPC +pKH oIB fXE kaS aiQ oIB -vmu -acB -acB +cnm +yat +yat kNq kNq qDB @@ -125958,22 +126312,22 @@ atr aeC atr aeC -qHA -hEj -cvi -qHA +cMx +jrC +jYa +cMx wFX -qHA -ncV -qii -vle -qHA -vle -vle -qHA -pqv -gqf -xCS +cMx +kqa +qbw +oVo +cMx +oVo +oVo +cMx +nSw +pqY +cla jvY jvY jvY @@ -125989,17 +126343,17 @@ jvY jvY jvY jvY -xeq -qKU -iZz +sjG +lOn +qhT oIB wqr bZw xUV oIB -vmu -vDR -acB +cnm +cjm +yat toD wDq aPO @@ -126161,22 +126515,22 @@ atu azU aeC ldl -qHA -qii -stA -qHA +cMx +qbw +iAI +cMx tvA -qHA -oTc -nwT -ocI -mfH -nwT -nwT -mfH -kjX -gqf -xCS +cMx +iml +fIK +kZc +wuS +fIK +fIK +wuS +tzF +pqY +cla alL urM dBG @@ -126192,17 +126546,17 @@ jvY wjv fDG alL -fes -wZp -kjX +sHI +aPC +tzF qgK tEB uBM dXo oIB -xPu -uOE -acB +fME +kon +yat swG jei aPO @@ -126364,22 +126718,22 @@ taw taw mRI taw -qHA -wpT -stA -qHA +cMx +vPT +iAI +cMx wTn -qHA -nQw -qii -wjP -qHA -vle -vle -qHA -gbR -vpi -chC +cMx +cLd +qbw +pTI +cMx +oVo +oVo +cMx +nWf +cNC +igC aqe amw anO @@ -126395,17 +126749,17 @@ arq anO qaV kwd -usi -qKU -iZz +acQ +lOn +qhT oIB wKF hzb ltU oIB -juG -eDk -acB +wSB +gAO +yat bCR jei aPO @@ -126567,22 +126921,22 @@ qlu taw wTn kCu -qHA -uPN -stA -qHA +cMx +sdd +iAI +cMx wFX -qHA -lsh -qii -hja -qHA -vle -hja -qHA -bwN -gxR -lCc +cMx +nDH +qbw +rYU +cMx +oVo +rYU +cMx +nXV +wHr +vGi aqg arr atn @@ -126598,17 +126952,17 @@ atn atn aOB aRj -dZR -kWc -cwL +rUN +hft +swn oIB phj vEf cNK oIB -hFt -lxJ -oFU +xiW +mCg +ryJ aPO aPO aPO @@ -126770,22 +127124,22 @@ rWb taw oAK kCu -qHA -qzQ -qHA -qHA +cMx +fVk +cMx +cMx tvA -qHA -vle -qii -vle -qHA -cap -fiN -qHA -fes -kzR -ngF +cMx +oVo +qbw +oVo +cMx +iVz +rAS +cMx +sHI +tof +jao kwd amA atq @@ -126801,17 +127155,17 @@ atq atq aoT kwd -usi -kzR -jhm +acQ +tof +wCe oIB cHC dha pxj oIB -juG -fmX -acB +wSB +hYj +yat fPF jei nNT @@ -126978,17 +127332,17 @@ oQL gqt oxy oxy -pFJ -qii -qii -vle -qHA -qHA -qHA -qHA -fes -kzR -lCf +vTE +qbw +qbw +oVo +cMx +cMx +cMx +cMx +sHI +tof +eLV alO ars amx @@ -127004,9 +127358,9 @@ amx amx aOC alO -fes -kzR -iZz +sHI +tof +qhT loP loP loP @@ -127090,7 +127444,7 @@ dJG sZe bdl ntd -hgO +jCm eqb mLR hdE @@ -127174,24 +127528,24 @@ fTl wIu wXJ taw -ldz +oNK kMa qIa iSB oxy oQL hdy -qHA -vle -qii -vle -qHA -liF -wPR -qHA -cui -kzR -lCf +cMx +oVo +qbw +oVo +cMx +oaP +jhQ +cMx +kYb +tof +eLV inw amA amx @@ -127207,9 +127561,9 @@ atq amx aoT inw -fes -kzR -hPr +sHI +tof +nii loP iwB tOC @@ -127384,17 +127738,17 @@ iKV oxy oQL oFr -qHA -mUL -qii -vle -qHA -vle -vle -qHA -fes -kzR -bLg +cMx +xnX +qbw +oVo +cMx +oVo +oVo +cMx +sHI +tof +ycA aqj arw anP @@ -127410,9 +127764,9 @@ atq atq wwJ inw -fes -vpi -iZz +sHI +cNC +qhT loP joG sDu @@ -127587,17 +127941,17 @@ qAG oxy kMa gQu -qHA -lsh -qii -wjP -qHA -vle -vle -qHA -gbR -kzR -xCS +cMx +nDH +qbw +pTI +cMx +oVo +oVo +cMx +nWf +tof +cla inw qHM emn @@ -127613,9 +127967,9 @@ amx amx aBs inw -fes -vpi -iZz +sHI +cNC +qhT loP kxo wSn @@ -127790,17 +128144,17 @@ ydf oxy wOv ixu -qHA -uxW -qii -qii -pFJ -qii -qii -pFJ -bKU -kzR -xsX +cMx +tNY +qbw +qbw +vTE +qbw +qbw +vTE +kGS +tof +dFB alO alO alO @@ -127816,9 +128170,9 @@ atq atq aBs alO -fes -kzR -bKU +sHI +tof +kGS fTF xBY xBY @@ -127993,17 +128347,17 @@ cnP oxy wOv qlu -qHA -xLm -qii -vle -qHA -vle -vle -lnD -fes -kzR -iea +cMx +qbU +qbw +oVo +cMx +oVo +oVo +btb +sHI +tof +sJN alO gKZ vTv @@ -128019,9 +128373,9 @@ atq atq aBs alO -pvE -vpi -iZz +uSk +cNC +qhT gdS wSn kXN @@ -128196,17 +128550,17 @@ lUQ oxy tBU iDs -qHA -xLm -qii -hja -qHA -kLZ -tty -lnD -fes -kzR -iea +cMx +qbU +qbw +rYU +cMx +pVh +mSl +btb +sHI +tof +sJN alO arz atq @@ -128222,15 +128576,15 @@ auB atc aOF alO -fes -vpi -iZz +sHI +cNC +qhT gdS lBg dXd loP loP -eMh +xeU loP loP kNq @@ -128394,22 +128748,22 @@ mOE gUG oxy oQL -qHA -qHA -qzQ -qHA -qHA -qHA -gDF -qii -vle -qHA -qHA -qHA -qHA -fes -kzR -iea +cMx +cMx +fVk +cMx +cMx +cMx +uyQ +qbw +oVo +cMx +cMx +cMx +cMx +sHI +tof +sJN alO arz atq @@ -128425,9 +128779,9 @@ aIU aMq aOG alO -fes -kzR -iZz +sHI +tof +qhT loP loP loP @@ -128437,10 +128791,10 @@ vyI lPB oHl jWh -acB -hJe -acB -acB +yat +rXq +yat +yat kNq kNq kNq @@ -128519,7 +128873,7 @@ qlz xYf skn bQX -jok +ijQ cLl qlz tez @@ -128597,22 +128951,22 @@ oxy bCv oxy oQL -qHA -gCQ -rEs -tvr -qHA -lsh -vle -qii -vle -aYU -uxs -iQG -qHA -fes -kzR -iea +cMx +aOS +gNI +eTm +cMx +nDH +oVo +qbw +oVo +oDa +yfn +nkc +cMx +sHI +tof +sJN alO arz atq @@ -128628,9 +128982,9 @@ xBe xBe xBe xBe -fes -kzR -iZz +sHI +tof +qhT jWh eFK wGd @@ -128640,10 +128994,10 @@ hSk hSk uIv jWh -jZj -sRP -oko -acB +dnh +bct +iDa +yat tiY qAK xGK @@ -128800,23 +129154,23 @@ oQL qmq oQL nXo -qHA -gCQ -bNc -tCC -qHA -ftG -vle -qii -vle -vle -vle -keE -qHA -pvE -kzR -iea -xnR +cMx +aOS +guP +mHT +cMx +kpL +oVo +qbw +oVo +oVo +oVo +iIU +cMx +uSk +tof +sJN +xHt arm ats auO @@ -128831,9 +129185,9 @@ aIV qqr arH xBe -fes -kzR -iZz +sHI +tof +qhT vXd duF hSk @@ -128843,10 +129197,10 @@ hSk hSk uIv jWh -eHz -juG -tMT -acB +tFJ +wSB +uBG +yat jei ltm oAT @@ -128999,26 +129353,26 @@ aag aag fTl oxy -qHA -qHA -xcs -qHA -qHA -utC -qii -ikC -vRJ -gNQ -laP -gNQ -gNQ -gNQ -gNQ -gNQ -xDG -jlO -qpH -iSu +cMx +cMx +orx +cMx +cMx +dtu +qbw +txf +ncx +whO +pJS +whO +whO +whO +whO +whO +bYL +dlT +qHD +qSp alO arA att @@ -129034,9 +129388,9 @@ azo aJg abR xBe -fes -kzR -jhm +sHI +tof +wCe jWh oih khE @@ -129046,10 +129400,10 @@ vyI kpQ vSE jWh -nwA -xZz -kRN -acB +dhA +iWn +mnB +yat jei ltm ejj @@ -129202,26 +129556,26 @@ aag aag fTl oxy -qHA -tZM -qEZ -frV -qHA -gCQ -uqJ -vbu -qHA -qHA -qHA -qzQ -qHA -qHA -qHA -qHA -qHA -gbR -kzR -iZz +cMx +cMH +qvF +lat +cMx +aOS +tlM +dan +cMx +cMx +cMx +fVk +cMx +cMx +cMx +cMx +cMx +nWf +tof +qhT wDM wDM wDM @@ -129237,9 +129591,9 @@ atv auV amE xBe -fes -kzR -iZz +sHI +tof +qhT jWh jWh uUz @@ -129249,10 +129603,10 @@ qbZ jWh jWh jWh -fQl -juG -nGZ -acB +tFO +wSB +flD +yat xQe jei lVR @@ -129405,15 +129759,15 @@ aag aag fTl lmq -qHA -mDz -pIf -uwf -qHA -gCQ -rEs -bhZ -qHA +cMx +rBY +pTY +ueY +cMx +aOS +gNI +aPg +cMx uiG rTZ tfb @@ -129422,9 +129776,9 @@ tfb tfb tfb ptK -fes -vpi -iZz +sHI +cNC +qhT wDM aOM aoW @@ -129440,9 +129794,9 @@ atv auV amE xBe -fes -vpi -iZz +sHI +cNC +qhT jWh xXa xXa @@ -129452,10 +129806,10 @@ cKL jbH rJh jWh -rJY -dPl -qQG -acB +pld +vhb +tie +yat cfm jei oSR @@ -129608,15 +129962,15 @@ aag aag fTl oxy -qHA -qHA -qHA -qHA -qHA -qHA -qzQ -qHA -qHA +cMx +cMx +cMx +cMx +cMx +cMx +fVk +cMx +cMx bNM wkX jhx @@ -129625,9 +129979,9 @@ jhx jhx dnH gpc -kjX -gqf -iZz +tzF +pqY +qhT wDM uto aoX @@ -129643,9 +129997,9 @@ nNY qKi abR xBe -pvE -gxR -kjX +uSk +wHr +tzF dEt soP pDr @@ -129655,10 +130009,10 @@ soP eoG uIv jWh -acB -hJe -acB -acB +yat +rXq +yat +yat kNq fJp ekz @@ -129828,9 +130182,9 @@ nwU owg owg ptK -fes -vpi -iZz +sHI +cNC +qhT wDM aOQ fxI @@ -129846,9 +130200,9 @@ azp qJf anV xBe -fes -vpi -iZz +sHI +cNC +qhT jWh iqH khE @@ -130031,9 +130385,9 @@ eNi eNi eNi eNi -fes -kzR -jhm +sHI +tof +wCe wDM aOH aJf @@ -130049,9 +130403,9 @@ xBe xBe xBe xBe -fes -vpi -rXV +sHI +cNC +xmP jWh jWh jlQ @@ -130234,9 +130588,9 @@ olO wiG nWN eNi -fes -vpi -iZz +sHI +cNC +qhT wDM wDM wDM @@ -130252,9 +130606,9 @@ aJh arq ufx alR -fes -vpi -jhm +sHI +cNC +wCe jWh hSk hSk @@ -130437,9 +130791,9 @@ ueG rPt jyE eNi -fes -vpi -iZz +sHI +cNC +qhT hwC rcS amx @@ -130455,9 +130809,9 @@ aJi azs atq alR -fes -vpi -iZz +sHI +cNC +qhT jlQ tst uUe @@ -130640,9 +130994,9 @@ iKD rPt rPt eNi -fes -vpi -iZz +sHI +cNC +qhT alR amA atq @@ -130658,9 +131012,9 @@ aJj aMD atq alR -fes -vpi -iZz +sHI +cNC +qhT jlQ tZZ gLz @@ -130843,9 +131197,9 @@ eNi eNi gIh eNi -iIQ -kzR -iZz +hGb +tof +qhT alR amA atq @@ -130861,9 +131215,9 @@ amA ayl amx alR -fes -vpi -iZz +sHI +cNC +qhT jWh jmQ vcu @@ -131046,9 +131400,9 @@ aWb dyK vzK wYY -fes -kzR -iZz +sHI +tof +qhT alR amA atq @@ -131064,9 +131418,9 @@ aJl amx atq alR -fes -vpi -iZz +sHI +cNC +qhT jlQ snE sGL @@ -131249,9 +131603,9 @@ tii eJX sAC wYY -fes -kzR -iZz +sHI +tof +qhT alR amA amx @@ -131267,9 +131621,9 @@ aJk amx atq alR -fes -vpi -iZz +sHI +cNC +qhT jlQ tZZ cBj @@ -131452,9 +131806,9 @@ sjj fzP sAC wYY -fes -vpi -iZz +sHI +cNC +qhT alR amA atq @@ -131470,9 +131824,9 @@ xEO xEO lnP alR -fes -vpi -jhm +sHI +cNC +wCe jWh qLs qLs @@ -131655,9 +132009,9 @@ fcM uzE qsL nim -prV -gqf -iZz +noe +pqY +qhT alR amA atq @@ -131673,9 +132027,9 @@ iWR iWR kbx alR -fes -vpi -iZz +sHI +cNC +qhT jWh jWh jlQ @@ -131858,9 +132212,9 @@ xlC gyO kTN eNi -pvE -vpi -iZz +uSk +cNC +qhT alR amA atq @@ -131876,9 +132230,9 @@ xEO xEO aOV alR -fes -vpi -iZz +sHI +cNC +qhT jWh wFQ bop @@ -132061,9 +132415,9 @@ oNb iFC qAA eNi -fes -kzR -iZz +sHI +tof +qhT alR arK atc @@ -132079,9 +132433,9 @@ aJq aMG aOW alR -fes -vpi -iZz +sHI +cNC +qhT jWh bXy bop @@ -132181,7 +132535,7 @@ oGh far vDo nnr -lQl +rKt ljv ljv sUi @@ -132264,9 +132618,9 @@ eNi eNi eNi eNi -fes -kzR -iZz +sHI +tof +qhT alO alO alO @@ -132282,9 +132636,9 @@ alO alO alO alO -fes -vpi -iZz +sHI +cNC +qhT jWh wFQ bop @@ -132467,9 +132821,9 @@ dWX owg owg ptK -bZq -hfc -jgS +knU +oOZ +hdP aqq aPa eky @@ -132485,9 +132839,9 @@ eky eky aPa aqq -bZq -hfc -lBf +knU +oOZ +doX jWh xXa xXa @@ -132670,9 +133024,9 @@ keR jhx keR dwI -kjX -jae -tGW +tzF +eIY +vER hal uYg nau @@ -132688,9 +133042,9 @@ uYg nau uYg hal -rrG -jae -kjX +sVv +eIY +tzF mPh soP tWi @@ -132873,9 +133227,9 @@ kPG kPG cVw ptK -iOP -xjI -fzm +eJg +bkb +pvi aqq eky aNl @@ -132891,9 +133245,9 @@ eky aNl eky aqq -iOP -xSl -fzm +eJg +lqL +pvi jWh tim uWV @@ -132976,7 +133330,7 @@ lKM sqg nSq oBr -eSc +sKf gdJ cjt pRZ @@ -133076,9 +133430,9 @@ ucp cIW ptK ptK -qDX -sDe -qDX +xga +kgV +xga aHe jlT exi @@ -133952,21 +134306,21 @@ aaa aKQ aaa aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa bdH aaa @@ -134155,21 +134509,21 @@ aaa aKQ aaa aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -134358,21 +134712,21 @@ aaa aKQ aaa aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -134500,7 +134854,7 @@ haO iYm fLl fLl -vjd +wRk eky wZX vUh @@ -134514,7 +134868,7 @@ aHe svf wZX eky -quy +wuk eZm eZm bjt @@ -134561,21 +134915,21 @@ aaa aKQ aaa aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -134601,7 +134955,7 @@ sqg ppM eTb hbs -vZU +xJV elx jnI oJk @@ -134764,21 +135118,21 @@ aaa aKQ aaa aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -134967,21 +135321,21 @@ aaa aKQ aaa aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -135170,21 +135524,21 @@ aaa aKQ aaa aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -135373,14 +135727,217 @@ aaa aKQ aaa aaa +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +bdH +aae +aah +aag +aag +aag +nic +tmQ +ppM +hsy +txS +bVN +oGJ +xpZ +llK +mVr +mZL +mZL +mZL +gSa +coH +oTO +uqh +iAE +sct +hsy +iWa +fZR +nic +aag +aag +aag +aah +afm +aaa +aaa +aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aaa +aaa +aaa +aaa +aaa aab aaa aaa +"} +(259,1,1) = {" +aaa +aaa +aab +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa bdH bdH bdH bdH +aad +cuC +mkH +rtd +fcP +cuC +ajZ +xVk +xVk +xVk +xVk +xVk +xVk +xVk +aad +aPw +vgD +mhG +had +eAL +pzJ +oPf +pzJ +had +eAL +dPC +ihX +aPw +ajZ +xVk +xVk +xVk +xVk +xVk +xVk +xVk +aad +bYn +kcA +uWV +uIv +bYn +ajZ +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aaa +aaa +aaa +aab +aaa +aaa +aKQ +aaa +aaa +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH bdH bdH bdH @@ -135401,209 +135958,6 @@ aaa aaa aaa aaa -aaa -aaa -bdH -aae -aah -aag -aag -aag -nic -tmQ -ppM -hsy -txS -bVN -oGJ -xpZ -llK -mVr -mZL -mZL -mZL -gSa -coH -oTO -uqh -iAE -sct -hsy -iWa -fZR -nic -aag -aag -aag -aah -afm -aaa -aaa -aaa -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -"} -(259,1,1) = {" -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -bdH -bdH -bdH -bdH -aad -cuC -mkH -rtd -fcP -cuC -ajZ -xVk -xVk -xVk -xVk -xVk -xVk -xVk -aad -aPw -vgD -mhG -had -eAL -pzJ -oPf -pzJ -had -eAL -dPC -ihX -aPw -ajZ -xVk -xVk -xVk -xVk -xVk -xVk -xVk -aad -bYn -kcA -uWV -uIv -bYn -ajZ -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -aaa -aaa -aaa -aab -aaa -aaa -aKQ -aaa -aaa -aab -aaa -aaa -aaa -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -135779,10 +136133,10 @@ aaa aKQ aaa aaa -aab -aaa -aaa -aaa +aak +bdH +bdH +bdH bdH bdH bdH @@ -135982,10 +136336,10 @@ aaa aKQ aaa aaa -aab -aaa -aaa -aaa +aak +bdH +bdH +bdH bdH bdH bdH @@ -136185,10 +136539,10 @@ aaa aKQ aaa aaa -aab -aaa -aaa -aaa +aak +bdH +bdH +bdH bdH bdH bdH @@ -136388,10 +136742,10 @@ aaa aKQ aaa aaa -aab -aaa -aaa -aaa +aak +bdH +bdH +bdH bdH bdH bdH @@ -136793,9 +137147,9 @@ aaa aaa aKQ aaa -aaa -aab -aaa +bdH +aak +bdH bdH bdH bdH @@ -136996,9 +137350,9 @@ aaa aaa aKQ aaa -aaa -aab -aaa +bdH +aak +bdH bdH bdH bdH @@ -137199,9 +137553,9 @@ aaa aaa aKQ aaa -aaa -aab -aaa +bdH +aak +bdH bdH bdH bdH @@ -137402,9 +137756,9 @@ aaa aaa aKQ aaa -aaa -aab -aaa +bdH +aak +bdH bdH bdH bdH @@ -137605,9 +137959,9 @@ aaa aaa aKQ aaa -aaa -aab -aaa +bdH +aak +bdH bdH bdH bdH @@ -137808,9 +138162,9 @@ aaa aaa aKQ aaa -aaa -aab -aaa +bdH +aak +bdH bdH bdH bdH @@ -138011,9 +138365,9 @@ aaa aaa aKQ aaa -aaa -aab -aaa +bdH +aak +bdH bdH bdH bdH @@ -138213,10 +138567,10 @@ aab aaa aaa aKQ -aaa -aaa -aab -aab +bdH +bdH +aak +aak aak aak aak @@ -138815,27 +139169,27 @@ bdH bdH bdH bdH -bdH -bdH -bdH -bdH -bdH -bdH -aKQ -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +rAd +rAd +rAd +rAd +rAd +rAd +rAd +rAd +rAd +rAd +rAd +rAd +rAd bdH bdH bdH @@ -139214,7 +139568,7 @@ aaa aab aaa aaa -aaa +bdH bdH bdH bdH @@ -139372,224 +139726,21 @@ xVk xVk xVk xVk -aad -aPw -jbq -aPw -vgD -eky -atg -aBE -ouB -eky -ihX -aPw -jbq -aPw -ajZ -xVk -xVk -xVk -xVk -xVk -xVk -xVk -aaa -aaa -bdH -bdH -bdH -bdH -bdH -bdH -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -bdH -bdH -bdH -bdH -bdH -bdH -bdH -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -bdH -bdH -bdH -aak -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -aaa -aaa -aaa -aaa -bdH -aad -aag -aag -aag -aag -gFP -gFP -qjZ -qjZ -qjZ -qjZ -dXI -qjZ -qjZ -qjZ -qjZ -qjZ -dXI -qjZ -qjZ -qjZ -qjZ -gFP -gFP -aag -aag -aag -aag -ajZ -aaa -aaa -aaa -aaa -aaa -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -"} -(279,1,1) = {" -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -xVk -xVk -xVk -xVk -xVk -xVk -xVk -aae -aah -aag +aad +aPw jbq -iaR -aBu -aBu -aBu -aBu -aBu -iub +aPw +vgD +eky +atg +aBE +ouB +eky +ihX +aPw jbq -aag -aah -afm +aPw +ajZ xVk xVk xVk @@ -139669,35 +139820,35 @@ aaa aaa aaa bdH -aae -aah -aah -aah -aah +aad +aag +aag +aag +aag gFP gFP -lMb -lMb -fLv -cLq -vON -sgs -ioP -vAI -kXm -eSk -vON -cLq -oLN -lMb -lMb +qjZ +qjZ +qjZ +qjZ +dXI +qjZ +qjZ +qjZ +qjZ +qjZ +dXI +qjZ +qjZ +qjZ +qjZ gFP gFP -aah -aah -aah -aah -afm +aag +aag +aag +aag +ajZ aaa aaa aaa @@ -139735,7 +139886,7 @@ aab aaa aaa "} -(280,1,1) = {" +(279,1,1) = {" aaa aaa aab @@ -139778,21 +139929,21 @@ xVk xVk xVk xVk -aaa -aaa -aad -aPw -aPw -jbq -jbq -jbq +aae +aah +aag jbq +iaR +aBu +aBu +aBu +aBu +aBu +iub jbq -aPw -aPw -ajZ -aaa -aaa +aag +aah +afm xVk xVk xVk @@ -139837,7 +139988,7 @@ lmz lmz daz vhe -fEN +qQS cqm gTH qit @@ -139871,64 +140022,64 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +aae +aah +aah +aah +aah +gFP gFP -vVI -lMb -lMb -lMb -lMb -lMb -lMb -lMb -lMb lMb lMb +fLv +cLq +vON +sgs +ioP +vAI +kXm +eSk +vON +cLq +oLN lMb lMb -fXZ -gsi gFP +gFP +aah +aah +aah +aah +afm aaa aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -139938,7 +140089,7 @@ aab aaa aaa "} -(281,1,1) = {" +(280,1,1) = {" aaa aaa aab @@ -139983,17 +140134,17 @@ xVk xVk aaa aaa -aae -aah -aah -aah -aah -aah -aah -aah -aah -aah -afm +aad +aPw +aPw +jbq +jbq +jbq +jbq +jbq +aPw +aPw +ajZ aaa aaa xVk @@ -140082,6 +140233,7 @@ aaa aaa aaa gFP +vVI lMb lMb lMb @@ -140094,9 +140246,8 @@ lMb lMb lMb lMb -lMb -lMb -lMb +fXZ +gsi gFP aaa aaa @@ -140134,56 +140285,34 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aab -aaa -aaa -"} -(282,1,1) = {" -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -xVk -xVk -xVk -xVk -xVk -xVk -xVk +aaa +aaa +aaa +aab +aaa +aaa +"} +(281,1,1) = {" +aaa +aaa +aab +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -140208,12 +140337,34 @@ xVk xVk aaa aaa +aae +aah +aah +aah +aah +aah +aah +aah +aah +aah +afm aaa aaa +xVk +xVk +xVk +xVk +xVk +xVk +xVk aaa aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -140228,7 +140379,7 @@ aaa aaa aab aaa -bdH +aaa lmz lmz lmz @@ -140243,7 +140394,7 @@ tte hvw auf pmV -xDC +yhi xDC dIn rby @@ -140344,7 +140495,7 @@ aab aaa aaa "} -(283,1,1) = {" +(282,1,1) = {" aaa aaa aab @@ -140449,7 +140600,7 @@ ebN ebN lnS uVv -yit +mxB ebN cxc kBy @@ -140488,7 +140639,6 @@ aaa aaa aaa gFP -riT lMb lMb lMb @@ -140502,7 +140652,8 @@ lMb lMb lMb lMb -vFn +lMb +lMb gFP aaa aaa @@ -140547,7 +140698,7 @@ aab aaa aaa "} -(284,1,1) = {" +(283,1,1) = {" aaa aaa aab @@ -140679,18 +140830,19 @@ bdH bdH bdH bdH -bdH -bdH -bdH -bdH -bdH -bdH -bdH +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa aaa gFP +riT lMb lMb lMb @@ -140704,8 +140856,7 @@ lMb lMb lMb lMb -lMb -lMb +vFn gFP aaa aaa @@ -140750,7 +140901,7 @@ aab aaa aaa "} -(285,1,1) = {" +(284,1,1) = {" aaa aaa aab @@ -140786,6 +140937,13 @@ aaa aaa aaa aaa +xVk +xVk +xVk +xVk +xVk +xVk +xVk aaa aaa aaa @@ -140801,20 +140959,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +xVk +xVk +xVk +xVk +xVk +xVk +xVk aaa aaa aaa @@ -140842,7 +140993,7 @@ lmz lmz lmz daz -acJ +hoo ubA cck wyQ @@ -140850,19 +141001,19 @@ fmv ubA gMN mRn -itf -mHE -vAU -qwJ -fJY -kzT +dJO +vMt +dkz +aGk +ktQ +teZ wkM -oLm -fcX -kKv -kKv -dGl -dGl +wHX +hWP +cSh +cSh +gsV +gsV daz lmz lmz @@ -140953,7 +141104,7 @@ aab aaa aaa "} -(286,1,1) = {" +(285,1,1) = {" aaa aaa aab @@ -141048,7 +141199,7 @@ daz cwS ffE vHa -wpw +qSA ffE ffE ffE @@ -141062,10 +141213,10 @@ erN wkM jvB jtj -ieF -ieF -pJR -gPr +vcM +vcM +pDQ +guU daz lmz lmz @@ -141097,7 +141248,6 @@ aaa aaa aaa gFP -vVI lMb lMb lMb @@ -141111,7 +141261,8 @@ lMb lMb lMb lMb -gsi +lMb +lMb gFP aaa aaa @@ -141156,7 +141307,7 @@ aab aaa aaa "} -(287,1,1) = {" +(286,1,1) = {" aaa aaa aab @@ -141256,19 +141407,19 @@ awu ydI aKs fMt -gOs -kXj -pYi -fMl -gUN -bLv +mEs +gbm +nIB +lFj +vyE +bha wkM -xvM -osy -cBm -cBm -iZw -dQl +qNc +jdl +lwZ +lwZ +lvB +goN daz lmz lmz @@ -141300,21 +141451,21 @@ aaa aaa aaa gFP +vVI +lMb +lMb +lMb +lMb lMb -wgf lMb -qbD lMb -wgf lMb -qbD lMb -wgf lMb -qbD lMb -wgf lMb +lMb +gsi gFP aaa aaa @@ -141359,7 +141510,7 @@ aab aaa aaa "} -(288,1,1) = {" +(287,1,1) = {" aaa aaa aab @@ -141456,7 +141607,7 @@ eKJ yaZ ffE hZj -clw +iCf daz daz daz @@ -141503,21 +141654,21 @@ aaa aaa aaa gFP -gFP -gFP -gFP -gFP -gFP -gFP -gFP -gFP -gFP -gFP -gFP -gFP -gFP -gFP -gFP +lMb +wgf +lMb +qbD +lMb +wgf +lMb +qbD +lMb +wgf +lMb +qbD +lMb +wgf +lMb gFP aaa aaa @@ -141562,7 +141713,7 @@ aab aaa aaa "} -(289,1,1) = {" +(288,1,1) = {" aaa aaa aab @@ -141667,7 +141818,7 @@ ebN ebN gbg uVv -lFq +ibN ebN qQS kBy @@ -141705,23 +141856,23 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +gFP +gFP +gFP +gFP +gFP +gFP +gFP +gFP +gFP +gFP +gFP +gFP +gFP +gFP +gFP +gFP +gFP aaa aaa aaa @@ -141765,7 +141916,7 @@ aab aaa aaa "} -(290,1,1) = {" +(289,1,1) = {" aaa aaa aab @@ -141867,7 +142018,7 @@ tte hvw auf hTl -xDC +efE xDC yaQ bat @@ -141968,7 +142119,7 @@ aab aaa aaa "} -(291,1,1) = {" +(290,1,1) = {" aaa aaa aab @@ -142060,17 +142211,17 @@ bdH lmz lmz lmz -lmz -lmz -lmz -lmz +daz +daz +daz +daz daz sbJ sbJ sbJ daz rna -clw +aOZ qQS aCd qQS @@ -142171,7 +142322,7 @@ aab aaa aaa "} -(292,1,1) = {" +(291,1,1) = {" aaa aaa aab @@ -142258,22 +142409,22 @@ aaa aaa aab aaa -aaa bdH -lmz -lmz -lmz -lmz +bdH lmz lmz lmz daz -ltc -eXk -xns -pTt -gAe -rCi +aiM +aiM +aiM +ebN +daz +klK +rFt +daz +ttT +gfQ gba mUz our @@ -142298,11 +142449,11 @@ bdH bdH bdH bdH -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH bdH bdH bdH @@ -142374,7 +142525,7 @@ aab aaa aaa "} -(293,1,1) = {" +(292,1,1) = {" aaa aaa aab @@ -142466,18 +142617,18 @@ bdH lmz lmz lmz -lmz -lmz -lmz -lmz daz +aiM +gWN +aiM +ebN tId -wJB -tJN -daz -daz -daz +ltc +ltc daz +ebN +npE +ebN daz daz daz @@ -142506,13 +142657,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -142577,7 +142728,7 @@ aab aaa aaa "} -(294,1,1) = {" +(293,1,1) = {" aaa aaa aab @@ -142669,10 +142820,18 @@ bdH bdH bdH bdH -bdH -bdH -bdH -lmz +sBR +aiM +qQS +aiM +ebN +tId +gWN +qQS +ebN +uPg +gfQ +qQS daz daz daz @@ -142685,7 +142844,202 @@ lmz lmz lmz lmz -lmz +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aab +aaa +aaa +"} +(294,1,1) = {" +aaa +aaa +aab +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aab +aaa +aaa +aaa +bdH +bdH +bdH +dop +cAQ +gWN +aiM +ebN +tId +qQS +vOp +oBv +xDC +yaQ +jtj +mss +gVz +gVz +tMu +daz lmz lmz lmz @@ -142872,23 +143226,23 @@ aaa bdH bdH bdH -bdH -bdH -bdH -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz +ylL +hfZ +orI +qQS +bEX +qQS +qQS +hTB +rCi +qQS +qQS +tYb +rYc +eYf +iRU +tMu +daz lmz lmz lmz @@ -143071,27 +143425,27 @@ aab aab aab aab -aaa -bdH -bdH bdH bdH bdH bdH -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz -lmz +dmU +daz +daz +daz +daz +daz +daz +daz +daz +daz +daz +daz +daz +daz +daz +daz +daz lmz lmz lmz From de9e1b409b2da2b8ff0f014235e9cb8b82fd2652 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 16 Apr 2024 14:57:40 +0100 Subject: [PATCH 134/431] Automatic changelog for PR #6117 [ci skip] --- html/changelogs/AutoChangeLog-pr-6117.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6117.yml diff --git a/html/changelogs/AutoChangeLog-pr-6117.yml b/html/changelogs/AutoChangeLog-pr-6117.yml new file mode 100644 index 000000000000..3b2f4ed2cbef --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6117.yml @@ -0,0 +1,6 @@ +author: "realforest2001" +delete-after: True +changes: + - maptweak: "Remodelled the AI Core Reception and WJ spawn area." + - maptweak: "Switches AI Core cameras over to manual naming." + - imageadd: "Added sprites for AI Core windows on black Almayer frames." \ No newline at end of file From ca2a650084c74b2ecefb6e80c475ac11fad314d9 Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Tue, 16 Apr 2024 12:58:25 -0700 Subject: [PATCH 135/431] M3A1 Synthetic Utility Vest becomes light(er)weight (#6116) # About the pull request This PR changes the M3A1 Synthetic Utility Vest to have a 10% slowdown TLDR, I want more people to use this vest because its flavorful. I conducted a poll last year to see why pretty much no one used it and its because of the slowdown with nothing to show for it, as it is an armor vest .. without the armor. Less than 1% of participants of the poll cared about the storage space(which is quite laughable, at 1 slot) Adding armor is not something I intend, but minimizing the slowdown is something I intend, and I see it as intuitive. If an armor vest weighs 25kg and you remove 2 inserts of 10kg armor, how does it still weigh 25kg?!? It is a stretch to say it has any slower movement at all. You get: added storage(1 slot), a suit light For: 20% slowdown Because the main intended user of this is a USCM Synthetic, they don't really benefit from the suitlight since they are usually with Marines. Speed is key for any support role and for Synthetic it is especially crucial, slowing yourself down for a single inventory slot is just ridiculous. Granted, there is still a slowdown here. Overall I'd just like to see it being used more under various circumstances, whether its for flavor during preparations in dangerous situations, or if its just part of someones outfit. # Explain why it's good for the game Despite many attempts to get more people to use it, the M3A1 is used by borderline nobody because of the slowdown. The description states that ALL ARMOR is removed(and indeed, all armor is removed). Why does it weight as much as combat vests that ALSO have lights and storage pouches? It just doesn't make sense. Armor weighs a significant amount and removing it should lighten the vest **significantly,** as described. Making it more lightweight will hopefully have more people use it. It is the only USCM styled Synthetic piece available. # Testing Photographs and Procedure

Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: balance: M3A1 Synthetic Utility Vest only has a 10% slowdown. /:cl: --- code/modules/clothing/suits/marine_armor/_marine_armor.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm index 6e1133a4dcc1..e2facb987959 100644 --- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm @@ -483,7 +483,7 @@ /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." + desc = "This variant of the ubiquitous M3 pattern vest has been extensively modified, providing no protection in exchange for maximum mobility and added storage. 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. @@ -496,7 +496,7 @@ armor_rad = CLOTHING_ARMOR_NONE armor_internaldamage = CLOTHING_ARMOR_NONE storage_slots = 3 - slowdown = SLOWDOWN_ARMOR_VERY_LIGHT + slowdown = SLOWDOWN_ARMOR_SUPER_LIGHT time_to_unequip = 0.5 SECONDS time_to_equip = 1 SECONDS uniform_restricted = null From c94539d5980b9b86915abb1088ce9fd76ec86325 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 16 Apr 2024 21:02:47 +0100 Subject: [PATCH 136/431] Automatic changelog for PR #6116 [ci skip] --- html/changelogs/AutoChangeLog-pr-6116.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6116.yml diff --git a/html/changelogs/AutoChangeLog-pr-6116.yml b/html/changelogs/AutoChangeLog-pr-6116.yml new file mode 100644 index 000000000000..7af81eddbd34 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6116.yml @@ -0,0 +1,4 @@ +author: "QuickLode" +delete-after: True +changes: + - balance: "M3A1 Synthetic Utility Vest only has a 10% slowdown." \ No newline at end of file From a94a1f88a3a3a709315404d099ccfb328fc6b2ba Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Wed, 17 Apr 2024 00:21:24 +0100 Subject: [PATCH 137/431] Project ARES: Nerve Gas Control (#5643) # About the pull request Allows nerve gas to be deployed from the AI Core vent system by use of the APOLLO and ARES Interface consoles. # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: add: Added Nerve Gas Release control buttons to the ARES and APOLLO interfaces, allowing the AI core to be secured from large groups or xenomorphs. Built in cooldowns should prevent fatalities. /:cl: --- code/__DEFINES/ARES.dm | 3 +- code/game/machinery/ARES/ARES_interface.dm | 85 +- .../machinery/ARES/ARES_interface_admin.dm | 23 + .../machinery/ARES/ARES_interface_apollo.dm | 24 + code/game/machinery/ARES/ARES_procs.dm | 21 + code/game/machinery/ARES/apollo_pda.dm | 24 + .../objects/effects/effect_system/smoke.dm | 2 +- .../structures/pipes/vents/pump_scrubber.dm | 29 + maps/map_files/USS_Almayer/USS_Almayer.dmm | 2559 +++++++++-------- tgui/packages/tgui/interfaces/AresAdmin.js | 100 + .../tgui/interfaces/AresInterface.jsx | 98 + tgui/packages/tgui/interfaces/WorkingJoe.jsx | 98 +- 12 files changed, 1760 insertions(+), 1306 deletions(-) diff --git a/code/__DEFINES/ARES.dm b/code/__DEFINES/ARES.dm index 7eee073aca51..55aa68f97309 100644 --- a/code/__DEFINES/ARES.dm +++ b/code/__DEFINES/ARES.dm @@ -15,7 +15,7 @@ /// High Command, can read the deletion log. #define ARES_ACCESS_HIGH 9 #define ARES_ACCESS_WY_COMMAND 10 -/// Debugging. Allows me to view everything without using a high command rank. Unlikely to stay in a full merge. +/// Debugging. Allows me to view everything without using a high command rank. #define ARES_ACCESS_DEBUG 11 #define ARES_RECORD_ANNOUNCE "Announcement Record" @@ -78,6 +78,7 @@ /// Cooldowns #define COOLDOWN_ARES_SENSOR 60 SECONDS #define COOLDOWN_ARES_ACCESS_CONTROL 20 SECONDS +#define COOLDOWN_ARES_VENT 60 SECONDS /// Time until someone can respawn as Working Joe #define JOE_JOIN_DEAD_TIME (15 MINUTES) diff --git a/code/game/machinery/ARES/ARES_interface.dm b/code/game/machinery/ARES/ARES_interface.dm index d6f58f371715..6cc7c220fd04 100644 --- a/code/game/machinery/ARES/ARES_interface.dm +++ b/code/game/machinery/ARES/ARES_interface.dm @@ -214,6 +214,8 @@ data["active_ref"] = active_ref data["conversations"] = logged_convos + data["security_vents"] = link.get_ares_vents() + return data /obj/structure/machinery/computer/ares_console/ui_status(mob/user, datum/ui_state/state) @@ -227,19 +229,19 @@ . = ..() if(.) return - - playsound(src, "keyboard_alt", 15, 1) - var/mob/living/carbon/human/operator = ui.user + var/mob/user = ui.user + var/playsound = TRUE switch (action) if("go_back") if(!last_menu) - return to_chat(operator, SPAN_WARNING("Error, no previous page detected.")) + return to_chat(user, SPAN_WARNING("Error, no previous page detected.")) var/temp_holder = current_menu current_menu = last_menu last_menu = temp_holder if("login") + var/mob/living/carbon/human/operator = user var/obj/item/card/id/idcard = operator.get_active_hand() if(istype(idcard)) authentication = get_ares_access(idcard) @@ -250,7 +252,7 @@ authentication = get_ares_access(idcard) last_login = idcard.registered_name else - to_chat(operator, SPAN_WARNING("You require an ID card to access this terminal!")) + to_chat(user, SPAN_WARNING("You require an ID card to access this terminal!")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE if(authentication) @@ -258,14 +260,14 @@ current_menu = "main" if("sudo") - var/new_user = tgui_input_text(operator, "Enter Sudo Username", "Sudo User", encode = FALSE) + var/new_user = tgui_input_text(user, "Enter Sudo Username", "Sudo User", encode = FALSE) if(new_user) if(new_user == sudo_holder) last_login = sudo_holder sudo_holder = null return FALSE if(new_user == last_login) - to_chat(operator, SPAN_WARNING("Already remote logged in as this user.")) + to_chat(user, SPAN_WARNING("Already remote logged in as this user.")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE sudo_holder = last_login @@ -331,6 +333,9 @@ if("page_tech") last_menu = current_menu current_menu = "tech_log" + if("page_core_sec") + last_menu = current_menu + current_menu = "core_security" // -- Delete Button -- // if("delete_record") @@ -388,9 +393,9 @@ datacore.records_talking -= conversation if("message_ares") - var/message = tgui_input_text(operator, "What do you wish to say to ARES?", "ARES Message", encode = FALSE) + var/message = tgui_input_text(user, "What do you wish to say to ARES?", "ARES Message", encode = FALSE) if(message) - message_ares(message, operator, params["active_convo"]) + message_ares(message, user, params["active_convo"]) if("read_record") var/datum/ares_record/deleted_talk/conversation = locate(params["record"]) @@ -403,36 +408,36 @@ // -- Emergency Buttons -- // if("general_quarters") if(!COOLDOWN_FINISHED(datacore, ares_quarters_cooldown)) - to_chat(operator, SPAN_WARNING("It has not been long enough since the last General Quarters call!")) + to_chat(user, SPAN_WARNING("It has not been long enough since the last General Quarters call!")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE if(GLOB.security_level < SEC_LEVEL_RED) set_security_level(SEC_LEVEL_RED, no_sound = TRUE, announce = FALSE) shipwide_ai_announcement("ATTENTION! GENERAL QUARTERS. ALL HANDS, MAN YOUR BATTLESTATIONS.", MAIN_AI_SYSTEM, 'sound/effects/GQfullcall.ogg') - log_game("[key_name(operator)] has called for general quarters via ARES.") - message_admins("[key_name_admin(operator)] has called for general quarters via ARES.") + log_game("[key_name(user)] has called for general quarters via ARES.") + message_admins("[key_name_admin(user)] has called for general quarters via ARES.") log_ares_security("General Quarters", "[last_login] has called for general quarters via ARES.") COOLDOWN_START(datacore, ares_quarters_cooldown, 10 MINUTES) . = TRUE if("evacuation_start") if(GLOB.security_level < SEC_LEVEL_RED) - to_chat(operator, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures.")) + to_chat(user, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures.")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE if(SShijack.evac_admin_denied) - to_chat(operator, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods.")) + to_chat(user, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods.")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE if(!SShijack.initiate_evacuation()) - to_chat(operator, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!")) + to_chat(user, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE - log_game("[key_name(operator)] has called for an emergency evacuation via ARES.") - message_admins("[key_name_admin(operator)] has called for an emergency evacuation via ARES.") + log_game("[key_name(user)] has called for an emergency evacuation via ARES.") + message_admins("[key_name_admin(user)] has called for an emergency evacuation via ARES.") log_ares_security("Initiate Evacuation", "[last_login] has called for an emergency evacuation via ARES.") . = TRUE @@ -440,27 +445,27 @@ if(!SSticker.mode) return FALSE //Not a game mode? if(world.time < DISTRESS_TIME_LOCK) - to_chat(operator, SPAN_WARNING("You have been here for less than six minutes... what could you possibly have done!")) + to_chat(user, SPAN_WARNING("You have been here for less than six minutes... what could you possibly have done!")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE if(!COOLDOWN_FINISHED(datacore, ares_distress_cooldown)) - to_chat(operator, SPAN_WARNING("The distress launcher is cooling down!")) + to_chat(user, SPAN_WARNING("The distress launcher is cooling down!")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE if(GLOB.security_level == SEC_LEVEL_DELTA) - to_chat(operator, SPAN_WARNING("The ship is already undergoing self destruct procedures!")) + to_chat(user, SPAN_WARNING("The ship is already undergoing self destruct procedures!")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE if(GLOB.security_level < SEC_LEVEL_RED) - to_chat(operator, SPAN_WARNING("The ship must be under red alert to launch a distress beacon!")) + to_chat(user, SPAN_WARNING("The ship must be under red alert to launch a distress beacon!")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE for(var/client/admin in GLOB.admins) if((R_ADMIN|R_MOD) & admin.admin_holder.rights) playsound_client(admin,'sound/effects/sos-morse-code.ogg',10) - SSticker.mode.request_ert(operator, TRUE) - to_chat(operator, SPAN_NOTICE("A distress beacon request has been sent to USCM High Command.")) + SSticker.mode.request_ert(user, TRUE) + to_chat(user, SPAN_NOTICE("A distress beacon request has been sent to USCM High Command.")) COOLDOWN_START(datacore, ares_distress_cooldown, COOLDOWN_COMM_REQUEST) return TRUE @@ -468,28 +473,50 @@ if(!SSticker.mode) return FALSE //Not a game mode? if(world.time < NUCLEAR_TIME_LOCK) - to_chat(operator, SPAN_WARNING("It is too soon to request Nuclear Ordnance!")) + to_chat(user, SPAN_WARNING("It is too soon to request Nuclear Ordnance!")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE if(!COOLDOWN_FINISHED(datacore, ares_nuclear_cooldown)) - to_chat(operator, SPAN_WARNING("The ordnance request frequency is garbled, wait for reset!")) + to_chat(user, SPAN_WARNING("The ordnance request frequency is garbled, wait for reset!")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE if(GLOB.security_level == SEC_LEVEL_DELTA || SSticker.mode.is_in_endgame) - to_chat(operator, SPAN_WARNING("The mission has failed catastrophically, what do you want a nuke for?!")) + to_chat(user, SPAN_WARNING("The mission has failed catastrophically, what do you want a nuke for?!")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE - var/reason = tgui_input_text(operator, "Please enter reason nuclear ordnance is required.", "Reason for Nuclear Ordnance") + var/reason = tgui_input_text(user, "Please enter reason nuclear ordnance is required.", "Reason for Nuclear Ordnance") if(!reason) return FALSE for(var/client/admin in GLOB.admins) if((R_ADMIN|R_MOD) & admin.admin_holder.rights) playsound_client(admin,'sound/effects/sos-morse-code.ogg',10) - message_admins("[key_name(operator)] has requested use of Nuclear Ordnance (via ARES)! Reason: [reason] [CC_MARK(operator)] (APPROVE) (DENY) [ADMIN_JMP_USER(operator)] [CC_REPLY(operator)]") - to_chat(operator, SPAN_NOTICE("A nuclear ordnance request has been sent to USCM High Command for the following reason: [reason]")) + message_admins("[key_name(user)] has requested use of Nuclear Ordnance (via ARES)! Reason: [reason] [CC_MARK(user)] (APPROVE) (DENY) [ADMIN_JMP_USER(user)] [CC_REPLY(user)]") + to_chat(user, SPAN_NOTICE("A nuclear ordnance request has been sent to USCM High Command for the following reason: [reason]")) log_ares_security("Nuclear Ordnance Request", "[last_login] has sent a request for nuclear ordnance for the following reason: [reason]") if(ares_can_interface()) ai_silent_announcement("[last_login] has sent a request for nuclear ordnance to USCM High Command.", ".V") ai_silent_announcement("Reason given: [reason].", ".V") COOLDOWN_START(datacore, ares_nuclear_cooldown, COOLDOWN_COMM_DESTRUCT) return TRUE + + if("trigger_vent") + playsound = FALSE + var/obj/structure/pipes/vents/pump/no_boom/gas/sec_vent = locate(params["vent"]) + if(!istype(sec_vent) || sec_vent.welded) + to_chat(user, SPAN_WARNING("ERROR: Gas release failure.")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(!COOLDOWN_FINISHED(sec_vent, vent_trigger_cooldown)) + to_chat(user, SPAN_WARNING("ERROR: Insufficient gas reserve for this vent.")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + to_chat(user, SPAN_WARNING("Initiating gas release from [sec_vent.vent_tag].")) + playsound(src, 'sound/machines/chime.ogg', 15, 1) + COOLDOWN_START(sec_vent, vent_trigger_cooldown, COOLDOWN_ARES_VENT) + ares_apollo_talk("Nerve Gas release imminent from [sec_vent.vent_tag].") + log_ares_security("Nerve Gas Release", "[last_login] released Nerve Gas from Vent '[sec_vent.vent_tag]'.") + sec_vent.create_gas(VENT_GAS_CN20_XENO, 6, 5 SECONDS) + log_admin("[key_name(user)] released nerve gas from Vent '[sec_vent.vent_tag]' via ARES.") + + if(playsound) + playsound(src, "keyboard_alt", 15, 1) diff --git a/code/game/machinery/ARES/ARES_interface_admin.dm b/code/game/machinery/ARES/ARES_interface_admin.dm index 5ca7a9ba171d..586b01a51af9 100644 --- a/code/game/machinery/ARES/ARES_interface_admin.dm +++ b/code/game/machinery/ARES/ARES_interface_admin.dm @@ -231,6 +231,8 @@ logged_access += list(current_ticket) data["access_tickets"] = logged_access + data["security_vents"] = get_ares_vents() + return data @@ -321,6 +323,9 @@ if("page_tech") admin_interface.last_menu = admin_interface.current_menu admin_interface.current_menu = "tech_log" + if("page_core_sec") + admin_interface.last_menu = admin_interface.current_menu + admin_interface.current_menu = "core_security" if("page_access_management") admin_interface.last_menu = admin_interface.current_menu admin_interface.current_menu = "access_management" @@ -491,3 +496,21 @@ ares_apollo_talk("Priority [ticket.ticket_type] [ticket.ticket_id] has been [choice] by [MAIN_AI_SYSTEM].") to_chat(user, SPAN_NOTICE("[ticket.ticket_type] [ticket.ticket_id] marked as [choice].")) return TRUE + + if("trigger_vent") + var/obj/structure/pipes/vents/pump/no_boom/gas/sec_vent = locate(params["vent"]) + if(!istype(sec_vent) || sec_vent.welded) + to_chat(user, SPAN_WARNING("ERROR: Gas release failure.")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(!COOLDOWN_FINISHED(sec_vent, vent_trigger_cooldown)) + to_chat(user, SPAN_WARNING("ERROR: Insufficient gas reserve for this vent.")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + to_chat(user, SPAN_WARNING("Initiating gas release from [sec_vent.vent_tag].")) + playsound(src, 'sound/machines/chime.ogg', 15, 1) + COOLDOWN_START(sec_vent, vent_trigger_cooldown, COOLDOWN_ARES_VENT) + ares_apollo_talk("Nerve Gas release imminent from [sec_vent.vent_tag].") + log_ares_security("Nerve Gas Release", "[MAIN_AI_SYSTEM] released Nerve Gas from Vent '[sec_vent.vent_tag]'.") + sec_vent.create_gas(VENT_GAS_CN20_XENO, 6, 5 SECONDS) + log_admin("[key_name(user)] released nerve gas from Vent '[sec_vent.vent_tag]' via ARES.") diff --git a/code/game/machinery/ARES/ARES_interface_apollo.dm b/code/game/machinery/ARES/ARES_interface_apollo.dm index c1c936676dc5..48fcad588574 100644 --- a/code/game/machinery/ARES/ARES_interface_apollo.dm +++ b/code/game/machinery/ARES/ARES_interface_apollo.dm @@ -141,6 +141,8 @@ requesting_access += access_ticket.ticket_name data["access_tickets"] = logged_access + data["security_vents"] = link.get_ares_vents() + return data /obj/structure/machinery/computer/working_joe/ui_status(mob/user, datum/ui_state/state) @@ -211,6 +213,9 @@ if("page_maintenance") last_menu = current_menu current_menu = "maint_claim" + if("page_core_gas") + last_menu = current_menu + current_menu = "core_security_gas" if("toggle_sound") notify_sounds = !notify_sounds @@ -413,6 +418,25 @@ playsound_client(id_owner?.client, 'sound/machines/pda_ping.ogg', src, 25, 0) return TRUE + if("trigger_vent") + playsound = FALSE + var/obj/structure/pipes/vents/pump/no_boom/gas/sec_vent = locate(params["vent"]) + if(!istype(sec_vent) || sec_vent.welded) + to_chat(operator, SPAN_WARNING("ERROR: Gas release failure.")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(!COOLDOWN_FINISHED(sec_vent, vent_trigger_cooldown)) + to_chat(operator, SPAN_WARNING("ERROR: Insufficient gas reserve for this vent.")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + to_chat(operator, SPAN_WARNING("Initiating gas release from [sec_vent.vent_tag].")) + playsound(src, 'sound/machines/chime.ogg', 15, 1) + COOLDOWN_START(sec_vent, vent_trigger_cooldown, COOLDOWN_ARES_VENT) + ares_apollo_talk("Nerve Gas release imminent from [sec_vent.vent_tag].") + log_ares_security("Nerve Gas Release", "[last_login] released Nerve Gas from Vent '[sec_vent.vent_tag]'.") + sec_vent.create_gas(VENT_GAS_CN20_XENO, 6, 5 SECONDS) + log_admin("[key_name(operator)] released nerve gas from Vent '[sec_vent.vent_tag]' via ARES.") + if(playsound) playsound(src, "keyboard_alt", 15, 1) diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm index 1212d1509a01..f18957a22d82 100644 --- a/code/game/machinery/ARES/ARES_procs.dm +++ b/code/game/machinery/ARES/ARES_procs.dm @@ -29,6 +29,10 @@ GLOBAL_LIST_INIT(maintenance_categories, list( var/datum/ares_datacore/datacore var/list/obj/structure/machinery/computer/working_joe/ticket_computers = list() + /// Linked security gas vents. + var/list/linked_vents = list() + /// The tag number for generated vent labels, if none is manually set. + var/tag_num = 1 /// Working Joe stuff var/list/tickets_maintenance = list() @@ -50,6 +54,23 @@ GLOBAL_LIST_INIT(maintenance_categories, list( alert.delink() ..() +/datum/ares_link/proc/get_ares_vents() + var/list/security_vents = list() + var/datum/ares_link/link = GLOB.ares_link + for(var/obj/structure/pipes/vents/pump/no_boom/gas/vent in link.linked_vents) + if(!vent.vent_tag) + vent.vent_tag = "Security Vent #[link.tag_num]" + link.tag_num++ + + var/list/current_vent = list() + var/is_available = COOLDOWN_FINISHED(vent, vent_trigger_cooldown) + current_vent["vent_tag"] = vent.vent_tag + current_vent["ref"] = "\ref[vent]" + current_vent["available"] = is_available + security_vents += list(current_vent) + return security_vents + + /* BELOW ARE IN AdminAres.dm /datum/ares_link/tgui_interact(mob/user, datum/tgui/ui) /datum/ares_link/ui_data(mob/user) diff --git a/code/game/machinery/ARES/apollo_pda.dm b/code/game/machinery/ARES/apollo_pda.dm index 69e774cf0da3..e447bb6f7ee7 100644 --- a/code/game/machinery/ARES/apollo_pda.dm +++ b/code/game/machinery/ARES/apollo_pda.dm @@ -166,6 +166,8 @@ requesting_access += access_ticket.ticket_name data["access_tickets"] = logged_access + data["security_vents"] = link.get_ares_vents() + return data /obj/item/device/working_joe_pda/ui_status(mob/user, datum/ui_state/state) @@ -237,6 +239,9 @@ if("page_maintenance") last_menu = current_menu current_menu = "maint_claim" + if("page_core_gas") + last_menu = current_menu + current_menu = "core_security_gas" if("toggle_sound") notify_sounds = !notify_sounds @@ -439,6 +444,25 @@ playsound_client(id_owner?.client, 'sound/machines/pda_ping.ogg', src, 25, 0) return TRUE + if("trigger_vent") + playsound = FALSE + var/obj/structure/pipes/vents/pump/no_boom/gas/sec_vent = locate(params["vent"]) + if(!istype(sec_vent) || sec_vent.welded) + to_chat(operator, SPAN_WARNING("ERROR: Gas release failure.")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(!COOLDOWN_FINISHED(sec_vent, vent_trigger_cooldown)) + to_chat(operator, SPAN_WARNING("ERROR: Insufficient gas reserve for this vent.")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + to_chat(operator, SPAN_WARNING("Initiating gas release from [sec_vent.vent_tag].")) + playsound(src, 'sound/machines/chime.ogg', 15, 1) + COOLDOWN_START(sec_vent, vent_trigger_cooldown, COOLDOWN_ARES_VENT) + ares_apollo_talk("Nerve Gas release imminent from [sec_vent.vent_tag].") + log_ares_security("Nerve Gas Release", "[last_login] released Nerve Gas from Vent '[sec_vent.vent_tag]'.") + sec_vent.create_gas(VENT_GAS_CN20_XENO, 6, 5 SECONDS) + log_admin("[key_name(operator)] released nerve gas from Vent '[sec_vent.vent_tag]' via ARES.") + if(playsound) var/sound = pick('sound/machines/pda_button1.ogg', 'sound/machines/pda_button2.ogg') playsound(src, sound, 15, TRUE) diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index c9e404ae5b60..b79e50b453cc 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -316,7 +316,7 @@ if(xeno_affecting) stun_chance = 35 if(prob(stun_chance)) - creature.apply_effect(1, WEAKEN) + creature.apply_effect(2, WEAKEN) //Topical damage (neurotoxin on exposed skin) if(xeno_creature) diff --git a/code/game/objects/structures/pipes/vents/pump_scrubber.dm b/code/game/objects/structures/pipes/vents/pump_scrubber.dm index a4565c610ad5..acc8b4784af9 100644 --- a/code/game/objects/structures/pipes/vents/pump_scrubber.dm +++ b/code/game/objects/structures/pipes/vents/pump_scrubber.dm @@ -21,6 +21,35 @@ name = "Reinforced Air Vent" explodey = FALSE +/// Vents that are linked to ARES Security Protocols, allowing the ARES Interface to trigger security measures. +/obj/structure/pipes/vents/pump/no_boom/gas + name = "Security Air Vent" + var/datum/ares_link/link + var/vent_tag + COOLDOWN_DECLARE(vent_trigger_cooldown) + +/obj/structure/pipes/vents/pump/no_boom/gas/Initialize() + link_systems(override = FALSE) + . = ..() + +/obj/structure/pipes/vents/pump/no_boom/gas/Destroy() + delink() + return ..() + +/obj/structure/pipes/vents/pump/no_boom/gas/proc/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) + if(link && !override) + return FALSE + delink() + if(new_link) + link = new_link + new_link.linked_vents += src + return TRUE + +/obj/structure/pipes/vents/pump/no_boom/gas/proc/delink() + if(link) + link.linked_vents -= src + link = null + /obj/structure/pipes/vents/pump/on icon_state = "on" diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 6a70a33c4e13..84eb6b3b142a 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -1533,10 +1533,6 @@ allow_construction = 0 }, /area/almayer/stair_clone/upper) -"aiM" = ( -/obj/structure/surface/rack, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "aiQ" = ( /obj/structure/machinery/faxmachine, /obj/structure/surface/table/almayer, @@ -2808,6 +2804,10 @@ icon_state = "test_floor4" }, /area/almayer/living/pilotbunks) +"aqB" = ( +/obj/structure/blocker/fuelpump, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "aqF" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_10" @@ -7851,14 +7851,6 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering) -"aOZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 4 - }, -/turf/open/floor/almayer/aicore/glowing/no_build{ - icon_state = "ai_floor3" - }, -/area/almayer/command/airoom) "aPa" = ( /obj/structure/machinery/light{ dir = 8 @@ -9640,16 +9632,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/operating_room_one) -"bat" = ( -/obj/structure/machinery/door_control{ - id = "ARES Mainframe Right"; - name = "ARES Mainframe Lockdown"; - pixel_x = -24; - pixel_y = -24; - req_one_access_txt = "200;91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "baw" = ( /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) @@ -10837,25 +10819,6 @@ icon_state = "red" }, /area/almayer/squads/alpha) -"bha" = ( -/obj/structure/machinery/door_control{ - id = "ARES StairsLower"; - name = "ARES Core Lockdown"; - pixel_x = 24; - pixel_y = -8; - req_one_access_txt = "90;91;92" - }, -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8; - pixel_y = 2; - c_tag = "AI - Main Corridor"; - autoname = 0 - }, -/turf/open/floor/almayer/aicore/no_build{ - dir = 4; - icon_state = "ai_silver" - }, -/area/almayer/command/airoom) "bhf" = ( /obj/structure/machinery/light{ dir = 4 @@ -14189,18 +14152,6 @@ icon_state = "plate" }, /area/almayer/squads/bravo) -"bEX" = ( -/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ - access_modified = 1; - name = "\improper Security Vault"; - req_access = null; - req_one_access_txt = "91;92"; - dir = 1 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "test_floor4" - }, -/area/almayer/command/airoom) "bFa" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -15291,6 +15242,13 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_midship_hallway) +"bMg" = ( +/obj/structure/pipes/vents/pump/no_boom/gas{ + vent_tag = "Synth Bay"; + dir = 8 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "bMq" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /obj/structure/machinery/light{ @@ -17194,6 +17152,21 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_midship_hallway) +"bZq" = ( +/obj/effect/projector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "bZr" = ( /turf/open/floor/almayer{ dir = 1; @@ -17680,6 +17653,10 @@ icon_state = "test_floor4" }, /area/almayer/maint/upper/u_m_s) +"cea" = ( +/obj/structure/machinery/fuelpump, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south2) "ceg" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -19172,6 +19149,12 @@ /obj/structure/window/framed/almayer/hull/hijack_bustable, /turf/open/floor/plating, /area/almayer/squads/req) +"cpP" = ( +/obj/structure/blocker/fuelpump, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north1) "cqd" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -19398,20 +19381,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/cryo) -"cup" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresDown"; - vector_x = 96; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "cuq" = ( /obj/structure/machinery/computer/arcade, /turf/open/floor/wood/ship, @@ -19599,6 +19568,16 @@ icon_state = "orange" }, /area/almayer/maint/upper/mess) +"cyP" = ( +/obj/structure/machinery/cm_vending/clothing/intelligence_officer{ + density = 0; + pixel_x = -32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/command/securestorage) "cyR" = ( /obj/structure/bed/chair{ dir = 8 @@ -19619,17 +19598,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"czh" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresDown"; - vector_x = 96; - vector_y = -65 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "czN" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -19697,21 +19665,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"cAQ" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/disposaloutlet{ - density = 0; - desc = "An outlet for the pneumatic delivery system."; - icon_state = "delivery_outlet"; - name = "take-ins"; - pixel_x = -1; - pixel_y = 28; - range = 0 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "cAR" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/mp_bunks) @@ -19814,21 +19767,6 @@ }, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_s) -"cCO" = ( -/obj/effect/projector{ - name = "Almayer_AresDown"; - vector_x = 96; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "cDb" = ( /obj/structure/closet/secure_closet/personal/cabinet{ req_access = null @@ -19985,6 +19923,24 @@ icon_state = "mono" }, /area/almayer/hallways/upper/fore_hallway) +"cFg" = ( +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/effect/projector{ + name = "Almayer_AresUp2"; + vector_x = -102; + vector_y = 61 + }, +/obj/structure/machinery/door_control{ + id = "ARES ReceptStairs2"; + name = "ARES Reception Stairway Shutters"; + pixel_x = 24; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "cFh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -20191,10 +20147,37 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"cJv" = ( +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/effect/projector{ + name = "Almayer_AresDown2"; + vector_x = 102; + vector_y = -61 + }, +/turf/open/floor/plating, +/area/almayer/command/airoom) "cJE" = ( /obj/structure/sign/prop2, /turf/closed/wall/almayer, /area/almayer/shipboard/sea_office) +"cJI" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/disposaloutlet{ + density = 0; + desc = "An outlet for the pneumatic delivery system."; + icon_state = "delivery_outlet"; + name = "take-ins"; + pixel_x = -1; + pixel_y = 28; + range = 0 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "cJK" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -20465,6 +20448,12 @@ }, /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) +"cOd" = ( +/obj/structure/blocker/fuelpump, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/south2) "cOe" = ( /turf/open/floor/almayer{ dir = 5; @@ -20504,6 +20493,27 @@ icon_state = "outerhull_dir" }, /area/almayer/engineering/upper_engineering/starboard) +"cOV" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + pixel_x = -24; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "cOY" = ( /obj/item/clothing/under/blackskirt{ desc = "A stylish skirt, in a business-black and red colour scheme."; @@ -20721,21 +20731,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) -"cSh" = ( -/obj/effect/projector{ - name = "Almayer_AresUp"; - vector_x = -96; - vector_y = 65 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "cSk" = ( /obj/structure/machinery/door/window/southleft, /turf/open/floor/almayer{ @@ -20773,18 +20768,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_midship_hallway) -"cSO" = ( -/obj/structure/surface/rack{ - density = 0; - pixel_y = 16 - }, -/obj/structure/machinery/faxmachine/uscm/command{ - density = 0; - department = "AI Core"; - pixel_y = 32 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "cSP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -21849,14 +21832,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"dmU" = ( -/obj/structure/disposalpipe/up/almayer{ - dir = 8; - id = "ares_vault_out"; - name = "aicore" - }, -/turf/closed/wall/almayer/aicore/hull, -/area/almayer/command/airoom) "dmZ" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1 @@ -21946,13 +21921,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering) -"dop" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/closed/wall/almayer/aicore/hull, -/area/almayer/command/airoom) "doJ" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -22006,6 +21974,21 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) +"dpp" = ( +/obj/effect/projector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "dpA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22118,6 +22101,19 @@ icon_state = "sterile_green" }, /area/almayer/medical/hydroponics) +"drU" = ( +/obj/structure/machinery/door_control{ + id = "ARES JoeCryo"; + name = "ARES WorkingJoe Bay Shutters"; + req_one_access_txt = "91;92"; + pixel_x = 24 + }, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + autoname = 0; + c_tag = "AI - Comms" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "dsA" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/almayer{ @@ -22454,6 +22450,22 @@ "dzp" = ( /turf/open/floor/almayer, /area/almayer/command/corporateliaison) +"dzt" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 8; + autoname = 0; + c_tag = "AI - Secondary Processors" + }, +/turf/open/floor/almayer/aicore/glowing/no_build, +/area/almayer/command/airoom) "dzG" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_y = 26 @@ -24246,12 +24258,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower) -"efE" = ( -/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ - dir = 8 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "efJ" = ( /obj/item/tool/wet_sign, /obj/effect/decal/cleanable/blood, @@ -24318,6 +24324,26 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) +"ege" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsLower"; + name = "ARES Core Lockdown"; + pixel_x = -24; + pixel_y = 8; + req_one_access_txt = "90;91;92" + }, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 4; + pixel_y = -8; + autoname = 0; + c_tag = "AI - Main Staircase" + }, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer/aicore/no_build{ + dir = 8; + icon_state = "ai_silver" + }, +/area/almayer/command/airoom) "egp" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/platform_decoration, @@ -24456,6 +24482,20 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) +"eii" = ( +/obj/structure/platform{ + dir = 4 + }, +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "eim" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -24844,17 +24884,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/lobby) -"epG" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresDown2"; - vector_x = 102; - vector_y = -61 - }, -/turf/open/floor/plating, -/area/almayer/command/airoom) "epJ" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -25459,6 +25488,18 @@ icon_state = "green" }, /area/almayer/shipboard/brig/cells) +"ezq" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "ezG" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -25735,21 +25776,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/bridgebunks) -"eDT" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/intelligence_officer{ - density = 0; - pixel_x = -32 - }, -/obj/structure/machinery/light{ - dir = 8; - pixel_x = -32; - alpha = 0 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/command/computerlab) "eEc" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -25897,6 +25923,15 @@ icon_state = "green" }, /area/almayer/hallways/lower/port_midship_hallway) +"eGr" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 8; + autoname = 0; + c_tag = "AI - Records" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "eGB" = ( /obj/structure/platform_decoration, /turf/open/floor/almayer, @@ -26319,6 +26354,42 @@ icon_state = "cargo" }, /area/almayer/engineering/lower/workshop/hangar) +"eQj" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + pixel_x = -10; + pixel_y = -24; + req_one_access_txt = "91;92" + }, +/obj/structure/machinery/door_control{ + id = "ARES StairsLock"; + name = "ARES Exterior Lockdown"; + pixel_y = -24; + req_one_access_txt = "91;92" + }, +/obj/structure/surface/table/reinforced/almayer_B{ + indestructible = 1; + unacidable = 1; + unslashable = 1 + }, +/obj/structure/machinery/door_control{ + id = "ARES Emergency"; + name = "ARES Emergency Lockdown"; + pixel_x = 10; + pixel_y = -24; + req_one_access_txt = "91;92" + }, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 4; + pixel_y = 12 + }, +/obj/structure/machinery/computer/cameras/almayer/ares{ + dir = 4; + pixel_y = -1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "eQm" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -26387,6 +26458,22 @@ icon_state = "test_floor4" }, /area/almayer/medical/lower_medical_medbay) +"eRI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 8; + pixel_y = 2; + autoname = 0; + c_tag = "AI - Reception Exterior" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/upper/midship_hallway) "eRR" = ( /obj/item/clothing/head/helmet/marine{ pixel_x = 16; @@ -26488,14 +26575,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_s) -"eTY" = ( -/obj/structure/disposalpipe/down/almayer{ - dir = 2; - id = "ares_vault_out"; - name = "wycomms" - }, -/turf/closed/wall/almayer/outer, -/area/almayer/command/airoom) "eUe" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -26535,12 +26614,6 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/chemistry) -"eUw" = ( -/obj/structure/blocker/fuelpump, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/south2) "eUA" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -26695,6 +26768,20 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/living/offices) +"eXy" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "eXD" = ( /obj/structure/prop/invuln/lattice_prop{ dir = 1; @@ -26706,24 +26793,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_m_s) -"eYf" = ( -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/obj/effect/projector{ - name = "Almayer_AresUp2"; - vector_x = -102; - vector_y = 61 - }, -/obj/structure/machinery/door_control{ - id = "ARES ReceptStairs2"; - name = "ARES Reception Stairway Shutters"; - pixel_x = 24; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "eYj" = ( /obj/structure/machinery/light{ dir = 8 @@ -27364,6 +27433,13 @@ icon_state = "mono" }, /area/almayer/engineering/upper_engineering/starboard) +"fhR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/closed/wall/almayer/aicore/hull, +/area/almayer/command/airoom) "fic" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -27448,6 +27524,13 @@ dir = 8 }, /area/almayer/medical/containment/cell/cl) +"flf" = ( +/obj/structure/pipes/vents/pump/no_boom/gas{ + vent_tag = "Records"; + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "flr" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -27462,6 +27545,29 @@ icon_state = "red" }, /area/almayer/maint/upper/u_a_p) +"flL" = ( +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 8; + autoname = 0; + c_tag = "AI - SynthBay" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) +"flR" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "flW" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/light{ @@ -27518,6 +27624,10 @@ icon_state = "green" }, /area/almayer/hallways/lower/port_midship_hallway) +"fnk" = ( +/obj/structure/blocker/fuelpump, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "fnv" = ( /obj/structure/machinery/light{ dir = 4 @@ -28289,6 +28399,20 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer, /area/almayer/hallways/lower/repair_bay) +"fCI" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES JoeCryo"; + name = "\improper ARES Synth Bay Shutters"; + plane = -7; + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "fCL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -28330,23 +28454,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) -"fDk" = ( -/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ - access_modified = 1; - name = "\improper AI Reception"; - req_access = null; - req_one_access_txt = "91;92"; - dir = 1 - }, -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "ARES ReceptStairs1"; - name = "\improper ARES Reception Shutters" - }, -/turf/open/floor/almayer/no_build{ - icon_state = "test_floor4" - }, -/area/almayer/command/airoom) "fDG" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light{ @@ -29040,20 +29147,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_p) -"fQi" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresDown"; - vector_x = 96; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "fQn" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -29083,6 +29176,16 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_f_s) +"fQD" = ( +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 8; + autoname = 0; + c_tag = "AI - Core Chamber" + }, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3" + }, +/area/almayer/command/airoom) "fQS" = ( /obj/structure/bed/chair/comfy/orange, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -29203,9 +29306,6 @@ icon_state = "test_floor4" }, /area/almayer/engineering/laundry) -"fUm" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/command/securestorage) "fUz" = ( /obj/structure/surface/rack, /obj/item/storage/box/cups{ @@ -29264,6 +29364,12 @@ icon_state = "orange" }, /area/almayer/engineering/lower/workshop) +"fVx" = ( +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3"; + light_range = 4 + }, +/area/almayer/command/airoom) "fVz" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -29783,12 +29889,6 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"gfQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 4 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "gfW" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/lockerroom) @@ -29989,6 +30089,17 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) +"gjv" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "gjB" = ( /obj/structure/machinery/light{ dir = 1 @@ -30221,20 +30332,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_a_p) -"goN" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresUp"; - vector_x = -96; - vector_y = 65 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "goY" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/panic) @@ -30286,6 +30383,23 @@ icon_state = "blue" }, /area/almayer/hallways/upper/midship_hallway) +"gpW" = ( +/obj/structure/surface/table/reinforced/almayer_B{ + indestructible = 1; + unacidable = 1; + unslashable = 1 + }, +/obj/structure/machinery/computer/secure_data{ + dir = 4 + }, +/obj/structure/machinery/door_control{ + id = "ARES ReceptStairs1"; + name = "ARES Reception Shutters"; + pixel_y = 24; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "gpY" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/lifeboat_pumps/north1) @@ -30496,20 +30610,6 @@ icon_state = "cargo" }, /area/almayer/engineering/lower/engine_core) -"gsV" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresUp"; - vector_x = -96; - vector_y = 65 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "gsZ" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 2; @@ -30609,17 +30709,6 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) -"guU" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresUp"; - vector_x = -96; - vector_y = 65 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "guW" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/sign/prop3{ @@ -30915,16 +31004,6 @@ /obj/item/reagent_container/hypospray/autoinjector/skillless, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"gzH" = ( -/obj/structure/machinery/cm_vending/clothing/intelligence_officer{ - density = 0; - pixel_x = -32 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/command/computerlab) "gzI" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -31120,6 +31199,18 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) +"gDh" = ( +/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + access_modified = 1; + name = "\improper Security Vault"; + req_access = null; + req_one_access_txt = "91;92"; + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "gDk" = ( /obj/structure/sign/safety/stairs{ pixel_x = -15 @@ -31152,27 +31243,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"gDu" = ( -/obj/effect/projector{ - name = "Almayer_AresDown"; - vector_x = 96; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/obj/structure/machinery/door_control{ - id = "ARES StairsUpper"; - name = "ARES Core Access"; - pixel_x = -24; - req_one_access_txt = "90;91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "gDH" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -32154,18 +32224,6 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) -"gVz" = ( -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/obj/effect/projector{ - name = "Almayer_AresUp2"; - vector_x = -102; - vector_y = 61 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "gVA" = ( /obj/structure/disposalpipe/down/almayer{ dir = 8; @@ -32235,12 +32293,6 @@ }, /turf/open/floor/plating, /area/almayer/medical/upper_medical) -"gWN" = ( -/turf/open/floor/almayer/aicore/glowing/no_build{ - icon_state = "ai_floor3"; - light_range = 4 - }, -/area/almayer/command/airoom) "gXl" = ( /obj/structure/closet/secure_closet/personal/cabinet{ req_access_txt = "5" @@ -32782,19 +32834,6 @@ icon_state = "plate" }, /area/almayer/squads/delta) -"hfZ" = ( -/obj/structure/machinery/disposal/delivery{ - density = 0; - desc = "A pneumatic delivery unit."; - icon_state = "delivery_engi"; - name = "Returns"; - pixel_y = 28 - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "hgg" = ( /obj/structure/surface/table/almayer, /obj/item/trash/USCMtray{ @@ -33392,26 +33431,6 @@ icon_state = "mono" }, /area/almayer/hallways/lower/vehiclehangar) -"hoo" = ( -/obj/structure/blocker/invisible_wall, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/mob/living/silicon/decoy/ship_ai{ - layer = 2.98; - pixel_y = -16 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) -"hoq" = ( -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 1; - c_tag = "AI - Reception Interior"; - autoname = 0 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "hoK" = ( /turf/open/floor/almayer{ dir = 8; @@ -34985,12 +35004,6 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/processing) -"hTB" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "hTF" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm{ isopen = 1; @@ -35239,6 +35252,10 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) +"hWM" = ( +/obj/structure/surface/rack, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "hWO" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer{ @@ -35519,14 +35536,6 @@ icon_state = "plate" }, /area/almayer/maint/lower/s_bow) -"ibN" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build{ - icon_state = "ai_plates" - }, -/area/almayer/command/airoom) "ibP" = ( /obj/structure/sign/safety/maint{ pixel_x = -19; @@ -35950,28 +35959,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/s_bow) -"ikH" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/disposal/delivery{ - density = 0; - desc = "A pneumatic delivery unit."; - icon_state = "delivery_engi"; - name = "Security Vault"; - pixel_y = 28; - pixel_x = -24 - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/machinery/door_control{ - id = "ARES StairsUpper"; - name = "ARES Core Access"; - pixel_x = -32; - pixel_y = 40; - req_one_access_txt = "90;91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "ikQ" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/tool/stamp/hop{ @@ -36057,6 +36044,28 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/living/offices/flight) +"imS" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES StairsUpper"; + name = "\improper ARES Core Shutters"; + plane = -7 + }, +/obj/structure/machinery/door/poddoor/almayer/blended/open{ + id = "ARES Emergency"; + name = "ARES Emergency Lockdown"; + open_layer = 1.9; + plane = -7 + }, +/obj/structure/disposalpipe/up/almayer{ + id = "ares_vault_in"; + name = "aicore"; + dir = 2 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "inh" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -36067,10 +36076,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) -"inm" = ( -/obj/structure/machinery/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south2) "ins" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -36084,16 +36089,6 @@ }, /turf/open/floor/plating, /area/almayer/engineering/upper_engineering) -"inI" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/door_control{ - id = "ARES ReceptStairs1"; - name = "ARES Reception Shutters"; - pixel_y = -24; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "inL" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -36104,6 +36099,16 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) +"ios" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/paper_bin/uscm{ + pixel_y = 6 + }, +/obj/item/tool/pen, +/turf/open/floor/almayer/no_build{ + icon_state = "plating" + }, +/area/almayer/command/airoom) "iow" = ( /obj/structure/machinery/cm_vending/sorted/attachments/squad{ req_access = null; @@ -36267,6 +36272,18 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cryo) +"irr" = ( +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/effect/projector{ + name = "Almayer_AresUp2"; + vector_x = -102; + vector_y = 61 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "iry" = ( /obj/structure/platform{ dir = 8 @@ -36356,6 +36373,12 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/morgue) +"itg" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "ito" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -36503,18 +36526,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) -"iwg" = ( -/obj/structure/surface/table/reinforced/almayer_B{ - indestructible = 1; - unacidable = 1; - unslashable = 1 - }, -/obj/item/paper_bin/uscm{ - pixel_y = 6 - }, -/obj/item/tool/pen, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "iwB" = ( /obj/structure/machinery/washing_machine, /obj/structure/machinery/washing_machine{ @@ -36671,6 +36682,14 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"izf" = ( +/obj/structure/disposalpipe/down/almayer{ + dir = 4; + id = "ares_vault_in"; + name = "aicore" + }, +/turf/closed/wall/almayer/aicore/hull, +/area/almayer/command/airoom) "izk" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -36753,6 +36772,9 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"iBn" = ( +/turf/closed/wall/almayer/aicore/white/hull, +/area/space) "iBu" = ( /obj/structure/sign/safety/storage{ pixel_x = -17 @@ -36768,16 +36790,6 @@ icon_state = "silver" }, /area/almayer/command/cichallway) -"iCf" = ( -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8; - autoname = 0; - c_tag = "AI - Core Chamber" - }, -/turf/open/floor/almayer/aicore/glowing/no_build{ - icon_state = "ai_floor3" - }, -/area/almayer/command/airoom) "iCg" = ( /turf/open/floor/almayer{ dir = 8; @@ -36852,6 +36864,12 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_s) +"iDK" = ( +/obj/structure/blocker/fuelpump, +/turf/open/floor/almayer{ + icon_state = "mono" + }, +/area/almayer/lifeboat_pumps/north2) "iEa" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -37225,10 +37243,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"iLe" = ( -/obj/structure/blocker/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north2) "iLf" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/disk_reader, @@ -37586,20 +37600,6 @@ dir = 4 }, /area/almayer/medical/containment/cell) -"iRU" = ( -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/obj/effect/projector{ - name = "Almayer_AresUp2"; - vector_x = -102; - vector_y = 61 - }, -/turf/open/floor/almayer/aicore/glowing/no_build{ - icon_state = "ai_floor3" - }, -/area/almayer/command/airoom) "iSd" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -38258,16 +38258,6 @@ icon_state = "plate" }, /area/almayer/hallways/lower/starboard_umbilical) -"jaH" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/paper_bin/uscm{ - pixel_y = 6 - }, -/obj/item/tool/pen, -/turf/open/floor/almayer/no_build{ - icon_state = "plating" - }, -/area/almayer/command/airoom) "jaI" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -38648,6 +38638,20 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/notunnel) +"jgy" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "jgF" = ( /obj/structure/platform, /turf/open/floor/almayer{ @@ -39366,6 +39370,12 @@ icon_state = "plate" }, /area/almayer/maint/upper/u_a_s) +"jrH" = ( +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ + dir = 8 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "jrI" = ( /obj/structure/filingcabinet{ density = 0; @@ -40217,10 +40227,6 @@ icon_state = "orange" }, /area/almayer/maint/upper/mess) -"jIF" = ( -/obj/structure/blocker/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) "jIJ" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/almayer{ @@ -40272,27 +40278,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"jKD" = ( -/obj/effect/projector{ - name = "Almayer_AresDown"; - vector_x = 96; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/obj/structure/machinery/door_control{ - id = "ARES StairsUpper"; - name = "ARES Core Access"; - pixel_x = 24; - req_one_access_txt = "90;91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "jKF" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -41099,6 +41084,18 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/p_stern) +"jYH" = ( +/obj/structure/blocker/invisible_wall, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/mob/living/silicon/decoy/ship_ai{ + layer = 2.98; + pixel_y = -16 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "jYM" = ( /obj/structure/ladder{ height = 1; @@ -41110,22 +41107,6 @@ }, /turf/open/floor/plating/almayer, /area/almayer/maint/hull/lower/p_bow) -"jYR" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 4; - c_tag = "AI - Primary Processors"; - autoname = 0 - }, -/turf/open/floor/almayer/aicore/glowing/no_build, -/area/almayer/command/airoom) "jZd" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -41675,22 +41656,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_f_p) -"khJ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S"; - layer = 3.3 - }, -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8; - autoname = 0; - c_tag = "AI - Secondary Processors" - }, -/turf/open/floor/almayer/aicore/glowing/no_build, -/area/almayer/command/airoom) "kil" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -41914,14 +41879,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_medbay) -"klK" = ( -/obj/structure/machinery/cryopod/right{ - dir = 4 - }, -/turf/open/floor/almayer/aicore/no_build{ - icon_state = "ai_cargo" - }, -/area/almayer/command/airoom) "klT" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, @@ -41994,20 +41951,6 @@ "knm" = ( /turf/open/floor/almayer, /area/almayer/hallways/lower/port_fore_hallway) -"knD" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresDown"; - vector_x = 96; - vector_y = -65 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "knH" = ( /obj/structure/machinery/vending/coffee, /obj/structure/sign/safety/coffee{ @@ -43717,6 +43660,22 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"kRQ" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/cameras/almayer/ares{ + dir = 8; + pixel_x = 17; + pixel_y = 7 + }, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + pixel_x = 17; + pixel_y = -6 + }, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3" + }, +/area/almayer/command/airoom) "kRU" = ( /obj/vehicle/powerloader, /obj/structure/platform{ @@ -43730,6 +43689,16 @@ icon_state = "cargo" }, /area/almayer/hallways/lower/repair_bay) +"kSi" = ( +/obj/structure/machinery/cm_vending/gear/intelligence_officer{ + density = 0; + pixel_x = -32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/command/computerlab) "kSn" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -44303,21 +44272,6 @@ icon_state = "plate" }, /area/almayer/squads/charlie) -"lce" = ( -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/obj/effect/projector{ - name = "Almayer_AresDown2"; - vector_x = 102; - vector_y = -61 - }, -/turf/open/floor/almayer/aicore/glowing/no_build{ - icon_state = "ai_floor3"; - light_range = 3 - }, -/area/almayer/command/airoom) "lcg" = ( /obj/structure/machinery/ares/substrate, /turf/open/floor/almayer/no_build{ @@ -44883,15 +44837,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/bravo) -"lmp" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/almayer/aicore/glowing/no_build{ - icon_state = "ai_floor3"; - light_range = 3 - }, -/area/almayer/command/airoom) "lmq" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -45371,18 +45316,6 @@ icon_state = "test_floor4" }, /area/almayer/living/commandbunks) -"lup" = ( -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/obj/effect/projector{ - name = "Almayer_AresDown2"; - vector_x = 102; - vector_y = -61 - }, -/turf/open/floor/plating, -/area/almayer/command/airoom) "luE" = ( /obj/structure/sign/poster{ pixel_y = 32 @@ -45452,20 +45385,6 @@ icon_state = "blue" }, /area/almayer/living/pilotbunks) -"lvB" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresUp"; - vector_x = -96; - vector_y = 65 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "lwh" = ( /obj/structure/machinery/light{ dir = 8 @@ -45520,21 +45439,6 @@ icon_state = "test_floor4" }, /area/almayer/maint/hull/upper/u_f_p) -"lwZ" = ( -/obj/effect/projector{ - name = "Almayer_AresUp"; - vector_x = -96; - vector_y = 65 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "lxd" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /turf/open/floor/almayer{ @@ -46365,6 +46269,10 @@ icon_state = "cargo" }, /area/almayer/engineering/upper_engineering/starboard) +"lMy" = ( +/obj/structure/machinery/fuelpump, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north2) "lMF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -47106,12 +47014,6 @@ icon_state = "emerald" }, /area/almayer/hallways/lower/port_midship_hallway) -"mdG" = ( -/obj/structure/blocker/fuelpump, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north1) "mdW" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/effect/decal/warning_stripes{ @@ -47619,6 +47521,21 @@ icon_state = "test_floor4" }, /area/almayer/command/corporateliaison) +"mmn" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/intelligence_officer{ + density = 0; + pixel_x = -32 + }, +/obj/structure/machinery/light{ + dir = 8; + pixel_x = -32; + alpha = 0 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/command/computerlab) "mmN" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -47807,6 +47724,16 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"mqh" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/machinery/cm_vending/sorted/medical/marinemed, +/obj/structure/medical_supply_link, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/almayer/command/cic) "mqt" = ( /turf/open/floor/almayer{ icon_state = "bluecorner" @@ -47932,17 +47859,6 @@ icon_state = "orange" }, /area/almayer/squads/bravo) -"mss" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "ARES ReceptStairs2"; - name = "\improper ARES Reception Shutters"; - plane = -7 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "test_floor4" - }, -/area/almayer/command/airoom) "msC" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -48190,19 +48106,6 @@ icon_state = "plate" }, /area/almayer/hallways/upper/midship_hallway) -"mxs" = ( -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer/aicore/glowing/no_build{ - icon_state = "ai_floor3"; - light_range = 3 - }, -/area/almayer/command/airoom) -"mxB" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "mxT" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, @@ -48342,6 +48245,17 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_m_s) +"mzP" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresDown2"; + vector_x = 102; + vector_y = -61 + }, +/turf/open/floor/plating, +/area/almayer/command/airoom) "mzS" = ( /turf/open/floor/almayer{ dir = 9; @@ -48354,11 +48268,29 @@ icon_state = "blue" }, /area/almayer/living/port_emb) +"mAe" = ( +/obj/structure/window/framed/almayer/aicore/hull/black/hijack_bustable, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "mAp" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/tool, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"mAs" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "mAF" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -48487,6 +48419,23 @@ }, /turf/open/floor/plating, /area/almayer/squads/req) +"mCx" = ( +/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + access_modified = 1; + name = "\improper AI Reception"; + req_access = null; + req_one_access_txt = "91;92"; + dir = 1 + }, +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES ReceptStairs1"; + name = "\improper ARES Reception Shutters" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "mCE" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12; @@ -48830,6 +48779,20 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_m_s) +"mIi" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "mIy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -48853,6 +48816,12 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"mIJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 6 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "mIP" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/warning_stripes{ @@ -49515,6 +49484,25 @@ icon_state = "cargo_arrow" }, /area/almayer/medical/hydroponics) +"mTr" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsLower"; + name = "ARES Core Lockdown"; + pixel_x = 24; + pixel_y = -8; + req_one_access_txt = "90;91;92" + }, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 8; + pixel_y = 2; + c_tag = "AI - Main Corridor"; + autoname = 0 + }, +/turf/open/floor/almayer/aicore/no_build{ + dir = 4; + icon_state = "ai_silver" + }, +/area/almayer/command/airoom) "mTL" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49544,22 +49532,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/bravo) -"mUz" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/cameras/almayer/ares{ - dir = 8; - pixel_x = 17; - pixel_y = 7 - }, -/obj/structure/machinery/computer/cameras/almayer{ - dir = 8; - pixel_x = 17; - pixel_y = -6 - }, -/turf/open/floor/almayer/aicore/glowing/no_build{ - icon_state = "ai_floor3" - }, -/area/almayer/command/airoom) "mUE" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -49886,6 +49858,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/lobby) +"naj" = ( +/obj/structure/machinery/door_control{ + id = "ARES JoeCryo"; + name = "ARES WorkingJoe Bay Shutters"; + req_one_access_txt = "91;92"; + pixel_x = -24 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "nar" = ( /obj/structure/toilet{ dir = 4 @@ -50608,6 +50589,21 @@ icon_state = "red" }, /area/almayer/hallways/upper/starboard) +"nkK" = ( +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/effect/projector{ + name = "Almayer_AresDown2"; + vector_x = 102; + vector_y = -61 + }, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3"; + light_range = 3 + }, +/area/almayer/command/airoom) "nkX" = ( /obj/structure/surface/table/almayer, /obj/structure/sign/safety/terminal{ @@ -50869,6 +50865,14 @@ }, /turf/open/floor/plating, /area/almayer/engineering/starboard_atmos) +"npq" = ( +/obj/structure/disposalpipe/up/almayer{ + dir = 8; + id = "ares_vault_out"; + name = "aicore" + }, +/turf/closed/wall/almayer/aicore/hull, +/area/almayer/command/airoom) "npt" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -50897,20 +50901,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) -"npE" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "ARES JoeCryo"; - name = "\improper ARES WorkingJoe Bay Shutters"; - plane = -7; - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 4 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "test_floor4" - }, -/area/almayer/command/airoom) "npO" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -51627,6 +51617,17 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) +"nDy" = ( +/obj/structure/bed/chair/comfy/ares{ + dir = 1 + }, +/obj/structure/pipes/vents/pump/no_boom/gas{ + vent_tag = "Core Chamber" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "plating" + }, +/area/almayer/command/airoom) "nDH" = ( /obj/structure/machinery/light/small{ dir = 1; @@ -51869,15 +51870,6 @@ icon_state = "redcorner" }, /area/almayer/shipboard/starboard_missiles) -"nIB" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/almayer/aicore/no_build{ - dir = 4; - icon_state = "ai_silver" - }, -/area/almayer/command/airoom) "nID" = ( /obj/structure/machinery/light{ dir = 8 @@ -51966,6 +51958,19 @@ icon_state = "red" }, /area/almayer/command/lifeboat) +"nKO" = ( +/obj/structure/machinery/disposal/delivery{ + density = 0; + desc = "A pneumatic delivery unit."; + icon_state = "delivery_engi"; + name = "Returns"; + pixel_y = 28 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "nKP" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -52053,21 +52058,6 @@ /obj/item/bedsheet/red, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) -"nNk" = ( -/obj/effect/projector{ - name = "Almayer_AresDown"; - vector_x = 96; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "nNt" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -52635,12 +52625,6 @@ icon_state = "orangecorner" }, /area/almayer/hallways/upper/aft_hallway) -"nWC" = ( -/obj/structure/blocker/fuelpump, -/turf/open/floor/almayer{ - icon_state = "mono" - }, -/area/almayer/lifeboat_pumps/north2) "nWN" = ( /obj/structure/surface/table/almayer, /turf/open/floor/wood/ship, @@ -52891,10 +52875,6 @@ }, /turf/closed/wall/almayer, /area/almayer/squads/req) -"obw" = ( -/obj/structure/machinery/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north2) "oby" = ( /obj/structure/surface/table/almayer, /obj/item/trash/plate{ @@ -52974,6 +52954,14 @@ }, /turf/open/floor/almayer/aicore/glowing/no_build, /area/almayer/command/airoom) +"ocL" = ( +/obj/structure/machinery/cryopod/right{ + dir = 4 + }, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_cargo" + }, +/area/almayer/command/airoom) "odb" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -53158,16 +53146,19 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"ogD" = ( -/obj/structure/machinery/cm_vending/clothing/intelligence_officer{ - density = 0; - pixel_x = -32 +"ofY" = ( +/obj/structure/surface/table/reinforced/almayer_B{ + indestructible = 1; + unacidable = 1; + unslashable = 1 }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" +/obj/structure/machinery/computer/working_joe{ + layer = 3.3; + dir = 4; + pixel_y = 6 }, -/area/almayer/command/securestorage) +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "ogK" = ( /obj/structure/bed/bedroll{ desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on."; @@ -53188,22 +53179,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/upper/midship_hallway) -"ogU" = ( -/obj/structure/surface/table/reinforced/almayer_B{ - indestructible = 1; - unacidable = 1; - unslashable = 1 - }, -/obj/structure/transmitter/rotary{ - name = "AI Reception Telephone"; - phone_category = "ARES"; - phone_color = "blue"; - phone_id = "AI Reception" - }, -/turf/open/floor/almayer/no_build{ - icon_state = "ai_floors" - }, -/area/almayer/command/airoom) "ohi" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -53668,6 +53643,20 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/upper_medical) +"onU" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "onY" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -53903,14 +53892,6 @@ dir = 10 }, /area/almayer/command/lifeboat) -"orI" = ( -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8; - autoname = 0; - c_tag = "AI - SecVault" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "orN" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -54431,12 +54412,6 @@ "oBr" = ( /turf/closed/wall/almayer, /area/almayer/maint/hull/lower/l_a_s) -"oBv" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/turf/open/floor/almayer/aicore/glowing/no_build{ - icon_state = "ai_floor3" - }, -/area/almayer/command/airoom) "oBA" = ( /obj/structure/sign/safety/conference_room{ pixel_x = -17; @@ -54451,6 +54426,16 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"oBD" = ( +/obj/structure/pipes/vents/pump/no_boom/gas{ + vent_tag = "Access Hall"; + dir = 8 + }, +/turf/open/floor/almayer/aicore/no_build{ + dir = 4; + icon_state = "ai_silver" + }, +/area/almayer/command/airoom) "oCa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55928,6 +55913,17 @@ icon_state = "red" }, /area/almayer/living/offices/flight) +"oZx" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES ReceptStairs2"; + name = "\improper ARES Reception Shutters"; + plane = -7 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "oZy" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -56012,6 +56008,17 @@ icon_state = "cargo" }, /area/almayer/shipboard/brig/cryo) +"pax" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/pipes/vents/pump/no_boom/gas{ + vent_tag = "Reception"; + dir = 8 + }, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3"; + light_range = 3 + }, +/area/almayer/command/airoom) "paI" = ( /obj/structure/sign/safety/debark_lounge{ pixel_x = 15; @@ -56533,6 +56540,20 @@ icon_state = "orange" }, /area/almayer/engineering/lower) +"pkS" = ( +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/effect/projector{ + name = "Almayer_AresUp2"; + vector_x = -102; + vector_y = 61 + }, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3" + }, +/area/almayer/command/airoom) "pld" = ( /obj/item/book/manual/medical_diagnostics_manual, /obj/structure/surface/rack, @@ -56541,17 +56562,6 @@ icon_state = "red" }, /area/almayer/maint/upper/u_a_p) -"plh" = ( -/obj/structure/machinery/cm_vending/sorted/medical/marinemed, -/obj/structure/sign/safety/medical{ - pixel_x = 8; - pixel_y = 32 - }, -/obj/structure/medical_supply_link, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/shipboard/panic) "plv" = ( /turf/open/floor/plating, /area/almayer/maint/hull/lower/l_m_p) @@ -57455,19 +57465,6 @@ icon_state = "plate" }, /area/almayer/squads/charlie) -"pDQ" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresUp"; - vector_x = -96; - vector_y = 65 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/glowing/no_build{ - icon_state = "ai_floor3" - }, -/area/almayer/command/airoom) "pDW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -57853,19 +57850,6 @@ icon_state = "blue" }, /area/almayer/hallways/upper/midship_hallway) -"pLH" = ( -/obj/structure/surface/table/reinforced/almayer_B{ - indestructible = 1; - unacidable = 1; - unslashable = 1 - }, -/obj/structure/machinery/computer/working_joe{ - layer = 3.3; - dir = 4; - pixel_y = 6 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "pLO" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -58273,22 +58257,6 @@ icon_state = "silvercorner" }, /area/almayer/command/computerlab) -"pTH" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8; - pixel_y = 2; - autoname = 0; - c_tag = "AI - Reception Exterior" - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/hallways/upper/midship_hallway) "pTI" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -58350,6 +58318,16 @@ icon_state = "bluecorner" }, /area/almayer/squads/delta) +"pUg" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door_control{ + id = "ARES ReceptStairs2"; + name = "ARES Reception Stairway Shutters"; + pixel_x = 24; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "pUj" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer, @@ -59669,6 +59647,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_p) +"qpY" = ( +/obj/structure/machinery/cryopod/right{ + layer = 3.1; + pixel_y = 13; + dir = 4 + }, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_cargo" + }, +/area/almayer/command/airoom) "qqa" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/almayer{ @@ -59942,6 +59930,21 @@ icon_state = "plate" }, /area/almayer/living/offices) +"qwJ" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "qwU" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -60099,6 +60102,16 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south1) +"qyA" = ( +/obj/structure/machinery/cm_vending/clothing/intelligence_officer{ + density = 0; + pixel_x = -32 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silver" + }, +/area/almayer/command/computerlab) "qyD" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger, @@ -60263,28 +60276,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/medical_science) -"qBa" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "ARES StairsUpper"; - name = "\improper ARES Core Shutters"; - plane = -7 - }, -/obj/structure/machinery/door/poddoor/almayer/blended/open{ - id = "ARES Emergency"; - name = "ARES Emergency Lockdown"; - open_layer = 1.9; - plane = -7 - }, -/obj/structure/disposalpipe/up/almayer{ - id = "ares_vault_in"; - name = "aicore"; - dir = 2 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "test_floor4" - }, -/area/almayer/command/airoom) "qBl" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer{ @@ -60882,6 +60873,19 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"qKZ" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3" + }, +/area/almayer/command/airoom) "qLg" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer{ @@ -61100,6 +61104,14 @@ icon_state = "test_floor4" }, /area/almayer/maint/hull/upper/u_f_p) +"qOZ" = ( +/obj/structure/machinery/cm_vending/sorted/medical/marinemed, +/obj/structure/medical_supply_link, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "sterile_green_side" + }, +/area/almayer/medical/lower_medical_lobby) "qPk" = ( /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_fore_hallway) @@ -61232,6 +61244,14 @@ icon_state = "test_floor4" }, /area/almayer/command/corporateliaison) +"qRX" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3" + }, +/area/almayer/command/airoom) "qSm" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -61247,14 +61267,6 @@ icon_state = "orangecorner" }, /area/almayer/hallways/upper/aft_hallway) -"qSA" = ( -/obj/structure/bed/chair/comfy/ares{ - dir = 1 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "plating" - }, -/area/almayer/command/airoom) "qSE" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/cholula, @@ -61893,23 +61905,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_p) -"rcR" = ( -/obj/structure/surface/table/reinforced/almayer_B{ - indestructible = 1; - unacidable = 1; - unslashable = 1 - }, -/obj/structure/machinery/computer/secure_data{ - dir = 4 - }, -/obj/structure/machinery/door_control{ - id = "ARES ReceptStairs1"; - name = "ARES Reception Shutters"; - pixel_y = 24; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "rcS" = ( /obj/structure/machinery/computer/cryopod/eng{ dir = 8 @@ -62576,6 +62571,10 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/upper_engineering/port) +"rmG" = ( +/obj/structure/blocker/fuelpump, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north2) "rna" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -63110,6 +63109,28 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_m_p) +"rxl" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/disposal/delivery{ + density = 0; + desc = "A pneumatic delivery unit."; + icon_state = "delivery_engi"; + name = "Security Vault"; + pixel_y = 28; + pixel_x = -24 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + pixel_x = -32; + pixel_y = 40; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "rxq" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -63130,6 +63151,9 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/fore_hallway) +"ryn" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/command/securestorage) "ryt" = ( /obj/structure/pipes/standard/manifold/visible, /turf/open/floor/almayer{ @@ -63188,9 +63212,6 @@ icon_state = "bluecorner" }, /area/almayer/living/briefing) -"rAd" = ( -/turf/closed/wall/almayer/aicore/white/hull, -/area/space) "rAo" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -63321,14 +63342,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/l_m_p) -"rCi" = ( -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8; - autoname = 0; - c_tag = "AI - SynthBay" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "rCl" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -63569,16 +63582,6 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) -"rFt" = ( -/obj/structure/machinery/cryopod/right{ - layer = 3.1; - pixel_y = 13; - dir = 4 - }, -/turf/open/floor/almayer/aicore/no_build{ - icon_state = "ai_cargo" - }, -/area/almayer/command/airoom) "rFy" = ( /turf/open/floor/almayer{ dir = 1; @@ -64164,10 +64167,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"rQl" = ( -/obj/structure/machinery/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) "rQs" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -64590,17 +64589,6 @@ icon_state = "cargo" }, /area/almayer/maint/hull/lower/l_f_s) -"rYc" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "ARES ReceptStairs2"; - name = "\improper ARES Reception Stairway Shutters"; - plane = -7 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "test_floor4" - }, -/area/almayer/command/airoom) "rYh" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -64948,6 +64936,10 @@ icon_state = "silver" }, /area/almayer/hallways/upper/midship_hallway) +"sfA" = ( +/obj/structure/machinery/fuelpump, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "sfT" = ( /turf/open/floor/almayer, /area/almayer/hallways/upper/port) @@ -65987,6 +65979,18 @@ icon_state = "greencorner" }, /area/almayer/living/grunt_rnr) +"swx" = ( +/obj/effect/projector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "swE" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/alarm/almayer{ @@ -66244,14 +66248,6 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/processing) -"sBR" = ( -/obj/structure/disposalpipe/down/almayer{ - dir = 4; - id = "ares_vault_in"; - name = "aicore" - }, -/turf/closed/wall/almayer/aicore/hull, -/area/almayer/command/airoom) "sBY" = ( /obj/item/tool/wet_sign, /obj/structure/disposalpipe/segment, @@ -66641,6 +66637,17 @@ icon_state = "silver" }, /area/almayer/engineering/port_atmos) +"sII" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES ReceptStairs2"; + name = "\improper ARES Reception Stairway Shutters"; + plane = -7 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "sIR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66927,6 +66934,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_p) +"sOK" = ( +/obj/structure/disposalpipe/down/almayer{ + dir = 2; + id = "ares_vault_out"; + name = "wycomms" + }, +/turf/closed/wall/almayer/outer, +/area/almayer/command/airoom) "sOL" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -67538,16 +67553,10 @@ icon_state = "blue" }, /area/almayer/living/port_emb) -"sZV" = ( -/obj/structure/machinery/cm_vending/gear/intelligence_officer{ - density = 0; - pixel_x = -32 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silver" - }, -/area/almayer/command/computerlab) +"sZY" = ( +/obj/structure/blocker/fuelpump, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south2) "tab" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/box/flashbangs{ @@ -68344,6 +68353,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/stern) +"tmV" = ( +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 8; + autoname = 0; + c_tag = "AI - SecVault" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "tmX" = ( /obj/effect/landmark/start/professor, /obj/effect/landmark/late_join/cmo, @@ -68551,6 +68568,16 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/vehiclehangar) +"tqu" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door_control{ + id = "ARES ReceptStairs1"; + name = "ARES Reception Shutters"; + pixel_y = -24; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "tqE" = ( /obj/structure/machinery/light{ dir = 8 @@ -68805,19 +68832,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) -"ttT" = ( -/obj/structure/machinery/door_control{ - id = "ARES JoeCryo"; - name = "ARES WorkingJoe Bay Shutters"; - req_one_access_txt = "91;92"; - pixel_x = 24 - }, -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - autoname = 0; - c_tag = "AI - Comms" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "ttX" = ( /obj/structure/surface/table/almayer, /obj/item/storage/firstaid/regular{ @@ -69063,23 +69077,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_a_s) -"txh" = ( -/obj/structure/surface/table/reinforced/almayer_B{ - indestructible = 1; - unacidable = 1; - unslashable = 1 - }, -/obj/item/desk_bell{ - pixel_y = 14; - pixel_x = -5; - anchored = 1 - }, -/obj/structure/machinery/computer/working_joe{ - layer = 3.3; - dir = 8 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "txp" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/plating_catwalk, @@ -69240,6 +69237,30 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) +"tAt" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "ARES StairsLock"; + name = "ARES Exterior Lockdown" + }, +/obj/effect/step_trigger/ares_alert/access_control, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/disposaloutlet{ + density = 0; + desc = "An outlet for the pneumatic delivery system."; + icon_state = "delivery_outlet"; + name = "returns outlet"; + pixel_y = 28; + range = 0; + pixel_x = -7 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "tAL" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ @@ -69353,6 +69374,14 @@ icon_state = "test_floor4" }, /area/almayer/hallways/upper/port) +"tCC" = ( +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 1; + c_tag = "AI - Reception Interior"; + autoname = 0 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "tCH" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -69437,18 +69466,6 @@ icon_state = "emeraldfull" }, /area/almayer/living/briefing) -"tEM" = ( -/obj/effect/projector{ - name = "Almayer_AresDown"; - vector_x = 96; - vector_y = -65 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "tEO" = ( /obj/effect/landmark/start/marine/medic/charlie, /obj/effect/landmark/late_join/charlie, @@ -69671,6 +69688,15 @@ icon_state = "test_floor4" }, /area/almayer/living/port_emb) +"tIu" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3"; + light_range = 3 + }, +/area/almayer/command/airoom) "tIF" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/almayer{ @@ -69847,17 +69873,6 @@ icon_state = "green" }, /area/almayer/hallways/upper/fore_hallway) -"tMu" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresUp2"; - vector_x = -102; - vector_y = 61 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "tMU" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -70091,30 +70106,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"tSI" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/door/poddoor/almayer/open{ - dir = 4; - id = "ARES StairsLock"; - name = "ARES Exterior Lockdown" - }, -/obj/effect/step_trigger/ares_alert/access_control, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/disposaloutlet{ - density = 0; - desc = "An outlet for the pneumatic delivery system."; - icon_state = "delivery_outlet"; - name = "returns outlet"; - pixel_y = 28; - range = 0; - pixel_x = -7 - }, -/turf/open/floor/almayer/no_build{ - icon_state = "test_floor4" - }, -/area/almayer/command/airoom) "tSX" = ( /obj/structure/surface/table/almayer, /obj/item/weapon/gun/rifle/l42a{ @@ -70434,16 +70425,6 @@ icon_state = "plate" }, /area/almayer/living/port_emb) -"tYb" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/machinery/door_control{ - id = "ARES ReceptStairs2"; - name = "ARES Reception Stairway Shutters"; - pixel_x = 24; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "tYi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -70630,10 +70611,6 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) -"ubB" = ( -/obj/structure/window/framed/almayer/aicore/hull/black/hijack_bustable, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "ubI" = ( /obj/structure/surface/table/almayer, /obj/item/folder/black_random{ @@ -71305,10 +71282,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/p_bow) -"upK" = ( -/obj/structure/blocker/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south2) "upM" = ( /obj/structure/machinery/light{ dir = 4 @@ -72379,10 +72352,6 @@ icon_state = "outerhull_dir" }, /area/space) -"uJA" = ( -/obj/structure/machinery/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) "uJM" = ( /obj/structure/sign/safety/medical{ pixel_x = 8; @@ -72507,6 +72476,27 @@ icon_state = "emerald" }, /area/almayer/living/port_emb) +"uMO" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + pixel_x = 24; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "uMS" = ( /turf/open/floor/almayer{ dir = 5; @@ -72604,15 +72594,6 @@ icon_state = "mono" }, /area/almayer/living/pilotbunks) -"uPg" = ( -/obj/structure/machinery/door_control{ - id = "ARES JoeCryo"; - name = "ARES WorkingJoe Bay Shutters"; - req_one_access_txt = "91;92"; - pixel_x = -24 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "uPr" = ( /turf/open/floor/almayer{ dir = 5; @@ -72622,6 +72603,22 @@ "uPE" = ( /turf/open/floor/almayer, /area/almayer/hallways/lower/port_aft_hallway) +"uPI" = ( +/obj/structure/surface/table/reinforced/almayer_B{ + indestructible = 1; + unacidable = 1; + unslashable = 1 + }, +/obj/structure/transmitter/rotary{ + name = "AI Reception Telephone"; + phone_category = "ARES"; + phone_color = "blue"; + phone_id = "AI Reception" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "uPP" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 2; @@ -72975,6 +72972,18 @@ }, /turf/open/floor/plating, /area/almayer/engineering/upper_engineering/port) +"uUB" = ( +/obj/structure/surface/table/reinforced/almayer_B{ + indestructible = 1; + unacidable = 1; + unslashable = 1 + }, +/obj/item/paper_bin/uscm{ + pixel_y = 6 + }, +/obj/item/tool/pen, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "uVc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -73466,18 +73475,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_s) -"vcM" = ( -/obj/effect/projector{ - name = "Almayer_AresUp"; - vector_x = -96; - vector_y = 65 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "vdl" = ( /obj/structure/window/reinforced/ultra{ pixel_y = -12 @@ -74299,6 +74296,23 @@ /obj/item/clothing/mask/cigarette/weed, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) +"vpH" = ( +/obj/structure/surface/table/reinforced/almayer_B{ + indestructible = 1; + unacidable = 1; + unslashable = 1 + }, +/obj/item/desk_bell{ + pixel_y = 14; + pixel_x = -5; + anchored = 1 + }, +/obj/structure/machinery/computer/working_joe{ + layer = 3.3; + dir = 8 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "vpI" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -74949,42 +74963,6 @@ icon_state = "ai_arrow" }, /area/almayer/command/airoom) -"vyG" = ( -/obj/structure/machinery/door_control{ - id = "ARES StairsUpper"; - name = "ARES Core Access"; - pixel_x = -10; - pixel_y = -24; - req_one_access_txt = "91;92" - }, -/obj/structure/machinery/door_control{ - id = "ARES StairsLock"; - name = "ARES Exterior Lockdown"; - pixel_y = -24; - req_one_access_txt = "91;92" - }, -/obj/structure/surface/table/reinforced/almayer_B{ - indestructible = 1; - unacidable = 1; - unslashable = 1 - }, -/obj/structure/machinery/door_control{ - id = "ARES Emergency"; - name = "ARES Emergency Lockdown"; - pixel_x = 10; - pixel_y = -24; - req_one_access_txt = "91;92" - }, -/obj/structure/machinery/computer/cameras/almayer{ - dir = 4; - pixel_y = 12 - }, -/obj/structure/machinery/computer/cameras/almayer/ares{ - dir = 4; - pixel_y = -1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "vyH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -75239,6 +75217,22 @@ /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/s_bow) +"vCH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 4; + c_tag = "AI - Primary Processors"; + autoname = 0 + }, +/turf/open/floor/almayer/aicore/glowing/no_build, +/area/almayer/command/airoom) "vCO" = ( /obj/effect/landmark/start/bridge, /turf/open/floor/plating/plating_catwalk, @@ -75759,6 +75753,16 @@ icon_state = "silver" }, /area/almayer/hallways/lower/repair_bay) +"vLz" = ( +/obj/structure/machinery/door_control{ + id = "ARES Mainframe Right"; + name = "ARES Mainframe Lockdown"; + pixel_x = -24; + pixel_y = -24; + req_one_access_txt = "200;91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "vLA" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -75908,12 +75912,6 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) -"vOp" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ - dir = 6 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "vOu" = ( /obj/structure/surface/table/almayer, /obj/item/weapon/gun/energy/taser, @@ -76164,6 +76162,17 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"vRA" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "vRR" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -76407,6 +76416,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/briefing) +"vVk" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/closed/wall/almayer/aicore/hull, +/area/almayer/command/airoom) "vVs" = ( /turf/open/floor/almayer{ icon_state = "sterile_green" @@ -77232,6 +77248,12 @@ "wid" = ( /turf/closed/wall/almayer/outer, /area/almayer/maint/hull/lower/p_bow) +"wiu" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3" + }, +/area/almayer/command/airoom) "wiz" = ( /obj/structure/bed/chair{ dir = 4 @@ -78586,6 +78608,17 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_medbay) +"wFi" = ( +/obj/structure/machinery/cm_vending/sorted/medical/marinemed, +/obj/structure/sign/safety/medical{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/structure/medical_supply_link, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/shipboard/panic) "wFn" = ( /obj/structure/surface/rack, /obj/item/clothing/suit/storage/marine/light/vest, @@ -78728,26 +78761,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/aft_hallway) -"wHX" = ( -/obj/structure/machinery/door_control{ - id = "ARES StairsLower"; - name = "ARES Core Lockdown"; - pixel_x = -24; - pixel_y = 8; - req_one_access_txt = "90;91;92" - }, -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 4; - pixel_y = -8; - autoname = 0; - c_tag = "AI - Main Staircase" - }, -/obj/effect/step_trigger/clone_cleaner, -/turf/open/floor/almayer/aicore/no_build{ - dir = 8; - icon_state = "ai_silver" - }, -/area/almayer/command/airoom) "wIr" = ( /obj/structure/machinery/cm_vending/clothing/senior_officer{ req_access = list(); @@ -79239,16 +79252,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) -"wOT" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/machinery/cm_vending/sorted/medical/marinemed, -/obj/structure/medical_supply_link, -/turf/open/floor/almayer{ - icon_state = "redfull" - }, -/area/almayer/command/cic) "wPa" = ( /obj/structure/platform{ dir = 4 @@ -80023,6 +80026,18 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"xdA" = ( +/obj/structure/surface/rack{ + density = 0; + pixel_y = 16 + }, +/obj/structure/machinery/faxmachine/uscm/command{ + density = 0; + department = "AI Core"; + pixel_y = 32 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "xdJ" = ( /obj/structure/machinery/light{ dir = 4; @@ -80286,14 +80301,6 @@ /obj/structure/window/reinforced, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"xin" = ( -/obj/structure/machinery/cm_vending/sorted/medical/marinemed, -/obj/structure/medical_supply_link, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "sterile_green_side" - }, -/area/almayer/medical/lower_medical_lobby) "xiH" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer{ @@ -80809,6 +80816,17 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/repair_bay) +"xsi" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp2"; + vector_x = -102; + vector_y = 61 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "xsl" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -81038,6 +81056,15 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"xwU" = ( +/obj/structure/pipes/vents/pump/no_boom/gas{ + vent_tag = "Comms"; + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_plates" + }, +/area/almayer/command/airoom) "xwX" = ( /turf/open/floor/almayer{ dir = 9; @@ -81119,6 +81146,10 @@ }, /turf/open/floor/plating, /area/almayer/living/port_emb) +"xxB" = ( +/obj/structure/machinery/fuelpump, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "xxG" = ( /obj/structure/prop/holidays/string_lights{ pixel_y = 27 @@ -81742,10 +81773,6 @@ icon_state = "red" }, /area/almayer/shipboard/brig/processing) -"xIM" = ( -/obj/structure/blocker/fuelpump, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) "xIQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -83237,15 +83264,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"yhi" = ( -/obj/structure/pipes/standard/simple/hidden/supply/no_boom, -/obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8; - autoname = 0; - c_tag = "AI - Records" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "yht" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -83427,13 +83445,6 @@ icon_state = "test_floor5" }, /area/almayer/engineering/lower/engine_core) -"ylL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/closed/wall/almayer/aicore/hull, -/area/almayer/command/airoom) "ylN" = ( /obj/structure/sign/safety/galley{ pixel_x = 8; @@ -101447,7 +101458,7 @@ aaa sGw xzB bfs -plh +wFi qxI dKO ykv @@ -104011,7 +104022,7 @@ wlE gvq wVW lrW -wOT +mqh vHW wVW ccg @@ -107230,7 +107241,7 @@ add fsU aHU aTm -uJA +xxB aTm jgF fsU @@ -107276,7 +107287,7 @@ aJU gBW ouQ iun -rQl +sfA vPm qys gBW @@ -107433,7 +107444,7 @@ awW auK aIr aTm -mdG +cpP aTm juX scu @@ -107479,7 +107490,7 @@ baw lRE tuf vbB -jIF +aqB vbB mlz sOy @@ -107636,7 +107647,7 @@ awW avc aIv aTm -mdG +cpP cbM jzZ sLo @@ -107682,7 +107693,7 @@ baw hJk yac vbB -jIF +aqB vbB fDS iLd @@ -107839,7 +107850,7 @@ add fsU aHU aTm -xIM +fnk aTm jgF fsU @@ -107885,7 +107896,7 @@ aJU gBW ouQ vbB -jIF +aqB tBq qys gBW @@ -108975,7 +108986,7 @@ arX vSG iag nvM -xin +qOZ qjN gGJ ham @@ -109178,7 +109189,7 @@ tzO fVG qpQ nvM -xin +qOZ qjN sld ham @@ -109381,7 +109392,7 @@ qpx bet bgu nvM -xin +qOZ qjN gGJ ham @@ -121059,7 +121070,7 @@ dUR kaE kaE kaE -pTH +eRI qvh aMl xXd @@ -121258,8 +121269,8 @@ mOi mOi mOi mOi -eTY -tSI +sOK +tAt auc hyE aqU @@ -121457,12 +121468,12 @@ xIj qdJ xIj mOi -cup -cup -cCO -gDu -qBa -ikH +onU +onU +qwJ +cOV +imS +rxl xQV qQS aqU @@ -121660,14 +121671,14 @@ sgH qdJ xIj mOi -knD -czh -tEM -tEM +eXy +vRA +ezq +ezq tFe xQV -mxs -hoq +pax +tCC aqU qjF oqv @@ -121863,14 +121874,14 @@ xIj yiu xIj mOi -fQi -fQi -nNk -jKD +mAs +mAs +flR +uMO tFe xVc xQV -txh +vpH aqU gjB wDy @@ -122071,9 +122082,9 @@ mOi mOi mOi mOi -ubB -ubB -ubB +mAe +mAe +mAe aqU jVE nTs @@ -122269,14 +122280,14 @@ oDm poD xIj mOi -epG -epG -lce -inI +mzP +mzP +nkK +tqu aqU -rcR -pLH -vyG +gpW +ofY +eQj aqU lyE rsO @@ -122472,14 +122483,14 @@ muW qdJ xIj mOi -epG -epG -lup +mzP +mzP +cJv xQV -fDk +mCx qQS -lmp -ogU +tIu +uPI aqU wmK liJ @@ -122674,15 +122685,15 @@ adO xIj qdJ xIj -fUm -fUm -fUm -fUm -fUm +ryn +ryn +ryn +ryn +ryn mOi -cSO +xdA qQS -iwg +uUB aqU aHq cnH @@ -123084,11 +123095,11 @@ ioU qyZ wTd cmK -ogD -sZV -eDT -sZV -gzH +cyP +kSi +mmn +kSi +qyA kXu jHC liJ @@ -124484,7 +124495,7 @@ aeC wXh ayn atr -obw +lMy aex ciw wXh @@ -124532,7 +124543,7 @@ vcE kpo iMx tGi -inm +cea bXe eyG kpo @@ -124687,7 +124698,7 @@ aeA asY ayQ atr -nWC +iDK atr ciD ngl @@ -124735,7 +124746,7 @@ lJY ttS wEO faO -eUw +cOd bXe deg wLu @@ -124890,7 +124901,7 @@ aeA atp ayR atr -nWC +iDK atr cji nqV @@ -124938,7 +124949,7 @@ lJY hlX umh bXe -eUw +cOd tGi pfH wlF @@ -125093,7 +125104,7 @@ aeC wXh ayn atr -iLe +rmG bXz ciw wXh @@ -125141,7 +125152,7 @@ vcE kpo iMx bXe -upK +sZY mzF eyG kpo @@ -139177,19 +139188,19 @@ lmz lmz lmz lmz -rAd -rAd -rAd -rAd -rAd -rAd -rAd -rAd -rAd -rAd -rAd -rAd -rAd +iBn +iBn +iBn +iBn +iBn +iBn +iBn +iBn +iBn +iBn +iBn +iBn +iBn bdH bdH bdH @@ -139996,7 +140007,7 @@ ebN qQS gwn pfT -jYR +vCH dyp daz lmz @@ -140394,7 +140405,7 @@ tte hvw auf pmV -yhi +eGr xDC dIn rby @@ -140600,7 +140611,7 @@ ebN ebN lnS uVv -mxB +flf ebN cxc kBy @@ -140993,7 +141004,7 @@ lmz lmz lmz daz -hoo +jYH ubA cck wyQ @@ -141008,12 +141019,12 @@ aGk ktQ teZ wkM -wHX +ege hWP -cSh -cSh -gsV -gsV +bZq +bZq +mIi +mIi daz lmz lmz @@ -141199,7 +141210,7 @@ daz cwS ffE vHa -qSA +nDy ffE ffE ffE @@ -141213,10 +141224,10 @@ erN wkM jvB jtj -vcM -vcM -pDQ -guU +swx +swx +qKZ +gjv daz lmz lmz @@ -141402,24 +141413,24 @@ daz oRV ydI mdW -jaH +ios awu ydI aKs fMt mEs gbm -nIB +oBD lFj vyE -bha +mTr wkM qNc jdl -lwZ -lwZ -lvB -goN +dpp +dpp +jgy +eii daz lmz lmz @@ -141607,7 +141618,7 @@ eKJ yaZ ffE hZj -iCf +fQD daz daz daz @@ -141818,7 +141829,7 @@ ebN ebN gbg uVv -ibN +xwU ebN qQS kBy @@ -142018,10 +142029,10 @@ tte hvw auf hTl -efE +jrH xDC yaQ -bat +vLz mFN kSy dDp @@ -142221,7 +142232,7 @@ sbJ sbJ daz rna -aOZ +qRX qQS aCd qQS @@ -142415,24 +142426,24 @@ lmz lmz lmz daz -aiM -aiM -aiM +hWM +hWM +hWM ebN daz -klK -rFt +ocL +qpY daz -ttT -gfQ +drU +itg gba -mUz +kRQ our ebN cxc kBy kBy -khJ +dzt gyN daz lmz @@ -142618,16 +142629,16 @@ lmz lmz lmz daz -aiM -gWN -aiM +hWM +fVx +hWM ebN tId ltc ltc daz ebN -npE +fCI ebN daz daz @@ -142820,17 +142831,17 @@ bdH bdH bdH bdH -sBR -aiM +izf +hWM qQS -aiM +hWM ebN tId -gWN +fVx qQS ebN -uPg -gfQ +naj +itg qQS daz daz @@ -143023,22 +143034,22 @@ aaa bdH bdH bdH -dop -cAQ -gWN -aiM +vVk +cJI +fVx +hWM ebN tId qQS -vOp -oBv +mIJ +wiu xDC yaQ jtj -mss -gVz -gVz -tMu +oZx +irr +irr +xsi daz lmz lmz @@ -143226,22 +143237,22 @@ aaa bdH bdH bdH -ylL -hfZ -orI +fhR +nKO +tmV qQS -bEX +gDh qQS qQS -hTB -rCi +bMg +flL qQS qQS -tYb -rYc -eYf -iRU -tMu +pUg +sII +cFg +pkS +xsi daz lmz lmz @@ -143429,7 +143440,7 @@ bdH bdH bdH bdH -dmU +npq daz daz daz diff --git a/tgui/packages/tgui/interfaces/AresAdmin.js b/tgui/packages/tgui/interfaces/AresAdmin.js index 3963ee87f3a4..bf9fdfacc1aa 100644 --- a/tgui/packages/tgui/interfaces/AresAdmin.js +++ b/tgui/packages/tgui/interfaces/AresAdmin.js @@ -19,6 +19,7 @@ const PAGES = { 'requisitions': () => Requisitions, 'emergency': () => Emergency, 'tech_log': () => TechLogs, + 'core_security': () => CoreSec, 'admin_access_log': () => AdminAccessLogs, 'access_management': () => AccessManagement, 'maintenance_management': () => MaintManagement, @@ -32,6 +33,10 @@ export const AresAdmin = (props, context) => { let themecolor = 'crtyellow'; if (sudo >= 1) { themecolor = 'crtred'; + } else if (current_menu === 'emergency') { + themecolor = 'crtred'; + } else if (current_menu === 'core_security') { + themecolor = 'crtred'; } return ( @@ -350,6 +355,25 @@ const MainMenu = (props, context) => { )} +
+

Core Security Protocols

+ + +
@@ -1328,6 +1352,8 @@ const FlightLogs = (props, context) => {

{logged_in}, {access_text} +
+ Remote Admin: {admin_login}

{ ); }; +const CoreSec = (props) => { + const { data, act } = useBackend(); + const { + logged_in, + access_text, + last_page, + current_menu, + security_vents, + admin_login, + } = data; + + return ( + <> +
+ + +
+ +
+

Core Security Protocols

+
+
+

Nerve Gas Release

+ {security_vents.map((vent, i) => { + return ( + act('trigger_vent', { vent: vent.ref })} + /> + ); + })} +
+ + ); +}; + // -------------------------------------------------------------------- // // Anything below this line is exclusive to the Admin Remote Interface. // -------------------------------------------------------------------- // diff --git a/tgui/packages/tgui/interfaces/AresInterface.jsx b/tgui/packages/tgui/interfaces/AresInterface.jsx index 4045cba6509c..bf7ded50d8ab 100644 --- a/tgui/packages/tgui/interfaces/AresInterface.jsx +++ b/tgui/packages/tgui/interfaces/AresInterface.jsx @@ -23,6 +23,7 @@ const PAGES = { 'requisitions': () => Requisitions, 'emergency': () => Emergency, 'tech_log': () => TechLogs, + 'core_security': () => CoreSec, }; export const AresInterface = (props) => { @@ -35,6 +36,8 @@ export const AresInterface = (props) => { themecolor = 'crtred'; } else if (current_menu === 'emergency') { themecolor = 'crtred'; + } else if (current_menu === 'core_security') { + themecolor = 'crtred'; } return ( @@ -365,6 +368,27 @@ const MainMenu = (props) => { )}
+ {(access_level === 3 || access_level >= 6) && ( +
+

Core Security Protocols

+ + +
+ )} ); }; @@ -1670,3 +1694,77 @@ const TechLogs = (props, context) => { ); }; + +const CoreSec = (props) => { + const { data, act } = useBackend(); + const { + logged_in, + access_text, + access_level, + last_page, + current_menu, + security_vents, + } = data; + + return ( + <> +
+ + +
+ +
+

Core Security Protocols

+
+
+

Nerve Gas Release

+ {security_vents.map((vent, i) => { + return ( + act('trigger_vent', { vent: vent.ref })} + /> + ); + })} +
+ + ); +}; diff --git a/tgui/packages/tgui/interfaces/WorkingJoe.jsx b/tgui/packages/tgui/interfaces/WorkingJoe.jsx index 4864631aa152..64aa5167d265 100644 --- a/tgui/packages/tgui/interfaces/WorkingJoe.jsx +++ b/tgui/packages/tgui/interfaces/WorkingJoe.jsx @@ -12,14 +12,20 @@ const PAGES = { 'access_requests': () => AccessRequests, 'access_tickets': () => AccessTickets, 'id_access': () => AccessID, + 'core_security_gas': () => CoreSecGas, }; export const WorkingJoe = (props) => { const { data } = useBackend(); const { current_menu } = data; const PageComponent = PAGES[current_menu](); + let themecolor = 'crtblue'; + if (current_menu === 'core_security_gas') { + themecolor = 'crtred'; + } + return ( - + @@ -235,6 +241,27 @@ const MainMenu = (props) => { )} + {access_level >= 5 && ( +
+

Core Security Protocols

+ + +
+ )} ); }; @@ -963,3 +990,72 @@ const AccessTickets = (props) => { ); }; + +const CoreSecGas = (props) => { + const { data, act } = useBackend(); + const { + logged_in, + access_text, + access_level, + last_page, + current_menu, + security_vents, + } = data; + + return ( + <> +
+ + +
+ +
+

Nerve Gas Release

+ {security_vents.map((vent, i) => { + return ( + act('trigger_vent', { vent: vent.ref })} + /> + ); + })} +
+ + ); +}; From 4d9c9e97764d00791de2efbf2c4010c4eea294d3 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Wed, 17 Apr 2024 00:26:42 +0100 Subject: [PATCH 138/431] Automatic changelog for PR #5643 [ci skip] --- html/changelogs/AutoChangeLog-pr-5643.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5643.yml diff --git a/html/changelogs/AutoChangeLog-pr-5643.yml b/html/changelogs/AutoChangeLog-pr-5643.yml new file mode 100644 index 000000000000..37034c2a5a42 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5643.yml @@ -0,0 +1,4 @@ +author: "realforest2001" +delete-after: True +changes: + - rscadd: "Added Nerve Gas Release control buttons to the ARES and APOLLO interfaces, allowing the AI core to be secured from large groups or xenomorphs. Built in cooldowns should prevent fatalities." \ No newline at end of file From 0d479ed938835decc095c22d16418a9f8714b832 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 17 Apr 2024 01:09:16 +0000 Subject: [PATCH 139/431] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-5643.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6108.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6116.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6117.yml | 6 ------ html/changelogs/AutoChangeLog-pr-6149.yml | 4 ---- html/changelogs/archive/2024-04.yml | 14 ++++++++++++++ 6 files changed, 14 insertions(+), 22 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-5643.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6108.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6116.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6117.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6149.yml diff --git a/html/changelogs/AutoChangeLog-pr-5643.yml b/html/changelogs/AutoChangeLog-pr-5643.yml deleted file mode 100644 index 37034c2a5a42..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5643.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "realforest2001" -delete-after: True -changes: - - rscadd: "Added Nerve Gas Release control buttons to the ARES and APOLLO interfaces, allowing the AI core to be secured from large groups or xenomorphs. Built in cooldowns should prevent fatalities." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6108.yml b/html/changelogs/AutoChangeLog-pr-6108.yml deleted file mode 100644 index edfab650390a..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6108.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "usnpeepoo" -delete-after: True -changes: - - balance: "Berserker's rage lock-out duration increased slightly" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6116.yml b/html/changelogs/AutoChangeLog-pr-6116.yml deleted file mode 100644 index 7af81eddbd34..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6116.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "QuickLode" -delete-after: True -changes: - - balance: "M3A1 Synthetic Utility Vest only has a 10% slowdown." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6117.yml b/html/changelogs/AutoChangeLog-pr-6117.yml deleted file mode 100644 index 3b2f4ed2cbef..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6117.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "realforest2001" -delete-after: True -changes: - - maptweak: "Remodelled the AI Core Reception and WJ spawn area." - - maptweak: "Switches AI Core cameras over to manual naming." - - imageadd: "Added sprites for AI Core windows on black Almayer frames." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6149.yml b/html/changelogs/AutoChangeLog-pr-6149.yml deleted file mode 100644 index 8deaea969055..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6149.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "iloveloopers" -delete-after: True -changes: - - bugfix: "You can no longer buckle xenos onto chairs" \ No newline at end of file diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml index b19a3e201e6f..2ab715ef58a3 100644 --- a/html/changelogs/archive/2024-04.yml +++ b/html/changelogs/archive/2024-04.yml @@ -233,3 +233,17 @@ - maptweak: added the fuel pump to the proper locations. ihatethisengine2: - rscadd: ported stripping menu from TG +2024-04-17: + QuickLode: + - balance: M3A1 Synthetic Utility Vest only has a 10% slowdown. + iloveloopers: + - bugfix: You can no longer buckle xenos onto chairs + realforest2001: + - rscadd: Added Nerve Gas Release control buttons to the ARES and APOLLO interfaces, + allowing the AI core to be secured from large groups or xenomorphs. Built in + cooldowns should prevent fatalities. + - maptweak: Remodelled the AI Core Reception and WJ spawn area. + - maptweak: Switches AI Core cameras over to manual naming. + - imageadd: Added sprites for AI Core windows on black Almayer frames. + usnpeepoo: + - balance: Berserker's rage lock-out duration increased slightly From acb69a7448dd2fdf90be079106f5eff112bd4aba Mon Sep 17 00:00:00 2001 From: InsaneRed <47158596+InsaneRed@users.noreply.github.com> Date: Wed, 17 Apr 2024 04:30:33 +0300 Subject: [PATCH 140/431] Hedgehog explosion immunity rebalance (#6104) # About the pull request Hedgehog now only has explosion stun immunity if you're above half shard rate. # Explain why it's good for the game Hedgehog is arguably one of the safest castes right now, always has grenade immunity, no longer has a slowdown and an increasing armor rate with its spikes and an invincibility button. The immunity was given due to the slowdown it naturally had, but recent changes have touched that without removing or touching up its immunity, this tries to fix that. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: balance: Hedgehog now gains explosion immunity to nades if you have above half shard amount. /:cl: --------- Co-authored-by: InsaneRed Co-authored-by: Birdtalon Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- .../xenomorph/strains/castes/ravager/hedgehog.dm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm index e1d6dc583416..5cb756d8889d 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm @@ -1,6 +1,6 @@ /datum/xeno_strain/hedgehog name = RAVAGER_HEDGEHOG - description = "You lose your empower, charge, scissor cut and some slash damage, for a bit more explosive resistance, immunity to small explosions, and you gain several new abilities that allow you to become a spiky tank. You build up shards internally over time and also when taking damage that increase your armor's resilience. You can use these shards to power three new abilities: Spike Shield, which gives you a temporary shield that spits bone shards around you when damaged, Fire Spikes, which launches spikes at your target that slows them and does extra damage if they move, and finally, Spike Shed, which launches spikes all around yourself and gives you a temporary speed boost as an escape plan at the cost of all your stored shards and being unable to gain shards for thirty seconds." + description = "You lose your empower, charge, scissor cut, and some slash damage in exchange for more explosive resistance. Your resistance scales with your shard count and at 50% grants you immunity to some explosive stuns. You accumulate shards over time and when taking damage. You can use these shards to power three new abilities: Spike Shield which gives you a temporary shield that spits bone shards around you when damaged; Fire Spikes which launches spikes at your target to slow them and deal damage when they move; and Spike Shed which launches all your spikes, grants a temporary speed boost, and disables shard generation for thirty seconds." flavor_description = "They will be of iron will and steely muscle. In great armor shall they be clad, and with the mightiest spikes will they be armed." icon_state_prefix = "Hedgehog" @@ -19,7 +19,7 @@ /datum/xeno_strain/hedgehog/apply_strain(mob/living/carbon/xenomorph/ravager/ravager) ravager.plasma_max = 0 - ravager.small_explosives_stun = FALSE + ravager.small_explosives_stun = TRUE ravager.explosivearmor_modifier += XENO_EXPOSIVEARMOR_MOD_SMALL ravager.damage_modifier -= XENO_DAMAGE_MOD_SMALL @@ -72,7 +72,6 @@ bound_xeno.speed_modifier += shard_lock_speed_mod bound_xeno.recalculate_speed() - shards_locked = FALSE // Return true if we have enough shards, false otherwise @@ -103,6 +102,15 @@ var/percentage_shards = round((shards / max_shards) * 100, 10) if(percentage_shards) holder.overlays += image('icons/mob/hud/hud.dmi', "xenoenergy[percentage_shards]") + + if(percentage_shards >= 50) + bound_xeno.small_explosives_stun = FALSE + bound_xeno.add_filter("hedge_unstunnable", 1, list("type" = "outline", "color" = "#421313", "size" = 1)) + else + bound_xeno.small_explosives_stun = TRUE + bound_xeno.remove_filter("hedge_unstunnable", 1, list("type" = "outline", "color" = "#421313", "size" = 1)) + + return From c3d7e501f33e0a1b272ae91287eb7994f1cdbe62 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Wed, 17 Apr 2024 02:35:40 +0100 Subject: [PATCH 141/431] Automatic changelog for PR #6104 [ci skip] --- html/changelogs/AutoChangeLog-pr-6104.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6104.yml diff --git a/html/changelogs/AutoChangeLog-pr-6104.yml b/html/changelogs/AutoChangeLog-pr-6104.yml new file mode 100644 index 000000000000..2f529ea329ed --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6104.yml @@ -0,0 +1,4 @@ +author: "InsaneRed" +delete-after: True +changes: + - balance: "Hedgehog now gains explosion immunity to nades if you have above half shard amount." \ No newline at end of file From f90db83ca4c2996387418e11552d87318a49e7fd Mon Sep 17 00:00:00 2001 From: Steelpoint <6595389+Steelpoint@users.noreply.github.com> Date: Thu, 18 Apr 2024 02:51:06 +0800 Subject: [PATCH 142/431] Updates UPP Synthetic Loadout (#6098) # About the pull request This PR updates the UPP Synthetic loadout to account for it no longer being a combat synthetic, this includes changing its job title to that of a Support Synthetic instead of a Combat Synthetic. This effects a large change to its loadout which is detailed below, and is showcased in the screenshots section. Furthermore this PR adds the UPP Support Synthetic job to the UPP crew monitor, previously niche as this only applied to the survivor UPP synthetic but now relevant as the regular UPP synthetic is also considered a support synth. The major changes to the inventory include. * Custom UPP synthetic armour, stats identical to USCM Synthetic armour (no armour, little slowdown) * Addition of a telescopic baton * Customized surgical vest and medical storage rig * Expanded tool pouch * New epinephrine chem bottle and hypo spray, issued to the UPP synth # Explain why it's good for the game The change to the Combat status of the UPP (and CLF) synthetic did not actually account for their inventory to a complete and comprehensive degree, ergo these units are lacking in a effective loadout. This included the fact the synth still technically spawned with armour and items inside the armour, but the armour (and thus the items inside the armour) are automatically deleted due to the synth not being able to wear it, and that the synthetic is still listed in-game as a Combat Synth. This PR fixes this and brings the loadout of the UPP synth up to a better standard to perform its duties as a support Synth whilst giving it some limited self-defence tools in the baton. # Testing Photographs and Procedure
Screenshots & Videos ![Screenshot 2024-04-06 23 56 38](https://github.com/cmss13-devs/cmss13/assets/6595389/db5ede70-5629-4f84-867b-3a84ad2e1a9f)
# Changelog :cl: balance: UPP Synthetic's loadout has been reworked to account for its new status as a non-combatant. /:cl: --------- Co-authored-by: Steelpoint --- .../objects/items/reagent_containers/glass.dm | 8 +++++ .../items/reagent_containers/glass/bottle.dm | 10 ++++++ .../items/reagent_containers/hypospray.dm | 3 ++ code/game/objects/items/storage/belt.dm | 23 ++++++++++++ code/game/objects/items/storage/pouch.dm | 15 ++++++++ .../clothing/suits/marine_armor/ert.dm | 16 +++++++++ code/modules/clothing/under/ties.dm | 19 ++++++++++ code/modules/cm_marines/marines_consoles.dm | 1 + code/modules/gear_presets/upp.dm | 35 +++++++++++-------- 9 files changed, 115 insertions(+), 15 deletions(-) diff --git a/code/game/objects/items/reagent_containers/glass.dm b/code/game/objects/items/reagent_containers/glass.dm index fc8d03f5d24d..e0f432bd5b09 100644 --- a/code/game/objects/items/reagent_containers/glass.dm +++ b/code/game/objects/items/reagent_containers/glass.dm @@ -365,6 +365,14 @@ ground_offset_x = 9 ground_offset_y = 8 +/obj/item/reagent_container/glass/beaker/vial/epinephrine + name = "epinephrine vial" + +/obj/item/reagent_container/glass/beaker/vial/epinephrine/Initialize() + . = ..() + reagents.add_reagent("adrenaline", 30) + update_icon() + /obj/item/reagent_container/glass/beaker/vial/tricordrazine name = "tricordrazine vial" diff --git a/code/game/objects/items/reagent_containers/glass/bottle.dm b/code/game/objects/items/reagent_containers/glass/bottle.dm index 9e0215b535b6..61cdee01c8f8 100644 --- a/code/game/objects/items/reagent_containers/glass/bottle.dm +++ b/code/game/objects/items/reagent_containers/glass/bottle.dm @@ -396,3 +396,13 @@ . = ..() reagents.add_reagent("tricordrazine", 60) update_icon() + +/obj/item/reagent_container/glass/bottle/epinephrine + name = "\improper Epinephrine bottle" + desc = "A small bottle. Contains epinephrine - Used to increase a patients arterial blood pressure, amongst other actions, to assist in cardiopulmonary resuscitation." //"I can't lie to you about your odds of a successful resuscitation, but you have my sympathies" + volume = 60 + +/obj/item/reagent_container/glass/bottle/epinephrine/Initialize() + . = ..() + reagents.add_reagent("adrenaline", 60) + update_icon() diff --git a/code/game/objects/items/reagent_containers/hypospray.dm b/code/game/objects/items/reagent_containers/hypospray.dm index 5e268d35a33d..05b76568d702 100644 --- a/code/game/objects/items/reagent_containers/hypospray.dm +++ b/code/game/objects/items/reagent_containers/hypospray.dm @@ -237,6 +237,9 @@ /obj/item/reagent_container/hypospray/tricordrazine starting_vial = /obj/item/reagent_container/glass/beaker/vial/tricordrazine +/obj/item/reagent_container/hypospray/epinephrine + starting_vial = /obj/item/reagent_container/glass/beaker/vial/epinephrine + /obj/item/reagent_container/hypospray/sedative name = "Sedative Hypospray" starting_vial = /obj/item/reagent_container/glass/beaker/vial/sedative diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index a977eb880ff5..2cb314a0b981 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -319,6 +319,29 @@ new /obj/item/storage/pill_bottle/inaprovaline(src) new /obj/item/storage/pill_bottle/tramadol(src) +/obj/item/storage/belt/medical/lifesaver/upp/synth/fill_preset_inventory() + new /obj/item/storage/pill_bottle/bicaridine(src) + new /obj/item/storage/pill_bottle/bicaridine(src) + new /obj/item/storage/pill_bottle/kelotane(src) + new /obj/item/storage/pill_bottle/kelotane(src) + new /obj/item/storage/pill_bottle/tramadol(src) + new /obj/item/storage/pill_bottle/tramadol(src) + new /obj/item/storage/pill_bottle/antitox(src) + new /obj/item/storage/pill_bottle/alkysine(src) + new /obj/item/storage/pill_bottle/imidazoline(src) + new /obj/item/stack/medical/advanced/bruise_pack(src) + new /obj/item/stack/medical/advanced/bruise_pack(src) + new /obj/item/stack/medical/advanced/bruise_pack(src) + new /obj/item/stack/medical/advanced/ointment(src) + new /obj/item/stack/medical/advanced/ointment(src) + new /obj/item/stack/medical/advanced/ointment(src) + new /obj/item/stack/medical/splint(src) + new /obj/item/stack/medical/splint(src) + new /obj/item/stack/medical/splint(src) + new /obj/item/reagent_container/hypospray/autoinjector/dexalinp(src) + new /obj/item/reagent_container/hypospray/autoinjector/oxycodone(src) + new /obj/item/device/healthanalyzer(src) + /obj/item/storage/belt/security name = "\improper M276 pattern security rig" desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This configuration is commonly seen among USCM Military Police and peacekeepers, though it can hold some light munitions." diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index c3df7547776d..1b75a1a7d89d 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -1272,6 +1272,21 @@ new /obj/item/explosive/plastic(src) new /obj/item/explosive/plastic(src) +/obj/item/storage/pouch/tools/tactical/upp + name = "synthetic tools pouch" + desc = "Special issue tools pouch for UPP synthetics. Due to the enhanced strength of the synthetic and its inability to feel discomfort, this pouch is designed to maximize internal space with no concern for its wearer's comfort." + icon_state = "tools" + storage_slots = 7 + +/obj/item/storage/pouch/tools/tactical/upp/fill_preset_inventory() + new /obj/item/tool/wrench(src) + new /obj/item/tool/crowbar(src) + new /obj/item/tool/wirecutters(src) + new /obj/item/device/multitool(src) + new /obj/item/tool/weldingtool(src) + new /obj/item/stack/cable_coil(src) + new /obj/item/stack/cable_coil(src) + /obj/item/storage/pouch/tools/uppsynth/fill_preset_inventory() new /obj/item/tool/crowbar(src) new /obj/item/tool/wirecutters(src) diff --git a/code/modules/clothing/suits/marine_armor/ert.dm b/code/modules/clothing/suits/marine_armor/ert.dm index 6d2ad9934a40..67bdd523c7f2 100644 --- a/code/modules/clothing/suits/marine_armor/ert.dm +++ b/code/modules/clothing/suits/marine_armor/ert.dm @@ -287,6 +287,22 @@ armor_rad = CLOTHING_ARMOR_MEDIUMLOW armor_internaldamage = CLOTHING_ARMOR_HIGH +/obj/item/clothing/suit/storage/marine/faction/UPP/support/synth + name = "\improper UL6 Synthetic personal armor" + desc = "Modified variant of the UL6 personel armor system intended to be useable by Synthetic units. Offers no protection but very little movement impairment." + flags_marine_armor = ARMOR_LAMP_OVERLAY|SYNTH_ALLOWED + 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 + slowdown = SLOWDOWN_ARMOR_VERY_LIGHT + time_to_unequip = 0.5 SECONDS + time_to_equip = 1 SECONDS + /obj/item/clothing/suit/storage/marine/faction/UPP/commando name = "\improper UM5CU personal armor" desc = "A modification of the UM5, designed for stealth operations." diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index 413c2edda0c7..d95c0a593d34 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -676,6 +676,25 @@ /obj/item/clothing/accessory/storage/surg_vest/drop_green/equipped hold = /obj/item/storage/internal/accessory/surg_vest/equipped +/obj/item/clothing/accessory/storage/surg_vest/drop_green/upp + hold = /obj/item/storage/internal/accessory/surg_vest/drop_green/upp + +/obj/item/storage/internal/accessory/surg_vest/drop_green/upp/fill_preset_inventory() + new /obj/item/tool/surgery/scalpel(src) + new /obj/item/tool/surgery/hemostat(src) + new /obj/item/tool/surgery/retractor(src) + new /obj/item/tool/surgery/cautery(src) + new /obj/item/tool/surgery/circular_saw(src) + new /obj/item/tool/surgery/surgicaldrill(src) + new /obj/item/tool/surgery/scalpel/pict_system(src) + new /obj/item/tool/surgery/bonesetter(src) + new /obj/item/tool/surgery/FixOVein(src) + new /obj/item/stack/medical/advanced/bruise_pack(src) + new /obj/item/stack/nanopaste(src) + new /obj/item/tool/surgery/bonegel(src) + new /obj/item/tool/surgery/bonegel(src) + new /obj/item/reagent_container/blood/OMinus(src) + /obj/item/clothing/accessory/storage/surg_vest/drop_black name = "black surgical drop pouch" desc = "A tactical black synthcotton drop pouch purpose-made for holding surgical tools." diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index 7e57430f081a..13f5e2d0df6d 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -1084,6 +1084,7 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor) // 50-59: Engineering JOB_UPP_COMBAT_SYNTH = 50, JOB_UPP_CREWMAN = 51, + JOB_UPP_SUPPORT_SYNTH = 52, // 60-69: Soldiers JOB_UPP_LEADER = 60, JOB_UPP_SPECIALIST = 61, diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 324fd8b77aa6..39aed17a1fad 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -2600,8 +2600,8 @@ languages = ALL_SYNTH_LANGUAGES_UPP skills = /datum/skills/synthetic - assignment = JOB_UPP_COMBAT_SYNTH - rank = JOB_UPP_COMBAT_SYNTH + assignment = JOB_UPP_SUPPORT_SYNTH + rank = JOB_UPP_SUPPORT_SYNTH paygrade = PAY_SHORT_SYN idtype = /obj/item/card/id/dogtag @@ -2648,14 +2648,15 @@ /datum/equipment_preset/upp/synth/load_gear(mob/living/carbon/human/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 - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) //2 - new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) //2.33 - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //2.66 - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3 - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3.33 + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, 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/storage/firstaid/adv, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/blood/OMinus, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/blood/OMinus, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) //face new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver, WEAR_R_EAR) 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 @@ -2665,25 +2666,29 @@ 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/webbing = new() + var/obj/item/clothing/accessory/storage/surg_vest/drop_green/upp/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/synth, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) - 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) //waist - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/synth, 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) //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/tools/tactical/upp, 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) - new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/tricordrazine, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/epinephrine, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/bottle/epinephrine, WEAR_IN_L_STORE) /datum/equipment_preset/upp/synth/get_antag_clothing_equipment() return list( From ba4086e9ed5ee1f2890c6796810f04e139b3b286 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Wed, 17 Apr 2024 19:55:44 +0100 Subject: [PATCH 143/431] Automatic changelog for PR #6098 [ci skip] --- html/changelogs/AutoChangeLog-pr-6098.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6098.yml diff --git a/html/changelogs/AutoChangeLog-pr-6098.yml b/html/changelogs/AutoChangeLog-pr-6098.yml new file mode 100644 index 000000000000..9ffb169d2d2d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6098.yml @@ -0,0 +1,4 @@ +author: "Steelpoint" +delete-after: True +changes: + - balance: "UPP Synthetic's loadout has been reworked to account for its new status as a non-combatant." \ No newline at end of file From 6f4658846464ec2fe81449a9e633e0dfa80dafe3 Mon Sep 17 00:00:00 2001 From: harry Date: Wed, 17 Apr 2024 19:51:44 +0100 Subject: [PATCH 144/431] dehardcodes client version warnings (#6114) :cl: MrStonedOne, LemonInTheDark server: config now allows you to warn players to upgrade their byond version, or bar them based on their byond version /:cl: thanks to https://github.com/tgstation/tgstation/pull/73549 https://github.com/tgstation/tgstation/pull/16914 --------- Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- .../configuration/entries/general.dm | 24 +++++++++++ code/modules/client/client_procs.dm | 40 +++++++++++++------ config/example/config.txt | 12 ++++++ 3 files changed, 63 insertions(+), 13 deletions(-) diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index e2572e5e2d61..1cf93e998a4e 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -640,3 +640,27 @@ This maintains a list of ip addresses that are able to bypass topic filtering. splitter = "|" key_mode = KEY_MODE_TEXT_UNALTERED value_mode = VALUE_MODE_TEXT + +/datum/config_entry/number/client_warn_version + default = null + min_val = 500 + +/datum/config_entry/number/client_warn_build + default = null + min_val = 0 + +/datum/config_entry/string/client_warn_message + default = "Your version of BYOND may have issues or be blocked from accessing this server in the future." + +/datum/config_entry/flag/client_warn_popup + +/datum/config_entry/number/client_error_version + default = null + min_val = 500 + +/datum/config_entry/number/client_error_build + default = null + min_val = 0 + +/datum/config_entry/string/client_error_message + default = "Your version of BYOND is too old, may have issues, and is blocked from accessing this server." diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 63cdcfd8716c..213c54f0e201 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -5,8 +5,6 @@ #define UPLOAD_LIMIT 10485760 //Restricts client uploads to the server to 10MB //Boosted this thing. What's the worst that can happen? #define MIN_CLIENT_VERSION 0 //Just an ambiguously low version for now, I don't want to suddenly stop people playing. //I would just like the code ready should it ever need to be used. -#define GOOD_BYOND_MAJOR 513 -#define GOOD_BYOND_MINOR 1500 GLOBAL_LIST_INIT(blacklisted_builds, list( "1407" = "bug preventing client display overrides from working leads to clients being able to see things/mobs they shouldn't be able to see", @@ -364,14 +362,34 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( INVOKE_ASYNC(src, /client/proc/set_macros) // Version check below if we ever need to start checking against BYOND versions again. - - /*if((byond_version < world.byond_version) || ((byond_version == world.byond_version) && (byond_build < world.byond_build))) - src << "Your version of Byond (v[byond_version].[byond_build]) differs from the server (v[world.byond_version].[world.byond_build]). You may experience graphical glitches, crashes, or other errors. You will be disconnected until your version matches or exceeds the server version.
\ - Direct Download (Windows Installer): http://www.byond.com/download/build/[world.byond_version]/[world.byond_version].[world.byond_build]_byond.exe
\ - Other versions (search for [world.byond_build] or higher): http://www.byond.com/download/build/[world.byond_version]" + var/breaking_version = CONFIG_GET(number/client_error_version) + var/breaking_build = CONFIG_GET(number/client_error_build) + var/warn_version = CONFIG_GET(number/client_warn_version) + var/warn_build = CONFIG_GET(number/client_warn_build) + + if (byond_version < breaking_version || (byond_version == breaking_version && byond_build < breaking_build)) //Out of date client. + to_chat_immediate(src, SPAN_DANGER("Your version of BYOND is too old:")) + to_chat_immediate(src, CONFIG_GET(string/client_error_message)) + to_chat_immediate(src, "Your version: [byond_version].[byond_build]") + to_chat_immediate(src, "Required version: [breaking_version].[breaking_build] or later") + to_chat_immediate(src, "Visit BYOND's website to get the latest version of BYOND.") qdel(src) - return*/ - //hardcode for now + return + + if (byond_version < warn_version || (byond_version == warn_version && byond_build < warn_build)) //We have words for this client. + if(CONFIG_GET(flag/client_warn_popup)) + var/msg = "Your version of BYOND may be getting out of date:
" + msg += CONFIG_GET(string/client_warn_message) + "

" + msg += "Your version: [byond_version].[byond_build]
" + msg += "Required version to remove this message: [warn_version].[warn_build] or later
" + msg += "Visit BYOND's website to get the latest version of BYOND.
" + src << browse(msg, "window=warning_popup") + else + to_chat(src, SPAN_DANGER("Your version of BYOND may be getting out of date:")) + to_chat(src, CONFIG_GET(string/client_warn_message)) + to_chat(src, "Your version: [byond_version].[byond_build]") + to_chat(src, "Required version to remove this message: [warn_version].[warn_build] or later") + to_chat(src, "Visit BYOND's website to get the latest version of BYOND.") if (num2text(byond_build) in GLOB.blacklisted_builds) log_access("Failed login: [key] - blacklisted byond build ([byond_version].[byond_build])") @@ -382,10 +400,6 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( qdel(src) return - //do this check after the blacklist check to avoid confusion - if((byond_version < GOOD_BYOND_MAJOR) || ((byond_version == GOOD_BYOND_MAJOR) && (byond_build < GOOD_BYOND_MINOR))) - to_chat(src, FONT_SIZE_HUGE(SPAN_BOLDNOTICE("YOUR BYOND VERSION IS NOT WELL SUITED FOR THIS SERVER. Download latest BETA build or you may suffer random crashes or disconnects."))) - // Initialize tgui panel stat_panel.initialize( inline_html = file("html/statbrowser.html"), diff --git a/config/example/config.txt b/config/example/config.txt index f055a5d65bff..0aff7ee6def9 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -241,3 +241,15 @@ GAMEMODE_DEFAULT Extended ## How long the mob will take to chestburst, in seconds #EMBRYO_BURST_TIMER 450 + +## CLIENT VERSION CONTROL +## This allows you to configure the minimum required client version, as well as a warning version, and message for both. +## These trigger for any version below (non-inclusive) the given version, so 510 triggers on 509 or lower. +## These messages will be followed by one stating the clients current version and the required version for clarity. +#CLIENT_WARN_VERSION 514 +#CLIENT_WARN_BUILD 1589 +#CLIENT_WARN_MESSAGE Your version of BYOND may have issues or be blocked from accessing this server in the future. +#CLIENT_WARN_POPUP +CLIENT_ERROR_VERSION 514 +#CLIENT_ERROR_BUILD 1589 +#CLIENT_ERROR_MESSAGE Your version of BYOND is too old, may have issues, and is blocked from accessing this server. From 4450acc3442fa45fb1c40d81ec1e1509d1236887 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Wed, 17 Apr 2024 20:03:45 +0100 Subject: [PATCH 145/431] Automatic changelog for PR #6114 [ci skip] --- html/changelogs/AutoChangeLog-pr-6114.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6114.yml diff --git a/html/changelogs/AutoChangeLog-pr-6114.yml b/html/changelogs/AutoChangeLog-pr-6114.yml new file mode 100644 index 000000000000..db87fb2cfcf2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6114.yml @@ -0,0 +1,4 @@ +author: "MrStonedOne, LemonInTheDark" +delete-after: True +changes: + - server: "config now allows you to warn players to upgrade their byond version, or bar them based on their byond version" \ No newline at end of file From aef42728dabb863a49e3ba2848194845ae90881d Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 18 Apr 2024 01:08:44 +0000 Subject: [PATCH 146/431] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-6098.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6104.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6114.yml | 4 ---- html/changelogs/archive/2024-04.yml | 10 ++++++++++ 4 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-6098.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6104.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6114.yml diff --git a/html/changelogs/AutoChangeLog-pr-6098.yml b/html/changelogs/AutoChangeLog-pr-6098.yml deleted file mode 100644 index 9ffb169d2d2d..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6098.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Steelpoint" -delete-after: True -changes: - - balance: "UPP Synthetic's loadout has been reworked to account for its new status as a non-combatant." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6104.yml b/html/changelogs/AutoChangeLog-pr-6104.yml deleted file mode 100644 index 2f529ea329ed..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6104.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "InsaneRed" -delete-after: True -changes: - - balance: "Hedgehog now gains explosion immunity to nades if you have above half shard amount." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6114.yml b/html/changelogs/AutoChangeLog-pr-6114.yml deleted file mode 100644 index db87fb2cfcf2..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6114.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "MrStonedOne, LemonInTheDark" -delete-after: True -changes: - - server: "config now allows you to warn players to upgrade their byond version, or bar them based on their byond version" \ No newline at end of file diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml index 2ab715ef58a3..82507d62ef9f 100644 --- a/html/changelogs/archive/2024-04.yml +++ b/html/changelogs/archive/2024-04.yml @@ -247,3 +247,13 @@ - imageadd: Added sprites for AI Core windows on black Almayer frames. usnpeepoo: - balance: Berserker's rage lock-out duration increased slightly +2024-04-18: + InsaneRed: + - balance: Hedgehog now gains explosion immunity to nades if you have above half + shard amount. + MrStonedOne, LemonInTheDark: + - server: config now allows you to warn players to upgrade their byond version, + or bar them based on their byond version + Steelpoint: + - balance: UPP Synthetic's loadout has been reworked to account for its new status + as a non-combatant. From b6f89f3c29301301f4a90ead75746d16ffab26d2 Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Wed, 17 Apr 2024 19:22:01 -0700 Subject: [PATCH 147/431] Fiorina Riot In Progress: Colonial Marshals & United Americas Police (#6022) # About the pull request Howdy, this PR adds in unique Riot Response flavored CMB Deputies and UA Riot Police to a Survivor Nightmare(thx badatthisgame302) on Fiorina Science Annex. Because this is a survivor nightmare I kept the loadouts very sparse, so you will only find a couple mags of ammo per weapon, and all participants here will likely have to resort to their sidearm. It is implied that by the time players control these characters, they've been surviving for hours if not days. Furthermore, because its a riot response, there are no specialists (engineers, doctors, etc.) to help the support side of things. After all, it is just a riot call.. PS. If you haven't read the Alien: Isolation comic yet, something similar is implied there. :) On the CMB side we have 3 variations and a Synthetic. These investigative federal agents are nimble on their feet, but inadequately protected and their weapons are more focused on self defense. They were sent here as emergency back-up to the understaffed prison, and aren't prepared for this scenario. They do however still carry some rubber munitions and crowd control elements. On the UA side we have 4 variations and a Synthetic. The infamous United Americas Riot Control Police show with four variations. Donned in complete riot gear and with uniformity, they would seem like an unstoppable force to be reckoned with. Unfortunately for them, they're dealing with Xenomorphs - all of their crowd control devices and nonlethal munitions may prove to be very ineffective at dealing with this new threat at hand.. # Explain why it's good for the game Adding meaningful and fitting equipment really adds to the immersion. Its not just a setting but it envokes the real feeling of "We came here to stop a riot, but we found something much more sinister." By giving players these settings to play with, they'll feel much more at home in the Aliens universe as opposed to the looming feeling of it being "just another round, just another role." I think CM really benefits from spicing up the loop and nightmares are an excellent example of that. Having lore accurate, flavorful layouts like this where you have a consistent theme going allows for excellent immersion. Even if everyone dies, the Marines stumbling upon the corpses of a horrific incident like this will be a really unique experience, in my opinion. # Testing Photographs and Procedure
Screenshots & Videos Basically I created a new file for these fine people and added what I think is thematically fitting for this scenario. I then tested it, fixed bugs, and then tested it again. This happened 3 times until I could no longer find any bugs. https://cdn.discordapp.com/attachments/1042176396711170119/1222482124771430460/image.png?ex=66166033&is=6603eb33&hm=69719c33b5d811033f62cba605d5ba6e044c4cdd8f7056c50e49e9523e7ce3f8&
# Changelog :cl: add: Adds 3 variations of CMB Marshal and 4 variations of a UA Riot Police Officer to Fiorina Prison Riot nightmare. These are fine men and women in uniform prepared to engage what they suspect is a riot(or in the case of CMB, assisting their underfunded and understaffed colleagues) however, they find something much more sinister going on.. add: Adds a CMB Investigative Synthetic(r) and a UA Police Synthetic. add: Allows police baton and telescopic baton to shield clash for intimidation and riot tactics. add: Allows M81 launcher to utilize less lethal baton round qol: removes taser from some security synthetics belts, replaced with a more synthetic friendly version /:cl: --------- Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- .../effects/landmarks/survivor_spawner.dm | 8 +- code/game/objects/items/storage/belt.dm | 7 + code/game/objects/items/weapons/shields.dm | 2 +- .../clothing/suits/marine_armor/ert.dm | 16 + ...ot_in_progress_insert_fiorina_nightmare.dm | 276 ++++++++++++++++++ code/modules/gear_presets/synths.dm | 4 +- .../specialist/launcher/grenade_launcher.dm | 2 +- colonialmarines.dme | 1 + 8 files changed, 308 insertions(+), 8 deletions(-) create mode 100644 code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm index 803d73151aeb..4a6e5272ed05 100644 --- a/code/game/objects/effects/landmarks/survivor_spawner.dm +++ b/code/game/objects/effects/landmarks/survivor_spawner.dm @@ -201,8 +201,8 @@ //CMB Survivors// /obj/effect/landmark/survivor_spawner/fiorina_armory_cmb - equipment = /datum/equipment_preset/survivor/colonial_marshal - synth_equipment = /datum/equipment_preset/synth/survivor/cmb_synth + equipment = /datum/equipment_preset/survivor/cmb/standard + synth_equipment = /datum/equipment_preset/synth/survivor/cmb/synth intro_text = list("

You are a CMB Deputy!

",\ "You are aware of the 'alien' threat.",\ "Your primary objective is to survive the infestation.") @@ -211,8 +211,8 @@ spawn_priority = SPAWN_PRIORITY_VERY_HIGH /obj/effect/landmark/survivor_spawner/fiorina_armory_riot_control - equipment = /datum/equipment_preset/survivor/colonial_marshal/fiorina - synth_equipment = /datum/equipment_preset/synth/survivor/cmb_synth + equipment = /datum/equipment_preset/survivor/cmb/ua + synth_equipment = /datum/equipment_preset/synth/survivor/cmb/ua_synth intro_text = list("

You are a United Americas Riot Control Officer!

",\ "You are aware of the 'alien' threat.",\ "Your primary objective is to survive the infestation.") diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 2cb314a0b981..1daffa2908f0 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -406,6 +406,13 @@ new /obj/item/reagent_container/spray/pepper(src) new /obj/item/device/clue_scanner(src) +/obj/item/storage/belt/security/MP/full/synth/fill_preset_inventory() + new /obj/item/explosive/grenade/flashbang(src) + new /obj/item/device/flash(src) + new /obj/item/weapon/baton(src) + new /obj/item/reagent_container/spray/pepper(src) + new /obj/item/device/clue_scanner(src) + new /obj/item/handcuffs(src) /obj/item/storage/belt/security/MP/UPP name = "\improper Type 43 military police rig" diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 0497a410a373..92400e2d3184 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -89,7 +89,7 @@ /obj/item/weapon/shield/riot/attackby(obj/item/W as obj, mob/user as mob) if(cooldown < world.time - 25) - if(istype(W, /obj/item/weapon/baton) || istype(W, /obj/item/weapon/sword) || istype(W, /obj/item/weapon/baseballbat) || istype(W, /obj/item/weapon/twohanded/fireaxe) || istype(W, /obj/item/weapon/chainofcommand)) + if(istype(W, /obj/item/weapon/baton) || istype(W, /obj/item/weapon/sword) || istype(W, /obj/item/weapon/telebaton) || istype(W, /obj/item/weapon/baseballbat) || istype(W, /obj/item/weapon/classic_baton) || istype(W, /obj/item/weapon/twohanded/fireaxe) || istype(W, /obj/item/weapon/chainofcommand)) user.visible_message(SPAN_WARNING("[user] bashes [src] with [W]!")) playsound(user.loc, 'sound/effects/shieldbash.ogg', 25, 1) cooldown = world.time diff --git a/code/modules/clothing/suits/marine_armor/ert.dm b/code/modules/clothing/suits/marine_armor/ert.dm index 67bdd523c7f2..106b09961103 100644 --- a/code/modules/clothing/suits/marine_armor/ert.dm +++ b/code/modules/clothing/suits/marine_armor/ert.dm @@ -747,6 +747,22 @@ uniform_restricted = list(/obj/item/clothing/under/marine/ua_riot) flags_atom = NO_SNOW_TYPE +/obj/item/clothing/suit/storage/marine/veteran/ua_riot/synth + name = "\improper UA-M1S Synthetic 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. The UA-1MS modification is Synthetic programming compliant, sacrificing protection for speed and carrying capacity." + 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 + slowdown = SLOWDOWN_ARMOR_SUPER_LIGHT + storage_slots = 3 + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE + flags_marine_armor = ARMOR_SQUAD_OVERLAY|ARMOR_LAMP_OVERLAY|SYNTH_ALLOWED + //================//=ROYAL MARINES=\\====================================\\ //=======================================================================\\ diff --git a/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm b/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm new file mode 100644 index 000000000000..657439a13f50 --- /dev/null +++ b/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm @@ -0,0 +1,276 @@ +// loadouts for riot_in_progress.dmm nightmare, thematic survivor preset. + +/datum/equipment_preset/survivor/cmb + name = "Survivor - Colonial Marshal" + faction = FACTION_MARSHAL + faction_group = list(FACTION_MARSHAL, FACTION_MARINE, FACTION_SURVIVOR) + languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) + var/human_versus_human = FALSE + access = list( + ACCESS_LIST_UA, + ) + +//*************************************************CMB****************************************************/ + +/datum/equipment_preset/survivor/cmb/standard + name = "Survivor - Colonial Marshal Deputy(Riot Response)" + paygrade = PAY_SHORT_CMBD + role_comm_title = "CMB DEP" + flags = EQUIPMENT_PRESET_EXTRA + assignment = "CMB Deputy" + rank = JOB_CMB + skills = /datum/skills/cmb + +/datum/equipment_preset/survivor/cmb/standard/load_gear(mob/living/carbon/human/new_human) + + var/choice = rand(1,10) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform, WEAR_BODY) + 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, 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/ammo_magazine/pistol/holdout, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15/rubber, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) + + switch(choice) + if(1 to 6) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY) + 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/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) + if(7 to 8) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge/rubber, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) + if(9 to 10) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY) + 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/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + +// cmb synth +/datum/equipment_preset/synth/survivor/cmb/synth + name = "Survivor - Synthetic - CMB Investigative Synthetic(Riot Response)" + paygrade = PAY_SHORT_CMBS + idtype = /obj/item/card/id/deputy + role_comm_title = "CMB Syn" + flags = EQUIPMENT_PRESET_EXTRA + assignment = "CMB Investigative Synthetic" + rank = JOB_CMB_SYN + languages = ALL_SYNTH_LANGUAGES + skills = /datum/skills/synthetic/cmb + +/datum/equipment_preset/synth/survivor/cmb/synth/load_race(mob/living/carbon/human/new_human) + new_human.set_species(SYNTH_COLONY) + +/datum/equipment_preset/synth/survivor/cmb/synth/load_gear(mob/living/carbon/human/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) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/autopsy_scanner, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge/rubber, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/pen, WEAR_R_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD) + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform, WEAR_BODY) + 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/accessory/storage/droppouch, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/candy, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/imidazoline, WEAR_IN_ACCESSORY) + 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/device/binoculars/range/designator, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) + //belt + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/synth, WEAR_WAIST) + //holding + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) + //pouches + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/synth/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_R_STORE) + +//************************************************UA RIOT POLICE****************************************************/ + +/datum/equipment_preset/survivor/cmb/ua + name = "Survivor - United Americas Riot Officer(Riot Response)" + paygrade = PAY_SHORT_CPO + role_comm_title = "UA RCP" + flags = EQUIPMENT_PRESET_EXTRA + assignment = "United Americas Police Officer" + skills = /datum/skills/civilian/survivor/marshal + idtype = /obj/item/card/id/silver + +/datum/equipment_preset/survivor/cmb/ua/load_gear(mob/living/carbon/human/new_human) + + var/choice = rand(1,10) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full, WEAR_L_STORE) + + switch(choice) + if(1 to 6) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/b92fs, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/b92fs, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/b92fs, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m16, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/classic_baton, WEAR_R_HAND) + if(7) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat/riot, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/classic_baton, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_L_HAND) + if(8) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/launcher/grenade/m81/riot, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/slug/baton, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/slug/baton, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/slug/baton, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/slug/baton, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_R_STORE) + if(9 to 10) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower/black, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge/rubber, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + +// ua synth +/datum/equipment_preset/synth/survivor/cmb/ua_synth + name = "Survivor - Synthetic - UA Police Synthetic(Riot Response)" + paygrade = PAY_SHORT_CMBS + role_comm_title = "UA Syn" + flags = EQUIPMENT_PRESET_EXTRA + assignment = "UA Police Synthetic" + languages = ALL_SYNTH_LANGUAGES + skills = /datum/skills/colonial_synthetic + idtype = /obj/item/card/id/silver + +/datum/equipment_preset/synth/survivor/cmb/ua_synth/load_race(mob/living/carbon/human/new_human) + new_human.set_species(SYNTH_COLONY) + +/datum/equipment_preset/synth/survivor/cmb/ua_synth/load_gear(mob/living/carbon/human/new_human) + //backpack + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/baton_slug, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, WEAR_IN_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/pen, WEAR_R_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield, WEAR_IN_HELMET) + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot, WEAR_BODY) + 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/accessory/storage/droppouch, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/flashbangs, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot/synth, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang, WEAR_IN_JACKET) + //belt + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full/synth, WEAR_WAIST) + //holding + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/classic_baton, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_L_HAND) + //pouches + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/synth/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full, WEAR_R_STORE) diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 30daac203a18..4eb674cf3796 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -418,7 +418,7 @@ WEAR_IN_BACK = /obj/item/device/taperecorder, WEAR_JACKET = /obj/item/clothing/suit/storage/det_suit/black, WEAR_IN_JACKET = /obj/item/weapon/telebaton, - WEAR_WAIST = /obj/item/storage/belt/security/MP/full, + WEAR_WAIST = /obj/item/storage/belt/security/MP/full/synth, WEAR_HANDS = /obj/item/clothing/gloves/black, WEAR_R_HAND = /obj/item/device/camera, WEAR_FEET = /obj/item/clothing/shoes/marine/knife, @@ -464,8 +464,8 @@ WEAR_IN_BACK = /obj/item/handcuffs/zip, WEAR_IN_BACK = /obj/item/handcuffs/zip, WEAR_JACKET = /obj/item/clothing/suit/storage/webbing, + WEAR_WAIST = /obj/item/storage/belt/security/MP/full/synth, WEAR_IN_JACKET = /obj/item/weapon/telebaton, - WEAR_WAIST = /obj/item/storage/belt/security/MP/full, WEAR_HANDS = /obj/item/clothing/gloves/black, WEAR_R_STORE = /obj/item/storage/pouch/tools/full, WEAR_FEET = /obj/item/clothing/shoes/marine/knife, diff --git a/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm index 0f767d679d03..f1d951324930 100644 --- a/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm +++ b/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm @@ -317,7 +317,7 @@ /obj/item/weapon/gun/launcher/grenade/m81/riot name = "\improper M81 riot grenade launcher" desc = "A lightweight, single-shot low-angle grenade launcher to launch tear gas grenades. Used by the Colonial Marines Military Police during riots." - valid_munitions = list(/obj/item/explosive/grenade/custom/teargas) + valid_munitions = list(/obj/item/explosive/grenade/custom/teargas, /obj/item/explosive/grenade/slug/baton) preload = /obj/item/explosive/grenade/custom/teargas //------------------------------------------------------- diff --git a/colonialmarines.dme b/colonialmarines.dme index 0d39f12cdbc6..b69a03136b78 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1782,6 +1782,7 @@ #include "code\modules\gear_presets\survivors\survivors.dm" #include "code\modules\gear_presets\survivors\corsat\preset_corsat.dm" #include "code\modules\gear_presets\survivors\fiorina_sciannex\preset_fiorina_sciannex.dm" +#include "code\modules\gear_presets\survivors\fiorina_sciannex\riot_in_progress_insert_fiorina_nightmare.dm" #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" From 6f7776a3fb84035deb200bc82d01dcb56d3862bf Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Thu, 18 Apr 2024 03:26:19 +0100 Subject: [PATCH 148/431] Automatic changelog for PR #6022 [ci skip] --- html/changelogs/AutoChangeLog-pr-6022.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6022.yml diff --git a/html/changelogs/AutoChangeLog-pr-6022.yml b/html/changelogs/AutoChangeLog-pr-6022.yml new file mode 100644 index 000000000000..b5a61f605ed6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6022.yml @@ -0,0 +1,8 @@ +author: "QuickLode" +delete-after: True +changes: + - rscadd: "Adds 3 variations of CMB Marshal and 4 variations of a UA Riot Police Officer to Fiorina Prison Riot nightmare. These are fine men and women in uniform prepared to engage what they suspect is a riot(or in the case of CMB, assisting their underfunded and understaffed colleagues) however, they find something much more sinister going on.." + - rscadd: "Adds a CMB Investigative Synthetic(r) and a UA Police Synthetic." + - rscadd: "Allows police baton and telescopic baton to shield clash for intimidation and riot tactics." + - rscadd: "Allows M81 launcher to utilize less lethal baton round" + - qol: "removes taser from some security synthetics belts, replaced with a more synthetic friendly version" \ No newline at end of file From 4b4709babb6f7f6709d0d4da781f1deef4db4185 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 19 Apr 2024 01:09:59 +0000 Subject: [PATCH 149/431] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-6022.yml | 8 -------- html/changelogs/archive/2024-04.yml | 13 +++++++++++++ 2 files changed, 13 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-6022.yml diff --git a/html/changelogs/AutoChangeLog-pr-6022.yml b/html/changelogs/AutoChangeLog-pr-6022.yml deleted file mode 100644 index b5a61f605ed6..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6022.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: "QuickLode" -delete-after: True -changes: - - rscadd: "Adds 3 variations of CMB Marshal and 4 variations of a UA Riot Police Officer to Fiorina Prison Riot nightmare. These are fine men and women in uniform prepared to engage what they suspect is a riot(or in the case of CMB, assisting their underfunded and understaffed colleagues) however, they find something much more sinister going on.." - - rscadd: "Adds a CMB Investigative Synthetic(r) and a UA Police Synthetic." - - rscadd: "Allows police baton and telescopic baton to shield clash for intimidation and riot tactics." - - rscadd: "Allows M81 launcher to utilize less lethal baton round" - - qol: "removes taser from some security synthetics belts, replaced with a more synthetic friendly version" \ No newline at end of file diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml index 82507d62ef9f..3fc9edf51cfb 100644 --- a/html/changelogs/archive/2024-04.yml +++ b/html/changelogs/archive/2024-04.yml @@ -257,3 +257,16 @@ Steelpoint: - balance: UPP Synthetic's loadout has been reworked to account for its new status as a non-combatant. +2024-04-19: + QuickLode: + - rscadd: Adds 3 variations of CMB Marshal and 4 variations of a UA Riot Police + Officer to Fiorina Prison Riot nightmare. These are fine men and women in uniform + prepared to engage what they suspect is a riot(or in the case of CMB, assisting + their underfunded and understaffed colleagues) however, they find something + much more sinister going on.. + - rscadd: Adds a CMB Investigative Synthetic(r) and a UA Police Synthetic. + - rscadd: Allows police baton and telescopic baton to shield clash for intimidation + and riot tactics. + - rscadd: Allows M81 launcher to utilize less lethal baton round + - qol: removes taser from some security synthetics belts, replaced with a more synthetic + friendly version From 8525fc3550973ac478decea315971a4e166f396e Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Thu, 18 Apr 2024 21:56:14 -0400 Subject: [PATCH 150/431] Stabilized metallic foam, a gimmick new flamer fuel (#6062) # About the pull request billions must foam adds in stabilized metallic foam, usable by flamers to make iron foam uses 2 units per tile that the main line travels max range of 6 tiles # Explain why it's good for the game billions must foam new and exciting way to block xenos from retreating can also be used by engineers to patch breaches more custom flamer fuel variety # Testing Photographs and Procedure https://www.youtube.com/watch?v=2x8rWPyxzpA https://github.com/cmss13-devs/cmss13/assets/140007537/e96a50c5-e5a6-45bd-bd12-bab3d0085189 # Changelog :cl: add: adds new flamer fuel type, stabilized metallic foam add: Incinerator tanks can now hold stabilized metallic foam /:cl: --------- Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- .../objects/effects/effect_system/foam.dm | 3 +- code/modules/projectiles/gun_attachables.dm | 4 ++ .../modules/projectiles/guns/flamer/flamer.dm | 58 ++++++++++++++++++- code/modules/projectiles/magazines/flamer.dm | 2 +- .../reagents/chemistry_reactions/other.dm | 6 ++ .../reagents/chemistry_reagents/other.dm | 9 +++ 6 files changed, 79 insertions(+), 3 deletions(-) diff --git a/code/game/objects/effects/effect_system/foam.dm b/code/game/objects/effects/effect_system/foam.dm index 525cb8c731a9..7a06fa50619c 100644 --- a/code/game/objects/effects/effect_system/foam.dm +++ b/code/game/objects/effects/effect_system/foam.dm @@ -20,6 +20,7 @@ var/expand = 1 animate_movement = 0 var/metal = FOAM_NOT_METAL + var/time_to_solidify = 4 SECONDS /obj/effect/particle_effect/foam/Initialize(mapload, ismetal=0) @@ -28,7 +29,7 @@ metal = ismetal playsound(src, 'sound/effects/bubbles2.ogg', 25, 1, 5) addtimer(CALLBACK(src, PROC_REF(foam_react)), 3 + metal*3) - addtimer(CALLBACK(src, PROC_REF(foam_metal_final_react)), 40) + addtimer(CALLBACK(src, PROC_REF(foam_metal_final_react)), time_to_solidify) /obj/effect/particle_effect/foam/proc/foam_react() process() diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 943cddd27ff5..a2801821349c 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -3221,6 +3221,10 @@ Defined in conflicts.dm of the #defines folder. to_chat(user, SPAN_WARNING("\The [gun] doesn't have enough fuel to launch a projectile!")) return + if(istype(flamer_reagent, /datum/reagent/foaming_agent/stabilized)) + to_chat(user, SPAN_WARNING("This chemical will clog the nozzle!")) + return + gun.last_fired = world.time gun.current_mag.reagents.remove_reagent(flamer_reagent.id, FLAME_REAGENT_USE_AMOUNT * fuel_per_projectile) diff --git a/code/modules/projectiles/guns/flamer/flamer.dm b/code/modules/projectiles/guns/flamer/flamer.dm index 5daef0bdff74..64499a71bb12 100644 --- a/code/modules/projectiles/guns/flamer/flamer.dm +++ b/code/modules/projectiles/guns/flamer/flamer.dm @@ -136,7 +136,10 @@ click_empty(user) else user.track_shot(initial(name)) - unleash_flame(target, user) + if(current_mag.reagents.has_reagent("stablefoam")) + unleash_foam(target, user) + else + unleash_flame(target, user) return AUTOFIRE_CONTINUE return NONE @@ -226,6 +229,59 @@ new /obj/flamer_fire(to_fire, create_cause_data(initial(name), user), R, max_range, current_mag.reagents, flameshape, target, CALLBACK(src, PROC_REF(show_percentage), user), fuel_pressure, fire_type) +/obj/item/weapon/gun/flamer/proc/unleash_foam(atom/target, mob/living/user) + last_fired = world.time + if(!current_mag || !current_mag.reagents || !current_mag.reagents.reagent_list.len) + return + + var/source_turf = get_turf(user) + var/foam_range = 6 // the max range the foam will travel + var/distance = 0 // the distance traveled + var/use_multiplier = 3 // if you want to increase the ammount of foam drained from the tank + var/datum/reagent/chemical = current_mag.reagents.reagent_list[1] + + var/turf/turfs[] = get_line(user, target, FALSE) + var/turf/first_turf = turfs[1] + var/ammount_required = (min(turfs.len, foam_range) * use_multiplier) // the ammount of units that this click requires + for(var/turf/turf in turfs) + + if(chemical.volume < ammount_required) + foam_range = round(chemical.volume / use_multiplier) + + if(distance >= foam_range) + break + + if(turf.density) + break + else + var/obj/effect/particle_effect/foam/checker = new() + var/atom/blocked = LinkBlocked(checker, source_turf, turf) + if(blocked) + break + + if(turf == first_turf) // this is so the first foam tile doesn't expand and touch the user + var/datum/effect_system/foam_spread/foam = new() + foam.set_up(0.5, turf, metal_foam = FOAM_METAL_TYPE_IRON) + foam.start() + else + var/datum/effect_system/foam_spread/foam = new() + foam.set_up(1, turf, metal_foam = FOAM_METAL_TYPE_IRON) + foam.start() + sleep(2) + + distance++ + + var/ammount_used = distance * use_multiplier // the actual ammount of units that we used + + chemical.volume = max(chemical.volume - ammount_used, 0) + + current_mag.reagents.total_volume = chemical.volume // this is needed for show_percentage to work + + if(chemical.volume < use_multiplier) // there aren't enough units left for a single tile of foam, empty the tank + current_mag.reagents.clear_reagents() + + show_percentage(user) + /obj/item/weapon/gun/flamer/proc/show_percentage(mob/living/user) if(current_mag) to_chat(user, SPAN_WARNING("The gauge reads: [round(current_mag.get_ammo_percent())]% fuel remains!")) diff --git a/code/modules/projectiles/magazines/flamer.dm b/code/modules/projectiles/magazines/flamer.dm index 7fba325177c6..dfd9eda20d8a 100644 --- a/code/modules/projectiles/magazines/flamer.dm +++ b/code/modules/projectiles/magazines/flamer.dm @@ -90,7 +90,7 @@ to_chat(user, SPAN_WARNING("You can't mix fuel mixtures!")) return - if(!to_add.intensityfire) + if(!to_add.intensityfire && to_add.id != "stablefoam") to_chat(user, SPAN_WARNING("This chemical is not potent enough to be used in a flamethrower!")) return diff --git a/code/modules/reagents/chemistry_reactions/other.dm b/code/modules/reagents/chemistry_reactions/other.dm index 24a8563e0848..28250aa38803 100644 --- a/code/modules/reagents/chemistry_reactions/other.dm +++ b/code/modules/reagents/chemistry_reactions/other.dm @@ -360,6 +360,12 @@ required_reagents = list("fluorine" = 2, "carbon" = 2, "sulphuric acid" = 1) result_amount = 5 +/datum/chemical_reaction/stablefoam + name = "Stabilized metallic foam" + id = "stablefoam" + result = "stablefoam" + required_reagents = list("fluorosurfactant" = 1, "iron" = 1, "sulphuric acid" = 1) + result_amount = 1 /datum/chemical_reaction/foam name = "Foam" diff --git a/code/modules/reagents/chemistry_reagents/other.dm b/code/modules/reagents/chemistry_reagents/other.dm index 786a58857830..2c441fb7059c 100644 --- a/code/modules/reagents/chemistry_reagents/other.dm +++ b/code/modules/reagents/chemistry_reagents/other.dm @@ -613,6 +613,15 @@ color = "#664B63" // rgb: 102, 75, 99 chemclass = CHEM_CLASS_UNCOMMON +/datum/reagent/foaming_agent/stabilized + name = "Stabilized metallic foam" + id = "stablefoam" + description = "Stabilized metallic foam that solidifies when exposed to an open flame" + reagent_state = LIQUID + color = "#d4b8d1" + chemclass = CHEM_CLASS_UNCOMMON + properties = list(PROPERTY_TOXIC = 8) + /datum/reagent/nicotine name = "Nicotine" id = "nicotine" From 62671799ac580dde6a0a2c794079e71534a6fd53 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Fri, 19 Apr 2024 03:01:59 +0100 Subject: [PATCH 151/431] Automatic changelog for PR #6062 [ci skip] --- html/changelogs/AutoChangeLog-pr-6062.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6062.yml diff --git a/html/changelogs/AutoChangeLog-pr-6062.yml b/html/changelogs/AutoChangeLog-pr-6062.yml new file mode 100644 index 000000000000..e0d9179d29f0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6062.yml @@ -0,0 +1,5 @@ +author: "iloveloopers" +delete-after: True +changes: + - rscadd: "adds new flamer fuel type, stabilized metallic foam" + - rscadd: "Incinerator tanks can now hold stabilized metallic foam" \ No newline at end of file From 4ae1fc89b8cc0fcf7709b54f0e4c51d891592220 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Thu, 18 Apr 2024 21:57:27 -0400 Subject: [PATCH 152/431] brightens the burncolor of the high-combustion napalm fuel (#6147) # About the pull request it says on the title # Explain why it's good for the game its a little too hard to see currently # Testing Photographs and Procedure ![new color](https://github.com/cmss13-devs/cmss13/assets/140007537/6faa3d84-24e1-4557-8ede-3aed85a31584) ![old color](https://github.com/cmss13-devs/cmss13/assets/140007537/23122d17-5b23-4058-8219-93399774ccf9)
# Changelog :cl: balance: High-Combustion napalm fuel is now easier to see on the ground /:cl: --- code/modules/reagents/chemistry_reagents/other.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry_reagents/other.dm b/code/modules/reagents/chemistry_reagents/other.dm index 2c441fb7059c..09b835b1482d 100644 --- a/code/modules/reagents/chemistry_reagents/other.dm +++ b/code/modules/reagents/chemistry_reagents/other.dm @@ -719,9 +719,9 @@ id = "highdamagenapalm" description = "A custom napalm mix, higher damage but not as sticky" reagent_state = LIQUID - color = "#742424" + color = "#c51c1c" chemfiresupp = FALSE - burncolor = "#742424" + burncolor = "#c51c1c" burn_sprite = "dynamic" properties = list( PROPERTY_INTENSITY = BURN_LEVEL_TIER_8, From 4f1e9f588aefcd050c3dcb684c3f6186ced3115b Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Fri, 19 Apr 2024 03:09:10 +0100 Subject: [PATCH 153/431] Automatic changelog for PR #6147 [ci skip] --- html/changelogs/AutoChangeLog-pr-6147.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6147.yml diff --git a/html/changelogs/AutoChangeLog-pr-6147.yml b/html/changelogs/AutoChangeLog-pr-6147.yml new file mode 100644 index 000000000000..482deca82b77 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6147.yml @@ -0,0 +1,4 @@ +author: "iloveloopers" +delete-after: True +changes: + - balance: "High-Combustion napalm fuel is now easier to see on the ground" \ No newline at end of file From 45b9090737c5847bac4176960cbb0275f3d6a746 Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Sat, 20 Apr 2024 02:05:20 +0200 Subject: [PATCH 154/431] Increase damage of standard revolver ammo from 55 to 72 (#6123) # About the pull request After some testing from myself on a private server and gathering a lot of feedback from a post i made on the forum. https://forum.cm-ss13.com/t/m44-rework-making-this-handgun-potent-and-unique-already-unique-in-uscm-weapon/6917 i think M44 is very cool buy lack damage output as an handgun if comparison to all the other handguns. why 72 ? because it allow to kill a drone with a full mag and a runner with three bullet (if you manage to hit them) it balance itself with the low mag capacity and the lower firing speed of it. # Explain why it's good for the game because the M44 is cool to use but i also want it to make it a decent pick if you want to use an handgun. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: balance: Increase damage of standard revolver ammo from 55 to 72. balance: Marksman ammo remains 55 damage. /:cl: --------- Co-authored-by: Julien --- code/datums/ammo/bullet/revolver.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/datums/ammo/bullet/revolver.dm b/code/datums/ammo/bullet/revolver.dm index 0688e615378e..def0a8e31952 100644 --- a/code/datums/ammo/bullet/revolver.dm +++ b/code/datums/ammo/bullet/revolver.dm @@ -7,14 +7,13 @@ /datum/ammo/bullet/revolver name = "revolver bullet" headshot_state = HEADSHOT_OVERLAY_MEDIUM - - damage = 55 + damage = 72 penetration = ARMOR_PENETRATION_TIER_1 accuracy = HIT_ACCURACY_TIER_1 /datum/ammo/bullet/revolver/marksman name = "marksman revolver bullet" - + damage = 55 shrapnel_chance = 0 damage_falloff = 0 accurate_range = 12 From e14d1534c3d41e629477d9ec0593fd9867b81a14 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 20 Apr 2024 01:09:56 +0100 Subject: [PATCH 155/431] Automatic changelog for PR #6123 [ci skip] --- html/changelogs/AutoChangeLog-pr-6123.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6123.yml diff --git a/html/changelogs/AutoChangeLog-pr-6123.yml b/html/changelogs/AutoChangeLog-pr-6123.yml new file mode 100644 index 000000000000..affc6b6d391b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6123.yml @@ -0,0 +1,5 @@ +author: "Huffie56" +delete-after: True +changes: + - balance: "Increase damage of standard revolver ammo from 55 to 72." + - balance: "Marksman ammo remains 55 damage." \ No newline at end of file From d57d2fba6c9146f9b421ca0fbdd201fe55984396 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 20 Apr 2024 01:09:09 +0000 Subject: [PATCH 156/431] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-6062.yml | 5 ----- html/changelogs/AutoChangeLog-pr-6123.yml | 5 ----- html/changelogs/AutoChangeLog-pr-6147.yml | 4 ---- html/changelogs/archive/2024-04.yml | 8 ++++++++ 4 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-6062.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6123.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6147.yml diff --git a/html/changelogs/AutoChangeLog-pr-6062.yml b/html/changelogs/AutoChangeLog-pr-6062.yml deleted file mode 100644 index e0d9179d29f0..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6062.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "iloveloopers" -delete-after: True -changes: - - rscadd: "adds new flamer fuel type, stabilized metallic foam" - - rscadd: "Incinerator tanks can now hold stabilized metallic foam" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6123.yml b/html/changelogs/AutoChangeLog-pr-6123.yml deleted file mode 100644 index affc6b6d391b..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6123.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Huffie56" -delete-after: True -changes: - - balance: "Increase damage of standard revolver ammo from 55 to 72." - - balance: "Marksman ammo remains 55 damage." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6147.yml b/html/changelogs/AutoChangeLog-pr-6147.yml deleted file mode 100644 index 482deca82b77..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6147.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "iloveloopers" -delete-after: True -changes: - - balance: "High-Combustion napalm fuel is now easier to see on the ground" \ No newline at end of file diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml index 3fc9edf51cfb..f9a6421b27cf 100644 --- a/html/changelogs/archive/2024-04.yml +++ b/html/changelogs/archive/2024-04.yml @@ -270,3 +270,11 @@ - rscadd: Allows M81 launcher to utilize less lethal baton round - qol: removes taser from some security synthetics belts, replaced with a more synthetic friendly version +2024-04-20: + Huffie56: + - balance: Increase damage of standard revolver ammo from 55 to 72. + - balance: Marksman ammo remains 55 damage. + iloveloopers: + - rscadd: adds new flamer fuel type, stabilized metallic foam + - rscadd: Incinerator tanks can now hold stabilized metallic foam + - balance: High-Combustion napalm fuel is now easier to see on the ground From c21848c576011fa09112a96a3c56cbfa439ea424 Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Sat, 20 Apr 2024 06:07:37 +0300 Subject: [PATCH 157/431] Fixes mach 3 boilers (#6162) # About the pull request # Explain why it's good for the game Bug bad Also boilers faster than defenders bad # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: Fixed a bug which made boilers go way faster than they should /:cl: --- .../mob/living/carbon/xenomorph/abilities/general_abilities.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm index 0e897335cf10..f62bb9e17421 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm @@ -295,7 +295,6 @@ /datum/action/xeno_action/onclick/toggle_long_range/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner - xeno.speed_modifier = initial(xeno.speed_modifier)// Reset the speed modifier should you be disrupted while zooming or whatnot if(xeno.observed_xeno) return From 55bdf27c9569dce60a87029bdef6a9705b96a36b Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 20 Apr 2024 04:12:10 +0100 Subject: [PATCH 158/431] Automatic changelog for PR #6162 [ci skip] --- html/changelogs/AutoChangeLog-pr-6162.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6162.yml diff --git a/html/changelogs/AutoChangeLog-pr-6162.yml b/html/changelogs/AutoChangeLog-pr-6162.yml new file mode 100644 index 000000000000..ed0b260f7fd8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6162.yml @@ -0,0 +1,4 @@ +author: "Git-Nivrak" +delete-after: True +changes: + - bugfix: "Fixed a bug which made boilers go way faster than they should" \ No newline at end of file From 1c72aa289f165f33da8173c10ce57327614cb0e5 Mon Sep 17 00:00:00 2001 From: 567Turtle <91508746+567Turtle@users.noreply.github.com> Date: Fri, 19 Apr 2024 22:23:53 -0500 Subject: [PATCH 159/431] Allow SOs to perform basic surgeries (#6136) # About the pull request gives so surgery 1 # Explain why it's good for the game \> give SO surgery tools \> dont give them the capability to use them It was probably an over sight but despite having the tools to do surgery SOs don't know how. They aren't able to properly fulfill their role as medics in a time of crisis.
Screenshots & Videos i didnt test this at all lol, probably works
# Changelog :cl: balance: SO can now do basic surgeries /:cl: --- code/datums/skills/uscm.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm index 8a6d2fd2c8c2..1e0dedf5dd05 100644 --- a/code/datums/skills/uscm.dm +++ b/code/datums/skills/uscm.dm @@ -292,6 +292,7 @@ COMMAND STAFF SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, SKILL_POLICE = SKILL_POLICE_FLASH, SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, From 76ac6e88e78da5df44d40ddb3ac9960954ac2963 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 20 Apr 2024 04:30:47 +0100 Subject: [PATCH 160/431] Automatic changelog for PR #6136 [ci skip] --- html/changelogs/AutoChangeLog-pr-6136.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6136.yml diff --git a/html/changelogs/AutoChangeLog-pr-6136.yml b/html/changelogs/AutoChangeLog-pr-6136.yml new file mode 100644 index 000000000000..6b41106b5d9a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6136.yml @@ -0,0 +1,4 @@ +author: "567Turtle" +delete-after: True +changes: + - balance: " SO can now do basic surgeries" \ No newline at end of file From 6d7aca67a8f8831553974e9809a1cb26827fe504 Mon Sep 17 00:00:00 2001 From: ItsVyzo <46250991+ItsVyzo@users.noreply.github.com> Date: Fri, 19 Apr 2024 21:04:10 -0700 Subject: [PATCH 161/431] Command Tablets for Provost Marshals (#6153) # About the pull request Adds Command Tablets for Provost Marshals+ # Explain why it's good for the game Generals already get Command Tablets but Provost Marshals do not. Also Provost Marshals are required by Marine Law to announce their Battlefield Executions, the only piece of Marine Law that Marshals have to strictly follow. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: LTNTS add: Adds Command Tablets to Provost Marshal+ /:cl: --- code/modules/gear_presets/uscm_event.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm index dc6eb34161ee..3ab1dbc99b4e 100644 --- a/code/modules/gear_presets/uscm_event.dm +++ b/code/modules/gear_presets/uscm_event.dm @@ -375,6 +375,7 @@ new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/marshal(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/cotablet(new_human.back), WEAR_IN_BACK) /datum/equipment_preset/uscm_event/provost/marshal/sector name = "Provost Sector Marshal (MO7)" From b896706c2b539c20d129e23426e48b9d48914180 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 20 Apr 2024 05:08:41 +0100 Subject: [PATCH 162/431] Automatic changelog for PR #6153 [ci skip] --- html/changelogs/AutoChangeLog-pr-6153.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6153.yml diff --git a/html/changelogs/AutoChangeLog-pr-6153.yml b/html/changelogs/AutoChangeLog-pr-6153.yml new file mode 100644 index 000000000000..36dd94c47bdd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6153.yml @@ -0,0 +1,4 @@ +author: "LTNTS" +delete-after: True +changes: + - rscadd: "Adds Command Tablets to Provost Marshal+" \ No newline at end of file From 9243cb66b7a73249bc85afa38346e97bf2925f2d Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Sat, 20 Apr 2024 00:21:33 -0400 Subject: [PATCH 163/431] Toggle ghost now leaves the users mob visible (#6065) # About the pull request Fixes #5894 # Explain why it's good for the game bug fix # Changelog :cl: fix: toggling ghost vision now keeps the user's mob visible. /:cl: --------- Co-authored-by: DOOM --- code/__DEFINES/__game.dm | 2 ++ code/modules/mob/dead/observer/observer.dm | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm index 6a9e9f1d4623..6617c5aafcee 100644 --- a/code/__DEFINES/__game.dm +++ b/code/__DEFINES/__game.dm @@ -78,6 +78,8 @@ #define SEE_INVISIBLE_LEVEL_TWO 45 //Used by some other stuff in code. It's really poorly organized. #define INVISIBILITY_LEVEL_TWO 45 //Used by some other stuff in code. It's really poorly organized. +#define HIDE_INVISIBLE_OBSERVER 59 // define for when we want to hide all observer mobs. + #define INVISIBILITY_OBSERVER 60 #define SEE_INVISIBLE_OBSERVER 60 diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 4f9493cfdf49..d93aeef63143 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -37,6 +37,7 @@ /// If the observer is an admin, are they excluded from the xeno queue? var/admin_larva_protection = TRUE // Enabled by default var/ghostvision = TRUE + var/self_visibility = TRUE var/can_reenter_corpse var/started_as_observer //This variable is set to 1 when you enter the game as an observer. //If you died in the game and are a ghost - this will remain as null. @@ -71,10 +72,10 @@ set desc = "Toggles your ability to see things only ghosts can see, like other ghosts" set category = "Ghost.Settings" ghostvision = !ghostvision - if(hud_used) - var/atom/movable/screen/plane_master/lighting/lighting = hud_used.plane_masters["[GHOST_PLANE]"] - if (lighting) - lighting.alpha = ghostvision? 255 : 0 + if(ghostvision) + see_invisible = INVISIBILITY_OBSERVER + else + see_invisible = HIDE_INVISIBLE_OBSERVER to_chat(usr, SPAN_NOTICE("You [(ghostvision?"now":"no longer")] have ghost vision.")) /mob/dead/observer/Initialize(mapload, mob/body) @@ -845,11 +846,12 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/verb/toggle_self_visibility() set name = "Toggle Self Visibility" set category = "Ghost.Settings" - - if (alpha) - alpha = 0 - else + self_visibility = !self_visibility + if (self_visibility) alpha = initial(alpha) + else + alpha = 0 + to_chat(usr, SPAN_NOTICE("You are now [(self_visibility?"visible":"invisible")].")) /mob/dead/observer/verb/view_manifest() set name = "View Crew Manifest" From 51d31a70797eeb0ddf47a242f54568ef66d34bd6 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 20 Apr 2024 05:26:10 +0100 Subject: [PATCH 164/431] Automatic changelog for PR #6065 [ci skip] --- html/changelogs/AutoChangeLog-pr-6065.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6065.yml diff --git a/html/changelogs/AutoChangeLog-pr-6065.yml b/html/changelogs/AutoChangeLog-pr-6065.yml new file mode 100644 index 000000000000..9e763fb402d4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6065.yml @@ -0,0 +1,4 @@ +author: "vero5123" +delete-after: True +changes: + - bugfix: "toggling ghost vision now keeps the user's mob visible." \ No newline at end of file From c1b8470ff72a95cbb27699155017bbb1b834180d Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Sat, 20 Apr 2024 06:07:09 +0100 Subject: [PATCH 165/431] Project ARES: Orbital Cannon loading log (#6157) # About the pull request Adds an ARES log for chambering the OB Cannon, and if it has been misfueled or not. # Explain why it's good for the game Logs who fires it, makes sense to log who loaded it. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: add: Added an ARES Log for chambering the OB Cannon. /:cl: --------- Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/game/machinery/ARES/ARES_procs.dm | 4 ++-- code/modules/cm_marines/orbital_cannon.dm | 3 +++ code/modules/cm_marines/overwatch.dm | 2 +- tgui/packages/tgui/interfaces/AresAdmin.js | 2 +- tgui/packages/tgui/interfaces/AresInterface.jsx | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm index f18957a22d82..05f110ec1a0c 100644 --- a/code/game/machinery/ARES/ARES_procs.dm +++ b/code/game/machinery/ARES/ARES_procs.dm @@ -165,11 +165,11 @@ GLOBAL_LIST_INIT(maintenance_categories, list( var/datum/ares_datacore/datacore = GLOB.ares_datacore datacore.records_bioscan.Add(new /datum/ares_record/bioscan(title, input)) -/proc/log_ares_bombardment(user_name, ob_name, coordinates) +/proc/log_ares_bombardment(user_name, ob_name, message) if(!ares_can_log()) return FALSE var/datum/ares_datacore/datacore = GLOB.ares_datacore - datacore.records_bombardment.Add(new /datum/ares_record/bombardment(ob_name, "Bombardment fired at [coordinates].", user_name)) + datacore.records_bombardment.Add(new /datum/ares_record/bombardment(ob_name, message, user_name)) /proc/log_ares_announcement(title, message) if(!ares_can_log()) diff --git a/code/modules/cm_marines/orbital_cannon.dm b/code/modules/cm_marines/orbital_cannon.dm index 23bce06fdc1a..ce69115cee48 100644 --- a/code/modules/cm_marines/orbital_cannon.dm +++ b/code/modules/cm_marines/orbital_cannon.dm @@ -184,9 +184,12 @@ GLOBAL_LIST(ob_type_fuel_requirements) chambered_tray = TRUE var/misfuel = get_misfuel_amount() var/message = "[key_name(user)] chambered the Orbital Bombardment cannon." + var/ares_message = "Shell chambered." if(misfuel) message += " It is misfueled by [misfuel] units!" + ares_message += " Fuel imbalance detected!" message_admins(message, x, y, z) + log_ares_bombardment(user, lowertext(tray.warhead.name), ares_message) update_icon() diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm index 489a7e528832..70b2b82d8c86 100644 --- a/code/modules/cm_marines/overwatch.dm +++ b/code/modules/cm_marines/overwatch.dm @@ -800,7 +800,7 @@ notify_ghosts(header = "Bombardment Inbound", message = "\A [ob_name] targeting [get_area(T)] has been fired!", source = T, alert_overlay = warhead_appearance, extra_large = TRUE) /// Project ARES interface log. - log_ares_bombardment(user.name, ob_name, "X[x_bomb], Y[y_bomb] in [get_area(T)]") + log_ares_bombardment(user.name, ob_name, "Bombardment fired at X[x_bomb], Y[y_bomb] in [get_area(T)]") busy = FALSE if(istype(T)) diff --git a/tgui/packages/tgui/interfaces/AresAdmin.js b/tgui/packages/tgui/interfaces/AresAdmin.js index bf9fdfacc1aa..dd51b5a1e007 100644 --- a/tgui/packages/tgui/interfaces/AresAdmin.js +++ b/tgui/packages/tgui/interfaces/AresAdmin.js @@ -689,7 +689,7 @@ const BombardmentLogs = (props, context) => { User - Coordinates + Details )} diff --git a/tgui/packages/tgui/interfaces/AresInterface.jsx b/tgui/packages/tgui/interfaces/AresInterface.jsx index bf7ded50d8ab..be9106e31c25 100644 --- a/tgui/packages/tgui/interfaces/AresInterface.jsx +++ b/tgui/packages/tgui/interfaces/AresInterface.jsx @@ -652,7 +652,7 @@ const BombardmentLogs = (props) => { User - Coordinates + Details )} From 4cba22644e2d8b3f307cafe8606e3cf86e1b2037 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 20 Apr 2024 06:11:45 +0100 Subject: [PATCH 166/431] Automatic changelog for PR #6157 [ci skip] --- html/changelogs/AutoChangeLog-pr-6157.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6157.yml diff --git a/html/changelogs/AutoChangeLog-pr-6157.yml b/html/changelogs/AutoChangeLog-pr-6157.yml new file mode 100644 index 000000000000..bf60e6ac34ce --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6157.yml @@ -0,0 +1,4 @@ +author: "realforest2001" +delete-after: True +changes: + - rscadd: "Added an ARES Log for chambering the OB Cannon." \ No newline at end of file From c517ea7c5b4a49eff1bd96dfdf3be1ff583618ed Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sat, 20 Apr 2024 01:19:49 -0400 Subject: [PATCH 167/431] white phosphorus smoke can no longer override stronger flames (#6137) # About the pull request white phosphorus smoke will no longer forcefully set the reagent of the mob # Explain why it's good for the game when hit by a WP rocket, a mob is supposed to be set with the blueflame reagent but sometimes the phosphorus smoke can override it just as you leave the fire and the mob's fire reagent ends up being normal UT napalm, which is signficantly weaker than blueflame. # Testing Photographs and Procedure yes I tested it # Changelog :cl: fix: White phosphorus will no longer forcefully set a mob's fire_reagent to be UT napthal /:cl: --- code/game/objects/effects/effect_system/smoke.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index b79e50b453cc..6e3869f563a4 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -240,9 +240,9 @@ if(isyautja(M) || isxeno(M)) burn_damage *= xeno_yautja_reduction + var/reagent = new /datum/reagent/napalm/ut() M.burn_skin(burn_damage) - M.adjust_fire_stacks(applied_fire_stacks) - M.fire_reagent = new /datum/reagent/napalm/ut() + M.adjust_fire_stacks(applied_fire_stacks, reagent) M.IgniteMob() M.updatehealth() From df8d8b9724e3d804eb1e2447d846970502ef0c38 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 20 Apr 2024 06:24:33 +0100 Subject: [PATCH 168/431] Automatic changelog for PR #6137 [ci skip] --- html/changelogs/AutoChangeLog-pr-6137.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6137.yml diff --git a/html/changelogs/AutoChangeLog-pr-6137.yml b/html/changelogs/AutoChangeLog-pr-6137.yml new file mode 100644 index 000000000000..064ceaa9a356 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6137.yml @@ -0,0 +1,4 @@ +author: "iloveloopers" +delete-after: True +changes: + - bugfix: "White phosphorus will no longer forcefully set a mob's fire_reagent to be UT napthal" \ No newline at end of file From 8ae8850adc366bd808dd8e2c0b49ecb8295bb486 Mon Sep 17 00:00:00 2001 From: Ben <91219575+Ben10083@users.noreply.github.com> Date: Sat, 20 Apr 2024 01:56:52 -0400 Subject: [PATCH 169/431] Synthetics X Gibber Fanfiction (Reworks how Synthetics and the meat gibber interact) (#6145) # About the pull request - Synthetic is delimbed and spat out of gibber instead of a true gib, making them not die in the process - Synthetics now spawn their proper meat as desired # Explain why it's good for the game ![image](https://github.com/cmss13-devs/cmss13/assets/91219575/19a5e852-b968-4a49-8784-916b319ed0cb) Desired by lore contributor, makes it so synthetic snowflake situation where they are shoved in gibber is handled properly. # Testing Photographs and Procedure
Screenshots & Videos https://github.com/cmss13-devs/cmss13/assets/91219575/96d92eaf-a60e-45f3-ac80-6d0275e82428
# Changelog :cl: add: Synthetics when shoved into meat gibber will not be delimbed and spawn their own flesh, but would not die (they are spat out as a torso and head) admin: Adjustment to meatgibber code to notify admins when a synthetic is being shoved into gibber /:cl: --------- Co-authored-by: Ben10083 Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/game/machinery/kitchen/gibber.dm | 94 ++++++++++++++++--- .../reagent_containers/food/snacks/meat.dm | 3 +- code/modules/cm_tech/droppod/lz_effect.dm | 1 + code/modules/mob/mob_helpers.dm | 2 +- 4 files changed, 83 insertions(+), 17 deletions(-) diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index 3fa96ca0bc3a..4b68b397116e 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -105,15 +105,28 @@ to_chat(user, SPAN_WARNING("You need a better grip to do that!")) return - if(victim.abiotic(1)) + if(victim.abiotic(TRUE)) to_chat(user, SPAN_WARNING("Subject may not have abiotic items on.")) return user.visible_message(SPAN_DANGER("[user] starts to put [victim] into the gibber!")) add_fingerprint(user) + ///If synth is getting gibbed, we will 'soft gib' them, but this is still pretty LRP so let admin know. + if(issynth(victim) && ishuman_strict(user) && !occupant) + var/turf/turf_ref = get_turf(user) + var/area/area = get_area(user) + message_admins("ALERT: [user] ([user.key]) is trying to shove [victim] in a gibber! (They are a synth, so this will delimb them) ([victim.key]) in [area.name] [ADMIN_JMP(turf_ref)]") + log_attack("[key_name(user)] tried to delimb [victim] using a gibber ([victim.key]) in [area.name]") + to_chat(user, SPAN_DANGER("What are you doing...")) + if(do_after(user, 30 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE && grabbed && grabbed.grabbed_thing && !occupant)) + user.visible_message(SPAN_DANGER("[user] stuffs [victim] into the gibber!")) + victim.forceMove(src) + occupant = victim + update_icon() + ///If someone's being LRP and doing funny chef shit, this lets admins know. This *shouldn't* flag preds, though. - if(ishuman(victim) && ishuman_strict(user) && !occupant) + else if(ishuman(victim) && ishuman_strict(user) && !occupant) var/turf/turf_ref = get_turf(user) var/area/area = get_area(user) message_admins("ALERT: [user] ([user.key]) is trying to gib [victim] ([victim.key]) in [area.name] [ADMIN_JMP(turf_ref)]") @@ -142,18 +155,23 @@ add_fingerprint(usr) return -/obj/structure/machinery/gibber/proc/go_out() +/obj/structure/machinery/gibber/proc/go_out(launch = FALSE) if (!occupant) - return + return FALSE for(var/obj/O in src) O.forceMove(loc) if (occupant.client) occupant.client.eye = occupant.client.mob occupant.client.perspective = MOB_PERSPECTIVE occupant.forceMove(loc) + if(launch) + // yeet them out of the gibber + visible_message(SPAN_DANGER("[occupant] suddenly is launched out of the [src]!")) + var/turf/Tx = locate(x - 3, y, z) + occupant.throw_atom(Tx, 3, SPEED_FAST, src, TRUE) occupant = null update_icon() - return + return TRUE /obj/structure/machinery/gibber/proc/startgibbing(mob/user as mob) @@ -162,13 +180,18 @@ if(!occupant) visible_message(SPAN_DANGER("You hear a loud metallic grinding sound.")) return + var/synthetic = issynth(occupant) use_power(1000) - visible_message(SPAN_DANGER("You hear a loud squelchy grinding sound.")) - operating = 1 + if(synthetic) + visible_message(SPAN_BOLDWARNING("[src] begins to emitt sparks out the top as a banging noise can be heard!"), SPAN_BOLDWARNING("You hear a myriad of loud bangs!")) + else + visible_message(SPAN_DANGER("You hear a loud squelchy grinding sound.")) + operating = TRUE update_icon() var/totalslabs = 2 + var/obj/item/reagent_container/food/snacks/meat/meat_template = /obj/item/reagent_container/food/snacks/meat/monkey if(istype(occupant, /mob/living/carbon/xenomorph)) var/mob/living/carbon/xenomorph/X = occupant @@ -186,6 +209,35 @@ meat_template = /obj/item/reagent_container/food/snacks/meat/human totalslabs = 3 + // Synths only get delimbed from this. 1 meat per limb + if(synthetic) + meat_template = /obj/item/reagent_container/food/snacks/meat/synthmeat/synthflesh + totalslabs = 0 + var/mob/living/carbon/human/victim = occupant + + // Remove all limbs to allow synth to park closer at the supermarket + var/obj/limb/limb + + if(victim.has_limb("l_leg")) + limb = victim.get_limb("r_leg") + totalslabs += 1 + limb.droplimb(FALSE, TRUE, "gibber") + + if(victim.has_limb("l_leg")) + limb = victim.get_limb("l_leg") + totalslabs += 1 + limb.droplimb(FALSE, TRUE, "gibber") + + if(victim.has_limb("r_arm")) + limb = victim.get_limb("r_arm") + totalslabs += 1 + limb.droplimb(FALSE, TRUE, "gibber") + + if(victim.has_limb("l_arm")) + limb = victim.get_limb("l_arm") + totalslabs += 1 + limb.droplimb(FALSE, TRUE, "gibber") + var/obj/item/reagent_container/food/snacks/meat/allmeat[totalslabs] for(var/i in 1 to totalslabs) var/obj/item/reagent_container/food/snacks/meat/newmeat @@ -194,26 +246,38 @@ newmeat.name = newmeat.made_from_player + newmeat.name allmeat[i] = newmeat - if(src.occupant.client) // Gibbed a cow with a client in it? log that shit - src.occupant.attack_log += "\[[time_stamp()]\] Was gibbed by [key_name(user)]" + // Synths wont die to this (on it's own at least), dont log as a gib + if(synthetic) + if(occupant.client) // Log still + occupant.attack_log += "\[[time_stamp()]\] Was delimbed by [key_name(user)]" + user.attack_log += "\[[time_stamp()]\] delimbed [key_name(occupant)]" + msg_admin_attack("[key_name(user)] delimbed [key_name(occupant)] with a gibber in [user.loc.name]([user.x], [user.y], [user.z]).", user.x, user.y, user.z) + continue + + if(occupant.client) // Gibbed a cow with a client in it? log that shit + occupant.attack_log += "\[[time_stamp()]\] Was gibbed by [key_name(user)]" user.attack_log += "\[[time_stamp()]\] Gibbed [key_name(occupant)]" msg_admin_attack("[key_name(user)] gibbed [key_name(occupant)] in [user.loc.name] ([user.x], [user.y], [user.z]).", user.x, user.y, user.z) - src.occupant.death(create_cause_data("gibber", user), TRUE) - src.occupant.ghostize() + occupant.death(create_cause_data("gibber", user), TRUE) + occupant.ghostize() - QDEL_NULL(occupant) + if(synthetic) + to_chat(occupant, SPAN_HIGHDANGER("You can detect your limbs being ripped off your body, but it begins to malfunction as it reaches your torso!")) + addtimer(CALLBACK(src, PROC_REF(create_gibs), totalslabs, allmeat), gibtime) + addtimer(CALLBACK(src, PROC_REF(go_out), TRUE), gibtime) + return - addtimer(CALLBACK(src, PROC_REF(create_gibs), totalslabs, allmeat), gibtime) + QDEL_NULL(occupant) /obj/structure/machinery/gibber/proc/create_gibs(totalslabs, list/obj/item/reagent_container/food/snacks/allmeat) playsound(loc, 'sound/effects/splat.ogg', 25, 1) operating = FALSE + var/turf/Tx = locate(x - 1, y, z) for (var/i in 1 to totalslabs) var/obj/item/meatslab = allmeat[i] - var/turf/Tx = locate(x - i, y, z) meatslab.forceMove(loc) - meatslab.throw_atom(Tx, i, SPEED_FAST, src) + meatslab.throw_atom(Tx, 1, SPEED_FAST, src) if (!Tx.density) if(istype(meatslab, /obj/item/reagent_container/food/snacks/meat/xenomeat)) new /obj/effect/decal/cleanable/blood/gibs/xeno(Tx) 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 f68f488f268d..f541986112e5 100644 --- a/code/game/objects/items/reagent_containers/food/snacks/meat.dm +++ b/code/game/objects/items/reagent_containers/food/snacks/meat.dm @@ -28,7 +28,8 @@ name = "synthetic meat" desc = "A synthetic slab of flesh." -/obj/item/reagent_container/food/snacks/meat/synthmeat/synthflesh //meat made from synthetics. Slightly toxic +/// Meat made from synthetics. Slightly toxic +/obj/item/reagent_container/food/snacks/meat/synthmeat/synthflesh name = "synthetic flesh" desc = "A slab of artificial, inorganic 'flesh' that resembles human meat. Probably came from a synth." icon_state = "synthmeat" diff --git a/code/modules/cm_tech/droppod/lz_effect.dm b/code/modules/cm_tech/droppod/lz_effect.dm index 6a73916c7b3f..7ab955d8a00c 100644 --- a/code/modules/cm_tech/droppod/lz_effect.dm +++ b/code/modules/cm_tech/droppod/lz_effect.dm @@ -34,6 +34,7 @@ /obj/effect/warning/explosive/proc/disappear() qdel(src) + /obj/effect/warning/explosive/gas name = "gas warning" color = "#42acd6" diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index cb36e919e82a..0f128b5bcb46 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -342,7 +342,7 @@ GLOBAL_LIST_INIT(limb_types_by_name, list( return FALSE -/mob/proc/abiotic(full_body = 0) +/mob/proc/abiotic(full_body = FALSE) if(full_body && ((src.l_hand && !( src.l_hand.flags_item & ITEM_ABSTRACT )) || (src.r_hand && !( src.r_hand.flags_item & ITEM_ABSTRACT )) || (src.back || src.wear_mask))) return TRUE From 33443670c464f61397d64b233e406383a0dae69a Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 20 Apr 2024 07:04:08 +0100 Subject: [PATCH 170/431] Automatic changelog for PR #6145 [ci skip] --- html/changelogs/AutoChangeLog-pr-6145.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6145.yml diff --git a/html/changelogs/AutoChangeLog-pr-6145.yml b/html/changelogs/AutoChangeLog-pr-6145.yml new file mode 100644 index 000000000000..dcb66bb21e9b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6145.yml @@ -0,0 +1,5 @@ +author: "Ben10083" +delete-after: True +changes: + - rscadd: "Synthetics when shoved into meat gibber will not be delimbed and spawn their own flesh, but would not die (they are spat out as a torso and head)" + - admin: "Adjustment to meatgibber code to notify admins when a synthetic is being shoved into gibber" \ No newline at end of file From 76792225c9a79e448ea91aa56506f66694a98b00 Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Sat, 20 Apr 2024 09:37:46 +0300 Subject: [PATCH 171/431] Lesser drone nerfs (#6140) # About the pull request # Explain why it's good for the game Lesser drones can go for extremely high risk high reward strategies without any risk as there is basically an infinite amount of respawns and no punishment for dying. I don't see why they should get a different treatment than huggers as they can just run in and apply facehuggers manually or for going off weeds to sneak into backline and place huggers on AFK marines they saw from ghost or just running around being an annoyance. And this is coming from a xeno main. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: You can no longer infinitely extend facehugger's lifetime by REDACTED balance: Lessers now lose 5 hp every 2 seconds off weeds /:cl: --------- Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- .../living/carbon/xenomorph/Facehuggers.dm | 25 ++++++++++++++++++- .../carbon/xenomorph/castes/lesser_drone.dm | 10 +++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm index df272387f001..8aa3000092f5 100644 --- a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm +++ b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm @@ -38,6 +38,9 @@ /// the nearest human before dying var/jumps_left = 2 + var/time_to_live = 30 SECONDS + var/death_timer + var/icon_xeno = 'icons/mob/xenos/effects.dmi' var/icon_xenonid = 'icons/mob/xenonids/xenonid_crab.dmi' @@ -55,6 +58,9 @@ set_hive_data(src, hivenumber) go_active() + if (hivenumber != XENO_HIVE_TUTORIAL) + death_timer = addtimer(CALLBACK(src, PROC_REF(end_lifecycle)), time_to_live, TIMER_OVERRIDE|TIMER_STOPPABLE|TIMER_UNIQUE) + /obj/item/clothing/mask/facehugger/Destroy() . = ..() @@ -75,6 +81,10 @@ if(QDESTROYING(src)) return addtimer(CALLBACK(src, PROC_REF(check_turf)), 0.2 SECONDS) + + if(!death_timer && hivenumber != XENO_HIVE_TUTORIAL) + death_timer = addtimer(CALLBACK(src, PROC_REF(end_lifecycle)), time_to_live, TIMER_OVERRIDE|TIMER_STOPPABLE|TIMER_UNIQUE) + if(stat == CONSCIOUS && loc) //Make sure we're conscious and not idle or dead. go_idle() if(attached) @@ -173,9 +183,18 @@ if(exposed_temperature > 300) die() -/obj/item/clothing/mask/facehugger/equipped(mob/M) +/obj/item/clothing/mask/facehugger/equipped(mob/holder) SHOULD_CALL_PARENT(FALSE) // ugh equip sounds // So picking up a hugger does not prematurely kill it + if (!isxeno(holder)) + return + + var/mob/living/carbon/xenomorph/xeno = holder + + if ((xeno.caste.hugger_nurturing || hivenumber == XENO_HIVE_TUTORIAL) && death_timer) + deltimer(death_timer) + death_timer = null + go_idle() /obj/item/clothing/mask/facehugger/Crossed(atom/target) @@ -410,6 +429,10 @@ deltimer(jump_timer) jump_timer = null + if(death_timer) + deltimer(death_timer) + death_timer = null + if(!impregnated) icon_state = "[initial(icon_state)]_dead" stat = DEAD diff --git a/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm index 8b268ebfce62..9be9e21fd983 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm @@ -16,9 +16,10 @@ can_be_revived = FALSE build_time_mult = BUILD_TIME_MULT_LESSER_DRONE + behavior_delegate_type = /datum/behavior_delegate/lesser_drone_base caste_desc = "A builder of hives." - can_hold_facehuggers = 1 + can_hold_facehuggers = TRUE can_hold_eggs = CAN_HOLD_TWO_HANDS acid_level = 1 weed_level = WEED_LEVEL_STANDARD @@ -118,3 +119,10 @@ /mob/living/carbon/xenomorph/lesser_drone/handle_ghost_message() return + +/datum/behavior_delegate/lesser_drone_base + name = "Base Lesser Drone Behavior Delegate" + +/datum/behavior_delegate/lesser_drone_base/on_life() + if(bound_xeno.body_position == STANDING_UP && !(locate(/obj/effect/alien/weeds) in get_turf(bound_xeno))) + bound_xeno.adjustBruteLoss(5) From 789fd19506e0f86e3c2106146d26ea54474204ec Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 20 Apr 2024 07:42:16 +0100 Subject: [PATCH 172/431] Automatic changelog for PR #6140 [ci skip] --- html/changelogs/AutoChangeLog-pr-6140.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6140.yml diff --git a/html/changelogs/AutoChangeLog-pr-6140.yml b/html/changelogs/AutoChangeLog-pr-6140.yml new file mode 100644 index 000000000000..cab9672ebc42 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6140.yml @@ -0,0 +1,5 @@ +author: "Git-Nivrak" +delete-after: True +changes: + - bugfix: "You can no longer infinitely extend facehugger's lifetime by REDACTED" + - balance: "Lessers now lose 5 hp every 2 seconds off weeds" \ No newline at end of file From 2d9d16492a5002b61861b26568ea8fa6be3d64bd Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 21 Apr 2024 01:14:25 +0000 Subject: [PATCH 173/431] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-6065.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6136.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6137.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6140.yml | 5 ----- html/changelogs/AutoChangeLog-pr-6145.yml | 5 ----- html/changelogs/AutoChangeLog-pr-6153.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6157.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6162.yml | 4 ---- html/changelogs/archive/2024-04.yml | 21 +++++++++++++++++++++ 9 files changed, 21 insertions(+), 34 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-6065.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6136.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6137.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6140.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6145.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6153.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6157.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6162.yml diff --git a/html/changelogs/AutoChangeLog-pr-6065.yml b/html/changelogs/AutoChangeLog-pr-6065.yml deleted file mode 100644 index 9e763fb402d4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6065.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "vero5123" -delete-after: True -changes: - - bugfix: "toggling ghost vision now keeps the user's mob visible." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6136.yml b/html/changelogs/AutoChangeLog-pr-6136.yml deleted file mode 100644 index 6b41106b5d9a..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6136.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "567Turtle" -delete-after: True -changes: - - balance: " SO can now do basic surgeries" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6137.yml b/html/changelogs/AutoChangeLog-pr-6137.yml deleted file mode 100644 index 064ceaa9a356..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6137.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "iloveloopers" -delete-after: True -changes: - - bugfix: "White phosphorus will no longer forcefully set a mob's fire_reagent to be UT napthal" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6140.yml b/html/changelogs/AutoChangeLog-pr-6140.yml deleted file mode 100644 index cab9672ebc42..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6140.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Git-Nivrak" -delete-after: True -changes: - - bugfix: "You can no longer infinitely extend facehugger's lifetime by REDACTED" - - balance: "Lessers now lose 5 hp every 2 seconds off weeds" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6145.yml b/html/changelogs/AutoChangeLog-pr-6145.yml deleted file mode 100644 index dcb66bb21e9b..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6145.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Ben10083" -delete-after: True -changes: - - rscadd: "Synthetics when shoved into meat gibber will not be delimbed and spawn their own flesh, but would not die (they are spat out as a torso and head)" - - admin: "Adjustment to meatgibber code to notify admins when a synthetic is being shoved into gibber" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6153.yml b/html/changelogs/AutoChangeLog-pr-6153.yml deleted file mode 100644 index 36dd94c47bdd..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6153.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "LTNTS" -delete-after: True -changes: - - rscadd: "Adds Command Tablets to Provost Marshal+" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6157.yml b/html/changelogs/AutoChangeLog-pr-6157.yml deleted file mode 100644 index bf60e6ac34ce..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6157.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "realforest2001" -delete-after: True -changes: - - rscadd: "Added an ARES Log for chambering the OB Cannon." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6162.yml b/html/changelogs/AutoChangeLog-pr-6162.yml deleted file mode 100644 index ed0b260f7fd8..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6162.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Git-Nivrak" -delete-after: True -changes: - - bugfix: "Fixed a bug which made boilers go way faster than they should" \ No newline at end of file diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml index f9a6421b27cf..b3f9ffa64195 100644 --- a/html/changelogs/archive/2024-04.yml +++ b/html/changelogs/archive/2024-04.yml @@ -278,3 +278,24 @@ - rscadd: adds new flamer fuel type, stabilized metallic foam - rscadd: Incinerator tanks can now hold stabilized metallic foam - balance: High-Combustion napalm fuel is now easier to see on the ground +2024-04-21: + 567Turtle: + - balance: ' SO can now do basic surgeries' + Ben10083: + - rscadd: Synthetics when shoved into meat gibber will not be delimbed and spawn + their own flesh, but would not die (they are spat out as a torso and head) + - admin: Adjustment to meatgibber code to notify admins when a synthetic is being + shoved into gibber + Git-Nivrak: + - bugfix: You can no longer infinitely extend facehugger's lifetime by REDACTED + - balance: Lessers now lose 5 hp every 2 seconds off weeds + - bugfix: Fixed a bug which made boilers go way faster than they should + LTNTS: + - rscadd: Adds Command Tablets to Provost Marshal+ + iloveloopers: + - bugfix: White phosphorus will no longer forcefully set a mob's fire_reagent to + be UT napthal + realforest2001: + - rscadd: Added an ARES Log for chambering the OB Cannon. + vero5123: + - bugfix: toggling ghost vision now keeps the user's mob visible. From 96fdf71eafa8d2af20e6733c247df2e4bce9a3d7 Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Sun, 21 Apr 2024 07:03:50 +0300 Subject: [PATCH 174/431] Reverts #6040 (#6165) # About the pull request Unforseen consequences Will have to take a look at redoing it at some point though it made me doubt it is even necessary # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: del: Reverted back to old throw logic /:cl: --- code/modules/movement/launching/launching.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/movement/launching/launching.dm b/code/modules/movement/launching/launching.dm index 3e188abb1067..778c452a3240 100644 --- a/code/modules/movement/launching/launching.dm +++ b/code/modules/movement/launching/launching.dm @@ -182,17 +182,21 @@ add_temp_pass_flags(pass_flags) + var/turf/start_turf = get_step_towards(src, LM.target) + var/list/turf/path = get_line(start_turf, LM.target) var/last_loc = loc var/early_exit = FALSE LM.dist = 0 - while (src && throwing && loc == last_loc && isturf(src.loc)) // While looks scary at first but it's basically just a for until LM.dist reaches LM.range + for (var/turf/T in path) + if (!src || !throwing || loc != last_loc || !isturf(src.loc)) + break if (!LM || QDELETED(LM)) early_exit = TRUE break if (LM.dist >= LM.range) break - if (!Move(get_step_towards(src, LM.target))) // If this returns FALSE, then a collision happened + if (!Move(T)) // If this returns FALSE, then a collision happened break last_loc = loc if (++LM.dist >= LM.range) From 7168b32d032cdb3cae3f650a02650e3aaae74af1 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 21 Apr 2024 05:08:34 +0100 Subject: [PATCH 175/431] Automatic changelog for PR #6165 [ci skip] --- html/changelogs/AutoChangeLog-pr-6165.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6165.yml diff --git a/html/changelogs/AutoChangeLog-pr-6165.yml b/html/changelogs/AutoChangeLog-pr-6165.yml new file mode 100644 index 000000000000..0f67210d4ce4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6165.yml @@ -0,0 +1,4 @@ +author: "Git-Nivrak" +delete-after: True +changes: + - rscdel: "Reverted back to old throw logic" \ No newline at end of file From 06f8099e237da7ef264c72b40b5c4845fa746276 Mon Sep 17 00:00:00 2001 From: Zonespace <41448081+Zonespace27@users.noreply.github.com> Date: Sat, 20 Apr 2024 21:04:10 -0700 Subject: [PATCH 176/431] Unmarked admin tickets are automatically marked when responding to one (#6167) # About the pull request If a ticket is unmarked and you start responding to it, it automatically marks itself for you. # Explain why it's good for the game This is something that's bugged me for a while, and it's always tripped me up when responding to tickets. One should reason that a ticket you're responding to is being handled by you. # Changelog :cl: admin: Unmarked tickets now mark themselves when an admin starts responding to one /:cl: --- code/modules/admin/verbs/adminhelp.dm | 15 ++++++++------- code/modules/admin/verbs/adminpm.dm | 3 +++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index ce02cdb59e20..84298faaa3a1 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -543,27 +543,28 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) log_ahelp(id, "Defer", "Deferred to mentors by [usr.key]", null, usr.ckey) Close(silent = TRUE) -/datum/admin_help/proc/mark_ticket() +/datum/admin_help/proc/mark_ticket(mob/marking_admin) + var/mob/user = marking_admin || usr if(marked_admin) - if(marked_admin == usr.ckey) + if(marked_admin == user.ckey) unmark_ticket() return - to_chat(usr, SPAN_WARNING("This ticket has already been marked by [marked_admin].")) - var/unmark_option = tgui_alert(usr, "This message has been marked by [marked_admin]. Do you want to override?", "Marked Ticket", list("Overwrite Mark", "Unmark", "Cancel")) + to_chat(user, SPAN_WARNING("This ticket has already been marked by [marked_admin].")) + var/unmark_option = tgui_alert(user, "This message has been marked by [marked_admin]. Do you want to override?", "Marked Ticket", list("Overwrite Mark", "Unmark", "Cancel")) if(unmark_option == "Unmark") unmark_ticket() return if(unmark_option != "Overwrite Mark") return - var/key_name = key_name_admin(usr) + var/key_name = key_name_admin(user) AddInteraction("Marked by [key_name].", player_message = "Ticket marked!") to_chat(initiator, SPAN_ADMINHELP("An admin is preparing to respond to your ticket.")) var/msg = "Ticket [TicketHref("#[id]")] marked by [key_name]." message_admins(msg) log_admin_private(msg) - log_ahelp(id, "Marked", "Marked by [usr.key]", sender = usr.ckey) - marked_admin = usr.ckey + log_ahelp(id, "Marked", "Marked by [user.key]", sender = user.ckey) + marked_admin = user.ckey /datum/admin_help/proc/unmark_ticket() var/key_name = key_name_admin(usr) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 76525b2cae96..a6cf0f02a3de 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -60,6 +60,9 @@ var/message_prompt = "Message:" + if(AH && !AH.marked_admin) + AH.mark_ticket() + if((AH?.opening_responders && length(AH.ticket_interactions) == 1 ) || ((AH?.marked_admin && AH?.marked_admin != usr.ckey) && 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]**" From b8bd5c5d37785ceba7288e2397a672c964f457c0 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 21 Apr 2024 05:16:01 +0100 Subject: [PATCH 177/431] Automatic changelog for PR #6167 [ci skip] --- html/changelogs/AutoChangeLog-pr-6167.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6167.yml diff --git a/html/changelogs/AutoChangeLog-pr-6167.yml b/html/changelogs/AutoChangeLog-pr-6167.yml new file mode 100644 index 000000000000..0406b100623e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6167.yml @@ -0,0 +1,4 @@ +author: "Zonespace27" +delete-after: True +changes: + - admin: "Unmarked tickets now mark themselves when an admin starts responding to one" \ No newline at end of file From 6d12dfed31e59f8918dd96fa35a1d9de873684d5 Mon Sep 17 00:00:00 2001 From: harry Date: Sun, 21 Apr 2024 05:05:20 +0100 Subject: [PATCH 178/431] unbreaks binding to space (#6168) we have to override the name of the key sometimes, and space is one of those times :cl: fix: you can bind to space again /:cl: --- tgui/packages/tgui/interfaces/KeyBinds.jsx | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tgui/packages/tgui/interfaces/KeyBinds.jsx b/tgui/packages/tgui/interfaces/KeyBinds.jsx index b387d6a8dba5..b3b2fd5a8c30 100644 --- a/tgui/packages/tgui/interfaces/KeyBinds.jsx +++ b/tgui/packages/tgui/interfaces/KeyBinds.jsx @@ -10,6 +10,20 @@ const KEY_MODS = { 'CONTROL': true, }; +const KEY_CODE_TO_BYOND = { + 'DEL': 'Delete', + 'DOWN': 'South', + 'END': 'Southwest', + 'HOME': 'Northwest', + 'INSERT': 'Insert', + 'LEFT': 'West', + 'PAGEDOWN': 'Southeast', + 'PAGEUP': 'Northeast', + 'RIGHT': 'East', + ' ': 'Space', + 'UP': 'North', +}; + const getAllKeybinds = (glob_keybinds) => { const all_keybinds = new Array(); Object.keys(glob_keybinds).map((x) => all_keybinds.push(...glob_keybinds[x])); @@ -274,6 +288,10 @@ export class ButtonKeybind extends Component { return; } + if (KEY_CODE_TO_BYOND[pressedKey]) { + pressedKey = KEY_CODE_TO_BYOND[pressedKey]; + } + if (e.keyCode >= 96 && e.keyCode <= 105) { pressedKey = 'Numpad' + pressedKey; } From d221238d148428c63c7928bde49765127a8da43f Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 21 Apr 2024 05:23:43 +0100 Subject: [PATCH 179/431] Automatic changelog for PR #6168 [ci skip] --- html/changelogs/AutoChangeLog-pr-6168.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6168.yml diff --git a/html/changelogs/AutoChangeLog-pr-6168.yml b/html/changelogs/AutoChangeLog-pr-6168.yml new file mode 100644 index 000000000000..3f1451a862c5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6168.yml @@ -0,0 +1,4 @@ +author: "harryob" +delete-after: True +changes: + - bugfix: "you can bind to space again" \ No newline at end of file From ea50e9d12acbad70f13f118d8d5a5aeb5f9d88b3 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sun, 21 Apr 2024 00:05:32 -0400 Subject: [PATCH 180/431] fixes high combustion napalm and sticky napalm working for OT assemblies (#6171) # About the pull request I didn't intend for these to work in OT assemblies, they're too good apparently chemfiresupp doesn't work if you have fire properties cause they set the reagent's chemfiresupp to true forcefully so I manually set the durationmod, intensitymod and radiusmod to negative to exatcly counter how much they affect # Explain why it's good for the game bugfix good unintended behaviour # Testing Photographs and Procedure it works, trust me # Changelog :cl: fix: custom flamer fuels no longer work for increasing OT assembly's caps /:cl: --- code/modules/reagents/chemistry_reagents/other.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry_reagents/other.dm b/code/modules/reagents/chemistry_reagents/other.dm index 09b835b1482d..dc70d65452fe 100644 --- a/code/modules/reagents/chemistry_reagents/other.dm +++ b/code/modules/reagents/chemistry_reagents/other.dm @@ -705,9 +705,11 @@ description = "A custom napalm mix, stickier and lasts longer but lower damage" reagent_state = LIQUID color = "#f8e3b2" - chemfiresupp = FALSE burncolor = "#f8e3b2" burn_sprite = "dynamic" + intensitymod = -1.5 + durationmod = -5 + radiusmod = -0.5 properties = list( PROPERTY_INTENSITY = BURN_LEVEL_TIER_2, PROPERTY_DURATION = BURN_TIME_TIER_5, @@ -720,9 +722,11 @@ description = "A custom napalm mix, higher damage but not as sticky" reagent_state = LIQUID color = "#c51c1c" - chemfiresupp = FALSE burncolor = "#c51c1c" burn_sprite = "dynamic" + intensitymod = -4.5 + durationmod = -1 + radiusmod = -0.5 properties = list( PROPERTY_INTENSITY = BURN_LEVEL_TIER_8, PROPERTY_DURATION = BURN_TIME_TIER_1, From 41c42e5d4522f05ccde6d64dcc1aa1c683364431 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 21 Apr 2024 05:31:01 +0100 Subject: [PATCH 181/431] Automatic changelog for PR #6171 [ci skip] --- html/changelogs/AutoChangeLog-pr-6171.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6171.yml diff --git a/html/changelogs/AutoChangeLog-pr-6171.yml b/html/changelogs/AutoChangeLog-pr-6171.yml new file mode 100644 index 000000000000..d9cd7b85fa1a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6171.yml @@ -0,0 +1,4 @@ +author: "iloveloopers" +delete-after: True +changes: + - bugfix: "custom flamer fuels no longer work for increasing OT assembly's caps" \ No newline at end of file From 1ca0f694fc0c29af0a157505134e8b116bec1809 Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Sun, 21 Apr 2024 08:09:38 +0100 Subject: [PATCH 182/431] Fixes delaying round start not showing on the timer. (#6166) # About the pull request As title # Explain why it's good for the game It's not always clear if it's been delayed or somehow broken anymore. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: Delaying round start now shows on the timer again. /:cl: --------- Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/modules/mob/dead/observer/observer.dm | 2 +- code/modules/mob/new_player/new_player.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index d93aeef63143..d13d5aa94053 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -1191,7 +1191,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!SSticker.HasRoundStarted()) var/time_remaining = SSticker.GetTimeLeft() if(time_remaining > 0) - . += "Time To Start: [round(time_remaining)]s" + . += "Time To Start: [round(time_remaining)]s[SSticker.delay_start ? " (DELAYED)" : ""]" else if(time_remaining == -10) . += "Time To Start: DELAYED" else diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 7917394df830..f436863b2f2f 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -451,7 +451,7 @@ var/time_remaining = SSticker.GetTimeLeft() if(time_remaining > 0) - . += "Time To Start: [round(time_remaining)]s" + . += "Time To Start: [round(time_remaining)]s[SSticker.delay_start ? " (DELAYED)" : ""]" else if(time_remaining == -10) . += "Time To Start: DELAYED" else From 1c14a87455845128a8fa08a6b1d62cb20d6bbb30 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 21 Apr 2024 08:14:09 +0100 Subject: [PATCH 183/431] Automatic changelog for PR #6166 [ci skip] --- html/changelogs/AutoChangeLog-pr-6166.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6166.yml diff --git a/html/changelogs/AutoChangeLog-pr-6166.yml b/html/changelogs/AutoChangeLog-pr-6166.yml new file mode 100644 index 000000000000..273b212dbda3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6166.yml @@ -0,0 +1,4 @@ +author: "realforest2001" +delete-after: True +changes: + - bugfix: "Delaying round start now shows on the timer again." \ No newline at end of file From 45489e639eb93df0e01460a31656f2999b6f3ed6 Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Sun, 21 Apr 2024 08:29:06 +0100 Subject: [PATCH 184/431] Added ID Modification Log to the Access Report Print (#6124) # About the pull request Allows MPs (or others) to read who made what changes to an ID card by plugging the card into an ID Computer and hitting the print button. This button previously printed a list of all the accesses on the ID Card, and will still do this at the same time. # Explain why it's good for the game It can be incredibly frustrating to figure out how someone can suddenly open a door without permission and is essentially untraceable at the moment without admin help. # Testing Photographs and Procedure ![image](https://github.com/cmss13-devs/cmss13/assets/41653574/96cff422-197e-4016-94be-087e802cd676) # Changelog :cl: add: Added ID Modification Log to the Access Report printout from an ID Console. /:cl: --- code/__HELPERS/logging.dm | 6 +-- code/modules/cm_marines/marines_consoles.dm | 48 ++++++++++----------- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/code/__HELPERS/logging.dm b/code/__HELPERS/logging.dm index 59e4c7710992..1e72f51a8d60 100644 --- a/code/__HELPERS/logging.dm +++ b/code/__HELPERS/logging.dm @@ -125,11 +125,11 @@ GLOBAL_VAR_INIT(log_end, world.system_type == UNIX ? ascii2text(13) : "") GLOB.STUI.admin.Add("\[[time]]OVERWATCH: [text]") GLOB.STUI.processing |= STUI_LOG_ADMIN -/proc/log_idmod(obj/item/card/id/target_id, msg) +/proc/log_idmod(obj/item/card/id/target_id, msg, changer) var/time = time_stamp() if (CONFIG_GET(flag/log_idmod)) - WRITE_LOG(GLOB.world_game_log, "ID MOD: [msg]") - LOG_REDIS("idmod", "\[[time]\] [msg]") + WRITE_LOG(GLOB.world_game_log, "ID MOD: ([changer]) [msg]") + LOG_REDIS("idmod", "\[[time]\] ([changer]) [msg]") target_id.modification_log += "\[[time]]: [msg]" /proc/log_vote(text) diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index 13f5e2d0df6d..e02bb930d416 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -43,12 +43,12 @@ ui = new(user, src, "CardMod", name) ui.open() -/obj/structure/machinery/computer/card/ui_act(action, params) +/obj/structure/machinery/computer/card/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return - var/mob/user = usr + var/mob/user = ui.user playsound(src, pick('sound/machines/computer_typing4.ogg', 'sound/machines/computer_typing5.ogg', 'sound/machines/computer_typing6.ogg'), 5, 1) switch(action) @@ -91,18 +91,11 @@ printing = TRUE playsound(src.loc, 'sound/machines/fax.ogg', 15, 1) sleep(40) - var/faction = "N/A" - if(target_id_card.faction_group && islist(target_id_card.faction_group)) - faction = jointext(target_id_card.faction_group, ", ") - if(isnull(target_id_card.faction_group)) - target_id_card.faction_group = list() - else - faction = target_id_card.faction_group var/contents = {"

Access Report

Prepared By: [user_id_card?.registered_name ? user_id_card.registered_name : "Unknown"]
For: [target_id_card.registered_name ? target_id_card.registered_name : "Unregistered"]
- Faction: [faction]
+ Faction: [target_id_card.faction ? target_id_card.faction : "N/A"]
Assignment: [target_id_card.assignment]
Account Number: #[target_id_card.associated_account_number]
Blood Type: [target_id_card.blood_type]

@@ -112,7 +105,10 @@ var/known_access_rights = get_access(ACCESS_LIST_MARINE_ALL) for(var/A in target_id_card.access) if(A in known_access_rights) - contents += " [get_access_desc(A)]" + contents += " [get_access_desc(A)]
" + contents += "
Modification Log:
" + for(var/change in target_id_card.modification_log) + contents += " [change]
" var/obj/item/paper/P = new /obj/item/paper(src.loc) P.name = "Access Report" @@ -139,9 +135,9 @@ GLOB.data_core.manifest_modify(target_id_card.registered_name, target_id_card.registered_ref, target_id_card.assignment, target_id_card.rank) target_id_card.name = text("[target_id_card.registered_name]'s ID Card ([target_id_card.assignment])") if(target_id_card.registered_name != origin_name) - log_idmod(target_id_card, " [key_name_admin(usr)] changed the registered name of the ID to '[target_id_card.registered_name]'. ") + log_idmod(target_id_card, " [user.real_name] changed the registered name of the ID to '[target_id_card.registered_name]'. ", key_name_admin(user)) if(target_id_card.assignment != origin_assignment) - log_idmod(target_id_card, " [key_name_admin(usr)] changed the assignment of the ID to the custom position '[target_id_card.assignment]'. ") + log_idmod(target_id_card, " [user.real_name] changed the assignment of the ID to the custom position '[target_id_card.assignment]'. ", key_name_admin(user)) if(ishuman(user)) target_id_card.forceMove(user.loc) if(!user.get_active_hand()) @@ -170,8 +166,8 @@ target_id_card.assignment = "Terminated" target_id_card.access = list() - log_idmod(target_id_card, " [key_name_admin(usr)] terminated the ID. ") - message_admins("[key_name_admin(usr)] terminated the ID of [target_id_card.registered_name].") + log_idmod(target_id_card, " [user.real_name] terminated the ID. ", key_name_admin(user)) + message_admins("[user.real_name] terminated the ID of [target_id_card.registered_name].", key_name_admin(user)) return TRUE if("PRG_edit") if(!authenticated || !target_id_card) @@ -221,19 +217,19 @@ target_id_card.faction_group = list() if(params["access_target"] in target_id_card.faction_group) target_id_card.faction_group -= params["access_target"] - log_idmod(target_id_card, " [key_name_admin(usr)] revoked [access_type] IFF. ") + log_idmod(target_id_card, " [user.real_name] revoked [access_type] IFF. ", key_name_admin(user)) else target_id_card.faction_group |= params["access_target"] - log_idmod(target_id_card, " [key_name_admin(usr)] granted [access_type] IFF. ") + log_idmod(target_id_card, " [user.real_name] granted [access_type] IFF. ", key_name_admin(user)) return TRUE access_type = text2num(params["access_target"]) if(access_type in (is_centcom ? get_access(ACCESS_LIST_WY_ALL) : get_access(ACCESS_LIST_MARINE_MAIN))) if(access_type in target_id_card.access) target_id_card.access -= access_type - log_idmod(target_id_card, " [key_name_admin(usr)] revoked access '[access_type]'. ") + log_idmod(target_id_card, " [user.real_name] revoked access '[get_access_desc(access_type)]'. ", key_name_admin(user)) else target_id_card.access |= access_type - log_idmod(target_id_card, " [key_name_admin(usr)] granted access '[access_type]'. ") + log_idmod(target_id_card, " [user.real_name] granted access '[get_access_desc(access_type)]'. ", key_name_admin(user)) return TRUE if("PRG_grantall") if(!authenticated || !target_id_card) @@ -241,7 +237,7 @@ target_id_card.access |= (is_centcom ? get_access(ACCESS_LIST_WY_ALL) : get_access(ACCESS_LIST_MARINE_MAIN)) target_id_card.faction_group |= factions - log_idmod(target_id_card, " [key_name_admin(usr)] granted the ID all access and USCM IFF. ") + log_idmod(target_id_card, " [user.real_name] granted the ID all access and USCM IFF. ", key_name_admin(user)) return TRUE if("PRG_denyall") if(!authenticated || !target_id_card) @@ -250,7 +246,7 @@ var/list/access = target_id_card.access access.Cut() target_id_card.faction_group -= factions - log_idmod(target_id_card, " [key_name_admin(usr)] removed all accesses and USCM IFF. ") + log_idmod(target_id_card, " [user.real_name] removed all accesses and USCM IFF. ", key_name_admin(user)) return TRUE if("PRG_grantregion") if(!authenticated || !target_id_card) @@ -258,14 +254,14 @@ if(params["region"] == "Faction (IFF system)") target_id_card.faction_group |= factions - log_idmod(target_id_card, " [key_name_admin(usr)] granted USCM IFF. ") + log_idmod(target_id_card, " [user.real_name] granted USCM IFF. ", key_name_admin(user)) return TRUE var/region = text2num(params["region"]) if(isnull(region)) return target_id_card.access |= get_region_accesses(region) var/additions = get_region_accesses_name(region) - log_idmod(target_id_card, " [key_name_admin(usr)] granted all [additions] accesses. ") + log_idmod(target_id_card, " [user.real_name] granted all [additions] accesses. ", key_name_admin(user)) return TRUE if("PRG_denyregion") if(!authenticated || !target_id_card) @@ -273,14 +269,14 @@ if(params["region"] == "Faction (IFF system)") target_id_card.faction_group -= factions - log_idmod(target_id_card, " [key_name_admin(usr)] revoked USCM IFF. ") + log_idmod(target_id_card, " [user.real_name] revoked USCM IFF. ", key_name_admin(user)) return TRUE var/region = text2num(params["region"]) if(isnull(region)) return target_id_card.access -= get_region_accesses(region) var/additions = get_region_accesses_name(region) - log_idmod(target_id_card, " [key_name_admin(usr)] revoked all [additions] accesses. ") + log_idmod(target_id_card, " [user.real_name] revoked all [additions] accesses. ", key_name_admin(user)) return TRUE if("PRG_account") if(!authenticated || !target_id_card) @@ -288,7 +284,7 @@ var/account = text2num(params["account"]) target_id_card.associated_account_number = account - log_idmod(target_id_card, " [key_name_admin(usr)] changed the account number to '[account]'. ") + log_idmod(target_id_card, " [user.real_name] changed the account number to '[account]'. ", key_name_admin(user)) return TRUE /obj/structure/machinery/computer/card/ui_static_data(mob/user) From e7375176084c57e2d5c99a199a3ef6fb8c571fb3 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 21 Apr 2024 08:33:53 +0100 Subject: [PATCH 185/431] Automatic changelog for PR #6124 [ci skip] --- html/changelogs/AutoChangeLog-pr-6124.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6124.yml diff --git a/html/changelogs/AutoChangeLog-pr-6124.yml b/html/changelogs/AutoChangeLog-pr-6124.yml new file mode 100644 index 000000000000..1e02f4897a69 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6124.yml @@ -0,0 +1,4 @@ +author: "realforest2001" +delete-after: True +changes: + - rscadd: "Added ID Modification Log to the Access Report printout from an ID Console." \ No newline at end of file From 85bcc1a23e09e240ed086ac502c856b29a27e4a6 Mon Sep 17 00:00:00 2001 From: LC4492 <122557086+LC4492@users.noreply.github.com> Date: Sun, 21 Apr 2024 18:16:53 -0300 Subject: [PATCH 186/431] Adds an upgraded photocopier for the CL and CC (#6126) # About the pull request Adds a new photocopier with a higher toner level (180) and that also have a higher print-at-once max limit (from the original 10 to 30), the original photocopier have been maintained for most part of the ship, receiving a little boost on the toner level (from the original 30 to 45). Sprites in overall have been updated to have a little bit more charm and look better, but the new photocopier version have a new "Weyland-Yutani" paint-scheme (look at the objects' descriptions for reason). # Explain why it's good for the game One problem that everyone encounters at least one time playing as CC or CL is the fact that, the toner limit of the normal photocopier is an annoying nightmare: Printing photos take a LOT of toner, and even though that makes a good balancing for the normal photocopier, its a giant ROCK in the way of anyone who wishes to mass-print newspapers (as CC) or spread pamphlets and photos (as CL) for the crew. This change would possibly makes the lives of both roles MUCH easier when printing and distributing, papers and photos, in mass. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: add: Adds a new, better variation of the normal photocopier. imageadd: Adds a new sprite to the new photocopier variation and updates the sprites of both normal, and new photocopiers to look slightly better. maptweak: Adds the new photocopiers to the CC and CL offices. /:cl: --------- Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/modules/paperwork/photocopier.dm | 37 +++++++++++++++++---- icons/obj/structures/machinery/library.dmi | Bin 11532 -> 18546 bytes maps/map_files/USS_Almayer/USS_Almayer.dmm | 6 ++-- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 08711f295085..0d5eca1dd9a1 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -1,7 +1,9 @@ +/// Normal Photocopier, made by Seegson /obj/structure/machinery/photocopier name = "photocopier" icon = 'icons/obj/structures/machinery/library.dmi' icon_state = "bigscanner" + desc = "A photocopier used for copying... you know, photos! Also useful for copying documents on paper. This specific model has been manufactured by Seegson in a cheaper frame than most modern photocopiers. It uses more primitive copying technology resulting in more toner waste and less printing capabilities. Nonetheless, its cheap construction means cheaper costs, and for people that only need to print a paper or two most of the time, it becomes cost-effective." anchored = TRUE density = TRUE use_power = USE_POWER_IDLE @@ -11,9 +13,15 @@ var/obj/item/paper/copy = null //what's in the copier! var/obj/item/photo/photocopy = null var/obj/item/paper_bundle/bundle = null - var/copies = 1 //how many copies to print! - var/toner = 30 //how much toner is left! woooooo~ - var/maxcopies = 10 //how many copies can be copied at once- idea shamelessly stolen from bs12's copier! + ///how many copies to print! + var/copies = 1 + ///how much toner is left! woooooo~ + var/toner = 45 + ///how many copies can be copied at once- idea shamelessly stolen from bs12's copier! + var/maxcopies = 10 + ///the flick state to use when inserting paper into the machine + var/animate_state = "bigscanner1" + /obj/structure/machinery/photocopier/attack_remote(mob/user as mob) return attack_hand(user) @@ -116,7 +124,7 @@ if(user.drop_inv_item_to_loc(O, src)) copy = O to_chat(user, SPAN_NOTICE("You insert the paper into \the [src].")) - flick("bigscanner1", src) + flick(animate_state, src) updateUsrDialog() else to_chat(user, SPAN_NOTICE("There is already something in \the [src].")) @@ -125,7 +133,7 @@ if(user.drop_inv_item_to_loc(O, src)) photocopy = O to_chat(user, SPAN_NOTICE("You insert the photo into \the [src].")) - flick("bigscanner1", src) + flick(animate_state, src) updateUsrDialog() else to_chat(user, SPAN_NOTICE("There is already something in \the [src].")) @@ -134,13 +142,13 @@ if(user.drop_inv_item_to_loc(O, src)) bundle = O to_chat(user, SPAN_NOTICE("You insert the bundle into \the [src].")) - flick("bigscanner1", src) + flick(animate_state, src) updateUsrDialog() else if(istype(O, /obj/item/device/toner)) if(toner == 0) if(user.temp_drop_inv_item(O)) qdel(O) - toner = 30 + toner = initial(toner) to_chat(user, SPAN_NOTICE("You insert the toner cartridge into \the [src].")) updateUsrDialog() else @@ -239,6 +247,21 @@ return p +/// Upgraded photocopier, straight upgrade from the normal photocopier, made by Weyland-Yutani +/obj/structure/machinery/photocopier/wyphotocopier + name = "photocopier" + icon = 'icons/obj/structures/machinery/library.dmi' + icon_state = "bigscannerpro" + desc = "A photocopier used for copying... you know, photos! Also useful for copying documents on paper. This specific model has been manufactured by Weyland-Yutani in a more modern and robust frame than the average photocopiers you see from smaller companies. It uses some of the most advanced technologies in the area of paper-printing such as bigger toner economy and much higher printing capabilities. All that makes it the favorite among consumers that need to print high amounts of paperwork for their daily duties." + idle_power_usage = 50 + active_power_usage = 300 + copies = 1 + toner = 180 + maxcopies = 30 + animate_state = "bigscannerpro1" + + +/// The actual toner cartridge used in photcopiers /obj/item/device/toner name = "toner cartridge" icon_state = "tonercartridge" diff --git a/icons/obj/structures/machinery/library.dmi b/icons/obj/structures/machinery/library.dmi index 3efeeef8b9f58ed85ce7da2737698f30431668d2..b2e62dc1bb932f4d864f9ecd9b9e2f10a4032901 100644 GIT binary patch literal 18546 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 literal 11532 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 WJ<-?xE`V=21NYT*RKF=(hWsxU1vU); diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 84eb6b3b142a..6bc6bfeb4a22 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -56403,10 +56403,10 @@ }, /area/almayer/living/briefing) "phj" = ( -/obj/structure/machinery/photocopier, /obj/structure/machinery/light/small{ dir = 1 }, +/obj/structure/machinery/photocopier/wyphotocopier, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -69589,12 +69589,10 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/machinery/photocopier{ - anchored = 0 - }, /obj/structure/sign/poster/art{ pixel_y = 32 }, +/obj/structure/machinery/photocopier/wyphotocopier, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) "tHk" = ( From 5e7d21c2befd85782d29d63367e84deca45cb584 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 21 Apr 2024 22:21:27 +0100 Subject: [PATCH 187/431] Automatic changelog for PR #6126 [ci skip] --- html/changelogs/AutoChangeLog-pr-6126.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6126.yml diff --git a/html/changelogs/AutoChangeLog-pr-6126.yml b/html/changelogs/AutoChangeLog-pr-6126.yml new file mode 100644 index 000000000000..32c18a571e83 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6126.yml @@ -0,0 +1,6 @@ +author: "LC4492" +delete-after: True +changes: + - rscadd: "Adds a new, better variation of the normal photocopier." + - imageadd: "Adds a new sprite to the new photocopier variation and updates the sprites of both normal, and new photocopiers to look slightly better." + - maptweak: "Adds the new photocopiers to the CC and CL offices." \ No newline at end of file From c6c04431a1653bcddb9d176835bdd578fd1e09cc Mon Sep 17 00:00:00 2001 From: GrrrKitten <158611449+GrrrKitten@users.noreply.github.com> Date: Sun, 21 Apr 2024 17:39:16 -0400 Subject: [PATCH 188/431] Adds Shockwaves to Explosions and Xeno Screeches (#5938) # About the pull request Mostly ported from TGMC via code from Ivanmixo + Tiviplus Tested and very functional, only activates on explosions with above 150 power meaning: notable would shockwave: -yajuta casters -HE rockets -nuke -pod decompresion -CAS minirockets -All OB's -most OT nades notable wouldnt shockwave: -AP rockets -Mateba HE -plastic explosives -sentry explosions -HEDP's -HEFA -other tiny explosions Also adds shockwaves to: -Queen Screech (very large) -Predalien Screech (smaller) # Explain why it's good for the game Looks pretty cool, purely a VFX change via render plates. After extensively testing it for a few hours then going to play an actual round and seeing our OB's in their current state it was so sad. # Testing Photographs and Procedure Screenshots & Videos video had to be stupid compressed for github and also I cant crop it good cause photoshop said no more rendering today so have fun with this: https://github.com/cmss13-devs/cmss13/assets/158611449/a83d26ea-3f7f-4053-8be4-d15ad707cdbc Queen + Predalien Screech from 3 seperate POV's https://github.com/cmss13-devs/cmss13/assets/158611449/137a496e-8b56-4039-ae84-cbaafa3de8d8 # Changelog :cl: add: Adds shockwave VFX to powerful explosions add: Adds shockwave VFX to Queen + Predalien screech /:cl: --------- Co-authored-by: harryob Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/__DEFINES/layers.dm | 3 + code/_onclick/hud/rendering/plane_master.dm | 7 ++ code/_onclick/hud/rendering/render_plate.dm | 4 ++ code/datums/autocells/explosion.dm | 3 + .../game/objects/effects/temporary_visuals.dm | 23 +++++++ .../mob/living/carbon/xenomorph/Abilities.dm | 2 +- .../abilities/predalien/predalien_powers.dm | 3 +- .../living/carbon/xenomorph/update_icons.dm | 65 ++++++++++++------- 8 files changed, 82 insertions(+), 28 deletions(-) diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 63e79cdf676d..ee958d87f580 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -11,6 +11,9 @@ //#define AREA_LAYER 1 +#define DISPLACEMENT_PLATE_RENDER_LAYER 1 +#define DISPLACEMENT_PLATE_RENDER_TARGET "*DISPLACEMENT_PLATE_RENDER_TARGET" + #define UNDER_TURF_LAYER 1.99 #define TURF_LAYER 2 diff --git a/code/_onclick/hud/rendering/plane_master.dm b/code/_onclick/hud/rendering/plane_master.dm index 6625120d1514..c4f070bdd842 100644 --- a/code/_onclick/hud/rendering/plane_master.dm +++ b/code/_onclick/hud/rendering/plane_master.dm @@ -189,3 +189,10 @@ plane = ESCAPE_MENU_PLANE appearance_flags = PLANE_MASTER|NO_CLIENT_COLOR render_relay_plane = RENDER_PLANE_MASTER + +/atom/movable/screen/plane_master/displacement + name = "displacement plane" + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + plane = DISPLACEMENT_PLATE_RENDER_LAYER + render_target = DISPLACEMENT_PLATE_RENDER_TARGET + render_relay_plane = null diff --git a/code/_onclick/hud/rendering/render_plate.dm b/code/_onclick/hud/rendering/render_plate.dm index 18236c6ee759..cb579eb4ff6a 100644 --- a/code/_onclick/hud/rendering/render_plate.dm +++ b/code/_onclick/hud/rendering/render_plate.dm @@ -39,6 +39,10 @@ plane = RENDER_PLANE_GAME render_relay_plane = RENDER_PLANE_MASTER +/atom/movable/screen/plane_master/rendering_plate/game_world/Initialize(mapload, datum/hud/hud_owner) + . = ..() + add_filter("displacer", 1, displacement_map_filter(render_source = DISPLACEMENT_PLATE_RENDER_TARGET, size = 10)) + ///render plate for OOC stuff like ghosts, hud-screen effects, etc /atom/movable/screen/plane_master/rendering_plate/non_game name = "non-game rendering plate" diff --git a/code/datums/autocells/explosion.dm b/code/datums/autocells/explosion.dm index 367567a6d40d..ecc6f9925800 100644 --- a/code/datums/autocells/explosion.dm +++ b/code/datums/autocells/explosion.dm @@ -282,6 +282,9 @@ as having entered the turf. if(QDELETED(E)) return + if(power >= 150) //shockwave for anything over 150 power + new /obj/effect/shockwave(epicenter, power/60) + E.power = power E.power_falloff = falloff E.falloff_shape = falloff_shape diff --git a/code/game/objects/effects/temporary_visuals.dm b/code/game/objects/effects/temporary_visuals.dm index 4dc07b76f3cb..d05e7789b1d5 100644 --- a/code/game/objects/effects/temporary_visuals.dm +++ b/code/game/objects/effects/temporary_visuals.dm @@ -96,3 +96,26 @@ splatter_type = "csplatter" color = BLOOD_COLOR_SYNTHETIC +//------------------------------------------ +//Shockwaves +//------------------------------------------ + +/obj/effect/shockwave + icon = 'icons/effects/light_overlays/shockwave.dmi' + icon_state = "shockwave" + plane = DISPLACEMENT_PLATE_RENDER_LAYER + pixel_x = -496 + pixel_y = -496 + +/obj/effect/shockwave/Initialize(mapload, radius, speed, easing_type = LINEAR_EASING, y_offset, x_offset) + . = ..() + if(!speed) + speed = 1 + if(y_offset) + pixel_y += y_offset + if(x_offset) + pixel_x += x_offset + QDEL_IN(src, 0.5 * radius * speed) + transform = matrix().Scale(32 / 1024, 32 / 1024) + animate(src, time = 0.5 * radius * speed, transform=matrix().Scale((32 / 1024) * radius * 1.5, (32 / 1024) * radius * 1.5), easing = easing_type) + diff --git a/code/modules/mob/living/carbon/xenomorph/Abilities.dm b/code/modules/mob/living/carbon/xenomorph/Abilities.dm index 3bf0c67ef721..ec024c3b5605 100644 --- a/code/modules/mob/living/carbon/xenomorph/Abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/Abilities.dm @@ -142,7 +142,7 @@ playsound(xeno.loc, pick(xeno.screech_sound_effect_list), 75, 0, status = 0) xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] emits an ear-splitting guttural roar!")) - xeno.create_shriekwave() //Adds the visual effect. Wom wom wom + xeno.create_shriekwave(14) //Adds the visual effect. Wom wom wom, 14 shriekwaves for(var/mob/mob in view()) if(mob && mob.client) 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 6e6fef86a2f4..3ec4855f9c3a 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 @@ -12,8 +12,7 @@ playsound(xeno.loc, pick(predalien_roar), 75, 0, status = 0) xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] emits a guttural roar!")) - xeno.create_shriekwave(color = "#FF0000") - + xeno.create_shriekwave(7) //Adds the visual effect. Wom wom wom, 7 shriekwaves for(var/mob/living/carbon/carbon in view(7, xeno)) if(ishuman(carbon)) var/mob/living/carbon/human/human = carbon diff --git a/code/modules/mob/living/carbon/xenomorph/update_icons.dm b/code/modules/mob/living/carbon/xenomorph/update_icons.dm index cf84312657a3..ac0c381f5ed4 100644 --- a/code/modules/mob/living/carbon/xenomorph/update_icons.dm +++ b/code/modules/mob/living/carbon/xenomorph/update_icons.dm @@ -207,31 +207,46 @@ overlays_standing[X_LEGCUFF_LAYER] = image("icon" = 'icons/mob/xenos/effects.dmi', "icon_state" = "legcuff", "layer" =-X_LEGCUFF_LAYER) apply_overlay(X_LEGCUFF_LAYER) -/mob/living/carbon/xenomorph/proc/create_shriekwave(color = null) - var/image/screech_image - - var/offset_x = 0 - var/offset_y = 0 - if(mob_size <= MOB_SIZE_XENO) - offset_x = -7 - offset_y = -10 - - if (color) - screech_image = image("icon"='icons/mob/xenos/overlay_effects64x64.dmi', "icon_state" = "shriek_waves_greyscale") // For Praetorian screech - screech_image.color = color - else - screech_image = image("icon"='icons/mob/xenos/overlay_effects64x64.dmi', "icon_state" = "shriek_waves") //Ehh, suit layer's not being used. - - screech_image.pixel_x = offset_x - screech_image.pixel_y = offset_y - - screech_image.appearance_flags |= RESET_COLOR - - remove_suit_layer() - - overlays_standing[X_SUIT_LAYER] = screech_image - apply_overlay(X_SUIT_LAYER) - addtimer(CALLBACK(src, PROC_REF(remove_overlay), X_SUIT_LAYER), 30) +/mob/living/carbon/xenomorph/proc/create_shriekwave(shriekwaves_left) + var/offset_y = 8 + if(mob_size == MOB_SIZE_XENO) + offset_y = 24 + if(mob_size == MOB_SIZE_IMMOBILE) + offset_y = 28 + + //the shockwave center is updated eachtime shockwave is called and offset relative to the mob_size. + //due to the speed of the shockwaves, it isn't required to be tied to the exact mob movements + var/epicenter = loc //center of the shockwave, set at the center of the tile that the mob is currently standing on + var/easing = QUAD_EASING | EASE_OUT + var/stage1_radius = rand(11, 12) + var/stage2_radius = rand(9, 11) + var/stage3_radius = rand(8, 10) + var/stage4_radius = 7.5 + + //shockwaves are iterated, counting down once per shriekwave, with the total amount being determined on the respective xeno ability tile + if(shriekwaves_left > 12) + shriekwaves_left-- + new /obj/effect/shockwave(epicenter, stage1_radius, 0.5, easing, offset_y) + addtimer(CALLBACK(src, PROC_REF(create_shriekwave), shriekwaves_left), 2) + return + if(shriekwaves_left > 8) + shriekwaves_left-- + new /obj/effect/shockwave(epicenter, stage2_radius, 0.5, easing, offset_y) + addtimer(CALLBACK(src, PROC_REF(create_shriekwave), shriekwaves_left), 3) + return + if(shriekwaves_left > 4) + shriekwaves_left-- + new /obj/effect/shockwave(epicenter, stage3_radius, 0.5, easing, offset_y) + addtimer(CALLBACK(src, PROC_REF(create_shriekwave), shriekwaves_left), 3) + return + if(shriekwaves_left > 1) + shriekwaves_left-- + new /obj/effect/shockwave(epicenter, stage4_radius, 0.5, easing, offset_y) + addtimer(CALLBACK(src, PROC_REF(create_shriekwave), shriekwaves_left), 3) + return + if(shriekwaves_left == 1) + shriekwaves_left-- + new /obj/effect/shockwave(epicenter, 10.5, 0.6, easing, offset_y) /mob/living/carbon/xenomorph/proc/create_stomp() remove_suit_layer() From 53e721666c8d46b32d9379f3663f789359202c2e Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 21 Apr 2024 22:43:32 +0100 Subject: [PATCH 189/431] Automatic changelog for PR #5938 [ci skip] --- html/changelogs/AutoChangeLog-pr-5938.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-5938.yml diff --git a/html/changelogs/AutoChangeLog-pr-5938.yml b/html/changelogs/AutoChangeLog-pr-5938.yml new file mode 100644 index 000000000000..7a28ba826a5d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5938.yml @@ -0,0 +1,5 @@ +author: "GrrrKitten" +delete-after: True +changes: + - rscadd: "Adds shockwave VFX to powerful explosions" + - rscadd: "Adds shockwave VFX to Queen + Predalien screech" \ No newline at end of file From 3a4e914594fae21b2a171e0399e9a0d9a5b6af8b Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 22 Apr 2024 01:11:38 +0000 Subject: [PATCH 190/431] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-5938.yml | 5 ----- html/changelogs/AutoChangeLog-pr-6124.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6126.yml | 6 ------ html/changelogs/AutoChangeLog-pr-6165.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6166.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6167.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6168.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6171.yml | 4 ---- html/changelogs/archive/2024-04.yml | 21 +++++++++++++++++++++ 9 files changed, 21 insertions(+), 35 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-5938.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6124.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6126.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6165.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6166.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6167.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6168.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6171.yml diff --git a/html/changelogs/AutoChangeLog-pr-5938.yml b/html/changelogs/AutoChangeLog-pr-5938.yml deleted file mode 100644 index 7a28ba826a5d..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5938.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "GrrrKitten" -delete-after: True -changes: - - rscadd: "Adds shockwave VFX to powerful explosions" - - rscadd: "Adds shockwave VFX to Queen + Predalien screech" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6124.yml b/html/changelogs/AutoChangeLog-pr-6124.yml deleted file mode 100644 index 1e02f4897a69..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6124.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "realforest2001" -delete-after: True -changes: - - rscadd: "Added ID Modification Log to the Access Report printout from an ID Console." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6126.yml b/html/changelogs/AutoChangeLog-pr-6126.yml deleted file mode 100644 index 32c18a571e83..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6126.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "LC4492" -delete-after: True -changes: - - rscadd: "Adds a new, better variation of the normal photocopier." - - imageadd: "Adds a new sprite to the new photocopier variation and updates the sprites of both normal, and new photocopiers to look slightly better." - - maptweak: "Adds the new photocopiers to the CC and CL offices." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6165.yml b/html/changelogs/AutoChangeLog-pr-6165.yml deleted file mode 100644 index 0f67210d4ce4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6165.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Git-Nivrak" -delete-after: True -changes: - - rscdel: "Reverted back to old throw logic" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6166.yml b/html/changelogs/AutoChangeLog-pr-6166.yml deleted file mode 100644 index 273b212dbda3..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6166.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "realforest2001" -delete-after: True -changes: - - bugfix: "Delaying round start now shows on the timer again." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6167.yml b/html/changelogs/AutoChangeLog-pr-6167.yml deleted file mode 100644 index 0406b100623e..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6167.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Zonespace27" -delete-after: True -changes: - - admin: "Unmarked tickets now mark themselves when an admin starts responding to one" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6168.yml b/html/changelogs/AutoChangeLog-pr-6168.yml deleted file mode 100644 index 3f1451a862c5..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6168.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "harryob" -delete-after: True -changes: - - bugfix: "you can bind to space again" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6171.yml b/html/changelogs/AutoChangeLog-pr-6171.yml deleted file mode 100644 index d9cd7b85fa1a..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6171.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "iloveloopers" -delete-after: True -changes: - - bugfix: "custom flamer fuels no longer work for increasing OT assembly's caps" \ No newline at end of file diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml index b3f9ffa64195..5373972976df 100644 --- a/html/changelogs/archive/2024-04.yml +++ b/html/changelogs/archive/2024-04.yml @@ -299,3 +299,24 @@ - rscadd: Added an ARES Log for chambering the OB Cannon. vero5123: - bugfix: toggling ghost vision now keeps the user's mob visible. +2024-04-22: + Git-Nivrak: + - rscdel: Reverted back to old throw logic + GrrrKitten: + - rscadd: Adds shockwave VFX to powerful explosions + - rscadd: Adds shockwave VFX to Queen + Predalien screech + LC4492: + - rscadd: Adds a new, better variation of the normal photocopier. + - imageadd: Adds a new sprite to the new photocopier variation and updates the sprites + of both normal, and new photocopiers to look slightly better. + - maptweak: Adds the new photocopiers to the CC and CL offices. + Zonespace27: + - admin: Unmarked tickets now mark themselves when an admin starts responding to + one + harryob: + - bugfix: you can bind to space again + iloveloopers: + - bugfix: custom flamer fuels no longer work for increasing OT assembly's caps + realforest2001: + - bugfix: Delaying round start now shows on the timer again. + - rscadd: Added ID Modification Log to the Access Report printout from an ID Console. From da476e741408603dc4589b6c41fd7933f7f3540e Mon Sep 17 00:00:00 2001 From: Drathek <76988376+Drulikar@users.noreply.github.com> Date: Mon, 22 Apr 2024 14:16:10 -0700 Subject: [PATCH 191/431] External Bleeding Sealing in Cryo Tubes (#6175) # About the pull request This PR is sort of a follow up to #6058 expanding on the bleeding stop effect for cryotubes allowing them to also seal external bleeding. Since internal bleeding did not cap the reduction in blood loss, it could underflow resulting in blood being added for the last tick. This is now fixed. # Explain why it's good for the game Cryotubes already cure IB when cryo chemicals are used because of the patient reaching low temperatures, so I see little reason why the effect wouldn't also occur for external bleeding if you're in a cryotube. # Testing Photographs and Procedure
Screenshots & Videos https://github.com/cmss13-devs/cmss13/assets/76988376/7dffed9b-051c-4cfc-9c01-7314766d5d15
# Changelog :cl: balance: Cryotubes now also cure external bleeding fix: Fixed internal bleeding granting blood on its last tick /:cl: --- code/datums/effects/bleeding.dm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/code/datums/effects/bleeding.dm b/code/datums/effects/bleeding.dm index 2171580a94db..f56efbb3c69d 100644 --- a/code/datums/effects/bleeding.dm +++ b/code/datums/effects/bleeding.dm @@ -71,6 +71,11 @@ if(affected_mob.reagents.get_reagent_amount("thwei")) blood_loss -= THWEI_BLOOD_REDUCTION + if(affected_mob.bodytemperature < T0C && (affected_mob.reagents.get_reagent_amount("cryoxadone") || affected_mob.reagents.get_reagent_amount("clonexadone"))) + var/obj/structure/machinery/cryo_cell/cryo = affected_mob.loc + if(istype(cryo) && cryo.on && cryo.operable()) + blood_loss -= CRYO_BLOOD_REDUCTION + var/mob/living/carbon/human/affected_human = affected_mob if(istype(affected_human)) if(affected_human.chem_effect_flags & CHEM_EFFECT_NO_BLEEDING) @@ -95,18 +100,19 @@ if(affected_mob.in_stasis == STASIS_IN_BAG) return FALSE - if(affected_mob.bodytemperature < T0C && (affected_mob.reagents && affected_mob.reagents.get_reagent_amount("cryoxadone") || affected_mob.reagents.get_reagent_amount("clonexadone"))) - blood_loss -= CRYO_BLOOD_REDUCTION - if(affected_mob.reagents) // Annoying QC check if(affected_mob.reagents.get_reagent_amount("thwei")) blood_loss -= THWEI_BLOOD_REDUCTION + if(affected_mob.bodytemperature < T0C && (affected_mob.reagents.get_reagent_amount("cryoxadone") || affected_mob.reagents.get_reagent_amount("clonexadone"))) + blood_loss -= CRYO_BLOOD_REDUCTION + var/mob/living/carbon/human/affected_human = affected_mob if(istype(affected_human)) if(affected_human.chem_effect_flags & CHEM_EFFECT_NO_BLEEDING) return FALSE + blood_loss = max(blood_loss, 0) // Bleeding shouldn't give extra blood even if its only 1 tick affected_mob.blood_volume = max(affected_mob.blood_volume - blood_loss, 0) return TRUE From 550f4f4a12354ec59c9878b44a4a35a04e531367 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Mon, 22 Apr 2024 22:21:07 +0100 Subject: [PATCH 192/431] Automatic changelog for PR #6175 [ci skip] --- html/changelogs/AutoChangeLog-pr-6175.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6175.yml diff --git a/html/changelogs/AutoChangeLog-pr-6175.yml b/html/changelogs/AutoChangeLog-pr-6175.yml new file mode 100644 index 000000000000..3adc713a94c4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6175.yml @@ -0,0 +1,5 @@ +author: "Drulikar" +delete-after: True +changes: + - balance: "Cryotubes now also cure external bleeding" + - bugfix: "Fixed internal bleeding granting blood on its last tick" \ No newline at end of file From cb9f8942c3589e73abb46ad168b5e926e1fa820c Mon Sep 17 00:00:00 2001 From: Changelogs Date: Tue, 23 Apr 2024 01:10:25 +0000 Subject: [PATCH 193/431] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-6175.yml | 5 ----- html/changelogs/archive/2024-04.yml | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-6175.yml diff --git a/html/changelogs/AutoChangeLog-pr-6175.yml b/html/changelogs/AutoChangeLog-pr-6175.yml deleted file mode 100644 index 3adc713a94c4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6175.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Drulikar" -delete-after: True -changes: - - balance: "Cryotubes now also cure external bleeding" - - bugfix: "Fixed internal bleeding granting blood on its last tick" \ No newline at end of file diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml index 5373972976df..d376ddccc565 100644 --- a/html/changelogs/archive/2024-04.yml +++ b/html/changelogs/archive/2024-04.yml @@ -320,3 +320,7 @@ realforest2001: - bugfix: Delaying round start now shows on the timer again. - rscadd: Added ID Modification Log to the Access Report printout from an ID Console. +2024-04-23: + Drulikar: + - balance: Cryotubes now also cure external bleeding + - bugfix: Fixed internal bleeding granting blood on its last tick From c7269abde29f33b9d29bd2552533182731ec6c9f Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Tue, 23 Apr 2024 08:48:44 +0300 Subject: [PATCH 194/431] Fixes boilers slowing themselves (#6177) # About the pull request Fixes a bug where boilers would slow themselves by using using toggle long-range sight when resting # Explain why it's good for the game Bugs are bad # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: Fixes boilers slowing themselves by using long range sight while resting. /:cl: --------- Co-authored-by: fira --- .../mob/living/carbon/xenomorph/abilities/general_abilities.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm index f62bb9e17421..f36e23394eef 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm @@ -296,6 +296,9 @@ /datum/action/xeno_action/onclick/toggle_long_range/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner + if (!xeno.check_state()) + return + if(xeno.observed_xeno) return From a389eef9f461f53315ed98b374760d8505838bd0 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 23 Apr 2024 06:53:21 +0100 Subject: [PATCH 195/431] Automatic changelog for PR #6177 [ci skip] --- html/changelogs/AutoChangeLog-pr-6177.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6177.yml diff --git a/html/changelogs/AutoChangeLog-pr-6177.yml b/html/changelogs/AutoChangeLog-pr-6177.yml new file mode 100644 index 000000000000..2395e50fe825 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6177.yml @@ -0,0 +1,4 @@ +author: "Git-Nivrak" +delete-after: True +changes: + - bugfix: "Fixes boilers slowing themselves by using long range sight while resting." \ No newline at end of file From 2e6f6dd036aca80d4ad12774f79b90c9942d8db0 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Tue, 23 Apr 2024 01:53:49 -0400 Subject: [PATCH 196/431] alt clicking a reagent tank will now toggle whether its dispensing or filling (#6176) # About the pull request the title # Explain why it's good for the game its QOL better OT speedrunning # Testing Photographs and Procedure testing seems to work fine but I'm not sure if there could be any undesired side effects # Changelog :cl: qol: Alt clicking a reagent tank will now toggle whether its dispensing or filling /:cl: --------- Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- .../objects/structures/reagent_dispensers.dm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm index a89f35ce38f3..d0f9f513e7f8 100644 --- a/code/game/objects/structures/reagent_dispensers.dm +++ b/code/game/objects/structures/reagent_dispensers.dm @@ -129,6 +129,25 @@ if(N) amount_per_transfer_from_this = N +/obj/structure/reagent_dispensers/clicked(mob/user, list/mods) + if(!Adjacent(user)) + return ..() + + if(!ishuman(user)) + return ..() + + if(!reagents || reagents.locked) + return ..() + + if(mods["alt"]) + dispensing = !dispensing + if(dispensing) + to_chat(user, SPAN_NOTICE("[src] is now dispensing")) + else + to_chat(user, SPAN_NOTICE("[src] is now filling")) + return TRUE + return ..() + /obj/structure/reagent_dispensers/attackby(obj/item/hit_item, mob/living/user) if(istype(hit_item, /obj/item/reagent_container)) return From 10c0b108d40d45776defebeb5142c5b355bc408a Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 23 Apr 2024 06:58:42 +0100 Subject: [PATCH 197/431] Automatic changelog for PR #6176 [ci skip] --- html/changelogs/AutoChangeLog-pr-6176.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6176.yml diff --git a/html/changelogs/AutoChangeLog-pr-6176.yml b/html/changelogs/AutoChangeLog-pr-6176.yml new file mode 100644 index 000000000000..9a7cef1f0df1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6176.yml @@ -0,0 +1,4 @@ +author: "iloveloopers" +delete-after: True +changes: + - qol: "Alt clicking a reagent tank will now toggle whether its dispensing or filling" \ No newline at end of file From 88955d735d44d1d6b94805663430cd69f330a50b Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 24 Apr 2024 01:11:22 +0000 Subject: [PATCH 198/431] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-6176.yml | 4 ---- html/changelogs/AutoChangeLog-pr-6177.yml | 4 ---- html/changelogs/archive/2024-04.yml | 5 +++++ 3 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-6176.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-6177.yml diff --git a/html/changelogs/AutoChangeLog-pr-6176.yml b/html/changelogs/AutoChangeLog-pr-6176.yml deleted file mode 100644 index 9a7cef1f0df1..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6176.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "iloveloopers" -delete-after: True -changes: - - qol: "Alt clicking a reagent tank will now toggle whether its dispensing or filling" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6177.yml b/html/changelogs/AutoChangeLog-pr-6177.yml deleted file mode 100644 index 2395e50fe825..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6177.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Git-Nivrak" -delete-after: True -changes: - - bugfix: "Fixes boilers slowing themselves by using long range sight while resting." \ No newline at end of file diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml index d376ddccc565..efa0f73ad350 100644 --- a/html/changelogs/archive/2024-04.yml +++ b/html/changelogs/archive/2024-04.yml @@ -324,3 +324,8 @@ Drulikar: - balance: Cryotubes now also cure external bleeding - bugfix: Fixed internal bleeding granting blood on its last tick +2024-04-24: + Git-Nivrak: + - bugfix: Fixes boilers slowing themselves by using long range sight while resting. + iloveloopers: + - qol: Alt clicking a reagent tank will now toggle whether its dispensing or filling From cba9817e5e75295b8731b520ce9964ab4ae2bb5f Mon Sep 17 00:00:00 2001 From: Steelpoint <6595389+Steelpoint@users.noreply.github.com> Date: Wed, 24 Apr 2024 12:04:56 +0800 Subject: [PATCH 199/431] UPP/CLF Combat Synth Presets (#6183) # About the pull request Adds a UPP and CLF Combat Synthetic preset, allowing staff to spawn in a ready to go combat synthetic. These are admin only, they can not spawn in via regular gameplay. Their loadouts have been slightly tweaked to retain their current setup but with an emphasis on having combat weapons. # Explain why it's good for the game Adds extra options for staff who may want to allow a Combat Synthetic to appear in-game for an event, the preset will make it quicker to spawn one in instead of requiring an admin to fiddle with changing a Synthetic to a combatant and spawning it in gear. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: add: UPP and CLF Combat Synthetic preset is now available for admins to spawn them in. /:cl: --------- Co-authored-by: Steelpoint Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/modules/gear_presets/clf.dm | 48 +++++++++++++++++++++++++++ code/modules/gear_presets/upp.dm | 56 ++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm index 9c05ff8fa5fc..143a2271f00e 100644 --- a/code/modules/gear_presets/clf.dm +++ b/code/modules/gear_presets/clf.dm @@ -900,6 +900,54 @@ list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), ) +/datum/equipment_preset/clf/synth/combat + name = "CLF Combat Synthetic" + flags = EQUIPMENT_PRESET_EXTRA + +/datum/equipment_preset/clf/synth/combat/load_skills(mob/living/carbon/human/new_human) + . = ..() + new_human.allow_gun_usage = TRUE + +/datum/equipment_preset/clf/synth/combat/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/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/roller, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + //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/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY) + 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/ammo_magazine/rifle/mar40/extended, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine, WEAR_J_STORE) + //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/commander diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 39aed17a1fad..cdb955bd9696 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -2806,6 +2806,62 @@ list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), ) + +/datum/equipment_preset/upp/synth/combat + name = "UPP Combat Synthetic" + flags = EQUIPMENT_PRESET_EXTRA + + assignment = JOB_UPP_COMBAT_SYNTH + rank = JOB_UPP_COMBAT_SYNTH + +/datum/equipment_preset/upp/synth/combat/load_skills(mob/living/carbon/human/new_human) + . = ..() + new_human.allow_gun_usage = TRUE + +/datum/equipment_preset/upp/synth/combat/load_gear(mob/living/carbon/human/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/tool/surgery/surgical_line, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/epinephrine, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/bottle/epinephrine, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/blood/OMinus, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver, WEAR_R_EAR) + 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 + var/hat = pick(/obj/item/clothing/head/uppcap, /obj/item/clothing/head/uppcap/beret, /obj/item/clothing/head/uppcap/ushanka) + new_human.equip_to_slot_or_del(new hat, WEAR_HEAD) + //body + var/obj/item/clothing/under/marine/veteran/UPP/UPP = new() + var/obj/item/clothing/accessory/storage/surg_vest/drop_green/upp/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/weapon/telebaton, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/bizon, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/bizon, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/bizon/upp, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/synth, 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) + //pockets + var/obj/item/storage/pouch/magazine/large/ppouch = new() + new_human.equip_to_slot_or_del(ppouch, WEAR_L_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_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical/upp, WEAR_R_STORE) + //*****************************************************************************************************/ /datum/equipment_preset/upp/conscript From dc9aa36465d5271a251141647001b75325c35967 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Wed, 24 Apr 2024 05:10:39 +0100 Subject: [PATCH 200/431] Automatic changelog for PR #6183 [ci skip] --- html/changelogs/AutoChangeLog-pr-6183.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6183.yml diff --git a/html/changelogs/AutoChangeLog-pr-6183.yml b/html/changelogs/AutoChangeLog-pr-6183.yml new file mode 100644 index 000000000000..5971ec8dae32 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6183.yml @@ -0,0 +1,4 @@ +author: "Steelpoint" +delete-after: True +changes: + - rscadd: "UPP and CLF Combat Synthetic preset is now available for admins to spawn them in." \ No newline at end of file From cc1ba1d2df4d6ccb8892ba91c08b0a33e734f1e6 Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Wed, 24 Apr 2024 20:58:38 +0300 Subject: [PATCH 201/431] Fixes spotlight breaking every time (#6184) # About the pull request Spotlight no longer turns off during transit. Who cares about lighting in space anyway? # Explain why it's good for the game Convenient and clear. # Testing Photographs and Procedure
I tested it
# Changelog :cl: ihatethisengine fix: spotlight no longer breaks after every flight /:cl: --- code/modules/cm_marines/dropship_equipment.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index bd40076ea500..af06f468adcd 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -524,12 +524,6 @@ if(light_on) set_light(0) -/obj/structure/dropship_equipment/electronics/spotlights/on_launch() - set_light(0) - -/obj/structure/dropship_equipment/electronics/spotlights/on_arrival() - set_light(brightness) - /obj/structure/dropship_equipment/electronics/spotlights/ui_data(mob/user) . = list() var/is_deployed = light_on From e58c905d8a78dbde9d71639c864c64070c2c905c Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Wed, 24 Apr 2024 19:03:04 +0100 Subject: [PATCH 202/431] Automatic changelog for PR #6184 [ci skip] --- html/changelogs/AutoChangeLog-pr-6184.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6184.yml diff --git a/html/changelogs/AutoChangeLog-pr-6184.yml b/html/changelogs/AutoChangeLog-pr-6184.yml new file mode 100644 index 000000000000..ed42d160bdee --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6184.yml @@ -0,0 +1,4 @@ +author: "ihatethisengine" +delete-after: True +changes: + - bugfix: "spotlight no longer breaks after every flight" \ No newline at end of file From 6bec1ddce6470251ee61b628c51e76c3d5e52bf8 Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Wed, 24 Apr 2024 20:50:38 +0100 Subject: [PATCH 203/431] Project ARES: Fixes deleting flight logs. (#6186) # About the pull request As title says, this lets you delete flight logs as intended. # Explain why it's good for the game Bugs are bad. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: You can delete flight logs from ARES Interface again as intended. /:cl: --- code/game/machinery/ARES/ARES_interface.dm | 4 ++++ tgui/packages/tgui/interfaces/AresInterface.jsx | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/ARES/ARES_interface.dm b/code/game/machinery/ARES/ARES_interface.dm index 6cc7c220fd04..341e6a05acf4 100644 --- a/code/game/machinery/ARES/ARES_interface.dm +++ b/code/game/machinery/ARES/ARES_interface.dm @@ -368,6 +368,10 @@ new_title = "[record.title] at [record.time]" new_details = record.details datacore.records_tech -= record + if(ARES_RECORD_FLIGHT) + new_title = "[record.title] at [record.time]" + new_details = record.details + datacore.records_flight -= record new_delete.details = new_details new_delete.user = last_login diff --git a/tgui/packages/tgui/interfaces/AresInterface.jsx b/tgui/packages/tgui/interfaces/AresInterface.jsx index be9106e31c25..bcd200d45d74 100644 --- a/tgui/packages/tgui/interfaces/AresInterface.jsx +++ b/tgui/packages/tgui/interfaces/AresInterface.jsx @@ -66,7 +66,7 @@ const Login = (props) => { WY-DOS Executive - Version 8.2.3 + Version 8.3.4 Copyright © 2182, Weyland Yutani Corp. + )} {x.value === DoorStatusEnum.SHUTTLE_DOOR_UNLOCKED && (