From cd0f67d4e9017a33027e6cd0f1d0a1cbbde1b357 Mon Sep 17 00:00:00 2001 From: LC4492 <122557086+LC4492@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:26:08 -0300 Subject: [PATCH] Commended Changes and etc --- .../cm_marines/altitude_control_console.dm | 31 +++++++++--------- .../objectives/objective_memory_storage.dm | 4 +-- code/modules/shuttle/dropship_hijack.dm | 2 +- icons/obj/structures/machinery/ares.dmi | Bin 4523 -> 4562 bytes .../interfaces/AltitudeControlConsole.jsx | 15 ++------- 5 files changed, 20 insertions(+), 32 deletions(-) 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 5bbe4a42441ae925e365ae6e67d7383a552f629a..9d4f4d398d590cd10fb343d88065e5550a98013c 100644 GIT binary patch delta 4064 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

XT+ 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 { 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 - - } - { - }