mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-30 00:21:11 +01:00
Hardsuit interface overhaul (#22403)
**Summary** Converts hardsuit NanoUI to TGUI and overhauls much of the associated UI and module code. The conversion alone is what necessitated quite a bit of cleanup of our 11-year-old hardsuit code, for which I leaned heavily upon tg's implementation of MODsuits. Therefore, this is a PARTIAL (???) port of both https://github.com/tgstation/tgstation/pull/59109 and https://github.com/tgstation/tgstation/pull/77022. While a lot of wonderful code and UI design was ported 1:1 (for which I am grateful!), our hardsuits are still NOT MODsuits. Most of our back-end remains the same. Fixes https://github.com/Aurorastation/Aurora.3/issues/22071 changes: - refactor: "Migrates Hardsuit NanoUI to TGUI." - refactor: "Updates Hardsuit module type definitions, configuration data, many misc other functions for the purpose of the UI refactor (general utility and readability improvements)." - balance: "Hardsuits now passively consume a small amount of energy while online, even when retracted." - balance: "Hardsuit boots can no longer be retracted without also retracting the chest piece first." - balance: "Mounted hardsuit storage module max space increased from 9 to 14." - balance: "Plasma cutter (standalone and mounted) damage increased and range decreased by 50% each." - soundadd: "Adds several new sounds for hardsuit use (attribution located w/ files)." - code_imp: "Makes power_wattage_readable() a global proc and adds power_joules_readable()." - code_imp: "Lots of misc DMdoc updates." - bugfix: "Synthetic Charging Stations now charge hardsuit power cells as intended." **Old UI** <img width="804" height="1321" alt="Screenshot 2026-05-04 135705" src="https://github.com/user-attachments/assets/f01957a0-7cec-4fcc-b862-c9dfde0dcc43" /> **New UI** <img width="998" height="782" alt="Screenshot 2026-05-04 174658" src="https://github.com/user-attachments/assets/ad402902-d489-435a-9c16-82150ed82618" /> ### Asset Licenses The following assets that **have not** been created by myself are included in this PR: | Path | Original Author | License | | --- | --- | --- | | icons/mob/rig_modules.dmi (mounted-plasmacutter)| [Ghostsheet](https://github.com/ghostsheet) | CC-BY-SA | --------- Signed-off-by: Batrachophreno <Batrochophreno@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com>
This commit is contained in:
co-authored by
VMSolidus
parent
155944d1d0
commit
374e220be6
@@ -35,8 +35,8 @@
|
||||
return ..()
|
||||
|
||||
/obj/effect/overlay/thermite
|
||||
name = "burning thermite"
|
||||
desc = "It's flaming ball of thermite!"
|
||||
name = "blazing heat"
|
||||
desc = "It's blazing wall of heat!"
|
||||
icon = 'icons/effects/fire.dmi'
|
||||
icon_state = "2"
|
||||
anchored = TRUE
|
||||
|
||||
@@ -59,11 +59,23 @@
|
||||
|
||||
toggle_rockets_stabilization(usr)
|
||||
|
||||
/obj/item/tank/jetpack/proc/toggle_rockets_stabilization(mob/user, var/list/message_mobs)
|
||||
stabilization_on = !stabilization_on
|
||||
to_chat(user, SPAN_NOTICE("You toggle \the [src]'s stabilization [stabilization_on ? "on" : "off"]."))
|
||||
for(var/M in message_mobs)
|
||||
to_chat(M, SPAN_NOTICE("[user] toggles \the [src]'s stabilization [stabilization_on ? "on" : "off"]."))
|
||||
/// This toggle proc is used for the verb, but we break activation and deactivation into separate procs for management from other objs (like hardsuits).
|
||||
/// Param 'send_message' will make proc send feedback messages if default TRUE, but proc will be silent if FALSE.
|
||||
/obj/item/tank/jetpack/proc/toggle_rockets_stabilization(mob/user)
|
||||
if(stabilization_on)
|
||||
disable_rockets_stabilization(user)
|
||||
else
|
||||
enable_rockets_stabilization(user)
|
||||
|
||||
/// Exists to be called directly from other objs (like hardsuits).
|
||||
/obj/item/tank/jetpack/proc/enable_rockets_stabilization(mob/user)
|
||||
stabilization_on = TRUE
|
||||
balloon_alert(user, "stabilizers on!")
|
||||
|
||||
/// Exists to be called directly from other objs (like hardsuits).
|
||||
/obj/item/tank/jetpack/proc/disable_rockets_stabilization(mob/user, var/message = TRUE)
|
||||
stabilization_on = FALSE
|
||||
balloon_alert(user, "stabilizers off!")
|
||||
|
||||
/obj/item/tank/jetpack/verb/toggle()
|
||||
set name = "Toggle Jetpack"
|
||||
@@ -72,20 +84,33 @@
|
||||
|
||||
toggle_jetpack(usr)
|
||||
|
||||
/obj/item/tank/jetpack/proc/toggle_jetpack(mob/user, var/list/message_mobs)
|
||||
on = !on
|
||||
toggle_rockets_stabilization(user, message_mobs)
|
||||
/// This toggle proc is used for the verb, but we break activation and deactivation into separate procs for management from other objs (like hardsuits).
|
||||
/obj/item/tank/jetpack/proc/toggle_jetpack(mob/user)
|
||||
if(on)
|
||||
icon_state = "[icon_state]-on"
|
||||
disable_jetpack(user)
|
||||
else
|
||||
icon_state = initial(icon_state)
|
||||
enable_jetpack(user)
|
||||
|
||||
/// Exists to be called directly from other objs (like hardsuits).
|
||||
/obj/item/tank/jetpack/proc/enable_jetpack(mob/user)
|
||||
on = TRUE
|
||||
enable_rockets_stabilization(user, FALSE)
|
||||
icon_state = "[icon_state]-on"
|
||||
|
||||
user.update_inv_back()
|
||||
user.update_action_buttons()
|
||||
|
||||
to_chat(user, SPAN_NOTICE("You toggle \the [src]'s thrusters [on ? "on" : "off"]."))
|
||||
for(var/M in message_mobs)
|
||||
to_chat(M, SPAN_NOTICE("[user] toggles \the [src]'s thrusters [on ? "on" : "off"]."))
|
||||
balloon_alert(user, "jetpack on!")
|
||||
|
||||
/// Exists to be called directly from other objs (like hardsuits).
|
||||
/obj/item/tank/jetpack/proc/disable_jetpack(mob/user, var/list/message_mobs)
|
||||
on = FALSE
|
||||
icon_state = initial(icon_state)
|
||||
|
||||
user.update_inv_back()
|
||||
user.update_action_buttons()
|
||||
|
||||
balloon_alert(user, "jetpack off!")
|
||||
|
||||
/obj/item/tank/jetpack/proc/allow_thrust(num, mob/living/user as mob)
|
||||
if(!(src.on))
|
||||
|
||||
Reference in New Issue
Block a user