Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Kills spec_updatehealth, replaces it with use of COMSIG_LIVING_HEALTH_UPDATE #766

Merged
merged 2 commits into from
Nov 23, 2023
Merged

[MIRROR] Kills spec_updatehealth, replaces it with use of COMSIG_LIVING_HEALTH_UPDATE #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92766ab
[MIRROR] Kills `spec_updatehealth`, replaces it with use of `COMSIG_L…
SkyratBot Nov 21, 2023
af57047
Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG…
Iajret Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/modules/admin/create_mob.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
human.dna.species.mutant_bodyparts = human.dna.mutant_bodyparts.Copy()
human.dna.species.body_markings = human.dna.body_markings.Copy()
// SKYRAT EDIT ADDITION END
// Snowflake stuff (ethereals)
human.dna.species.spec_updatehealth(human)
// Snowflake for Ethereals
human.updatehealth()
human.updateappearance(mutcolor_update = TRUE)
3 changes: 0 additions & 3 deletions code/modules/mob/living/carbon/human/_species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,9 +1130,6 @@ GLOBAL_LIST_EMPTY(features_by_species)
// ATTACK PROCS //
//////////////////

/datum/species/proc/spec_updatehealth(mob/living/carbon/human/H)
return

/datum/species/proc/help(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
if(SEND_SIGNAL(target, COMSIG_CARBON_PRE_HELP, user, attacker_style) & COMPONENT_BLOCK_HELP_ACT)
return TRUE
Expand Down
1 change: 0 additions & 1 deletion code/modules/mob/living/carbon/human/human.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
ADD_TRAIT(src, TRAIT_AGEUSIA, NO_TONGUE_TRAIT)

/mob/living/carbon/human/proc/setup_human_dna()
randomize_human(src, randomize_mutations = TRUE)

Check failure on line 57 in code/modules/mob/living/carbon/human/human.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

bad keyword argument "randomize_mutations" to /proc/randomize_human[1/2]

/mob/living/carbon/human/Destroy()
QDEL_NULL(physiology)
Expand Down Expand Up @@ -999,7 +999,6 @@

/mob/living/carbon/human/updatehealth()
. = ..()
dna?.species.spec_updatehealth(src)
if(HAS_TRAIT(src, TRAIT_IGNOREDAMAGESLOWDOWN))
remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown)
remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown_flying)
Expand Down
87 changes: 44 additions & 43 deletions code/modules/mob/living/carbon/human/species_types/ethereal.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,24 +55,24 @@
QDEL_NULL(ethereal_light)
return ..()

/datum/species/ethereal/on_species_gain(mob/living/carbon/new_ethereal, datum/species/old_species, pref_load)
/datum/species/ethereal/on_species_gain(mob/living/carbon/human/new_ethereal, datum/species/old_species, pref_load)
. = ..()
if(!ishuman(new_ethereal))
return
var/mob/living/carbon/human/ethereal = new_ethereal
default_color = ethereal.dna.features["ethcolor"]
default_color = new_ethereal.dna.features["ethcolor"]
fixed_hair_color = default_color
r1 = GETREDPART(default_color)
g1 = GETGREENPART(default_color)
b1 = GETBLUEPART(default_color)
RegisterSignal(ethereal, COMSIG_ATOM_EMAG_ACT, PROC_REF(on_emag_act))
RegisterSignal(ethereal, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp_act))
RegisterSignal(ethereal, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater))
RegisterSignal(ethereal, COMSIG_HIT_BY_SABOTEUR, PROC_REF(on_saboteur))
ethereal_light = ethereal.mob_light(light_type = /obj/effect/dummy/lighting_obj/moblight/species)
spec_updatehealth(ethereal)
RegisterSignal(new_ethereal, COMSIG_ATOM_EMAG_ACT, PROC_REF(on_emag_act))
RegisterSignal(new_ethereal, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp_act))
RegisterSignal(new_ethereal, COMSIG_HIT_BY_SABOTEUR, PROC_REF(on_saboteur))
RegisterSignal(new_ethereal, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater))
RegisterSignal(new_ethereal, COMSIG_LIVING_HEALTH_UPDATE, PROC_REF(refresh_light_color))
ethereal_light = new_ethereal.mob_light(light_type = /obj/effect/dummy/lighting_obj/moblight/species)
refresh_light_color(new_ethereal)
new_ethereal.set_safe_hunger_level()
update_mail_goodies(ethereal)
update_mail_goodies(new_ethereal)

var/obj/item/organ/internal/heart/ethereal/ethereal_heart = new_ethereal.get_organ_slot(ORGAN_SLOT_HEART)
ethereal_heart.ethereal_color = default_color
Expand All @@ -82,10 +82,13 @@
limb.update_limb(is_creating = TRUE)

/datum/species/ethereal/on_species_loss(mob/living/carbon/human/former_ethereal, datum/species/new_species, pref_load)
UnregisterSignal(former_ethereal, COMSIG_ATOM_EMAG_ACT)
UnregisterSignal(former_ethereal, COMSIG_ATOM_EMP_ACT)
UnregisterSignal(former_ethereal, COMSIG_LIGHT_EATER_ACT)
UnregisterSignal(former_ethereal, COMSIG_HIT_BY_SABOTEUR)
UnregisterSignal(former_ethereal, list(
COMSIG_ATOM_EMAG_ACT,
COMSIG_ATOM_EMP_ACT,
COMSIG_HIT_BY_SABOTEUR,
COMSIG_LIGHT_EATER_ACT,
COMSIG_LIVING_HEALTH_UPDATE,
))
QDEL_NULL(ethereal_light)
return ..()

Expand All @@ -109,9 +112,9 @@
features["ethcolor"] = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)]
return features

/datum/species/ethereal/spec_updatehealth(mob/living/carbon/human/ethereal)
. = ..()
if(!ethereal_light)
/datum/species/ethereal/proc/refresh_light_color(mob/living/carbon/human/ethereal)
SIGNAL_HANDLER
if(isnull(ethereal_light))
return
if(default_color != ethereal.dna.features["ethcolor"])
var/new_color = ethereal.dna.features["ethcolor"]
Expand All @@ -138,39 +141,38 @@
ethereal.set_facial_haircolor(dead_color, override = TRUE, update = FALSE)
ethereal.set_haircolor(dead_color, override = TRUE, update = TRUE)

/datum/species/ethereal/proc/on_emp_act(mob/living/carbon/human/H, severity, protection)
/datum/species/ethereal/proc/on_emp_act(mob/living/carbon/human/source, severity, protection)
SIGNAL_HANDLER
if(protection & EMP_PROTECT_SELF)
return
EMPeffect = TRUE
spec_updatehealth(H)
to_chat(H, span_notice("You feel the light of your body leave you."))
refresh_light_color(source)
to_chat(source, span_notice("You feel the light of your body leave you."))
switch(severity)
if(EMP_LIGHT)
addtimer(CALLBACK(src, PROC_REF(stop_emp), H), 10 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 10 seconds
addtimer(CALLBACK(src, PROC_REF(stop_emp), source), 10 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 10 seconds
if(EMP_HEAVY)
addtimer(CALLBACK(src, PROC_REF(stop_emp), H), 20 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 20 seconds
addtimer(CALLBACK(src, PROC_REF(stop_emp), source), 20 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 20 seconds

/datum/species/ethereal/proc/on_saboteur(datum/source, disrupt_duration)
/datum/species/ethereal/proc/on_saboteur(mob/living/carbon/human/source, disrupt_duration)
SIGNAL_HANDLER
var/mob/living/carbon/human/our_target = source
EMPeffect = TRUE
spec_updatehealth(our_target)
to_chat(our_target, span_warning("Something inside of you crackles in a bad way."))
our_target.take_bodypart_damage(burn = 3, wound_bonus = CANT_WOUND)
addtimer(CALLBACK(src, PROC_REF(stop_emp), our_target), disrupt_duration, TIMER_UNIQUE|TIMER_OVERRIDE)
refresh_light_color(source)
to_chat(source, span_warning("Something inside of you crackles in a bad way."))
source.take_bodypart_damage(burn = 3, wound_bonus = CANT_WOUND)
addtimer(CALLBACK(src, PROC_REF(stop_emp), source), disrupt_duration, TIMER_UNIQUE|TIMER_OVERRIDE)
return COMSIG_SABOTEUR_SUCCESS

/datum/species/ethereal/proc/on_emag_act(mob/living/carbon/human/H, mob/user)
/datum/species/ethereal/proc/on_emag_act(mob/living/carbon/human/source, mob/user)
SIGNAL_HANDLER
if(emageffect)
return FALSE
emageffect = TRUE
if(user)
to_chat(user, span_notice("You tap [H] on the back with your card."))
H.visible_message(span_danger("[H] starts flickering in an array of colors!"))
handle_emag(H)
addtimer(CALLBACK(src, PROC_REF(stop_emag), H), 2 MINUTES) //Disco mode for 2 minutes! This doesn't affect the ethereal at all besides either annoying some players, or making someone look badass.
to_chat(user, span_notice("You tap [source] on the back with your card."))
source.visible_message(span_danger("[source] starts flickering in an array of colors!"))
handle_emag(source)
addtimer(CALLBACK(src, PROC_REF(stop_emag), source), 2 MINUTES) //Disco mode for 2 minutes! This doesn't affect the ethereal at all besides either annoying some players, or making someone look badass.
return TRUE

/// Special handling for getting hit with a light eater
Expand All @@ -179,23 +181,22 @@
source.emp_act(EMP_LIGHT)
return COMPONENT_BLOCK_LIGHT_EATER

/datum/species/ethereal/proc/stop_emp(mob/living/carbon/human/H)
/datum/species/ethereal/proc/stop_emp(mob/living/carbon/human/ethereal)
EMPeffect = FALSE
spec_updatehealth(H)
to_chat(H, span_notice("You feel more energized as your shine comes back."))

refresh_light_color(ethereal)
to_chat(ethereal, span_notice("You feel more energized as your shine comes back."))

/datum/species/ethereal/proc/handle_emag(mob/living/carbon/human/H)
/datum/species/ethereal/proc/handle_emag(mob/living/carbon/human/ethereal)
if(!emageffect)
return
current_color = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)]
spec_updatehealth(H)
addtimer(CALLBACK(src, PROC_REF(handle_emag), H), 5) //Call ourselves every 0.5 seconds to change color
refresh_light_color(ethereal)
addtimer(CALLBACK(src, PROC_REF(handle_emag), ethereal), 0.5 SECONDS)

/datum/species/ethereal/proc/stop_emag(mob/living/carbon/human/H)
/datum/species/ethereal/proc/stop_emag(mob/living/carbon/human/ethereal)
emageffect = FALSE
spec_updatehealth(H)
H.visible_message(span_danger("[H] stops flickering and goes back to their normal state!"))
refresh_light_color(ethereal)
ethereal.visible_message(span_danger("[ethereal] stops flickering and goes back to their normal state!"))

/datum/species/ethereal/get_features()
var/list/features = ..()
Expand Down
Loading