diff --git a/code/modules/cm_marines/altitude_control_console.dm b/code/modules/cm_marines/altitude_control_console.dm index e5ae12876fc2..e6fc28ca97d7 100644 --- a/code/modules/cm_marines/altitude_control_console.dm +++ b/code/modules/cm_marines/altitude_control_console.dm @@ -48,23 +48,23 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED) /obj/structure/machinery/computer/altitude_control_console/process() . = ..() - var/altitude = "Altitude" - switch(GLOB.ship_alt) - if(SHIP_ALT_LOW) - altitude = "Low altitude" - if(SHIP_ALT_MED) - altitude = "Medium altitude" - if(SHIP_ALT_HIGH) - altitude = "High altitude" var/temperature_change - if(GLOB.ship_temp >= OVERHEAT) - ai_silent_announcement("Attention: [altitude] orbital maneuver no longer sustainable, moving to geo-synchronous orbit until engine cooloff.", ";", TRUE) + 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 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) + current_mob.apply_effect(3, SLOW) + shake_camera(current_mob, 10, 2) + 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 + 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) shake_camera(current_mob, 10, 2) if(!temperature_change) switch(GLOB.ship_alt) @@ -82,7 +82,7 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED) if(!is_mainship_level(current_mob.z)) continue shake_camera(current_mob, 10, 1) - ai_silent_announcement(" [altitude] maneuver currently under performance, full stabilization of the altitude unable to be achieved, maintaining procedures until overheat.", ";", TRUE) + ai_silent_announcement("Low altitude maneuver currently under performance, full stabilization of the altitude unable to be achieved, maintaining procedures until overheat.", ";", 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) @@ -114,6 +114,7 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED) 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") @@ -130,9 +131,6 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED) add_fingerprint(ui.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("Engines pending recalibration to burn again, stand by.")) - return if(GLOB.ship_alt == new_altitude) return else @@ -141,7 +139,8 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED) 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) + current_mob.apply_effect(3, SLOW) + to_chat(user, SPAN_WARNING("You have some difficulty on maintaining balance!")) shake_camera(current_mob, 10, 2) ai_silent_announcement("Attention: Altitude control protocols initialized, currently performing high-g orbital maneuver.", ";", 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/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 5bbe4a42441a..9d4f4d398d59 100644 Binary files a/icons/obj/structures/machinery/ares.dmi and b/icons/obj/structures/machinery/ares.dmi differ diff --git a/tgui/packages/tgui/interfaces/AltitudeControlConsole.jsx b/tgui/packages/tgui/interfaces/AltitudeControlConsole.jsx index 394a37246d4c..d1426082e304 100644 --- a/tgui/packages/tgui/interfaces/AltitudeControlConsole.jsx +++ b/tgui/packages/tgui/interfaces/AltitudeControlConsole.jsx @@ -34,7 +34,7 @@ export const AltitudeControlConsole = () => { disabled={data.alt === 0.5} onClick={() => act('low_alt')} > - Set to: Low Altitude + Set to: Lowest orbitable altitude } { @@ -45,18 +45,7 @@ export const AltitudeControlConsole = () => { disabled={data.alt === 1} onClick={() => act('med_alt')} > - Set to: Medium Altitude - - } - { - }