Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Adds a scream for preternis #6269

Merged
Amelia0010 merged 7 commits into from
Jul 6, 2019
Merged

Adds a scream for preternis #6269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4043819
Merge remote-tracking branch 'upstream/master'
Jul 3, 2019
5621ece
sprite fix
Jul 3, 2019
b73a18e
Revert "sprite fix"
Jul 3, 2019
15016b0
*scream
Jul 5, 2019
bd1e35f
Revert "*scream"
Jul 5, 2019
cc6a7d9
Auto stash before revert of "*scream"
Jul 6, 2019
498b149
adds the actual scream
Jul 6, 2019
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/mob/living/carbon/human/emote.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
return pick('sound/voice/human/malescream_1.ogg', 'sound/voice/human/malescream_2.ogg', 'sound/voice/human/malescream_3.ogg', 'sound/voice/human/malescream_4.ogg', 'sound/voice/human/malescream_5.ogg')
else if(ismoth(H))
return 'sound/voice/moth/scream_moth.ogg'
else if(islizard(H)) //yogs start: adds lizard screams
return 'yogstation/sound/voice/lizardperson/lizard_scream.ogg' //yogs end
else if(H.dna?.species?.screamsound) //yogs start: grabs scream from screamsound located in the appropriate species file.
return H.dna.species.screamsound //yogs end - current added screams: lizard, preternis.


/datum/emote/living/carbon/human/pale
Expand Down
1 change: 1 addition & 0 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 @@ -48,6 +48,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/deathsound //used to set the mobs deathsound on species change
var/list/special_step_sounds //Sounds to override barefeet walkng
var/grab_sound //Special sound for grabbing
var/screamsound //yogs - audio of a species' scream

// species-only traits. Can be found in DNA.dm
var/list/species_traits = list()
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
liked_food = GROSS | MEAT
inert_mutation = FIREBREATH
deathsound = 'sound/voice/lizard/deathsound.ogg'
screamsound = 'yogstation/sound/voice/lizardperson/lizard_scream.ogg' //yogs - lizard scream

/datum/species/lizard/after_equip_job(datum/job/J, mob/living/carbon/human/H)
H.grant_language(/datum/language/draconic)
Expand Down
Binary file added goon/sound/robot_scream.ogg
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ adjust_charge - take a positive or negative value to adjust the charge level
var/power_drain = 0.5 //probably going to have to tweak this shit
var/tesliumtrip = FALSE
var/draining = FALSE
screamsound = 'goon/sound/robot_scream.ogg'

/datum/species/preternis/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
. = ..()
Expand Down