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.

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

Working Joe Death Sound and Death Message (It is so Joever) #3798

Merged
merged 24 commits into from
Jul 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7438cfe
Death Rattle and Death Message (First Pass)
Ben10083 Jul 5, 2023
4857c09
Merge branch 'master' into Joe_Death
Ben10083 Jul 5, 2023
42495d1
Death message (Credit to Quickload
Ben10083 Jul 5, 2023
5c999b7
Death sounds (They need adjusted)
Ben10083 Jul 5, 2023
37c1818
No vary
Ben10083 Jul 5, 2023
5da5e70
Better quality audio files pt1 (Thanks Quickload)
Ben10083 Jul 5, 2023
0add2ff
use pick_weight to pick a sound now
Ben10083 Jul 5, 2023
40ad93c
Merge branch 'master' into Joe_Death
Ben10083 Jul 5, 2023
efce272
Working Joes now lose color in their eyes when dead
Ben10083 Jul 5, 2023
bdeda83
Code readjusted to now lose color in eyes for anyone with relevant trait
Ben10083 Jul 5, 2023
c75650e
old code I forgot to remove
Ben10083 Jul 5, 2023
8c3fd42
Increase volume of normal sound
Ben10083 Jul 5, 2023
a00b806
Merge branch 'master' into Joe_Death
Ben10083 Jul 5, 2023
d6d6b7e
Typo and adjustment to death message
Ben10083 Jul 5, 2023
60bd4e1
Adjust probability of rare death noises
Ben10083 Jul 5, 2023
9ecce72
Audio Stuff, Credit to Thwomper for assistance
Ben10083 Jul 5, 2023
6a9aeae
Handle Death Parent call
Ben10083 Jul 6, 2023
26fee8d
Merge branch 'master' into Joe_Death
Ben10083 Jul 8, 2023
d46ebb2
Death code moved to _species
Ben10083 Jul 8, 2023
fed1d2f
Move message to _Species
Ben10083 Jul 10, 2023
d5998b2
Remove Old R
Ben10083 Jul 10, 2023
708a97f
Merge branch 'master' into Joe_Death
Ben10083 Jul 10, 2023
38fd96e
Update code/modules/mob/living/carbon/human/species/working_joe/_spec…
Ben10083 Jul 10, 2023
47771ba
You always know, a dying Joe
Ben10083 Jul 10, 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
5 changes: 5 additions & 0 deletions code/modules/mob/living/carbon/human/death.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@
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
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_special_items()
Expand All @@ -59,6 +63,7 @@
//Handle species-specific deaths.
if(species)
species.handle_death(src, gibbed)
update_body() //if species handle_death or other procs change body in some way after death, this is what will update the body.

SEND_GLOBAL_SIGNAL(COMSIG_GLOB_MARINE_DEATH, src, gibbed)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/datum/species/synthetic/colonial/working_joe
name = SYNTH_WORKING_JOE
name_plural = "Working Joes"
death_message = "violently gargles fluid and seizes up, the glow in their eyes dimming..."
uses_ethnicity = FALSE
burn_mod = 0.65 // made for hazardous environments, withstanding temperatures up to 1210 degrees
mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES, TRAIT_EMOTE_CD_EXEMPT, TRAIT_CANNOT_EAT)
Expand All @@ -14,6 +15,11 @@
. = ..()
give_action(joe, /datum/action/joe_emote_panel)

// Special death noise for Working Joe
/datum/species/synthetic/colonial/working_joe/handle_death(mob/living/carbon/human/dying_joe, gibbed)
if(!gibbed) //A gibbed Joe won't have a death rattle
playsound(dying_joe.loc, pick_weight(list('sound/voice/joe/death_normal.ogg' = 75, 'sound/voice/joe/death_silence.ogg' = 10, 'sound/voice/joe/death_tomorrow.ogg' = 10,'sound/voice/joe/death_dream.ogg' = 5)), 25, FALSE)
return ..()

/// Open the WJ's emote panel, which allows them to use voicelines
/datum/species/synthetic/colonial/working_joe/proc/open_emote_panel()
Expand Down
Binary file added sound/voice/joe/death_dream.ogg
Binary file not shown.
Binary file added sound/voice/joe/death_normal.ogg
Binary file not shown.
Binary file added sound/voice/joe/death_silence.ogg
Binary file not shown.
Binary file added sound/voice/joe/death_tomorrow.ogg
Binary file not shown.