Skip to content

Commit

Permalink
dying no longer shows death message and doesnt turn off lights (#122)
Browse files Browse the repository at this point in the history
  • Loading branch information
AndroBetel authored Feb 26, 2024
1 parent fa2a9bb commit 9068fd3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions code/modules/mob/death.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
/mob/proc/dust_animation()
return

/mob/proc/death(datum/cause_data/cause_data, gibbed = 0, deathmessage = "seizes up and falls limp...")
/mob/proc/death(datum/cause_data/cause_data, gibbed = 0, deathmessage = "seizes up and falls limp...", should_deathmessage = TRUE)
if(stat == DEAD)
return 0

if(!gibbed)
if(!gibbed && should_deathmessage)
visible_message("<b>\The [src.name]</b> [deathmessage]")

if(cause_data && !istype(cause_data))
Expand Down
7 changes: 4 additions & 3 deletions code/modules/mob/living/carbon/human/death.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
/mob/living/carbon/human/dust_animation()
new /obj/effect/overlay/temp/dust_animation(loc, src, "dust-h")

/mob/living/carbon/human/death(cause, gibbed)
/mob/living/carbon/human/death(cause, gibbed, should_deathmessage = TRUE)
if(stat == DEAD)
species?.handle_dead_death(src, gibbed)
return
Expand All @@ -48,12 +48,13 @@
if(HAS_TRAIT(src, TRAIT_HARDCORE) || MODE_HAS_TOGGLEABLE_FLAG(MODE_HARDCORE_PERMA))
if(!(species.flags & IS_SYNTHETIC)) // Synths wont perma
status_flags |= PERMANENTLY_DEAD
should_deathmessage = FALSE
if(HAS_TRAIT(src, TRAIT_INTENT_EYES)) //their eyes need to be 'offline'
r_eyes = 0
g_eyes = 0
b_eyes = 0
disable_special_flags()
disable_lights()
// disable_lights()
disable_special_items()
disable_headsets() //Disable radios for dead people to reduce load

Expand Down Expand Up @@ -110,7 +111,7 @@
if(HAS_TRAIT(src, TRAIT_HARDCORE))
death_message = "valiantly falls to the ground, dead, unable to continue."

. = ..(cause, gibbed, death_message)
. = ..(cause, gibbed, death_message, should_deathmessage)

// stat is now set
/*
Expand Down

0 comments on commit 9068fd3

Please sign in to comment.