@@ -180,3 +178,40 @@
if("explosionfar")
playsound(src, 'sound/effects/explosionfar.ogg', 50)
return
+
+//DARK H.O.N.K.
+
+/obj/vehicle/sealed/mecha/combat/honker/dark
+ desc = "Produced by \"Tyranny of Honk, INC\", this exosuit is designed as heavy clown-support. This one has been painted black for maximum fun. HONK!"
+ name = "\improper Dark H.O.N.K"
+ icon_state = "darkhonker"
+ max_integrity = 300
+ deflect_chance = 15
+ armor = list(MELEE = 40, BULLET = 40, LASER = 50, ENERGY = 35, BOMB = 20, BIO = 0, RAD = 0, FIRE = 100, ACID = 100, STAMINA = 0, BLEED = 0)
+ max_temperature = 35000
+ operation_req_access = list(ACCESS_SYNDICATE)
+ internals_req_access = list(ACCESS_SYNDICATE)
+ wreckage = /obj/structure/mecha_wreckage/honker/dark
+ max_equip = 4
+
+/obj/vehicle/sealed/mecha/combat/honker/dark/add_cell(obj/item/stock_parts/cell/C)
+ if(C)
+ C.forceMove(src)
+ cell = C
+ return
+ cell = new /obj/item/stock_parts/cell/hyper(src)
+
+/obj/vehicle/sealed/mecha/combat/honker/dark/loaded/Initialize(mapload)
+ . = ..()
+ var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/thrusters/ion(src)
+ ME.attach(src)
+ ME = new /obj/item/mecha_parts/mecha_equipment/weapon/honker()
+ ME.attach(src)
+ ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana()//Needed more offensive weapons.
+ ME.attach(src)
+ ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache()//The mousetrap mortar was not up-to-snuff.
+ ME.attach(src)
+
+/obj/structure/mecha_wreckage/honker/dark
+ name = "\improper Dark H.O.N.K wreckage"
+ icon_state = "darkhonker-broken"
diff --git a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
index 30f1bc54abf0f..35ef34f9331a2 100644
--- a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
+++ b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
@@ -1,6 +1,7 @@
-//DO NOT ADD MECHA PARTS TO THE GAME WITH THE DEFAULT "SPRITE ME" SPRITE!
-//I'm annoyed I even have to tell you this! SPRITE FIRST, then commit.
-
+/**
+ * Mecha Equipment
+ * All mech equippables are currently childs of this
+ */
/obj/item/mecha_parts/mecha_equipment
name = "mecha equipment"
icon = 'icons/mecha/mecha_equipment.dmi'
@@ -8,32 +9,40 @@
force = 5
max_integrity = 300
item_flags = ISWEAPON
+ ///Cooldown in ticks required between activations of the equipment
var/equip_cooldown = 0
- var/equip_ready = TRUE //whether the equipment is ready for use. (or deactivated/activated for static stuff)
+ ///used for equipment that can be turned on/off, boolean
+ var/activated = TRUE
+ ///Chassis power cell quantity used on activation
var/energy_drain = 0
- var/obj/vehicle/sealed/mecha/chassis = null
+ ///Reference to mecha that this equipment is currently attached to
+ var/obj/vehicle/sealed/mecha/chassis
///Bitflag. Determines the range of the equipment.
var/range = MECHA_MELEE
/// Bitflag. Used by exosuit fabricator to assign sub-categories based on which exosuits can equip this.
var/mech_flags = NONE
- var/salvageable = 1
- var/detachable = TRUE // Set to FALSE for built-in equipment that cannot be removed
- var/selectable = 1 // Set to 0 for passive equipment such as mining scanner or armor plates
- var/harmful = FALSE //Controls if equipment can be used to attack by a pacifist.
+ ///boolean: FALSE if this equipment can not be removed/salvaged
+ var/detachable = TRUE
+ ///Boolean: whether we can equip this equipment through the mech UI or the cycling ability
+ var/selectable = TRUE
+ ///Boolean: whether a pacifist can use this equipment
+ var/harmful = FALSE
+ ///Sound file: Sound to play when this equipment is destroyed while still attached to the mech
var/destroy_sound = 'sound/mecha/critdestr.ogg'
+///Updates chassis equipment list html menu
/obj/item/mecha_parts/mecha_equipment/proc/update_chassis_page()
- if(chassis)
- send_byjax(chassis.occupants,"exosuit.browser","eq_list",chassis.get_equipment_list())
- send_byjax(chassis.occupants,"exosuit.browser","equipment_menu",chassis.get_equipment_menu(),"dropdowns")
- return TRUE
- return
+ SHOULD_CALL_PARENT(TRUE)
+ send_byjax(chassis.occupants,"exosuit.browser","eq_list", chassis.get_equipment_list())
+ send_byjax(chassis.occupants,"exosuit.browser","equipment_menu", chassis.get_equipment_menu(),"dropdowns")
+ return TRUE
+///Updates chassis equipment list html menu with custom data
/obj/item/mecha_parts/mecha_equipment/proc/update_equip_info()
- if(chassis)
- send_byjax(chassis.occupants,"exosuit.browser","[REF(src)]",get_equip_info())
- return TRUE
- return
+ if(!chassis)
+ return
+ send_byjax(chassis.occupants,"exosuit.browser","[REF(src)]",get_equip_info())
+ return TRUE
/obj/item/mecha_parts/mecha_equipment/Destroy()
if(chassis)
@@ -42,43 +51,50 @@
chassis.selected = null
update_chassis_page()
log_message("[src] is destroyed.", LOG_MECHA)
- if(chassis.occupants)
+ if(LAZYLEN(chassis.occupants))
to_chat(chassis.occupants, "[icon2html(src, chassis.occupants)]
[src] is destroyed!")
playsound(chassis, destroy_sound, 50)
chassis = null
return ..()
-/obj/item/mecha_parts/mecha_equipment/try_attach_part(mob/user, obj/vehicle/sealed/mecha/M)
- if(!do_after(user, 15, M))
+/obj/item/mecha_parts/mecha_equipment/try_attach_part(mob/user, obj/vehicle/sealed/mecha/mech)
+ if(!do_after(user, 15, mech))
return FALSE
- if(!can_attach(M))
- to_chat(user, "
You are unable to attach [src] to [M]!")
+ if(!can_attach(mech))
+ to_chat(user, "
You are unable to attach [src] to [mech]!")
return FALSE
if(!user.temporarilyRemoveItemFromInventory(src))
return FALSE
- attach(M)
- user.visible_message("[user] attaches [src] to [M].", "
You attach [src] to [M].")
+ attach(mech)
+ user.visible_message("[user] attaches [src] to [mech].", "
You attach [src] to [mech].")
return TRUE
+///fetches and returns a html formatted string with equippability status
/obj/item/mecha_parts/mecha_equipment/proc/get_equip_info()
if(!chassis)
return
- var/txt = "
* "
+ var/txt = "
* "
if(chassis.selected == src)
- txt += "
[src.name]"
+ txt += "
[src]"
else if(selectable)
- txt += "
[src.name]"
+ txt += "
[src]"
else
- txt += "[src.name]"
+ txt += "[src]"
return txt
+/**
+ * Checks whether this mecha equipment can be activated
+ * Returns a bool
+ * Arguments:
+ * * target: atom we are activating/clicked on
+ */
/obj/item/mecha_parts/mecha_equipment/proc/action_checks(atom/target)
if(!target)
return FALSE
if(!chassis)
return FALSE
- if(!equip_ready)
+ if(!activated)
return FALSE
if(energy_drain && !chassis.has_charge(energy_drain))
return FALSE
@@ -93,68 +109,78 @@
/obj/item/mecha_parts/mecha_equipment/proc/action(mob/source, atom/target, params)
TIMER_COOLDOWN_START(chassis, COOLDOWN_MECHA_EQUIPMENT, equip_cooldown)//Cooldown is on the MECH so people dont bypass it by switching equipment
- send_byjax(chassis.occupants,"exosuit.browser","[REF(src)]",src.get_equip_info())
+ send_byjax(chassis.occupants,"exosuit.browser","[REF(src)]", get_equip_info())
chassis.use_power(energy_drain)
return TRUE
+/**
+ * Cooldown proc variant for using do_afters between activations instead of timers
+ * Example of usage is mech drills, rcds
+ * arguments:
+ * * target: targetted atom for action activation
+ * * user: occupant to display do after for
+ * * interaction_key: interaction key to pass to [/proc/do_after]
+ */
/obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(atom/target, mob/user)
if(!chassis)
return
- var/C = chassis.loc
chassis.use_power(energy_drain)
. = do_after(user, equip_cooldown, target=target)
- if(!chassis || chassis.loc != C || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir))
+ if(!chassis || src != chassis.selected || !(get_dir(chassis, target) & chassis.dir))
return FALSE
+///Do after wrapper for mecha equipment
/obj/item/mecha_parts/mecha_equipment/proc/do_after_mecha(atom/target, mob/user, delay)
if(!chassis)
return
- var/C = chassis.loc
. = do_after(user, delay, target=target)
- if(!chassis || chassis.loc != C || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir))
+ if(!chassis || src != chassis.selected || !(get_dir(chassis, target) & chassis.dir))
return FALSE
+///Returns TRUE if equipment should be allowed to attach to the targetted necha
/obj/item/mecha_parts/mecha_equipment/proc/can_attach(obj/vehicle/sealed/mecha/M)
- if(LAZYLEN(M.equipment)
You start putting [target] into [src]...")
chassis.visible_message("[chassis] starts putting [target] into \the [src].")
- if(do_after(source, equip_cooldown, target=target))
- if(!chassis || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir))
- return
- if(!patient_insertion_check(target, source))
- return
- target.forceMove(src)
- patient = target
- START_PROCESSING(SSobj, src)
- update_equip_info()
- to_chat(source, "[icon2html(src, source)][target] successfully loaded into [src]. Life support functions engaged.")
- chassis.visible_message("[chassis] loads [target] into [src].")
- log_message("[target] loaded. Life support functions engaged.", LOG_MECHA)
- return ..()
+ if(!do_after(source, equip_cooldown, target=target))
+ return
+ if(!chassis || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir))
+ return
+ if(!patient_insertion_check(target, source))
+ return
+ target.forceMove(src)
+ patient = target
+ START_PROCESSING(SSobj, src)
+ update_equip_info()
+ to_chat(source, "[icon2html(src, source)][target] successfully loaded into [src]. Life support functions engaged.")
+ chassis.visible_message("[chassis] loads [target] into [src].")
+ log_message("[target] loaded. Life support functions engaged.", LOG_MECHA)
+ return ..()
/obj/item/mecha_parts/mecha_equipment/medical/sleeper/proc/patient_insertion_check(mob/living/carbon/target, mob/user)
if(target.buckled)
to_chat(user, "[icon2html(src, user)][target] will not fit into the sleeper because [target.p_theyre()] buckled to [target.buckled]!")
- return
+ return FALSE
if(target.has_buckled_mobs())
to_chat(user, "[icon2html(src, user)][target] will not fit into the sleeper because of the creatures attached to it!")
- return
+ return FALSE
if(patient)
to_chat(user, "[icon2html(src, user)]The sleeper is already occupied!")
- return
+ return FALSE
return TRUE
/obj/item/mecha_parts/mecha_equipment/medical/sleeper/proc/go_out()
@@ -214,37 +215,36 @@
update_equip_info()
/obj/item/mecha_parts/mecha_equipment/medical/sleeper/update_equip_info()
- if(..())
- if(patient)
- send_byjax(chassis.occupants,"msleeper.browser","lossinfo",get_patient_dam())
- send_byjax(chassis.occupants,"msleeper.browser","reagents",get_patient_reagents())
- send_byjax(chassis.occupants,"msleeper.browser","injectwith",get_available_reagents())
- return 1
- return
+ . = ..()
+ if(. && patient)
+ send_byjax(chassis.occupants,"msleeper.browser","lossinfo",get_patient_dam())
+ send_byjax(chassis.occupants,"msleeper.browser","reagents",get_patient_reagents())
+ send_byjax(chassis.occupants,"msleeper.browser","injectwith",get_available_reagents())
/obj/item/mecha_parts/mecha_equipment/medical/sleeper/container_resist(mob/living/user)
go_out()
-/obj/item/mecha_parts/mecha_equipment/medical/sleeper/process()
- if(..())
+/obj/item/mecha_parts/mecha_equipment/medical/sleeper/process(delta_time)
+ . = ..()
+ if(.)
return
if(!chassis.has_charge(energy_drain))
log_message("Deactivated.", LOG_MECHA)
to_chat(chassis.occupants, "[icon2html(src, chassis.occupants)][src] deactivated - no power.")
STOP_PROCESSING(SSobj, src)
return
- var/mob/living/carbon/M = patient
- if(!M)
+ var/mob/living/carbon/ex_patient = patient
+ if(!ex_patient)
return
- if(M.health > 0)
- M.adjustOxyLoss(-1)
- M.AdjustStun(-80)
- M.AdjustKnockdown(-80)
- M.AdjustParalyzed(-80)
- M.AdjustImmobilized(-80)
- M.AdjustUnconscious(-80)
- if(M.reagents.get_reagent_amount(/datum/reagent/medicine/epinephrine) < 5)
- M.reagents.add_reagent(/datum/reagent/medicine/epinephrine, 5)
+ if(ex_patient.health > 0)
+ ex_patient.adjustOxyLoss(-0.5 * delta_time)
+ ex_patient.AdjustStun(-40 * delta_time)
+ ex_patient.AdjustKnockdown(-40 * delta_time)
+ ex_patient.AdjustParalyzed(-40 * delta_time)
+ ex_patient.AdjustImmobilized(-40 * delta_time)
+ ex_patient.AdjustUnconscious(-40 * delta_time)
+ if(ex_patient.reagents.get_reagent_amount(/datum/reagent/medicine/epinephrine) < 5)
+ ex_patient.reagents.add_reagent(/datum/reagent/medicine/epinephrine, 5)
chassis.use_power(energy_drain)
update_equip_info()
@@ -253,29 +253,36 @@
///////////////////////////////// Syringe Gun ///////////////////////////////////////////////////////////////
+#define FIRE_SYRINGE_MODE 0
+#define ANALYZE_SYRINGE_MODE 1
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun
name = "exosuit syringe gun"
desc = "Equipment for medical exosuits. A chem synthesizer with syringe gun. Reagents inside are held in stasis, so no reactions will occur."
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "syringegun"
+ range = MECHA_MELEE|MECHA_RANGED
+ equip_cooldown = 10
+ energy_drain = 10
+ ///Lazylist of syringes that we've picked up
var/list/syringes
+ ///List of all scanned reagents, starts with epinephrine and multiver
var/list/known_reagents
+ ///List of reagents we want to be creating this processing tick
var/list/processed_reagents
+ ///Maximu amount of syringes we can hold
var/max_syringes = 10
- var/max_volume = 75 //max reagent volume
- var/synth_speed = 5 //[num] reagent units per cycle
- energy_drain = 10
- var/mode = 0 //0 - fire syringe, 1 - analyze reagents.
- range = MECHA_MELEE|MECHA_RANGED
- equip_cooldown = 10
+ ///Maximum volume of reagents we can hold
+ var/max_volume = 75
+ ///Reagent amount in units we produce per two seconds
+ var/synth_speed = 5
+ ///Chooses what kind of action we should perform when clicking
+ var/mode = FIRE_SYRINGE_MODE // fire syringe or analyze reagents.
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/Initialize(mapload)
. = ..()
create_reagents(max_volume, NO_REACT)
- syringes = new
known_reagents = list(/datum/reagent/medicine/epinephrine="Epinephrine",/datum/reagent/medicine/charcoal="Charcoal")
- processed_reagents = new
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/detach()
STOP_PROCESSING(SSobj, src)
@@ -286,18 +293,16 @@
return ..()
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/can_attach(obj/vehicle/sealed/mecha/medical/M)
- if(..())
- if(istype(M))
- return 1
- return 0
+ . = ..()
+ if(!istype(M))
+ return FALSE
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/get_equip_info()
- var/output = ..()
+ var/output = ..()// no . = here to avoid obfuscation
if(output)
- return "[output] \[[mode? "Analyze" : "Launch"]\]
\[Syringes: [syringes.len]/[max_syringes] | Reagents: [reagents.total_volume]/[reagents.maximum_volume]\]
Reagents list"
- return
+ return "[output] \[[mode? "Analyze" : "Launch"]\]
\[Syringes: [LAZYLEN(syringes)]/[max_syringes] | Reagents: [reagents.total_volume]/[reagents.maximum_volume]\]
Reagents list"
-/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/action(mob/source, atom/movable/target, params)
+/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/action(mob/source, atom/target, params)
if(!action_checks(target))
return
if(istype(target, /obj/item/reagent_containers/syringe))
@@ -306,63 +311,23 @@
for(var/obj/item/reagent_containers/syringe/S in target.contents)
load_syringe(S, source)
return
- if(mode)
+ if(mode == ANALYZE_SYRINGE_MODE)
return analyze_reagents(target, source)
- if(!syringes.len)
+ //we're in syringe mode so lets do syringe stuff
+ if(!LAZYLEN(syringes))
to_chat(source, "[icon2html(src, source)]No syringes loaded.")
return
if(reagents.total_volume<=0)
to_chat(source, "[icon2html(src, source)]No available reagents to load syringe with.")
return
if(HAS_TRAIT(source, TRAIT_PACIFISM))
- to_chat(source, "The [src] is lethally chambered! You don't want to risk harming anyone...")
+ to_chat(source, "The [src] might be lethally chambered! You don't want to risk harming anyone...")
return
- var/turf/trg = get_turf(target)
- var/obj/item/reagent_containers/syringe/mechsyringe = syringes[1]
- mechsyringe.forceMove(get_turf(chassis))
- reagents.trans_to(mechsyringe, min(mechsyringe.volume, reagents.total_volume), transfered_by = source)
- syringes -= mechsyringe
- mechsyringe.icon = 'icons/obj/chemical.dmi'
- mechsyringe.icon_state = "syringeproj"
- playsound(chassis, 'sound/items/syringeproj.ogg', 50, 1)
- log_message("Launched [mechsyringe] from [src] by [source], targeting [target].", LOG_MECHA)
- spawn(0) //This code is trash and whoever wrote it should feel bad
- for(var/i=0, i<6, i++)
- if(!mechsyringe)
- break
- if(step_towards(mechsyringe,trg))
- var/list/mobs = new
- for(var/mob/living/carbon/M in mechsyringe.loc)
- mobs += M
- var/mob/living/carbon/M = safepick(mobs)
- if(M)
- var/R
- mechsyringe.visible_message(" [M] was hit by the syringe!")
- if(M.can_inject(null, 1))
- if(mechsyringe.reagents)
- for(var/datum/reagent/A in mechsyringe.reagents.reagent_list)
- R += "[A.name] ([num2text(A.volume)]"
- mechsyringe.icon_state = initial(mechsyringe.icon_state)
- mechsyringe.icon = initial(mechsyringe.icon)
- mechsyringe.reagents.reaction(M, INJECT)
- mechsyringe.reagents.trans_to(M, mechsyringe.reagents.total_volume, transfered_by = source)
- M.take_bodypart_damage(2)
- log_combat(source, M, "shot", "syringegun")
- break
- else if(mechsyringe.loc == trg)
- mechsyringe.icon_state = initial(mechsyringe.icon_state)
- mechsyringe.icon = initial(mechsyringe.icon)
- mechsyringe.update_icon()
- break
- else
- mechsyringe.icon_state = initial(mechsyringe.icon_state)
- mechsyringe.icon = initial(mechsyringe.icon)
- mechsyringe.update_icon()
- break
- sleep(1)
+ var/obj/item/ammo_casing/syringegun/chambered = new /obj/item/ammo_casing/syringegun(src)
+ log_message("Fired [chambered] from [src] by [source], targeting [target].", LOG_MECHA)
+ chambered.fire_casing(target, source, null, 0, 0, null, 0, src)
return ..()
-
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/Topic(href,href_list)
..()
if (href_list["toggle_mode"])
@@ -370,18 +335,18 @@
update_equip_info()
return
if (href_list["select_reagents"])
- processed_reagents.len = 0
- var/m = 0
+ LAZYCLEARLIST(processed_reagents)
+ var/processingreagentamount = 0
var/message
for(var/i=1 to known_reagents.len)
- if(m>=synth_speed)
+ if(processingreagentamount >= synth_speed)
break
var/reagent = text2path(href_list["reagent_[i]"])
if(reagent && (reagent in known_reagents))
- message = "[m ? ", " : null][known_reagents[reagent]]"
- processed_reagents += reagent
- m++
- if(processed_reagents.len)
+ message = "[processingreagentamount ? ", " : null][known_reagents[reagent]]"
+ LAZYADD(processed_reagents, reagent)
+ processingreagentamount++
+ if(LAZYLEN(processed_reagents))
message += " added to production"
START_PROCESSING(SSobj, src)
to_chat(usr, message)
@@ -392,10 +357,12 @@
if(!(usr in chassis.occupants))
return
usr << browse(get_reagents_page(),"window=msyringegun")
+ return
if (href_list["purge_reagent"])
var/reagent = href_list["purge_reagent"]
- if(reagent)
- reagents.del_reagent(reagent)
+ if(!reagent)
+ return
+ reagents.del_reagent(reagent)
return
if (href_list["purge_all"])
reagents.clear_reagents()
@@ -463,18 +430,18 @@
return output || "None"
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/load_syringe(obj/item/reagent_containers/syringe/S, mob/user)
- if(syringes.lenUnable to load syringe!")
- return FALSE
- S.reagents.trans_to(src, S.reagents.total_volume, transfered_by = user)
- S.forceMove(src)
- syringes += S
- to_chat(user, "[icon2html(src, user)]Syringe loaded.")
- update_equip_info()
- return 1
- to_chat(user, "[icon2html(src, user)][src]'s syringe chamber is full!")
- return 0
+ if(LAZYLEN(syringes) >= max_syringes)
+ to_chat(user, "[icon2html(src, user)][src]'s syringe chamber is full!")
+ return FALSE
+ if(!chassis.Adjacent(S))
+ to_chat(user, "[icon2html(src, user)]Unable to load syringe!")
+ return FALSE
+ S.reagents.trans_to(src, S.reagents.total_volume, transfered_by = user)
+ S.forceMove(src)
+ LAZYADD(syringes,S)
+ to_chat(user, "[icon2html(src, user)]Syringe loaded.")
+ update_equip_info()
+ return TRUE
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/analyze_reagents(atom/A, mob/user)
if(get_dist(src,A) >= 4)
@@ -492,38 +459,40 @@
return TRUE
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/add_known_reagent(r_id,r_name)
- if(!(r_id in known_reagents))
- known_reagents += r_id
- known_reagents[r_id] = r_name
- return TRUE
- return FALSE
+ if(r_id in known_reagents)
+ return FALSE
+ known_reagents += r_id
+ known_reagents[r_id] = r_name
+ return TRUE
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/update_equip_info()
- if(..())
+ . = ..()
+ if(.)
send_byjax(chassis.occupants,"msyringegun.browser","reagents",get_current_reagents())
send_byjax(chassis.occupants,"msyringegun.browser","reagents_form",get_reagents_form())
- return 1
- return
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/on_reagent_change(changetype)
- ..()
+ . = ..()
update_equip_info()
return
-/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/process()
- if(..())
+/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/process(delta_time)
+ . = ..()
+ if(.)
return
- if(!processed_reagents.len || reagents.total_volume >= reagents.maximum_volume || !chassis.has_charge(energy_drain))
+ if(!LAZYLEN(processed_reagents) || reagents.total_volume >= reagents.maximum_volume || !chassis.has_charge(energy_drain))
to_chat(chassis.occupants, "[icon2html(src, chassis.occupants)]Reagent processing stopped.")
log_message("Reagent processing stopped.", LOG_MECHA)
- STOP_PROCESSING(SSobj, src)
- return
- var/amount = synth_speed / processed_reagents.len
+ return PROCESS_KILL
+ var/amount = delta_time * synth_speed / LAZYLEN(processed_reagents)
for(var/reagent in processed_reagents)
reagents.add_reagent(reagent,amount)
chassis.use_power(energy_drain)
+#undef FIRE_SYRINGE_MODE
+#undef ANALYZE_SYRINGE_MODE
+
///////////////////////////////// Medical Beam ///////////////////////////////////////////////////////////////
/obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam
@@ -533,6 +502,7 @@
energy_drain = 10
range = MECHA_MELEE|MECHA_RANGED
equip_cooldown = 0
+ ///The medical gun doing the actual healing. yes its wierd but its better than copypasting the entire thing
var/obj/item/gun/medbeam/mech/medigun
custom_materials = list(/datum/material/iron = 15000, /datum/material/glass = 8000, /datum/material/plasma = 3000, /datum/material/gold = 8000, /datum/material/diamond = 2000)
@@ -542,18 +512,18 @@
/obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam/Destroy()
- qdel(medigun)
+ QDEL_NULL(medigun)
return ..()
-/obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam/process()
- if(..())
+/obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam/process(deltatime)
+ . = ..()
+ if(.)
return
- medigun.process()
+ medigun.process(SSOBJ_DT)
/obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam/action(mob/source, atom/movable/target, params)
medigun.process_fire(target, loc)
-
/obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam/detach()
STOP_PROCESSING(SSobj, src)
medigun.LoseTarget()
diff --git a/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm b/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
index f5075feea0cd2..9434cdedbe7ce 100644
--- a/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
@@ -176,7 +176,7 @@
qdel(src)
if(istype(loc, /obj/vehicle/sealed/mecha/working) && scanning_time <= world.time)
var/obj/vehicle/sealed/mecha/working/mecha = loc
- if(!mecha.occupants)
+ if(!LAZYLEN(mecha.occupants))
return
scanning_time = world.time + equip_cooldown
mineral_scan_pulse(get_turf(src))
diff --git a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
index 89c3f16316c46..b399a8220b70c 100644
--- a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
@@ -13,7 +13,8 @@
range = MECHA_RANGED
/obj/item/mecha_parts/mecha_equipment/teleporter/action(mob/source, atom/target, params)
- if(!action_checks(target) || is_centcom_level(loc.z))
+ var/area/ourarea = get_area(src)
+ if(!action_checks(target) || ourarea & TELEPORT_ALLOW_NONE)
return
var/turf/T = get_turf(target)
if(T)
@@ -26,7 +27,7 @@
/obj/item/mecha_parts/mecha_equipment/wormhole_generator
name = "mounted wormhole generator"
- desc = "An exosuit module that allows generating of small quasi-stable wormholes."
+ desc = "An exosuit module that allows generating of small quasi-stable wormholes, allowing for long-range innaccurate teleportation."
icon_state = "mecha_wholegen"
equip_cooldown = 50
energy_drain = 300
@@ -34,39 +35,38 @@
/obj/item/mecha_parts/mecha_equipment/wormhole_generator/action(mob/source, atom/target, params)
- if(!action_checks(target) || is_centcom_level(loc.z))
+ var/area/ourarea = get_area(src)
+ if(!action_checks(target) || (ourarea & TELEPORT_ALLOW_NONE))
return
- var/list/theareas = get_areas_in_range(100, chassis)
- if(!theareas.len)
+ var/area/targetarea = pick(get_areas_in_range(100, chassis))
+ if(!targetarea)//Literally middle of nowhere how did you even get here
return
- var/area/thearea = pick(theareas)
- var/list/L = list()
- var/turf/pos = get_turf(src)
- for(var/turf/T in get_area_turfs(thearea.type))
- if(!T.density && pos.get_virtual_z_level() == T.get_virtual_z_level())
- var/clear = 1
- for(var/obj/O in T)
- if(O.density)
- clear = 0
- break
- if(clear)
- L+=T
- if(!L.len)
- return
- var/turf/target_turf = pick(L)
+ var/list/validturfs = list()
+ var/turf/ourturf = get_turf(src)
+ for(var/t in get_area_turfs(targetarea.type))
+ var/turf/evaluated_turf = t
+ if(evaluated_turf.density || chassis.get_virtual_z_level() != evaluated_turf.get_virtual_z_level())
+ continue
+ for(var/obj/evaluated_obj in evaluated_turf)
+ if(!evaluated_obj.density)
+ continue
+ validturfs += evaluated_turf
+
+ var/turf/target_turf = pick(validturfs)
if(!target_turf)
return
- var/list/obj/effect/portal/created = create_portal_pair(get_turf(src), target_turf, src, 300, 1, /obj/effect/portal/anom)
- var/turf/T = get_turf(target)
- message_admins("[ADMIN_LOOKUPFLW(source)] used a Wormhole Generator in [ADMIN_VERBOSEJMP(T)]")
- log_game("[key_name(source)] used a Wormhole Generator in [AREACOORD(T)]")
- src = null
+ var/list/obj/effect/portal/created = create_portal_pair(ourturf, target_turf, 300, 1, /obj/effect/portal/anom)
+ message_admins("[ADMIN_LOOKUPFLW(source)] used a Wormhole Generator in [ADMIN_VERBOSEJMP(ourturf)]")
+ log_game("[key_name(source)] used a Wormhole Generator in [AREACOORD(ourturf)]")
QDEL_LIST_IN(created, rand(150,300))
return ..()
/////////////////////////////////////// GRAVITATIONAL CATAPULT ///////////////////////////////////////////
+#define GRAVSLING_MODE 1
+#define GRAVPUSH_MODE 2
+
/obj/item/mecha_parts/mecha_equipment/gravcatapult
name = "mounted gravitational catapult"
desc = "An exosuit mounted Gravitational Catapult."
@@ -74,73 +74,77 @@
equip_cooldown = 10
energy_drain = 100
range = MECHA_MELEE|MECHA_RANGED
- var/atom/movable/locked
- var/mode = 1 //1 - gravsling 2 - gravpush
+ ///Which atom we are movable_target onto for
+ var/atom/movable/movable_target
+ ///Whether we will throw movable atomstothrow by locking onto them or just throw them back from where we click
+ var/mode = GRAVSLING_MODE
/obj/item/mecha_parts/mecha_equipment/gravcatapult/action(mob/source, atom/movable/target, params)
if(!action_checks(target))
return
switch(mode)
- if(1)
- if(!locked)
+ if(GRAVSLING_MODE)
+ if(!movable_target)
if(!istype(target) || target.anchored || target.move_resist >= MOVE_FORCE_EXTREMELY_STRONG)
to_chat(source, "[icon2html(src, source)]Unable to lock on [target]!")
return
if(ismob(target))
var/mob/M = target
if(M.mob_negates_gravity())
- to_chat(source, "[icon2html(src, source)]Unable to lock on [target]!")
+ to_chat(source, "[icon2html(src, source)][target] immune to gravitational impulses, unable to lock!")
return
- locked = target
- to_chat(source, "[icon2html(src, source)]Locked on [target].")
- send_byjax(source,"exosuit.browser","[REF(src)]",src.get_equip_info())
- else if(target!=locked)
- if(locked in view(chassis))
+ movable_target = target
+ to_chat(source, "[icon2html(src, source)]locked on [target].")
+ send_byjax(source,"exosuit.browser","[REF(src)]", get_equip_info())
+ else if(target!=movable_target)
+ if(movable_target in view(chassis))
var/turf/targ = get_turf(target)
- var/turf/orig = get_turf(locked)
- locked.throw_at(target, 14, 1.5)
- locked = null
- send_byjax(source,"exosuit.browser","[REF(src)]",src.get_equip_info())
- log_game("[key_name(source)] used a Gravitational Catapult to throw [locked] (From [AREACOORD(orig)]) at [target] ([AREACOORD(targ)]).")
+ var/turf/orig = get_turf(movable_target)
+ movable_target.throw_at(target, 14, 1.5)
+ movable_target = null
+ send_byjax(source,"exosuit.browser","[REF(src)]", get_equip_info())
+ log_game("[key_name(source)] used a Gravitational Catapult to throw [movable_target] (From [AREACOORD(orig)]) at [target] ([AREACOORD(targ)]).")
return ..()
- else
- locked = null
- to_chat(source, "[icon2html(src, source)]Lock on [locked] disengaged.")
- send_byjax(source,"exosuit.browser","[REF(src)]",src.get_equip_info())
- if(2)
- var/list/atoms = list()
+ movable_target = null
+ to_chat(source, "[icon2html(src, source)]Lock on [movable_target] disengaged.")
+ send_byjax(source,"exosuit.browser","[REF(src)]", get_equip_info())
+
+ if(GRAVPUSH_MODE)
+ var/list/atomstothrow = list()
if(isturf(target))
- atoms = range(3, target)
+ atomstothrow = range(3, target)
else
- atoms = orange(3, target)
- for(var/atom/movable/A in atoms)
- if(A.anchored || A.move_resist >= MOVE_FORCE_EXTREMELY_STRONG)
+ atomstothrow = orange(3, target)
+ for(var/atom/movable/scatter in atomstothrow)
+ if(scatter.anchored || scatter.move_resist >= MOVE_FORCE_EXTREMELY_STRONG)
continue
- if(ismob(A))
- var/mob/M = A
- if(M.mob_negates_gravity())
+ if(ismob(scatter))
+ var/mob/scatter_mob = scatter
+ if(scatter_mob.mob_negates_gravity())
continue
- var/dist = 5 - get_dist(A, target)
- var/delay = 2
- SSmove_manager.move_away(A, target, delay = delay, timeout = delay * dist, flags = MOVEMENT_LOOP_START_FAST, priority = MOVEMENT_ABOVE_SPACE_PRIORITY)
- var/turf/T = get_turf(target)
- log_game("[key_name(source)] used a Gravitational Catapult repulse wave on [AREACOORD(T)]")
+ do_scatter(scatter, target)
+ var/turf/targetturf = get_turf(target)
+ log_game("[key_name(source)] used a Gravitational Catapult repulse wave on [AREACOORD(targetturf)]")
return ..()
+/obj/item/mecha_parts/mecha_equipment/gravcatapult/proc/do_scatter(atom/movable/scatter, atom/movable/target)
+ var/dist = 5 - get_dist(scatter, target)
+ var/delay = 2
+ SSmove_manager.move_away(scatter, target, delay = delay, timeout = delay * dist, flags = MOVEMENT_LOOP_START_FAST, priority = MOVEMENT_ABOVE_SPACE_PRIORITY)
/obj/item/mecha_parts/mecha_equipment/gravcatapult/get_equip_info()
- return "[..()] [mode==1?"([locked||"Nothing"])":null] \[S|P\]"
+ return "[..()] [mode==1?"([movable_target||"Nothing"])":null] \[S|P\]"
/obj/item/mecha_parts/mecha_equipment/gravcatapult/Topic(href, href_list)
..()
if(href_list["mode"])
mode = text2num(href_list["mode"])
send_byjax(chassis.occupants,"exosuit.browser","[REF(src)]",src.get_equip_info())
- return
-
+#undef GRAVSLING_MODE
+#undef GRAVPUSH_MODE
//////////////////////////// ARMOR BOOSTER MODULES //////////////////////////////////////////////////////////
@@ -154,7 +158,7 @@
range = 0
var/deflect_coeff = 1.15
var/damage_coeff = 0.8
- selectable = 0
+ selectable = FALSE
/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/proc/attack_react()
if(energy_drain && !chassis.has_charge(energy_drain))
@@ -173,7 +177,7 @@
range = 0
var/deflect_coeff = 1.15
var/damage_coeff = 0.8
- selectable = 0
+ selectable = FALSE
/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/proc/projectile_react()
if(energy_drain && !chassis.has_charge(energy_drain))
@@ -191,74 +195,76 @@
icon_state = "repair_droid"
energy_drain = 50
range = 0
- var/health_boost = 1
+
+ /// Repaired health per second
+ var/health_boost = 0.5
var/icon/droid_overlay
var/list/repairable_damage = list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH)
selectable = 0
/obj/item/mecha_parts/mecha_equipment/repair_droid/Destroy()
STOP_PROCESSING(SSobj, src)
- if(chassis)
- chassis.cut_overlay(droid_overlay)
+ chassis?.cut_overlay(droid_overlay)
return ..()
/obj/item/mecha_parts/mecha_equipment/repair_droid/attach(obj/vehicle/sealed/mecha/M)
- ..()
+ . = ..()
droid_overlay = new(src.icon, icon_state = "repair_droid")
M.add_overlay(droid_overlay)
/obj/item/mecha_parts/mecha_equipment/repair_droid/detach()
chassis.cut_overlay(droid_overlay)
STOP_PROCESSING(SSobj, src)
- ..()
+ return ..()
/obj/item/mecha_parts/mecha_equipment/repair_droid/get_equip_info()
- if(!chassis)
- return
- return "* [src.name] - [equip_ready?"A":"Dea"]ctivate"
+ return "* [src] - [activated?"Deactivate":"Activate"]"
/obj/item/mecha_parts/mecha_equipment/repair_droid/Topic(href, href_list)
..()
- if(href_list["toggle_repairs"])
- chassis.cut_overlay(droid_overlay)
- if(equip_ready)
- START_PROCESSING(SSobj, src)
- droid_overlay = new(src.icon, icon_state = "repair_droid_a")
- log_message("Activated.", LOG_MECHA)
- else
- STOP_PROCESSING(SSobj, src)
- droid_overlay = new(src.icon, icon_state = "repair_droid")
- log_message("Deactivated.", LOG_MECHA)
- chassis.add_overlay(droid_overlay)
- send_byjax(chassis.occupants,"exosuit.browser", "[REF(src)]", get_equip_info())
+ if(!href_list["toggle_repairs"])
+ return
+ chassis.cut_overlay(droid_overlay)
+ activated = !activated //now set to FALSE and active, so update the UI
+ update_equip_info()
+ if(activated)
+ START_PROCESSING(SSobj, src)
+ droid_overlay = new(icon, icon_state = "repair_droid_a")
+ log_message("Activated.", LOG_MECHA)
+ else
+ STOP_PROCESSING(SSobj, src)
+ droid_overlay = new(icon, icon_state = "repair_droid")
+ log_message("Deactivated.", LOG_MECHA)
+ chassis.add_overlay(droid_overlay)
+ send_byjax(chassis.occupants,"exosuit.browser", "[REF(src)]", get_equip_info())
-/obj/item/mecha_parts/mecha_equipment/repair_droid/process()
+/obj/item/mecha_parts/mecha_equipment/repair_droid/process(delta_time)
if(!chassis)
- STOP_PROCESSING(SSobj, src)
- return
- var/h_boost = health_boost
- var/repaired = 0
+ return PROCESS_KILL
+ var/h_boost = health_boost * delta_time
+ var/repaired = FALSE
if(chassis.internal_damage & MECHA_INT_SHORT_CIRCUIT)
h_boost *= -2
- else if(chassis.internal_damage && prob(15))
+ else if(chassis.internal_damage && DT_PROB(8, delta_time))
for(var/int_dam_flag in repairable_damage)
- if(chassis.internal_damage & int_dam_flag)
- chassis.clearInternalDamage(int_dam_flag)
- repaired = 1
- break
+ if(!(chassis.internal_damage & int_dam_flag))
+ continue
+ chassis.clear_internal_damage(int_dam_flag)
+ repaired = TRUE
+ break
if(h_boost<0 || chassis.get_integrity() < chassis.max_integrity)
chassis.repair_damage(h_boost)
- repaired = 1
+ repaired = TRUE
if(repaired)
if(!chassis.use_power(energy_drain))
- STOP_PROCESSING(SSobj, src)
+ return PROCESS_KILL
else //no repair needed, we turn off
- STOP_PROCESSING(SSobj, src)
chassis.cut_overlay(droid_overlay)
droid_overlay = new(src.icon, icon_state = "repair_droid")
chassis.add_overlay(droid_overlay)
+ return PROCESS_KILL
@@ -273,7 +279,7 @@
range = 0
var/coeff = 100
var/list/use_channels = list(AREA_USAGE_EQUIP,AREA_USAGE_ENVIRON,AREA_USAGE_LIGHT)
- selectable = 0
+ selectable = FALSE
/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/Destroy()
STOP_PROCESSING(SSobj, src)
@@ -281,31 +287,33 @@
/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/detach()
STOP_PROCESSING(SSobj, src)
- ..()
- return
+ return ..()
/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/get_charge()
- if(equip_ready) //disabled
+ if(activated) //disabled
return
- var/area/A = get_area(chassis)
- var/pow_chan = GET_MUTATION_POWER_channel(A)
+ var/pow_chan = get_chassis_area_power(get_area(chassis))
if(pow_chan)
return 1000 //making magic
-/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/GET_MUTATION_POWER_channel(var/area/A)
- var/pow_chan
- if(A)
- for(var/c in use_channels)
- if(A.powered(c))
- pow_chan = c
- break
+/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/get_chassis_area_power(area/A)
+ if(!A)
+ return
+ var/pow_chan = 0
+ for(var/c in use_channels)
+ if(!A.powered(c))
+ continue
+ pow_chan = c
+ break
return pow_chan
/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/Topic(href, href_list)
..()
if(href_list["toggle_relay"])
- if(equip_ready) //inactive
+ activated = !activated //now set to FALSE and active, so update the UI
+ update_equip_info()
+ if(activated) //inactive
START_PROCESSING(SSobj, src)
log_message("Activated.", LOG_MECHA)
else
@@ -315,30 +323,24 @@
/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/get_equip_info()
if(!chassis)
return
- return "* [src.name] - [equip_ready?"A":"Dea"]ctivate"
+ return "* [src.name] - [activated?"Deactivate":"Activate"]"
-/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/process()
+/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/process(delta_time)
if(!chassis || chassis.internal_damage & MECHA_INT_SHORT_CIRCUIT)
- STOP_PROCESSING(SSobj, src)
- return
+ return PROCESS_KILL
var/cur_charge = chassis.get_charge()
if(isnull(cur_charge) || !chassis.cell)
- STOP_PROCESSING(SSobj, src)
to_chat(chassis.occupants, "[icon2html(src, chassis.occupants)]No power cell detected.")
+ return PROCESS_KILL
+ if(cur_charge >= chassis.cell.maxcharge)
return
- if(cur_charge < chassis.cell.maxcharge)
- var/area/A = get_area(chassis)
- if(A)
- var/pow_chan
- for(var/c in use_channels)
- if(A.powered(c))
- pow_chan = c
- break
- if(pow_chan)
- var/delta = min(20, chassis.cell.maxcharge-cur_charge)
- chassis.give_power(delta)
- A.use_power(delta*coeff, pow_chan)
+ var/area/A = get_area(chassis)
+ var/pow_chan = get_chassis_area_power(A)
+ if(pow_chan)
+ var/delta = min(10 * delta_time, chassis.cell.maxcharge-cur_charge)
+ chassis.give_power(delta)
+ A.use_power(delta*coeff, pow_chan)
@@ -354,9 +356,12 @@
var/coeff = 100
var/obj/item/stack/sheet/fuel
var/max_fuel = 150000
- var/fuel_per_cycle_idle = 25
- var/fuel_per_cycle_active = 200
- var/power_per_cycle = 20
+ /// Fuel used per second while idle, not generating
+ var/fuelrate_idle = 12.5
+ /// Fuel used per second while actively generating
+ var/fuelrate_active = 100
+ /// Energy recharged per second
+ var/rechargerate = 10
/obj/item/mecha_parts/mecha_equipment/generator/Initialize(mapload)
. = ..()
@@ -371,12 +376,14 @@
/obj/item/mecha_parts/mecha_equipment/generator/detach()
STOP_PROCESSING(SSobj, src)
- ..()
+ return ..()
/obj/item/mecha_parts/mecha_equipment/generator/Topic(href, href_list)
..()
if(href_list["toggle"])
- if(equip_ready) //inactive
+ activated = !activated //now set to FALSE and active, so update the UI
+ update_equip_info()
+ if(activated) //inactive
START_PROCESSING(SSobj, src)
log_message("Activated.", LOG_MECHA)
else
@@ -386,13 +393,14 @@
/obj/item/mecha_parts/mecha_equipment/generator/get_equip_info()
var/output = ..()
if(output)
- return "[output] \[[fuel]: [round(fuel.amount*MINERAL_MATERIAL_AMOUNT,0.1)] cm3\] - [equip_ready?"A":"Dea"]ctivate"
+ return "[output] \[[fuel]: [round(fuel.amount*MINERAL_MATERIAL_AMOUNT,0.1)] cm3\] - [activated?"Deactivate":"Activate"]"
/obj/item/mecha_parts/mecha_equipment/generator/action(mob/source, atom/movable/target, params)
- if(chassis)
- if(load_fuel(target, source))
- send_byjax(chassis.occupants,"exosuit.browser","[REF(src)]",src.get_equip_info())
- return ..()
+ if(!chassis)
+ return
+ if(load_fuel(target, source))
+ send_byjax(chassis.occupants,"exosuit.browser","[REF(src)]",src.get_equip_info())
+ return ..()
/obj/item/mecha_parts/mecha_equipment/generator/proc/load_fuel(obj/item/stack/sheet/P, mob/user)
if(P.type == fuel.type && P.amount > 0)
@@ -413,27 +421,24 @@
/obj/item/mecha_parts/mecha_equipment/generator/attackby(weapon,mob/user, params)
load_fuel(weapon)
-/obj/item/mecha_parts/mecha_equipment/generator/process()
+/obj/item/mecha_parts/mecha_equipment/generator/process(delta_time)
if(!chassis)
- STOP_PROCESSING(SSobj, src)
- return
+ return PROCESS_KILL
if(fuel.amount<=0)
- STOP_PROCESSING(SSobj, src)
log_message("Deactivated - no fuel.", LOG_MECHA)
- return
+ to_chat(chassis.occupants, "[icon2html(src, chassis.occupants)]Fuel reserves depleted.")
+ return PROCESS_KILL
var/cur_charge = chassis.get_charge()
if(isnull(cur_charge))
to_chat(chassis.occupants, "[icon2html(src, chassis.occupants)]No power cell detected.")
log_message("Deactivated.", LOG_MECHA)
- STOP_PROCESSING(SSobj, src)
- return
- var/use_fuel = fuel_per_cycle_idle
+ return PROCESS_KILL
+ var/use_fuel = fuelrate_idle
if(cur_charge < chassis.cell.maxcharge)
- use_fuel = fuel_per_cycle_active
- chassis.give_power(power_per_cycle)
- fuel.amount -= min(use_fuel/MINERAL_MATERIAL_AMOUNT,fuel.amount)
+ use_fuel = fuelrate_active
+ chassis.give_power(rechargerate * delta_time)
+ fuel.amount -= min(delta_time * use_fuel / MINERAL_MATERIAL_AMOUNT, fuel.amount)
update_equip_info()
- return TRUE
/obj/item/mecha_parts/mecha_equipment/generator/nuclear
@@ -441,17 +446,18 @@
desc = "An exosuit module that generates power using uranium as fuel. Pollutes the environment."
icon_state = "tesla"
max_fuel = 50000
- fuel_per_cycle_idle = 10
- fuel_per_cycle_active = 30
- power_per_cycle = 50
- var/rad_per_cycle = 30
+ fuelrate_idle = 5
+ fuelrate_active = 15
+ rechargerate = 25
+ var/radrate = 15
/obj/item/mecha_parts/mecha_equipment/generator/nuclear/generator_init()
fuel = new /obj/item/stack/sheet/mineral/uranium(src, 0)
-/obj/item/mecha_parts/mecha_equipment/generator/nuclear/process()
- if(..())
- radiation_pulse(get_turf(src), rad_per_cycle)
+/obj/item/mecha_parts/mecha_equipment/generator/nuclear/process(delta_time)
+ . = ..()
+ if(!.) //process wasnt killed
+ radiation_pulse(get_turf(src), radrate * delta_time)
/////////////////////////////////////////// THRUSTERS /////////////////////////////////////////////
@@ -468,34 +474,35 @@
if(istype(I, src))
to_chat(user, "[M] already has this thruster package!")
return FALSE
- . = ..()
+ return ..()
/obj/item/mecha_parts/mecha_equipment/thrusters/attach(obj/vehicle/sealed/mecha/M)
M.active_thrusters = src //Enable by default
- . = ..()
+ return ..()
/obj/item/mecha_parts/mecha_equipment/thrusters/detach()
if(chassis?.active_thrusters == src)
chassis.active_thrusters = null
- . = ..()
+ return ..()
/obj/item/mecha_parts/mecha_equipment/thrusters/Destroy()
if(chassis?.active_thrusters == src)
chassis.active_thrusters = null
- . = ..()
+ return ..()
/obj/item/mecha_parts/mecha_equipment/thrusters/Topic(href,href_list)
..()
- if(!chassis)
- return
- if(href_list["mode"])
- var/mode = text2num(href_list["mode"])
- switch(mode)
- if(0)
- enable()
- if(1)
- disable()
- return
+ if(href_list["toggle"])
+ activated = !activated //now set to FALSE and active, so update the UI
+ update_equip_info()
+ if(activated) //inactive
+ START_PROCESSING(SSobj, src)
+ enable()
+ log_message("Activated.", LOG_MECHA)
+ else
+ STOP_PROCESSING(SSobj, src)
+ disable()
+ log_message("Deactivated.", LOG_MECHA)
/obj/item/mecha_parts/mecha_equipment/thrusters/proc/enable()
if (chassis.active_thrusters == src)
@@ -510,7 +517,9 @@
to_chat(chassis.occupants, "[icon2html(src, chassis.occupants)][src] disabled.")
/obj/item/mecha_parts/mecha_equipment/thrusters/get_equip_info()
- return "[..()] \[Enable|Disable\]"
+ var/output = ..()
+ if(output)
+ return "[output] [activated?"Deactivate":"Activate"]"
/obj/item/mecha_parts/mecha_equipment/thrusters/proc/thrust(var/movement_dir)
if(!chassis)
@@ -535,7 +544,7 @@
if(!M.internal_tank)
to_chat(user, "[M] does not have an internal tank and cannot support this upgrade!")
return FALSE
- . = ..()
+ return ..()
/obj/item/mecha_parts/mecha_equipment/thrusters/gas/thrust(var/movement_dir)
if(!chassis || !chassis.internal_tank)
@@ -554,7 +563,6 @@
name = "Ion thruster package"
desc = "A set of thrusters that allow for exosuit movement in zero-gravity environments."
detachable = FALSE
- salvageable = FALSE
effect_type = /obj/effect/particle_effect/ion_trails
/obj/item/mecha_parts/mecha_equipment/thrusters/ion/thrust(var/movement_dir)
diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
index e7488c81f60d9..85b081a27c992 100644
--- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
+++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
@@ -232,7 +232,7 @@
return TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/get_equip_info()
- return "[..()] \[[src.projectiles]\][(src.projectiles < initial(src.projectiles))?" - Rearm":null]"
+ return "[..()] \[[projectiles]\][(projectiles < initial(projectiles))?" - Rearm":null]"
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/rearm()
@@ -243,20 +243,19 @@
projectiles_to_add--
chassis.use_power(projectile_energy_cost)
send_byjax(chassis.occupants,"exosuit.browser","[REF(src)]",src.get_equip_info())
- log_message("Rearmed [src.name].", LOG_MECHA)
+ log_message("Rearmed [src].", LOG_MECHA)
return 1
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/needs_rearm()
- . = !(projectiles > 0)
+ return projectiles <= 0
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/Topic(href, href_list)
..()
if (href_list["rearm"])
- src.rearm()
- return
+ rearm()
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/action(mob/source, atom/target, params)
if(..())
@@ -456,3 +455,37 @@
var/atom/movable/AM = hit_atom
AM.safe_throw_at(get_edge_target_turf(AM,get_dir(src, AM)), 7, 2)
qdel(src)
+
+///dark honk weapons
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana
+ name = "bombanana mortar"
+ desc = "Equipment for clown exosuits. Launches exploding banana peels."
+ icon_state = "mecha_bananamrtr"
+ projectile = /obj/item/grown/bananapeel/bombanana
+ projectiles = 8
+ projectile_energy_cost = 1000
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana/can_attach(obj/vehicle/sealed/mecha/combat/honker/M)
+ if(..())
+ if(istype(M))
+ return TRUE
+ return FALSE
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache
+ name = "\improper HONKeR-6 grenade launcher"
+ desc = "A weapon for combat exosuits. Launches primed tear-stache grenades."
+ icon_state = "mecha_grenadelnchr"
+ projectile = /obj/item/grenade/chem_grenade/teargas/moustache
+ fire_sound = 'sound/weapons/grenadelaunch.ogg'
+ projectiles = 6
+ missile_speed = 1.5
+ projectile_energy_cost = 800
+ equip_cooldown = 60
+ det_time = 20
+
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache/can_attach(obj/vehicle/sealed/mecha/combat/honker/M)
+ if(..())
+ if(istype(M))
+ return TRUE
+ return FALSE
diff --git a/code/modules/vehicles/mecha/mech_bay.dm b/code/modules/vehicles/mecha/mech_bay.dm
index cf2a0d9b2aa00..f4f7813010d4c 100644
--- a/code/modules/vehicles/mecha/mech_bay.dm
+++ b/code/modules/vehicles/mecha/mech_bay.dm
@@ -46,14 +46,14 @@
var/MC
for(var/obj/item/stock_parts/capacitor/C in component_parts)
MC += C.rating
- recharge_power = MC * 25
+ recharge_power = MC * 12.5
/obj/machinery/mech_bay_recharge_port/examine(mob/user)
. = ..()
if(in_range(user, src) || isobserver(user))
- . += "The status display reads: Base recharge rate at [siunit(recharge_power, "W", 1)]."
+ . += "The status display reads: Recharge power [siunit(recharge_power, "W", 1)]."
-/obj/machinery/mech_bay_recharge_port/process()
+/obj/machinery/mech_bay_recharge_port/process(delta_time)
if(machine_stat & NOPOWER || !recharge_console)
return
if(!recharging_mech)
@@ -63,7 +63,7 @@
recharge_console.ui_update()
if(recharging_mech && recharging_mech.cell)
if(recharging_mech.cell.charge < recharging_mech.cell.maxcharge)
- var/delta = min(recharge_power, recharging_mech.cell.maxcharge - recharging_mech.cell.charge)
+ var/delta = min(recharge_power * delta_time, recharging_mech.cell.maxcharge - recharging_mech.cell.charge)
recharging_mech.give_power(delta)
use_power(delta*150)
else
diff --git a/code/modules/vehicles/mecha/mech_melee_attack.dm b/code/modules/vehicles/mecha/mech_melee_attack.dm
index e9c60f9dd2ef8..569965f02351d 100644
--- a/code/modules/vehicles/mecha/mech_melee_attack.dm
+++ b/code/modules/vehicles/mecha/mech_melee_attack.dm
@@ -79,6 +79,8 @@
to_chat(mecha_attacker, "You push [src] out of the way.")
/mob/living/carbon/human/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/user)
+ if(!user)
+ stack_trace("Warning: [src] had mech_melee_attack called on them with no mob?")
if(user.a_intent == INTENT_HARM)
if(HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, "You don't want to harm other living beings!")
diff --git a/code/modules/vehicles/mecha/mecha_control_console.dm b/code/modules/vehicles/mecha/mecha_control_console.dm
index b2194d82b028e..0af652f19922f 100644
--- a/code/modules/vehicles/mecha/mecha_control_console.dm
+++ b/code/modules/vehicles/mecha/mecha_control_console.dm
@@ -74,8 +74,8 @@
var/obj/vehicle/sealed/mecha/M = MT.chassis
if(M)
MT.shock()
- log_game("[key_name(usr)] has activated remote EMP on exosuit [M], located at [loc_name(M)], which [M.occupants ? "has the occupants [M.occupants]." : "without a pilot."] ")
- message_admins("[key_name_admin(usr)][ADMIN_FLW(usr)] has activated remote EMP on exosuit [M][ADMIN_JMP(M)], which is currently [M.occupants ? "occupied by [M.occupants][ADMIN_FLW(M)]." : "without a pilot."] ")
+ log_game("[key_name(usr)] has activated remote EMP on exosuit [M], located at [loc_name(M)], which is currently [LAZYLEN(M.occupants) ? "occupied by [M.occupants.Join(",")][ADMIN_FLW(M)]." : "without a pilot."]")
+ message_admins("[key_name_admin(usr)][ADMIN_FLW(usr)] has activated remote EMP on exosuit [M][ADMIN_JMP(M)], which is currently [LAZYLEN(M.occupants) ? "occupied by [M.occupants.Join(",")][ADMIN_FLW(M)]." : "without a pilot."]")
. = TRUE
/obj/item/mecha_parts/mecha_tracking
diff --git a/code/modules/vehicles/mecha/mecha_defense.dm b/code/modules/vehicles/mecha/mecha_defense.dm
index 99b4935f11291..bd3e0023e5a58 100644
--- a/code/modules/vehicles/mecha/mecha_defense.dm
+++ b/code/modules/vehicles/mecha/mecha_defense.dm
@@ -171,7 +171,7 @@
for(var/occus in occupants)
var/mob/living/occupant = occus
occupant.update_mouse_pointer()
- if(!equipment_disabled && occupants) //prevent spamming this message with back-to-back EMPs
+ if(!equipment_disabled && LAZYLEN(occupants)) //prevent spamming this message with back-to-back EMPs
to_chat(occupants, "Error -- Connection to equipment control unit has been lost.")
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/vehicle/sealed/mecha, restore_equipment)), 3 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
equipment_disabled = 1
@@ -251,7 +251,7 @@
if(construction_state == MECHA_OPEN_HATCH && (internal_damage & MECHA_INT_SHORT_CIRCUIT))
var/obj/item/stack/cable_coil/CC = W
if(CC.use(2))
- clearInternalDamage(MECHA_INT_SHORT_CIRCUIT)
+ clear_internal_damage(MECHA_INT_SHORT_CIRCUIT)
to_chat(user, "You replace the fused wires.")
else
to_chat(user, "You need two lengths of cable to fix this mech!")
@@ -290,7 +290,7 @@
..()
. = TRUE
if(internal_damage & MECHA_INT_TEMP_CONTROL)
- clearInternalDamage(MECHA_INT_TEMP_CONTROL)
+ clear_internal_damage(MECHA_INT_TEMP_CONTROL)
to_chat(user, "You repair the damaged temperature controller.")
return
@@ -302,7 +302,7 @@
if(internal_damage & MECHA_INT_TANK_BREACH)
if(!W.use_tool(src, user, 0, volume=50, amount=1))
return
- clearInternalDamage(MECHA_INT_TANK_BREACH)
+ clear_internal_damage(MECHA_INT_TANK_BREACH)
to_chat(user, "You repair the damaged gas tank.")
return
if(obj_integrity < max_integrity)
@@ -337,15 +337,15 @@
if(cell && charge_cell)
cell.charge = cell.maxcharge
if(internal_damage & MECHA_INT_FIRE)
- clearInternalDamage(MECHA_INT_FIRE)
+ clear_internal_damage(MECHA_INT_FIRE)
if(internal_damage & MECHA_INT_TEMP_CONTROL)
- clearInternalDamage(MECHA_INT_TEMP_CONTROL)
+ clear_internal_damage(MECHA_INT_TEMP_CONTROL)
if(internal_damage & MECHA_INT_SHORT_CIRCUIT)
- clearInternalDamage(MECHA_INT_SHORT_CIRCUIT)
+ clear_internal_damage(MECHA_INT_SHORT_CIRCUIT)
if(internal_damage & MECHA_INT_TANK_BREACH)
- clearInternalDamage(MECHA_INT_TANK_BREACH)
+ clear_internal_damage(MECHA_INT_TANK_BREACH)
if(internal_damage & MECHA_INT_CONTROL_LOST)
- clearInternalDamage(MECHA_INT_CONTROL_LOST)
+ clear_internal_damage(MECHA_INT_CONTROL_LOST)
/obj/vehicle/sealed/mecha/narsie_act()
emp_act(EMP_HEAVY)
@@ -374,10 +374,10 @@
AI = crew
var/obj/structure/mecha_wreckage/WR = new wreckage(loc, AI)
for(var/obj/item/mecha_parts/mecha_equipment/E in equipment)
- if(E.salvageable && prob(30))
+ if(E.detachable && prob(30))
WR.crowbar_salvage += E
E.detach(WR) //detaches from src into WR
- E.equip_ready = 1
+ E.activated = TRUE
else
E.detach(loc)
qdel(E)
diff --git a/code/modules/vehicles/mecha/mecha_topic.dm b/code/modules/vehicles/mecha/mecha_topic.dm
index 26b09a97e3bc2..b7bc5104d16d3 100644
--- a/code/modules/vehicles/mecha/mecha_topic.dm
+++ b/code/modules/vehicles/mecha/mecha_topic.dm
@@ -395,7 +395,7 @@
///Repairs internal damage if the mech hasn't moved.
/obj/vehicle/sealed/mecha/proc/stationary_repair(location)
if(location == loc)
- clearInternalDamage(MECHA_INT_CONTROL_LOST)
+ clear_internal_damage(MECHA_INT_CONTROL_LOST)
to_chat(occupants, "[icon2html(src, occupants)]Recalibration successful.")
log_message("Recalibration of coordination system finished with 0 errors.", LOG_MECHA)
else
diff --git a/code/modules/vehicles/mecha/working/clarke.dm b/code/modules/vehicles/mecha/working/clarke.dm
index 905024e9437d6..9590c536310b3 100644
--- a/code/modules/vehicles/mecha/working/clarke.dm
+++ b/code/modules/vehicles/mecha/working/clarke.dm
@@ -65,7 +65,6 @@
icon_state = "bin"
selectable = FALSE
detachable = FALSE
- salvageable = FALSE
/// Var to avoid istype checking every time the topic button is pressed. This will only work inside Clarke mechs.
var/obj/vehicle/sealed/mecha/working/clarke/hostmech
diff --git a/code/modules/vehicles/sealed.dm b/code/modules/vehicles/sealed.dm
index 8a3b1aa6ab7b6..b37a594c8d8e2 100644
--- a/code/modules/vehicles/sealed.dm
+++ b/code/modules/vehicles/sealed.dm
@@ -122,12 +122,13 @@
/obj/vehicle/sealed/proc/DumpSpecificMobs(flag, randomstep = TRUE)
for(var/i in occupants)
- if((occupants[i] & flag))
- mob_exit(i, null, randomstep)
- if(iscarbon(i))
- var/mob/living/carbon/C = i
- C.Paralyze(40)
- C.uncuff()
+ if(!(occupants[i] & flag))
+ continue
+ mob_exit(i, null, randomstep)
+ if(iscarbon(i))
+ var/mob/living/carbon/C = i
+ C.Paralyze(40)
+ C.uncuff()
/obj/vehicle/sealed/AllowDrop()
diff --git a/code/modules/vehicles/vehicle_actions.dm b/code/modules/vehicles/vehicle_actions.dm
index 7fba7f7f2bd6c..174b7127ea6cd 100644
--- a/code/modules/vehicles/vehicle_actions.dm
+++ b/code/modules/vehicles/vehicle_actions.dm
@@ -21,7 +21,7 @@
grant_controller_actions(i) //refresh
/obj/vehicle/proc/grant_action_type_to_mob(actiontype, mob/m)
- if(isnull(occupants[m]) || !actiontype)
+ if(isnull(LAZYACCESS(occupants, m)) || !actiontype)
return FALSE
LAZYINITLIST(occupant_actions[m])
if(occupant_actions[m][actiontype])
@@ -32,7 +32,7 @@
return TRUE
/obj/vehicle/proc/remove_action_type_from_mob(actiontype, mob/m)
- if(isnull(occupants[m]) || !actiontype)
+ if(isnull(LAZYACCESS(occupants, m)) || !actiontype)
return FALSE
LAZYINITLIST(occupant_actions[m])
if(occupant_actions[m][actiontype])
@@ -50,7 +50,7 @@
remove_action_type_from_mob(v, M)
/obj/vehicle/proc/grant_controller_actions(mob/M)
- if(!istype(M) || isnull(occupants[M]))
+ if(!istype(M) || isnull(LAZYACCESS(occupants, M)))
return FALSE
for(var/i in GLOB.bitflags)
if(occupants[M] & i)
@@ -58,7 +58,7 @@
return TRUE
/obj/vehicle/proc/remove_controller_actions(mob/M)
- if(!istype(M) || isnull(occupants[M]))
+ if(!istype(M) || isnull(LAZYACCESS(occupants, M)))
return FALSE
for(var/i in GLOB.bitflags)
remove_controller_actions_by_flag(M, i)
diff --git a/html/changelogs/AutoChangeLog-pr-11149.yml b/html/changelogs/AutoChangeLog-pr-11149.yml
new file mode 100644
index 0000000000000..ebe2a28bbd3be
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11149.yml
@@ -0,0 +1,8 @@
+author: rkz, TiviPlus, TemporalOroboros, Timberpoes, MLGTASTICa
+delete-after: true
+changes:
+ - refactor: refactors mech initialization
+ - refactor: refactors medical mech tools
+ - code_imp: adds lazylist support for vehicle occupants
+ - bugfix: Phazons no longer can exponentially increase speed by phasing through
+ certain things...
diff --git a/html/changelogs/AutoChangeLog-pr-11381.yml b/html/changelogs/AutoChangeLog-pr-11381.yml
new file mode 100644
index 0000000000000..686dc86663092
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11381.yml
@@ -0,0 +1,5 @@
+author: XeonMations
+delete-after: true
+changes:
+ - tweak: Tapes now hold 20 minutes worth of recordings, 10 on each side.
+ - rscadd: Added more sounds to the universal recorder.
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index e6379f882ff31..d7467f636522b 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/radial_tape.dmi b/icons/obj/radial_tape.dmi
new file mode 100644
index 0000000000000..ae5be96dd8a94
Binary files /dev/null and b/icons/obj/radial_tape.dmi differ
diff --git a/icons/obj/radial_taperecorder.dmi b/icons/obj/radial_taperecorder.dmi
new file mode 100644
index 0000000000000..29d97b0aba05f
Binary files /dev/null and b/icons/obj/radial_taperecorder.dmi differ
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 75fad5d60bcff..f5624fe9aed9d 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -232,4 +232,5 @@ h1.alert, h2.alert {color: #000000;}
.monkeyhive {color: #774704;}
.monkeylead {color: #774704; font-size: 2;}
+.tape_recorder {color: #ff0000; font-family: 'Courier New', cursive, sans-serif;}
"}
diff --git a/sound/items/taperecorder/tape_flip.ogg b/sound/items/taperecorder/tape_flip.ogg
new file mode 100644
index 0000000000000..fae3e07373c5b
Binary files /dev/null and b/sound/items/taperecorder/tape_flip.ogg differ
diff --git a/sound/items/taperecorder/taperecorder_close.ogg b/sound/items/taperecorder/taperecorder_close.ogg
new file mode 100644
index 0000000000000..ab9f521c5f9fc
Binary files /dev/null and b/sound/items/taperecorder/taperecorder_close.ogg differ
diff --git a/sound/items/taperecorder/taperecorder_hiss_mid.ogg b/sound/items/taperecorder/taperecorder_hiss_mid.ogg
new file mode 100644
index 0000000000000..50ef4f2171b19
Binary files /dev/null and b/sound/items/taperecorder/taperecorder_hiss_mid.ogg differ
diff --git a/sound/items/taperecorder/taperecorder_hiss_start.ogg b/sound/items/taperecorder/taperecorder_hiss_start.ogg
new file mode 100644
index 0000000000000..fa57041a72281
Binary files /dev/null and b/sound/items/taperecorder/taperecorder_hiss_start.ogg differ
diff --git a/sound/items/taperecorder/taperecorder_open.ogg b/sound/items/taperecorder/taperecorder_open.ogg
new file mode 100644
index 0000000000000..7b7110fa58ba5
Binary files /dev/null and b/sound/items/taperecorder/taperecorder_open.ogg differ
diff --git a/sound/items/taperecorder/taperecorder_play.ogg b/sound/items/taperecorder/taperecorder_play.ogg
new file mode 100644
index 0000000000000..1bf4d7a3bd63a
Binary files /dev/null and b/sound/items/taperecorder/taperecorder_play.ogg differ
diff --git a/sound/items/taperecorder/taperecorder_print.ogg b/sound/items/taperecorder/taperecorder_print.ogg
new file mode 100644
index 0000000000000..7912d08dc9827
Binary files /dev/null and b/sound/items/taperecorder/taperecorder_print.ogg differ
diff --git a/sound/items/taperecorder/taperecorder_stop.ogg b/sound/items/taperecorder/taperecorder_stop.ogg
new file mode 100644
index 0000000000000..a3b0f659928f3
Binary files /dev/null and b/sound/items/taperecorder/taperecorder_stop.ogg differ
diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
index 7f0900ee516e1..e30a3478814e5 100644
--- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
@@ -969,6 +969,11 @@ em {
font-family: 'Courier New', cursive, sans-serif;
}
+.tape_recorder {
+ color: #ff0000;
+ font-family: 'Courier New', cursive, sans-serif;
+}
+
.command_headset {
font-weight: bold;
font-size: 24px;
diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss
index 44e3ea8702b07..0f9ef2f2be605 100644
--- a/tgui/packages/tgui-panel/styles/goon/chat-light.scss
+++ b/tgui/packages/tgui-panel/styles/goon/chat-light.scss
@@ -974,6 +974,11 @@ h2.alert {
font-family: 'Courier New', cursive, sans-serif;
}
+.tape_recorder {
+ color: #800000;
+ font-family: 'Courier New', cursive, sans-serif;
+}
+
.command_headset {
font-weight: bold;
font-size: 24px;
diff --git a/tgui/packages/tgui/constants.js b/tgui/packages/tgui/constants.js
index 4caf607c13261..182bcd0634c7a 100644
--- a/tgui/packages/tgui/constants.js
+++ b/tgui/packages/tgui/constants.js
@@ -20,6 +20,7 @@ export const COLORS = {
science: '#9b59b6',
engineering: '#f1c40f',
cargo: '#f39c12',
+ service: '#7cc46a',
centcom: '#00c100',
other: '#c38312',
},
diff --git a/tgui/packages/tgui/interfaces/CrewConsole.js b/tgui/packages/tgui/interfaces/CrewConsole.js
deleted file mode 100644
index bf72fad4e327a..0000000000000
--- a/tgui/packages/tgui/interfaces/CrewConsole.js
+++ /dev/null
@@ -1,139 +0,0 @@
-import { useBackend } from '../backend';
-import { Box, Button, ColorBox, Section, Table } from '../components';
-import { COLORS } from '../constants';
-import { Window } from '../layouts';
-import { sortBy } from 'common/collections';
-
-export const HEALTH_COLOR_BY_LEVEL = ['#17d568', '#2ecc71', '#e67e22', '#ed5100', '#e74c3c', '#ed2814'];
-
-export const jobIsHead = (jobId) => jobId % 10 === 0;
-
-export const jobToColor = (jobId) => {
- if (jobId >= 0 && jobId < 10) {
- return COLORS.department.captain;
- }
- if (jobId >= 10 && jobId < 20) {
- return COLORS.department.security;
- }
- if (jobId >= 20 && jobId < 30) {
- return COLORS.department.medbay;
- }
- if (jobId >= 30 && jobId < 40) {
- return COLORS.department.science;
- }
- if (jobId >= 40 && jobId < 50) {
- return COLORS.department.engineering;
- }
- if (jobId >= 50 && jobId < 60) {
- return COLORS.department.cargo;
- }
- if (jobId >= 200 && jobId < 230) {
- return COLORS.department.centcom;
- }
- if (jobId === -1) {
- return null;
- }
- return COLORS.department.other;
-};
-
-export const healthToColor = (oxy, tox, burn, brute) => {
- const healthSum = oxy + tox + burn + brute;
- const level = Math.min(Math.max(Math.ceil(healthSum / 25), 0), 5);
- return HEALTH_COLOR_BY_LEVEL[level];
-};
-
-export const HealthStat = (props) => {
- const { type, value } = props;
- return (
-
- {value}
-
- );
-};
-
-export const CrewConsole = () => {
- return (
-
-
-
-
-
- );
-};
-
-const CrewTable = (props, context) => {
- const { act, data } = useBackend(context);
- const sensors = sortBy((s) => s.ijob)(data.sensors ?? []);
- return (
-
-
- Name
-
-
- Vitals
-
- Position
- {!!data.link_allowed && (
-
- Tracking
-
- )}
-
- {sensors.map((sensor) => (
-
- ))}
-
- );
-};
-
-const CrewTableEntry = (props, context) => {
- const { act, data } = useBackend(context);
- const { link_allowed } = data;
- const { sensor_data } = props;
- const { name, assignment, ijob, life_status, oxydam, toxdam, burndam, brutedam, area, can_track } = sensor_data;
-
- return (
-
-
- {name}
- {assignment !== undefined ? ` (${assignment})` : ''}
-
-
- {life_status ? : }
-
-
- {oxydam !== undefined ? (
-
-
- {'/'}
-
- {'/'}
-
- {'/'}
-
-
- ) : life_status ? (
- 'Alive'
- ) : (
- 'Dead'
- )}
-
- {area !== undefined ? area : 'N/A'}
- {!!link_allowed && (
-
-
- )}
-
- );
-};
diff --git a/tgui/packages/tgui/interfaces/CrewConsole.tsx b/tgui/packages/tgui/interfaces/CrewConsole.tsx
new file mode 100644
index 0000000000000..192eac007d4f6
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/CrewConsole.tsx
@@ -0,0 +1,258 @@
+import { Box, Button, Icon, Input, Section, Table } from '../components';
+import { BooleanLike } from 'common/react';
+import { createSearch } from 'common/string';
+import { useBackend, useLocalState } from '../backend';
+import { COLORS } from '../constants';
+import { Window } from '../layouts';
+
+const HEALTH_COLOR_BY_LEVEL = ['#17d568', '#c4cf2d', '#e67e22', '#ed5100', '#e74c3c', '#801308'];
+
+const SORT_NAMES = {
+ ijob: 'Job',
+ name: 'Name',
+ area: 'Position',
+ health: 'Vitals',
+};
+
+const STAT_LIVING = 0;
+const STAT_DEAD = 4;
+
+const SORT_OPTIONS = ['health', 'ijob', 'name', 'area'];
+
+const jobIsHead = (jobId: number) => jobId % 10 === 0;
+
+const jobToColor = (jobId: number) => {
+ if (jobId === 0) {
+ return COLORS.department.captain;
+ }
+ if (jobId >= 10 && jobId < 20) {
+ return COLORS.department.security;
+ }
+ if (jobId >= 20 && jobId < 30) {
+ return COLORS.department.medbay;
+ }
+ if (jobId >= 30 && jobId < 40) {
+ return COLORS.department.science;
+ }
+ if (jobId >= 40 && jobId < 50) {
+ return COLORS.department.engineering;
+ }
+ if (jobId >= 50 && jobId < 60) {
+ return COLORS.department.cargo;
+ }
+ if (jobId >= 60 && jobId < 200) {
+ return COLORS.department.service;
+ }
+ if (jobId >= 200 && jobId < 230) {
+ return COLORS.department.centcom;
+ }
+ return COLORS.department.other;
+};
+
+const statToIcon = (life_status: number) => {
+ switch (life_status) {
+ case STAT_LIVING:
+ return 'heart';
+ case STAT_DEAD:
+ return 'skull';
+ }
+ return 'heartbeat';
+};
+
+const healthSort = (a: CrewSensor, b: CrewSensor) => {
+ if (a.life_status > b.life_status) return -1;
+ if (a.life_status < b.life_status) return 1;
+ if (a.health < b.health) return -1;
+ if (a.health > b.health) return 1;
+ return 0;
+};
+
+const areaSort = (a: CrewSensor, b: CrewSensor) => {
+ a.area ??= '~';
+ b.area ??= '~';
+ if (a.area < b.area) return -1;
+ if (a.area > b.area) return 1;
+ return 0;
+};
+
+const healthToAttribute = (oxy: number, tox: number, burn: number, brute: number, attributeList: string[]) => {
+ const healthSum = oxy + tox + burn + brute;
+ const level = Math.min(Math.max(Math.ceil(healthSum / 25), 0), 5);
+ return attributeList[level];
+};
+
+type HealthStatProps = {
+ type: string;
+ value: number;
+};
+
+const HealthStat = (props: HealthStatProps) => {
+ const { type, value } = props;
+ return (
+
+ {value}
+
+ );
+};
+
+export const CrewConsole = () => {
+ return (
+
+
+
+
+
+ );
+};
+
+type CrewSensor = {
+ name: string;
+ assignment: string | undefined;
+ ijob: number;
+ life_status: number;
+ oxydam: number;
+ toxdam: number;
+ burndam: number;
+ brutedam: number;
+ area: string | undefined;
+ health: number;
+ can_track: BooleanLike;
+ ref: string;
+};
+
+type CrewConsoleData = {
+ sensors: CrewSensor[];
+ link_allowed: BooleanLike;
+};
+
+const CrewTable = (props, context) => {
+ const { data } = useBackend(context);
+ const { sensors } = data;
+
+ const [sortAsc, setSortAsc] = useLocalState(context, 'sortAsc', true);
+ const [searchQuery, setSearchQuery] = useLocalState(context, 'searchQuery', '');
+ const [sortBy, setSortBy] = useLocalState(context, 'sortBy', SORT_OPTIONS[0]);
+
+ const cycleSortBy = () => {
+ let idx = SORT_OPTIONS.indexOf(sortBy) + 1;
+ if (idx === SORT_OPTIONS.length) idx = 0;
+ setSortBy(SORT_OPTIONS[idx]);
+ };
+
+ const nameSearch = createSearch(searchQuery, (crew: CrewSensor) => crew.name);
+
+ const sorted = sensors.filter(nameSearch).sort((a, b) => {
+ switch (sortBy) {
+ case 'name':
+ return sortAsc ? +(a.name > b.name) : +(b.name > a.name);
+ case 'ijob':
+ return sortAsc ? a.ijob - b.ijob : b.ijob - a.ijob;
+ case 'health':
+ return sortAsc ? healthSort(a, b) : healthSort(b, a);
+ case 'area':
+ return sortAsc ? areaSort(a, b) : areaSort(b, a);
+ default:
+ return 0;
+ }
+ });
+
+ return (
+
+ );
+};
+
+type CrewTableEntryProps = {
+ sensor_data: CrewSensor;
+};
+
+const CrewTableEntry = (props: CrewTableEntryProps, context) => {
+ const { act, data } = useBackend(context);
+ const { link_allowed } = data;
+ const { sensor_data } = props;
+ const { name, assignment, ijob, life_status, oxydam, toxdam, burndam, brutedam, area, can_track } = sensor_data;
+
+ return (
+
+
+ {name}
+ {assignment !== undefined ? ` (${assignment})` : ''}
+
+
+ {oxydam !== undefined ? (
+
+ ) : life_status !== STAT_DEAD ? (
+
+ ) : (
+
+ )}
+
+
+ {oxydam !== undefined ? (
+
+
+ {'/'}
+
+ {'/'}
+
+ {'/'}
+
+
+ ) : life_status !== STAT_DEAD ? (
+ 'Alive'
+ ) : (
+ 'Dead'
+ )}
+
+ {area !== '~' && area !== undefined ? area : }
+ {!!link_allowed && (
+
+
+
+ )}
+
+ );
+};