diff --git a/code/game/machinery/ARES/ARES_interface_apollo.dm b/code/game/machinery/ARES/ARES_interface_apollo.dm index 93637f39d1a7..1b30e5db2036 100644 --- a/code/game/machinery/ARES/ARES_interface_apollo.dm +++ b/code/game/machinery/ARES/ARES_interface_apollo.dm @@ -1,6 +1,6 @@ // #################### Working Joe Ticket Console ##################### /obj/structure/machinery/computer/working_joe - name = "APOLLO Maintenance Controller" + name = "\improper APOLLO Maintenance Controller" desc = "A console built to facilitate Working Joes and their operation, allowing for simple allocation of resources." icon = 'icons/obj/structures/machinery/ares.dmi' icon_state = "console" @@ -473,3 +473,9 @@ to_chat(id_owner, SPAN_HELPFUL("AI visitation access granted.")) playsound_client(id_owner?.client, 'sound/machines/pda_ping.ogg', src, 25, 0) return TRUE + +/obj/structure/machinery/computer/working_joe/bulky + desc = "The IBM series 10 computer retrofitted to work as a console to facilitate Working Joes and their operation, allowing for easy allocation of resources. While somewhat dated it still serves its purpose." + icon = 'icons/obj/structures/machinery/ares.dmi' + icon_state = "console_bulky" + density = TRUE diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm index e549436669de..40fdeabb8d13 100644 --- a/code/game/machinery/computer/camera_console.dm +++ b/code/game/machinery/computer/camera_console.dm @@ -315,12 +315,18 @@ network = list("NUKE") circuit = null - /obj/structure/machinery/computer/cameras/almayer density = FALSE icon_state = "security_cam" network = list(CAMERA_NET_ALMAYER) +/obj/structure/machinery/computer/cameras/almayer/bulky + icon = 'icons/obj/structures/machinery/computer.dmi' + desc = "The IBM series 10 computer retrofitted to work as a security cameras console for the ship. While somewhat dated it still serves its purpose." + icon_state = "cameras_bulky" + density = TRUE + circuit = null + /obj/structure/machinery/computer/cameras/almayer/containment name = "Containment Cameras" network = list(CAMERA_NET_CONTAINMENT) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 40b23667636f..bc109c22333d 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -507,3 +507,12 @@ desc = "Cheap Weyland-Yutani Laptop." icon_state = "medlaptop" density = FALSE + +/obj/structure/machinery/computer/med_data/bulky + name = "medical records computer" + desc = "The IBM series 10 computer retrofitted to be used to check the medical records of all crew. While somewhat dated it still serves its purpose." + icon_state = "medcomp_bulky" + deconstructible = FALSE + unslashable = TRUE + unacidable = TRUE + breakable = FALSE diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 8974eb36187f..8c61fe9d4811 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -149,7 +149,7 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new()) computer.black_market_lockout = TRUE /obj/structure/machinery/computer/ordercomp - name = "Supply ordering console" + name = "supply ordering console" icon = 'icons/obj/structures/machinery/computer.dmi' icon_state = "request" density = TRUE @@ -158,6 +158,15 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new()) var/reqtime = 0 //Cooldown for requisitions - Quarxink var/last_viewed_group = "categories" +/obj/structure/machinery/computer/ordercomp/bulky + desc = "The IBM series 10 computer retrofitted to be used as a console for the Automated Storage Retrieval System. While somewhat dated it still serves its purpose." + icon = 'icons/obj/structures/machinery/computer.dmi' + icon_state = "request_bulky" + deconstructible = FALSE + unslashable = TRUE + unacidable = TRUE + breakable = FALSE + /obj/structure/machinery/computer/supply_drop_console name = "Supply Drop Console" desc = "An old-fashioned computer hooked into the nearby Supply Drop system." diff --git a/code/modules/cm_marines/altitude_control_console.dm b/code/modules/cm_marines/altitude_control_console.dm index 7e0a8c395152..7a0eb3eb8980 100644 --- a/code/modules/cm_marines/altitude_control_console.dm +++ b/code/modules/cm_marines/altitude_control_console.dm @@ -13,6 +13,7 @@ GLOBAL_VAR_INIT(alt_ctrl_disabled, FALSE) #define COOLING -10 #define OVERHEAT_COOLING -5 #define HEATING 10 +#define B_HEATING 20 #define OVERHEAT 100 //Has the ships temperature set to 0 on startup, sets the global default var to med @@ -20,9 +21,19 @@ GLOBAL_VAR_INIT(ship_temp, 0) GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED) /obj/structure/machinery/computer/altitude_control_console - icon_state = "overwatch" - name = "Altitude Control Console" - desc = "The A.C.C console monitors, regulates, and updates the ships attitude and altitude in relation to the AO. It's not rocket science." + icon_state = "almayer_altitude" + name = "\improper Altitude Control Console" + desc = "The A.C.C console monitors, regulates, and updates the ships attitude and altitude in relation to the AO. It's not rocket science... or maybe it is." + density = TRUE + unslashable = TRUE + unacidable = TRUE + breakable = FALSE + +/obj/structure/machinery/computer/altitude_control_console/ex_act() + return + +/obj/structure/machinery/computer/altitude_control_console/bullet_act() + return /obj/structure/machinery/computer/altitude_control_console/attack_hand() . = ..() @@ -44,34 +55,50 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED) /obj/structure/machinery/computer/altitude_control_console/process() . = ..() + //Updating temperature var/temperature_change - if(GLOB.ship_temp >= OVERHEAT) - ai_silent_announcement("Attention: orbital correction no longer sustainable, moving to geo-synchronous orbit until engine cooloff.", ";", TRUE) + switch(GLOB.ship_alt) + if(SHIP_ALT_LOW) + if(prob(50)) + temperature_change = HEATING + else + temperature_change = B_HEATING + if(SHIP_ALT_MED) + temperature_change = COOLING + if(SHIP_ALT_HIGH) + if(prob(75)) + temperature_change = OVERHEAT_COOLING + else + temperature_change = COOLING + GLOB.ship_temp = clamp(GLOB.ship_temp += temperature_change, 0, OVERHEAT) + + //Override orbit, announce low orbit + if(GLOB.ship_alt == SHIP_ALT_HIGH && GLOB.ship_temp == 0) + ai_silent_announcement("Attention: Engine cooloff completed, automatic stabilization to most optimal geo-synchronous orbit undergoing.", ";", TRUE) + GLOB.ship_alt = SHIP_ALT_MED + TIMER_COOLDOWN_START(src, COOLDOWN_ALTITUDE_CHANGE, 20 SECONDS) + for(var/mob/living/carbon/current_mob in GLOB.living_mob_list) + if(!is_mainship_level(current_mob.z)) + continue + current_mob.apply_effect(3, SLOW) + return + if(GLOB.ship_alt == SHIP_ALT_LOW && GLOB.ship_temp >= OVERHEAT) + ai_silent_announcement("Attention: Low altitude orbital maneuver no longer sustainable, moving to furthest geo-synchronous orbit until engine cooloff.", ";", TRUE) GLOB.ship_alt = SHIP_ALT_HIGH - temperature_change = OVERHEAT_COOLING + TIMER_COOLDOWN_START(src, COOLDOWN_ALTITUDE_CHANGE, 20 SECONDS) for(var/mob/living/carbon/current_mob in GLOB.living_mob_list) if(!is_mainship_level(current_mob.z)) continue - current_mob.apply_effect(3, WEAKEN) - shake_camera(current_mob, 10, 2) - ai_silent_announcement("Attention performing high-G maneuverer", ";", TRUE) - if(!temperature_change) - switch(GLOB.ship_alt) - if(SHIP_ALT_LOW) - temperature_change = HEATING - if(SHIP_ALT_MED) - temperature_change = COOLING - if(SHIP_ALT_HIGH) - temperature_change = COOLING - GLOB.ship_temp = clamp(GLOB.ship_temp += temperature_change, 0, 120) + current_mob.apply_effect(3, SLOW) + shake_camera(current_mob, 2, 2) + return if(prob(50)) return - if(GLOB.ship_alt == SHIP_ALT_LOW) + else if(GLOB.ship_alt == SHIP_ALT_LOW) + ai_silent_announcement("Low altitude maneuver currently under performance, full stabilization of the altitude unable to be achieved, maintaining procedures until overheat.", ";", TRUE) for(var/mob/living/carbon/current_mob in GLOB.living_mob_list) if(!is_mainship_level(current_mob.z)) continue - shake_camera(current_mob, 10, 1) - ai_silent_announcement("Performing Attitude Control", ";", TRUE) //TGUI.... fun... years have gone by, I am dying of old age /obj/structure/machinery/computer/altitude_control_console/tgui_interact(mob/user, datum/tgui/ui) @@ -100,35 +127,33 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED) if(.) return - var/mob/user = usr - switch(action) - if("low_alt") - change_altitude(user, SHIP_ALT_LOW) - . = TRUE - if("med_alt") - change_altitude(user, SHIP_ALT_MED) - . = TRUE - if("high_alt") - change_altitude(user, SHIP_ALT_HIGH) - . = TRUE - message_admins("[key_name(user)] has changed the ship's altitude to [action].") - - add_fingerprint(usr) + var/mob/user = ui.user + if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_ALTITUDE_CHANGE)) + message_admins("[key_name(user)] tried to change the ship's altitude, but it is still on cooldown.") + to_chat(user, SPAN_WARNING("Engines pending recalibration to burn again, stand by.")) + else + switch(action) + if("low_alt") + change_altitude(user, SHIP_ALT_LOW) + . = TRUE + if("med_alt") + change_altitude(user, SHIP_ALT_MED) + . = TRUE + message_admins("[key_name(user)] has changed the ship's altitude to [action].") + + add_fingerprint(user) /obj/structure/machinery/computer/altitude_control_console/proc/change_altitude(mob/user, new_altitude) - if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_ALTITUDE_CHANGE)) - to_chat(user, SPAN_WARNING("The engines are not ready to burn yet.")) - return if(GLOB.ship_alt == new_altitude) return GLOB.ship_alt = new_altitude - TIMER_COOLDOWN_START(src, COOLDOWN_ALTITUDE_CHANGE, 90 SECONDS) + TIMER_COOLDOWN_START(src, COOLDOWN_ALTITUDE_CHANGE, 40 SECONDS) + ai_silent_announcement("Attention: Altitude control protocols initialized, currently performing high-g orbital maneuver.", ";", TRUE) for(var/mob/living/carbon/current_mob in GLOB.living_mob_list) if(!is_mainship_level(current_mob.z)) continue - current_mob.apply_effect(3, WEAKEN) - shake_camera(current_mob, 10, 2) - ai_silent_announcement("Attention: Performing high-G manoeuvre", ";", TRUE) + current_mob.apply_effect(3, SLOW) + to_chat(user, SPAN_WARNING("You have some difficulty on maintaining balance!")) #undef COOLING #undef OVERHEAT_COOLING diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index 7225556584de..299d080ed51d 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -747,6 +747,36 @@ icon_state = "cmonitor" density = FALSE +/obj/structure/machinery/computer/crew/alt/update_icon() + if(stat & BROKEN) + icon_state = "cmonitorb" + else + if(stat & NOPOWER) + icon_state = "cmonitor0" + stat |= NOPOWER + else + icon_state = initial(icon_state) + stat &= ~NOPOWER + +/obj/structure/machinery/computer/crew/bulky + desc = "The IBM series 10 computer retrofitted to be used to monitor active health sensors built into the wearer's uniform. While somewhat dated it still serves its purpose." + icon_state = "crew_bulky" + deconstructible = FALSE + unslashable = TRUE + unacidable = TRUE + breakable = FALSE + +/obj/structure/machinery/computer/crew/bulky/update_icon() + if(stat & BROKEN) + icon_state = "crew_bulkyb" + else + if(stat & NOPOWER) + icon_state = "crew_bulky0" + stat |= NOPOWER + else + icon_state = initial(icon_state) + stat &= ~NOPOWER + /obj/structure/machinery/computer/crew/alt/yautja name = "\improper Yautja health monitor" desc = "Used to monitor active health sensors of all Yautja in the system. You can see that the console highlights the human's ship areas with BLUE and the hunting locations with RED." diff --git a/code/modules/cm_tech/trees/marine.dm b/code/modules/cm_tech/trees/marine.dm index 046712f9656b..a525779ac1d1 100644 --- a/code/modules/cm_tech/trees/marine.dm +++ b/code/modules/cm_tech/trees/marine.dm @@ -150,7 +150,7 @@ GLOBAL_LIST_EMPTY(tech_controls_marine) /obj/structure/machinery/computer/view_objectives name = "Intel Database Computer" desc = "An USCM Intel Computer for consulting the current Intel database." - icon_state = "terminal1_old" + icon_state = "comm" unslashable = TRUE unacidable = TRUE diff --git a/code/modules/objectives/objective_memory_storage.dm b/code/modules/objectives/objective_memory_storage.dm index c84f71556743..df24c2d1c1e6 100644 --- a/code/modules/objectives/objective_memory_storage.dm +++ b/code/modules/objectives/objective_memory_storage.dm @@ -115,7 +115,7 @@ GLOBAL_DATUM_INIT(intel_system, /datum/intel_system, new()) name = "Intel Computer" var/label = "" desc = "An USCM Intel Computer for data cataloguing and distribution." - icon_state = "terminal1_old" + icon_state = "comm" unslashable = TRUE unacidable = TRUE var/typing_time = 20 @@ -235,7 +235,7 @@ GLOBAL_DATUM_INIT(intel_system, /datum/intel_system, new()) /obj/structure/machinery/computer/view_objectives name = "Intel Database Computer" desc = "An USCM Intel Database Computer used for consulting the current intel database." - icon_state = "terminal1_old" + icon_state = "comm" unslashable = TRUE unacidable = TRUE diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index a28f65ce475d..771934ada212 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -58,12 +58,12 @@ return // initial flight time - var/flight_duration = is_flyby ? DROPSHIP_TRANSIT_DURATION : DROPSHIP_TRANSIT_DURATION * GLOB.ship_alt + var/flight_duration = is_flyby ? DROPSHIP_TRANSIT_DURATION / GLOB.ship_alt : DROPSHIP_TRANSIT_DURATION * GLOB.ship_alt if(optimised) if(is_flyby) - flight_duration = DROPSHIP_TRANSIT_DURATION * 1.5 + flight_duration *= 1.5 else - flight_duration = DROPSHIP_TRANSIT_DURATION * SHUTTLE_OPTIMIZE_FACTOR_TRAVEL + flight_duration *= SHUTTLE_OPTIMIZE_FACTOR_TRAVEL // recharge time before dropship can take off var/recharge_duration = SHUTTLE_RECHARGE diff --git a/code/modules/shuttle/dropship_hijack.dm b/code/modules/shuttle/dropship_hijack.dm index 73150f5bfc08..2ac4ef2b5746 100644 --- a/code/modules/shuttle/dropship_hijack.dm +++ b/code/modules/shuttle/dropship_hijack.dm @@ -70,7 +70,7 @@ /datum/dropship_hijack/almayer/proc/fire() if(!shuttle || !crash_site) return FALSE - shuttle.callTime = DROPSHIP_CRASH_TRANSIT_DURATION * GLOB.ship_alt + shuttle.callTime = DROPSHIP_CRASH_TRANSIT_DURATION SSshuttle.moveShuttle(shuttle.id, crash_site.id, TRUE) if(GLOB.round_statistics) GLOB.round_statistics.track_hijack() diff --git a/icons/obj/structures/machinery/ares.dmi b/icons/obj/structures/machinery/ares.dmi index 77dd304310f6..9d4f4d398d59 100644 Binary files a/icons/obj/structures/machinery/ares.dmi and b/icons/obj/structures/machinery/ares.dmi differ diff --git a/icons/obj/structures/machinery/computer.dmi b/icons/obj/structures/machinery/computer.dmi index 54c99e3186d9..9a69859ef86c 100644 Binary files a/icons/obj/structures/machinery/computer.dmi and b/icons/obj/structures/machinery/computer.dmi differ diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index c1d18d4f9483..9bf51b294f65 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -2510,12 +2510,6 @@ }, /turf/open/floor/almayer/silver/north, /area/almayer/command/cic) -"arG" = ( -/obj/structure/machinery/power/apc/almayer/hardened{ - dir = 1 - }, -/turf/open/floor/almayer/silver/north, -/area/almayer/command/cic) "arH" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/redfull, @@ -2537,13 +2531,6 @@ }, /turf/open/floor/almayer/silver/north, /area/almayer/command/cic) -"arR" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/prop/almayer/computers/sensor_computer1, -/turf/open/floor/almayer/silver/northeast, -/area/almayer/command/cic) "arT" = ( /obj/structure/target{ name = "punching bag" @@ -2654,11 +2641,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/stair_clone/upper) -"asN" = ( -/obj/structure/machinery/computer/crew, -/obj/structure/machinery/light, -/turf/open/floor/almayer/silver/southeast, -/area/almayer/command/cic) "asQ" = ( /obj/structure/surface/rack, /obj/item/device/radio/marine, @@ -2853,9 +2835,6 @@ }, /turf/open/floor/almayer/plating/northeast, /area/almayer/command/cic) -"atO" = ( -/turf/open/floor/almayer/silver/east, -/area/almayer/command/cic) "atP" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; @@ -3274,16 +3253,6 @@ "awz" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/command/cichallway) -"awA" = ( -/obj/structure/prop/almayer/computers/sensor_computer3{ - name = "weapon targetting computer" - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "awB" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -3316,20 +3285,6 @@ /obj/structure/closet/toolcloset, /turf/open/floor/almayer/redfull, /area/almayer/command/cic) -"awH" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/faxmachine/uscm/command, -/obj/item/device/megaphone, -/obj/structure/machinery/computer/cameras/almayer_brig{ - dir = 8; - desc = "Used to access the various cameras in the security brig."; - name = "brig cameras console"; - pixel_y = 12; - pixel_x = 17; - layer = 2.99 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "awQ" = ( /obj/structure/surface/table/almayer, /obj/item/cell/high{ @@ -3647,24 +3602,6 @@ /obj/structure/machinery/prop/almayer/CICmap, /turf/open/floor/almayer/redfull, /area/almayer/shipboard/starboard_missiles) -"ayr" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/storage/belt/medical/full, -/obj/item/storage/belt/medical/full, -/obj/item/storage/belt/medical/full, -/obj/item/storage/belt/medical/full, -/obj/structure/machinery/computer/working_joe{ - dir = 8; - pixel_x = 17; - pixel_y = 8 - }, -/obj/structure/machinery/computer/cameras/almayer/ares{ - dir = 8; - pixel_x = 17; - pixel_y = -6 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "ays" = ( /turf/open/floor/almayer/silvercorner, /area/almayer/command/cic) @@ -4393,7 +4330,8 @@ /obj/structure/machinery/computer/cameras/almayer_network/vehicle{ dir = 4; layer = 2.99; - pixel_y = 4 + pixel_y = 4; + network = list("Almayer","Vehicle","brig") }, /obj/structure/machinery/computer/almayer_control{ dir = 4; @@ -5120,10 +5058,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/starboard) -"aGH" = ( -/obj/structure/machinery/computer/ordercomp, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "aGN" = ( /turf/open/floor/almayer, /area/almayer/command/computerlab) @@ -5620,15 +5554,6 @@ /obj/structure/flora/bush/ausbushes/var3/brflowers, /turf/open/floor/grass, /area/almayer/living/starboard_garden) -"aKi" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/turf/open/floor/almayer/silver/north, -/area/almayer/command/cichallway) "aKk" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -15625,12 +15550,6 @@ /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_fore_hallway) -"cvZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/silver/east, -/area/almayer/command/cic) "cwo" = ( /obj/structure/largecrate/random/mini/chest{ pixel_x = 4 @@ -18337,6 +18256,9 @@ /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_aft_hallway) +"dCR" = ( +/turf/open/floor/almayer/silver/west, +/area/almayer/command/cic) "dDp" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -19159,6 +19081,12 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/medical_science) +"dVF" = ( +/obj/structure/machinery/camera/autoname/almayer/brig{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/shipboard/brig/cells) "dVH" = ( /obj/structure/platform{ dir = 8 @@ -19923,20 +19851,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/starboard_garden) -"ekZ" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ - dir = 4; - pixel_y = 10 - }, -/obj/structure/machinery/computer/cameras/almayer_brig{ - dir = 4; - desc = "Used to access the various cameras in the security brig."; - name = "brig cameras console"; - pixel_y = -11 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/warden_office) "elf" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -21465,6 +21379,14 @@ "eRS" = ( /turf/open/floor/almayer/cargo_arrow, /area/almayer/engineering/lower/workshop/hangar) +"eRW" = ( +/obj/structure/machinery/computer/ordercomp/bulky, +/obj/structure/sign/safety/terminal{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "eSk" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -21579,12 +21501,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) -"eVj" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "eVm" = ( /obj/structure/sign/safety/bulkhead_door{ pixel_x = 8; @@ -22391,6 +22307,11 @@ }, /turf/open/floor/almayer/bluecorner, /area/almayer/living/pilotbunks) +"fmO" = ( +/obj/structure/machinery/computer/med_data/bulky, +/obj/structure/machinery/light, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "fmZ" = ( /turf/open/floor/almayer/orange/west, /area/almayer/hallways/lower/starboard_umbilical) @@ -22678,6 +22599,15 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/starboard_point_defense) +"frE" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/command/cichallway) "frF" = ( /obj/structure/pipes/vents/scrubber{ dir = 8 @@ -27175,6 +27105,9 @@ "hoK" = ( /turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/starboard_hallway) +"hoO" = ( +/turf/open/floor/almayer/silvercorner/west, +/area/almayer/command/cic) "hoT" = ( /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_s) @@ -27545,13 +27478,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) -"hxm" = ( -/obj/item/paper_bin/uscm{ - pixel_y = 4 - }, -/obj/structure/surface/table/reinforced/black, -/turf/open/floor/almayer, -/area/almayer/command/cic) "hxG" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -27915,6 +27841,20 @@ /obj/structure/machinery/meter, /turf/open/floor/almayer/orange, /area/almayer/engineering/lower) +"hEz" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 4; + pixel_y = 1 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/sign/safety/terminal{ + pixel_y = 32 + }, +/turf/open/floor/almayer/red/north, +/area/almayer/shipboard/brig/chief_mp_office) "hEV" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -29082,6 +29022,16 @@ }, /turf/open/floor/almayer/red/north, /area/almayer/lifeboat_pumps/north1) +"ifu" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "ifz" = ( /obj/structure/machinery/keycard_auth{ pixel_x = 25 @@ -29868,6 +29818,22 @@ }, /turf/open/floor/almayer/blue, /area/almayer/squads/delta) +"iyT" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/secure_data{ + dir = 4; + pixel_y = 19; + layer = 2.99 + }, +/obj/structure/machinery/computer/cameras/almayer_brig{ + dir = 4; + desc = "Used to access the various cameras in the security brig."; + name = "brig cameras console"; + pixel_y = 5; + layer = 2.99 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/chief_mp_office) "izf" = ( /obj/structure/disposalpipe/up/almayer{ dir = 4; @@ -31602,22 +31568,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) -"jhI" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/secure_data{ - dir = 4; - pixel_y = 19; - layer = 2.99 - }, -/obj/structure/machinery/computer/cameras/almayer_brig{ - dir = 4; - desc = "Used to access the various cameras in the security brig."; - name = "brig cameras console"; - pixel_y = 5; - layer = 2.99 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/chief_mp_office) "jhK" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer/plate, @@ -32764,6 +32714,12 @@ /obj/structure/closet/firecloset, /turf/open/floor/almayer/cargo, /area/almayer/engineering/upper_engineering/port) +"jGe" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/silvercorner/north, +/area/almayer/command/cic) "jGn" = ( /obj/structure/machinery/light{ dir = 1 @@ -33785,16 +33741,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"kbX" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/camera/autoname/almayer/brig, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) "kcg" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -34461,14 +34407,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/gym) -"kry" = ( -/obj/structure/machinery/flasher{ - id = "Perma 1"; - pixel_y = 24 - }, -/obj/structure/machinery/camera/autoname/almayer/brig, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/perma) "krA" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -34652,14 +34590,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering) -"kvL" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 4; - pixel_y = 0 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/warden_office) "kvU" = ( /obj/structure/surface/table/almayer, /turf/open/floor/plating/plating_catwalk, @@ -34712,6 +34642,9 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) +"kwR" = ( +/turf/open/floor/almayer/silver/northwest, +/area/almayer/command/cic) "kxd" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -35079,6 +35012,14 @@ }, /turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/lower_medical_lobby) +"kEa" = ( +/obj/item/paper_bin/uscm{ + pixel_y = 4 + }, +/obj/structure/surface/table/reinforced/black, +/obj/item/device/megaphone, +/turf/open/floor/almayer, +/area/almayer/command/cic) "kEc" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -35382,6 +35323,27 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/starboard_fore_hallway) +"kLJ" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/computer/altitude_control_console, +/obj/structure/transmitter/rotary/no_dnd{ + name = "Flight Control Line 1 Telephone"; + phone_category = "Command"; + phone_id = "CIC Flight Control Line 1"; + pixel_y = 17; + pixel_x = -8 + }, +/obj/structure/transmitter/rotary/no_dnd{ + name = "Flight Control Line 2 Telephone"; + phone_category = "Command"; + phone_id = "CIC Flight Control Line 2"; + pixel_y = 18; + pixel_x = 6 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "kLP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -36921,13 +36883,6 @@ /obj/structure/bed/chair, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"lrW" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/adv, -/obj/item/storage/firstaid/adv, -/obj/item/storage/firstaid/adv, -/turf/open/floor/almayer/redfull, -/area/almayer/command/cic) "lrX" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -38012,9 +37967,11 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/vehiclehangar) -"lQG" = ( -/obj/structure/machinery/computer/tech_control, -/turf/open/floor/plating/plating_catwalk, +"lQL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/silver/northwest, /area/almayer/command/cic) "lQO" = ( /obj/structure/machinery/disposal, @@ -38314,26 +38271,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_p) -"lZs" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_x = -6; - pixel_y = 28 - }, -/obj/structure/machinery/computer/cameras/almayer/vehicle{ - dir = 4; - pixel_x = -17 - }, -/obj/item/device/flashlight/lamp, -/obj/item/clothing/glasses/hud/health, -/obj/structure/machinery/firealarm{ - pixel_x = 8; - pixel_y = 28 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "lZI" = ( /obj/structure/prop/invuln/lattice_prop{ dir = 1; @@ -38644,6 +38581,14 @@ }, /turf/open/floor/almayer/plate, /area/almayer/squads/alpha) +"mhK" = ( +/obj/structure/machinery/flasher{ + id = "Perma 2"; + pixel_y = 24 + }, +/obj/structure/machinery/camera/autoname/almayer/brig, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/perma) "mis" = ( /turf/open/floor/plating, /area/almayer/maint/upper/u_f_s) @@ -39286,6 +39231,13 @@ }, /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/lower_medical_lobby) +"mvL" = ( +/obj/structure/machinery/computer/crew/bulky, +/obj/structure/machinery/status_display{ + pixel_y = -29 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "mww" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -39739,6 +39691,13 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"mEP" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/obj/structure/machinery/computer/working_joe/bulky, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "mFc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39918,6 +39877,16 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) +"mIt" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/camera/autoname/almayer/brig, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) "mIy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -45445,6 +45414,13 @@ }, /turf/open/floor/almayer/silver/west, /area/almayer/living/auxiliary_officer_office) +"oQR" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/faxmachine/uscm/command{ + pixel_y = 2 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "oRk" = ( /turf/open/floor/almayer/red/east, /area/almayer/shipboard/brig/processing) @@ -45672,6 +45648,14 @@ }, /turf/open/floor/almayer/plate, /area/almayer/shipboard/brig/general_equipment) +"oVg" = ( +/obj/structure/machinery/flasher{ + id = "Perma 1"; + pixel_y = 24 + }, +/obj/structure/machinery/camera/autoname/almayer/brig, +/turf/open/floor/almayer/plate, +/area/almayer/shipboard/brig/perma) "oVk" = ( /obj/structure/stairs{ dir = 4 @@ -47676,6 +47660,12 @@ }, /turf/open/floor/almayer/plating/northeast, /area/almayer/hallways/lower/vehiclehangar) +"pPZ" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/command/cic) "pQc" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -49705,6 +49695,10 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/chief_mp_office) +"qFq" = ( +/obj/structure/machinery/computer/tech_control, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "qFu" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -55597,6 +55591,12 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/medical/containment/cell) +"taI" = ( +/obj/structure/machinery/camera/autoname/almayer/brig{ + dir = 4 + }, +/turf/open/floor/almayer/green/west, +/area/almayer/shipboard/brig/cells) "taV" = ( /obj/effect/projector{ name = "Almayer_Down1"; @@ -55750,13 +55750,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"teY" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/prop/almayer/computers/sensor_computer2, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "teZ" = ( /obj/structure/machinery/door_control{ id = "ARES StairsLower"; @@ -57175,6 +57168,17 @@ }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/north1) +"tGC" = ( +/obj/structure/surface/rack, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/item/storage/belt/medical/full, +/obj/item/storage/belt/medical/full, +/obj/item/storage/belt/medical/full, +/obj/item/storage/belt/medical/full, +/turf/open/floor/almayer/redfull, +/area/almayer/command/cic) "tGG" = ( /obj/structure/bed/chair/comfy/alpha{ dir = 1 @@ -57631,6 +57635,12 @@ /obj/item/weapon/gun/rifle/l42a, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_m_s) +"tTb" = ( +/obj/structure/machinery/power/apc/almayer/hardened{ + dir = 4 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "tTk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -60543,6 +60553,26 @@ }, /turf/open/floor/almayer/emeraldfull, /area/almayer/living/briefing) +"vex" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/surface/table/almayer, +/obj/structure/sign/safety/terminal{ + pixel_x = 3; + pixel_y = 27 + }, +/obj/structure/sign/safety/rewire{ + pixel_x = 15; + pixel_y = 27 + }, +/obj/structure/machinery/computer/cameras/almayer_brig{ + dir = 4; + desc = "Used to access the various cameras in the security brig."; + name = "brig cameras console" + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/processing) "vfa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -61375,12 +61405,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/stern) -"vsz" = ( -/obj/structure/machinery/camera/autoname/almayer/brig{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/shipboard/brig/cells) "vsF" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -61723,6 +61747,20 @@ "vyI" = ( /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) +"vzf" = ( +/obj/structure/sign/safety/terminal{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/machinery/computer/cameras/almayer/bulky{ + network = list("ARES","Alamo","Normandy"); + name = "ARES Core and Dropship Cameras" + }, +/obj/structure/sign/safety/flightcontrol{ + pixel_y = 32 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "vzi" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -61906,12 +61944,6 @@ }, /turf/open/floor/almayer/silver, /area/almayer/shipboard/brig/cic_hallway) -"vCy" = ( -/obj/structure/machinery/camera/autoname/almayer/brig{ - dir = 4 - }, -/turf/open/floor/almayer/green/west, -/area/almayer/shipboard/brig/cells) "vCE" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/plating/plating_catwalk, @@ -62746,12 +62778,6 @@ }, /turf/open/floor/almayer/sterile_green_corner, /area/almayer/medical/upper_medical) -"vSl" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "vSn" = ( /obj/structure/barricade/handrail/medical{ dir = 4 @@ -62799,6 +62825,21 @@ }, /turf/open/floor/almayer/silver/north, /area/almayer/shipboard/brig/cic_hallway) +"vSV" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = 28 + }, +/obj/structure/machinery/computer/cameras/almayer/vehicle{ + dir = 4; + pixel_x = -17 + }, +/obj/item/device/flashlight/lamp, +/obj/item/clothing/glasses/hud/health, +/turf/open/floor/almayer/plate, +/area/almayer/command/cic) "vSW" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer/cargo, @@ -63401,6 +63442,13 @@ }, /turf/open/floor/almayer/silver/southwest, /area/almayer/shipboard/brig/cic_hallway) +"wdk" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/almayer_network{ + dir = 4 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/warden_office) "wdv" = ( /obj/structure/machinery/door/airlock/almayer/maint{ name = "\improper Core Hatch" @@ -63938,14 +63986,6 @@ /obj/structure/window/framed/almayer/aicore/hull, /turf/open/floor/plating, /area/almayer/command/airoom) -"wnw" = ( -/obj/structure/machinery/flasher{ - id = "Perma 2"; - pixel_y = 24 - }, -/obj/structure/machinery/camera/autoname/almayer/brig, -/turf/open/floor/almayer/plate, -/area/almayer/shipboard/brig/perma) "wnL" = ( /obj/item/stack/tile/carpet{ amount = 12 @@ -64343,20 +64383,6 @@ /obj/structure/filingcabinet, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"wvE" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/almayer_network{ - dir = 4; - pixel_y = 1 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/sign/safety/terminal{ - pixel_y = 32 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/shipboard/brig/chief_mp_office) "wvI" = ( /obj/item/paper_bin/uscm{ pixel_y = 7 @@ -66211,26 +66237,6 @@ }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/north1) -"xjF" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/surface/table/almayer, -/obj/structure/sign/safety/terminal{ - pixel_x = 3; - pixel_y = 27 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = 15; - pixel_y = 27 - }, -/obj/structure/machinery/computer/cameras/almayer_brig{ - dir = 4; - desc = "Used to access the various cameras in the security brig."; - name = "brig cameras console" - }, -/turf/open/floor/almayer/red/west, -/area/almayer/shipboard/brig/processing) "xjK" = ( /obj/structure/sign/safety/hazard{ pixel_y = 32 @@ -66286,6 +66292,9 @@ /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/greencorner/east, /area/almayer/hallways/lower/starboard_fore_hallway) +"xkS" = ( +/turf/open/floor/almayer/silver/southwest, +/area/almayer/command/cic) "xlk" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer, @@ -66530,6 +66539,20 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/stern) +"xrm" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/secure_data{ + dir = 4; + pixel_y = 10 + }, +/obj/structure/machinery/computer/cameras/almayer_brig{ + dir = 4; + desc = "Used to access the various cameras in the security brig."; + name = "brig cameras console"; + pixel_y = -11 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/shipboard/brig/warden_office) "xrq" = ( /obj/structure/closet/firecloset, /obj/item/clothing/mask/gas, @@ -67568,14 +67591,6 @@ }, /turf/open/floor/almayer/red/west, /area/almayer/hallways/upper/starboard) -"xMA" = ( -/obj/structure/machinery/computer/med_data, -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/cic) "xMB" = ( /turf/open/floor/almayer/uscm/directional/southeast, /area/almayer/command/cic) @@ -67720,6 +67735,12 @@ }, /turf/open/floor/almayer/research/containment/corner/east, /area/almayer/medical/containment/cell) +"xPh" = ( +/obj/structure/machinery/camera/autoname/almayer/brig{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/shipboard/brig/cells) "xPn" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -68612,12 +68633,6 @@ /obj/item/fuel_cell, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/engine_core) -"yhg" = ( -/obj/structure/machinery/camera/autoname/almayer/brig{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/shipboard/brig/cells) "yht" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -76742,7 +76757,7 @@ uDg uDg lHk naB -wnw +mhK pHp fgl dya @@ -77554,7 +77569,7 @@ hvd bLF eyD naB -kry +oVg pHp fgl xXj @@ -77777,7 +77792,7 @@ iHG dCe moB uns -vCy +taI eyV xkd mkF @@ -78777,7 +78792,7 @@ tpn srT tpn tpn -xjF +vex myP gDt bju @@ -79196,7 +79211,7 @@ nUj eZH tUx vrx -yhg +dVF lbs eZH tUx @@ -80817,7 +80832,7 @@ xkd uvY lSs xkd -kbX +mIt ezX prY rUk @@ -81432,7 +81447,7 @@ tUx tUx tUx tUx -vsz +xPh oEE xkd gNZ @@ -81837,8 +81852,8 @@ emp emp cHk hlI -ekZ -kvL +xrm +wdk oix cHk uxb @@ -83458,8 +83473,8 @@ mPj omy sCQ wIC -wvE -jhI +hEz +iyT jfY bra wIC @@ -87504,7 +87519,7 @@ wVW apo fHh wVW -lZs +vSV lVX sni ayz @@ -87905,11 +87920,11 @@ kcN cod ufL aic -aov -wVW -arG +aKq +luZ +alX alX -lQG +avY oPE alZ auT @@ -87919,11 +87934,11 @@ bZJ aRt axp aPI -lQG +avY aIf -aEB -wVW -aKi +alX +eRu +frE amY aVg aVV @@ -88109,7 +88124,7 @@ yff ufL aic aKq -luZ +uTU alX alX avY @@ -88125,7 +88140,7 @@ alX avY aIf alX -eRu +uTU aKq aKz mKq @@ -88311,10 +88326,10 @@ kcN kcN agj aic -aKq -uTU -alX -alX +aov +wVW +qFq +xkS aqN avY alX @@ -88326,10 +88341,10 @@ alX alX avY aqN -aIf -alX -uTU -aKq +lQL +qFq +wVW +aTj aKz mKq ceK @@ -88514,12 +88529,12 @@ xxh xpi agj bFA -aov +sxW wVW -arR -atO -atO -atO +mEP +hoO +dCR +xkS awt aqN rKd @@ -88527,12 +88542,12 @@ aAA xMB aqN ays -atO -atO -cvZ -asN +kwR +dCR +jGe +mvL wVW -aTj +aKn aKz mKq bFC @@ -88719,9 +88734,9 @@ agj aic aoA wVW -teY -eVj -aqN +kLJ +pPZ +alX alX asc abk @@ -88733,7 +88748,7 @@ awk alX alX mPn -xMA +fmO wVW aKo aKz @@ -88922,9 +88937,9 @@ agj aic aov wVW -awA -ayr -awH +vzf +tTb +oQR aPD asc azW @@ -88935,8 +88950,8 @@ bPs xUB gkK oug -vSl -aGH +ifu +eRW wVW aKn aKz @@ -89340,7 +89355,7 @@ avY wlE gvq wVW -lrW +tGC mqh vHW wVW @@ -89943,7 +89958,7 @@ ato wVW aKF alX -hxm +kEa deD tUo aIf diff --git a/tgui/packages/tgui/interfaces/AltitudeControlConsole.jsx b/tgui/packages/tgui/interfaces/AltitudeControlConsole.jsx index 394a37246d4c..4761b0401f47 100644 --- a/tgui/packages/tgui/interfaces/AltitudeControlConsole.jsx +++ b/tgui/packages/tgui/interfaces/AltitudeControlConsole.jsx @@ -1,11 +1,24 @@ import { useBackend } from '../backend'; -import { Box, Button, ProgressBar, Section } from '../components'; +import { + Box, + Button, + Icon, + ProgressBar, + Section, + Tooltip, +} from '../components'; import { Window } from '../layouts'; -import { createLogger } from '../logging'; export const AltitudeControlConsole = () => { const { act, data } = useBackend(); - const logger = createLogger('Debug'); - logger.warn(data); + let altIcon = 'plane'; + let altTip = 'Currently: Normal Altitude'; + if (data.alt === 0.5) { + altIcon = 'plane-arrival'; + altTip = 'Currently: Low Altitude'; + } else if (data.alt === 1.5) { + altIcon = 'plane-departure'; + altTip = 'Currently: High Altitude'; + } return ( @@ -25,7 +38,14 @@ export const AltitudeControlConsole = () => { -
+
+ + + } + > { } { @@ -45,21 +65,19 @@ export const AltitudeControlConsole = () => { disabled={data.alt === 1} onClick={() => act('med_alt')} > - Set to: Medium Altitude - - } - { - }
+
+ + 1. Automatic changes have a cooldown of 20 seconds. +
+ 2. Manual changes have a cooldown of 40 seconds. +
+ 3. In average, it takes 3 minutes for the engines to 100% overheat. + +
);