diff --git a/code/__DEFINES/ARES.dm b/code/__DEFINES/ARES.dm index 55aa68f97309..be9609476356 100644 --- a/code/__DEFINES/ARES.dm +++ b/code/__DEFINES/ARES.dm @@ -82,3 +82,7 @@ /// Time until someone can respawn as Working Joe #define JOE_JOIN_DEAD_TIME (15 MINUTES) + +/// Lockdown defines +#define ARES_LOCKDOWN_READY 0 +#define ARES_LOCKDOWN_ACTIVE 1 diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm index 05f110ec1a0c..55d076889e49 100644 --- a/code/game/machinery/ARES/ARES_procs.dm +++ b/code/game/machinery/ARES/ARES_procs.dm @@ -106,9 +106,13 @@ GLOBAL_LIST_INIT(maintenance_categories, list( /// Is nuke request usable or not? var/nuke_available = TRUE + /// Status of the AI Core Lockdown + var/ai_lockdown_state = ARES_LOCKDOWN_READY + COOLDOWN_DECLARE(ares_distress_cooldown) COOLDOWN_DECLARE(ares_nuclear_cooldown) COOLDOWN_DECLARE(ares_quarters_cooldown) + COOLDOWN_DECLARE(aicore_lockdown) // ------ ARES Logging Procs ------ // /proc/ares_is_active() diff --git a/code/game/machinery/aicore_lockdown.dm b/code/game/machinery/aicore_lockdown.dm index d4edee5f86cc..bf58a45ff7d9 100644 --- a/code/game/machinery/aicore_lockdown.dm +++ b/code/game/machinery/aicore_lockdown.dm @@ -1,13 +1,8 @@ -#define LOCKDOWN_READY 0 -#define LOCKDOWN_ACTIVE 1 -GLOBAL_VAR_INIT(ai_lockdown_state, LOCKDOWN_READY) - /obj/structure/machinery/aicore_lockdown - name = "Emergency Containment Breach" + name = "AI Core Lockdown" icon_state = "big_red_button_tablev" unslashable = TRUE unacidable = TRUE - COOLDOWN_DECLARE(containment_lockdown) /obj/structure/machinery/aicore_lockdown/ex_act(severity) return FALSE @@ -29,30 +24,37 @@ GLOBAL_VAR_INIT(ai_lockdown_state, LOCKDOWN_READY) flick(initial(icon_state) + "-denied", src) return FALSE - if(!COOLDOWN_FINISHED(src, containment_lockdown)) - to_chat(user, SPAN_BOLDWARNING("AI Core Lockdown procedures are on cooldown! They will be ready in [COOLDOWN_SECONDSLEFT(src, containment_lockdown)] seconds!")) + if(!COOLDOWN_FINISHED(GLOB.ares_datacore, aicore_lockdown)) + to_chat(user, SPAN_BOLDWARNING("AI Core Lockdown procedures are on cooldown! They will be ready in [COOLDOWN_SECONDSLEFT(GLOB.ares_datacore, aicore_lockdown)] seconds!")) return FALSE add_fingerprint(user) aicore_lockdown(user) - COOLDOWN_START(src, containment_lockdown, 5 MINUTES) + COOLDOWN_START(GLOB.ares_datacore, aicore_lockdown, 2 MINUTES) /obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown name = "ARES Emergency Lockdown Shutter" density = FALSE + open_layer = 1.9 + plane = FLOOR_PLANE /obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore icon_state = "aidoor1" base_icon_state = "aidoor" +/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore/white + icon_state = "w_aidoor1" + base_icon_state = "w_aidoor" + +/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/white + icon_state = "w_almayer_pdoor1" + base_icon_state = "w_almayer_pdoor" + /obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/Initialize() . = ..() RegisterSignal(SSdcs, COMSIG_GLOB_AICORE_LOCKDOWN, PROC_REF(close)) RegisterSignal(SSdcs, COMSIG_GLOB_AICORE_LIFT, PROC_REF(open)) -/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/white - icon_state = "w_almayer_pdoor1" - base_icon_state = "w_almayer_pdoor" /client/proc/admin_aicore_alert() set name = "AI Core Lockdown" @@ -77,7 +79,7 @@ GLOBAL_VAR_INIT(ai_lockdown_state, LOCKDOWN_READY) if(IsAdminAdvancedProcCall()) return PROC_BLOCKED - var/log = "[key_name(user)] triggered research AI core lockdown!" + var/log = "[key_name(user)] triggered AI core lockdown!" var/ares_log = "[user.name] triggered triggered AI Core Emergency Lockdown." if(!message) message = "ATTENTION! \n\nCORE SECURITY ALERT. \n\nAI CORE UNDER LOCKDOWN." @@ -87,13 +89,14 @@ GLOBAL_VAR_INIT(ai_lockdown_state, LOCKDOWN_READY) log += " (Admin Triggered)." ares_log = "[MAIN_AI_SYSTEM] triggered AI Core Emergency Lockdown." - switch(GLOB.ai_lockdown_state) - if(LOCKDOWN_READY) - GLOB.ai_lockdown_state = LOCKDOWN_ACTIVE - set_security_level(SEC_LEVEL_RED, TRUE, FALSE) + switch(GLOB.ares_datacore.ai_lockdown_state) + if(ARES_LOCKDOWN_READY) + GLOB.ares_datacore.ai_lockdown_state = ARES_LOCKDOWN_ACTIVE + if(GLOB.security_level < SEC_LEVEL_RED) + set_security_level(SEC_LEVEL_RED, TRUE, FALSE) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_AICORE_LOCKDOWN) - if(LOCKDOWN_ACTIVE) - GLOB.ai_lockdown_state = LOCKDOWN_READY + if(ARES_LOCKDOWN_ACTIVE) + GLOB.ares_datacore.ai_lockdown_state = ARES_LOCKDOWN_READY message = "ATTENTION! \n\nAI CORE EMERGENCY LOCKDOWN LIFTED." log = "[key_name(user)] lifted AI core lockdown!" ares_log = "[user.name] lifted AI Core Emergency Lockdown." @@ -101,12 +104,10 @@ GLOBAL_VAR_INIT(ai_lockdown_state, LOCKDOWN_READY) log += " (Admin Triggered)." ares_log = "[MAIN_AI_SYSTEM] lifted AI Core Emergency Lockdown." - set_security_level(SEC_LEVEL_BLUE, TRUE, FALSE) + if(GLOB.security_level > SEC_LEVEL_GREEN) + set_security_level(SEC_LEVEL_BLUE, TRUE, FALSE) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_AICORE_LIFT) shipwide_ai_announcement(message, MAIN_AI_SYSTEM, 'sound/effects/biohazard.ogg') message_admins(log) log_ares_security("AI Core Lockdown", ares_log) - -#undef LOCKDOWN_READY -#undef LOCKDOWN_ACTIVE diff --git a/code/game/machinery/biohazard_lockdown.dm b/code/game/machinery/biohazard_lockdown.dm index 90d620f1fcf3..8474dbd5df2a 100644 --- a/code/game/machinery/biohazard_lockdown.dm +++ b/code/game/machinery/biohazard_lockdown.dm @@ -86,7 +86,8 @@ GLOBAL_VAR_INIT(med_lockdown_state, LOCKDOWN_READY) switch(GLOB.med_lockdown_state) if(LOCKDOWN_READY) GLOB.med_lockdown_state = LOCKDOWN_ACTIVE - set_security_level(SEC_LEVEL_RED, TRUE, FALSE) + if(GLOB.security_level < SEC_LEVEL_RED) + set_security_level(SEC_LEVEL_RED, TRUE, FALSE) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_RESEARCH_LOCKDOWN) if(LOCKDOWN_ACTIVE) GLOB.med_lockdown_state = LOCKDOWN_READY @@ -97,7 +98,8 @@ GLOBAL_VAR_INIT(med_lockdown_state, LOCKDOWN_READY) log += " (Admin Triggered)." ares_log = "[MAIN_AI_SYSTEM] lifted Medical Research Biohazard Containment Lockdown." - set_security_level(SEC_LEVEL_BLUE, TRUE, FALSE) + if(GLOB.security_level > SEC_LEVEL_GREEN) + set_security_level(SEC_LEVEL_BLUE, TRUE, FALSE) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_RESEARCH_LIFT) shipwide_ai_announcement(message, MAIN_AI_SYSTEM, 'sound/effects/biohazard.ogg') diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm index 8a8698d0c047..10cf69d232bb 100644 --- a/code/game/turfs/floor_types.dm +++ b/code/game/turfs/floor_types.dm @@ -331,6 +331,15 @@ . = ..() set_light_on(TRUE) + RegisterSignal(SSdcs, COMSIG_GLOB_AICORE_LOCKDOWN, PROC_REF(start_emergency_light_on)) + RegisterSignal(SSdcs, COMSIG_GLOB_AICORE_LIFT, PROC_REF(start_emergency_light_off)) + +/turf/open/floor/almayer/aicore/glowing/proc/start_emergency_light_on() + set_light(l_color = "#c70f0f") + +/turf/open/floor/almayer/aicore/glowing/proc/start_emergency_light_off() + set_light(l_color = "#d69c46") + /turf/open/floor/almayer/aicore/no_build allow_construction = FALSE hull_floor = TRUE diff --git a/icons/obj/structures/doors/blastdoors_shutters.dmi b/icons/obj/structures/doors/blastdoors_shutters.dmi index 8c63d0580922..1fe1df44b23a 100644 Binary files a/icons/obj/structures/doors/blastdoors_shutters.dmi and b/icons/obj/structures/doors/blastdoors_shutters.dmi differ diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 84eb6b3b142a..057385ff5c3e 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -14160,6 +14160,15 @@ icon_state = "red" }, /area/almayer/shipboard/weapon_room) +"bFg" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_floor2" + }, +/area/almayer/command/airoom) "bFj" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -14601,15 +14610,7 @@ name = "\improper ARES Mainframe Shutters"; plane = -7 }, -/obj/structure/machinery/door/poddoor/almayer/blended/aicore/open{ - closed_layer = 3.2; - id = "ARES Emergency"; - layer = 3.2; - name = "ARES Emergency Lockdown"; - needs_power = 0; - open_layer = 1.9; - plane = -7 - }, +/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore, /turf/open/floor/almayer/no_build{ icon_state = "test_floor4" }, @@ -20167,15 +20168,15 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/structure/disposaloutlet{ +/obj/structure/machinery/disposal/delivery{ density = 0; - desc = "An outlet for the pneumatic delivery system."; - icon_state = "delivery_outlet"; - name = "take-ins"; - pixel_x = -1; + desc = "A pneumatic delivery unit."; + icon_state = "delivery_engi"; + name = "Returns"; pixel_y = 28; - range = 0 + pixel_x = 25 }, +/obj/structure/surface/rack, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) "cJK" = ( @@ -22464,7 +22465,9 @@ autoname = 0; c_tag = "AI - Secondary Processors" }, -/turf/open/floor/almayer/aicore/glowing/no_build, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_floor2" + }, /area/almayer/command/airoom) "dzG" = ( /obj/structure/reagent_dispensers/peppertank{ @@ -25241,6 +25244,19 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) +"etM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_floor2" + }, +/area/almayer/command/airoom) "etN" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/plating/plating_catwalk, @@ -26358,7 +26374,7 @@ /obj/structure/machinery/door_control{ id = "ARES StairsUpper"; name = "ARES Core Access"; - pixel_x = -10; + pixel_x = -5; pixel_y = -24; req_one_access_txt = "91;92" }, @@ -26366,20 +26382,14 @@ id = "ARES StairsLock"; name = "ARES Exterior Lockdown"; pixel_y = -24; - req_one_access_txt = "91;92" + req_one_access_txt = "91;92"; + pixel_x = 6 }, /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 @@ -26769,18 +26779,19 @@ /turf/open/floor/almayer, /area/almayer/living/offices) "eXy" = ( -/obj/effect/step_trigger/teleporter_vector{ +/obj/effect/projector{ name = "Almayer_AresDown"; vector_x = 96; vector_y = -65 }, -/obj/structure/machinery/light{ - dir = 1 - }, /obj/structure/stairs{ - dir = 1 + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/glowing/no_build{ + icon_state = "ai_floor3"; + light_range = 3 }, -/turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) "eXD" = ( /obj/structure/prop/invuln/lattice_prop{ @@ -28784,7 +28795,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, -/turf/open/floor/almayer/aicore/glowing/no_build, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_floor2" + }, /area/almayer/command/airoom) "fKh" = ( /obj/structure/window/framed/almayer, @@ -28951,15 +28964,6 @@ plane = -7 }, /obj/effect/step_trigger/ares_alert/core, -/obj/structure/machinery/door/poddoor/almayer/blended/aicore/open{ - closed_layer = 3.2; - id = "ARES Emergency"; - layer = 3.2; - name = "ARES Emergency Lockdown"; - needs_power = 0; - open_layer = 1.9; - plane = -7 - }, /obj/structure/sign/safety/laser{ pixel_x = 32; pixel_y = -8 @@ -28968,6 +28972,7 @@ pixel_x = 32; pixel_y = 6 }, +/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore, /turf/open/floor/almayer/no_build{ icon_state = "test_floor4" }, @@ -31207,6 +31212,9 @@ req_one_access_txt = "91;92"; dir = 1 }, +/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore{ + plane = -6 + }, /turf/open/floor/almayer/no_build{ icon_state = "test_floor4" }, @@ -35739,7 +35747,9 @@ /obj/effect/decal/warning_stripes{ icon_state = "SE-out" }, -/turf/open/floor/almayer/aicore/glowing/no_build, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_floor2" + }, /area/almayer/command/airoom) "igs" = ( /obj/structure/surface/table/almayer, @@ -36051,17 +36061,12 @@ 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 }, +/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown, /turf/open/floor/almayer/no_build{ icon_state = "test_floor4" }, @@ -36683,9 +36688,9 @@ }, /area/almayer/squads/delta) "izf" = ( -/obj/structure/disposalpipe/down/almayer{ +/obj/structure/disposalpipe/up/almayer{ dir = 4; - id = "ares_vault_in"; + id = "ares_vault_out"; name = "aicore" }, /turf/closed/wall/almayer/aicore/hull, @@ -38339,15 +38344,14 @@ pixel_x = -2; pixel_y = 26 }, -/obj/structure/machinery/door_control/brbutton{ - id = "ARES Emergency"; - name = "ARES Emergency Lockdown Override"; - pixel_x = 8; - pixel_y = 26 - }, /obj/structure/machinery/computer/cameras/almayer/ares{ dir = 4 }, +/obj/structure/machinery/aicore_lockdown{ + icon_state = "big_red_button_wallv"; + pixel_x = 8; + pixel_y = 26 + }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "jbX" = ( @@ -39300,15 +39304,7 @@ plane = -7 }, /obj/effect/step_trigger/ares_alert/core, -/obj/structure/machinery/door/poddoor/almayer/blended/aicore/open{ - closed_layer = 3.2; - id = "ARES Emergency"; - layer = 3.2; - name = "ARES Emergency Lockdown"; - needs_power = 0; - open_layer = 1.9; - plane = -7 - }, +/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore, /turf/open/floor/almayer/no_build{ icon_state = "test_floor4" }, @@ -48270,6 +48266,10 @@ /area/almayer/living/port_emb) "mAe" = ( /obj/structure/window/framed/almayer/aicore/hull/black/hijack_bustable, +/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown{ + plane = -6; + dir = 4 + }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) "mAp" = ( @@ -48607,15 +48607,7 @@ name = "\improper ARES Mainframe Shutters"; plane = -7 }, -/obj/structure/machinery/door/poddoor/almayer/blended/aicore/open{ - closed_layer = 3.2; - id = "ARES Emergency"; - layer = 3.2; - name = "ARES Emergency Lockdown"; - needs_power = 0; - open_layer = 1.9; - plane = -7 - }, +/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore, /turf/open/floor/almayer/no_build{ icon_state = "test_floor4" }, @@ -49291,15 +49283,6 @@ plane = -7 }, /obj/effect/step_trigger/ares_alert/core, -/obj/structure/machinery/door/poddoor/almayer/blended/aicore/open{ - closed_layer = 3.2; - id = "ARES Emergency"; - layer = 3.2; - name = "ARES Emergency Lockdown"; - needs_power = 0; - open_layer = 1.9; - plane = -7 - }, /obj/structure/sign/safety/terminal{ pixel_x = -18; pixel_y = -8 @@ -49308,6 +49291,7 @@ pixel_x = -18; pixel_y = 6 }, +/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore, /turf/open/floor/almayer/no_build{ icon_state = "test_floor4" }, @@ -50866,9 +50850,9 @@ /turf/open/floor/plating, /area/almayer/engineering/starboard_atmos) "npq" = ( -/obj/structure/disposalpipe/up/almayer{ +/obj/structure/disposalpipe/down/almayer{ dir = 8; - id = "ares_vault_out"; + id = "ares_vault_in"; name = "aicore" }, /turf/closed/wall/almayer/aicore/hull, @@ -51959,16 +51943,18 @@ }, /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 }, +/obj/structure/disposaloutlet{ + density = 0; + desc = "An outlet for the pneumatic delivery system."; + icon_state = "delivery_outlet"; + name = "take-ins"; + pixel_x = 7; + pixel_y = 28; + range = 0 + }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) "nKP" = ( @@ -52089,6 +52075,19 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) +"nNA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_floor2" + }, +/area/almayer/command/airoom) "nNH" = ( /turf/open/floor/almayer{ dir = 1; @@ -52718,6 +52717,19 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) +"nYg" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_floor2" + }, +/area/almayer/command/airoom) "nYi" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -55897,6 +55909,20 @@ icon_state = "silver" }, /area/almayer/hallways/lower/repair_bay) +"oYZ" = ( +/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/glowing/no_build{ + icon_state = "ai_floor3"; + light_range = 3 + }, +/area/almayer/command/airoom) "oZp" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light, @@ -64093,6 +64119,15 @@ icon_state = "silver" }, /area/almayer/hallways/lower/repair_bay) +"rOz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_floor2" + }, +/area/almayer/command/airoom) "rOC" = ( /obj/structure/machinery/light{ dir = 1 @@ -69482,12 +69517,7 @@ 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/machinery/door/poddoor/almayer/blended/ai_lockdown, /turf/open/floor/almayer/no_build{ icon_state = "test_floor4" }, @@ -71030,6 +71060,14 @@ icon_state = "test_floor4" }, /area/almayer/command/cichallway) +"ujn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_floor2" + }, +/area/almayer/command/airoom) "ujz" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -72979,9 +73017,16 @@ unslashable = 1 }, /obj/item/paper_bin/uscm{ - pixel_y = 6 + pixel_y = 6; + pixel_x = -12 + }, +/obj/item/tool/pen{ + pixel_x = -14 + }, +/obj/structure/machinery/aicore_lockdown{ + pixel_y = 4; + pixel_x = 3 }, -/obj/item/tool/pen, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) "uVc" = ( @@ -75231,7 +75276,9 @@ c_tag = "AI - Primary Processors"; autoname = 0 }, -/turf/open/floor/almayer/aicore/glowing/no_build, +/turf/open/floor/almayer/aicore/no_build{ + icon_state = "ai_floor2" + }, /area/almayer/command/airoom) "vCO" = ( /obj/effect/landmark/start/bridge, @@ -77456,15 +77503,7 @@ alert_message = "Caution: Movement detected in ARES Core."; cooldown_duration = 1200 }, -/obj/structure/machinery/door/poddoor/almayer/blended/aicore/open{ - closed_layer = 3.2; - id = "ARES Emergency"; - layer = 3.2; - name = "ARES Emergency Lockdown"; - needs_power = 0; - open_layer = 1.9; - plane = -7 - }, +/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore, /turf/open/floor/almayer/no_build{ icon_state = "test_floor4" }, @@ -78333,12 +78372,7 @@ /area/almayer/maint/hull/lower/l_m_s) "wyQ" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/door_control{ - id = "ARES Emergency"; - indestructible = 1; - name = "ARES Emergency Lockdown"; - req_one_access_txt = "91;92" - }, +/obj/structure/machinery/aicore_lockdown, /turf/open/floor/almayer/no_build{ icon_state = "plating" }, @@ -121671,10 +121705,10 @@ sgH qdJ xIj mOi -eXy vRA +oYZ ezq -ezq +eXy tFe xQV pax @@ -140209,7 +140243,7 @@ qQS bIp fKe dDp -dDp +bFg frM lcg daz @@ -140411,9 +140445,9 @@ dIn rby bIp euN +ujn sEK -sEK -mlb +etM lcg daz lmz @@ -140613,10 +140647,10 @@ lnS uVv flf ebN -cxc +rOz kBy kBy -gfu +nNA fPB daz lmz @@ -142035,9 +142069,9 @@ yaQ vLz mFN kSy +bFg dDp -dDp -frM +nYg lcg daz lmz @@ -142239,7 +142273,7 @@ qQS mFN igr sEK -sEK +ujn mlb lcg daz