cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Makes the scream emote sound use a species proc rather than being a long list [MDB IGNORE] (#9241)

Browse Source 
* Makes the scream emote sound use a species proc rather than being a long list

* Fixing conflicts

Co-authored-by: SgtHunk <68669754+SgtHunk@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2021-11-05 18:43:04 -04:00
committed by GitHub
co-authored by SgtHunk GoldenAlpharex
parent 241ad06286
commit b49c6519ee
7 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/emote.dm
+3 -23
View File
@@ -58,30 +58,10 @@
/datum/emote/living/carbon/human/scream/get_sound(mob/living/user)
if(!ishuman(user))
return
var/mob/living/carbon/human/H = user
if(H.mind?.miming)
var/mob/living/carbon/human/human = user
if(human.mind?.miming)
return
if(ishumanbasic(H) || isfelinid(H))
if(user.gender == FEMALE)
return pick('sound/voice/human/femalescream_1.ogg', 'sound/voice/human/femalescream_2.ogg', 'sound/voice/human/femalescream_3.ogg', 'sound/voice/human/femalescream_4.ogg', 'sound/voice/human/femalescream_5.ogg')
else
if(prob(1))
return 'sound/voice/human/wilhelm_scream.ogg'
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', 'sound/voice/human/malescream_6.ogg')
else if(ismoth(H))
return 'sound/voice/moth/scream_moth.ogg'
else if(islizard(H))
return pick('sound/voice/lizard/lizard_scream_1.ogg', 'sound/voice/lizard/lizard_scream_2.ogg', 'sound/voice/lizard/lizard_scream_3.ogg')
else if(isethereal(H))
return pick('sound/voice/ethereal/ethereal_scream_1.ogg', 'sound/voice/ethereal/ethereal_scream_2.ogg', 'sound/voice/ethereal/ethereal_scream_3.ogg')
else if(ismonkey(user)) //If its a monkey, override it.
return pick('sound/creatures/monkey/monkey_screech_1.ogg',
'sound/creatures/monkey/monkey_screech_2.ogg',
'sound/creatures/monkey/monkey_screech_3.ogg',
'sound/creatures/monkey/monkey_screech_4.ogg',
'sound/creatures/monkey/monkey_screech_5.ogg',
'sound/creatures/monkey/monkey_screech_6.ogg',
'sound/creatures/monkey/monkey_screech_7.ogg')
return human.dna.species.get_scream_sound(human)
*/
/datum/emote/living/carbon/human/scream/screech //If a human tries to screech it'll just scream.
code/modules/mob/living/carbon/human/species.dm
+4
View File
@@ -2237,3 +2237,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
/// This should create a CONSISTENT result, so the icons don't randomly change.
/datum/species/proc/prepare_human_for_preview(mob/living/carbon/human/human)
return
/// Returns the species's scream sound.
/datum/species/proc/get_scream_sound(mob/living/carbon/human/human)
return
code/modules/mob/living/carbon/human/species_types/ethereal.dm
+5
View File
@@ -147,3 +147,8 @@
features += "feature_ethcolor"
return features
/datum/species/ethereal/get_scream_sound(mob/living/carbon/human/ethereal)
return pick('sound/voice/ethereal/ethereal_scream_1.ogg',
'sound/voice/ethereal/ethereal_scream_2.ogg',
'sound/voice/ethereal/ethereal_scream_3.ogg')
code/modules/mob/living/carbon/human/species_types/humans.dm
+16
View File
@@ -20,3 +20,19 @@
human.hairstyle = "Business Hair"
human.hair_color = "#bb9966" // brown
human.update_hair()
/datum/species/human/get_scream_sound(mob/living/carbon/human/human)
if(human.gender == MALE)
if(prob(1))
return 'sound/voice/human/wilhelm_scream.ogg'
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',
'sound/voice/human/malescream_6.ogg')
return pick('sound/voice/human/femalescream_1.ogg',
'sound/voice/human/femalescream_2.ogg',
'sound/voice/human/femalescream_3.ogg',
'sound/voice/human/femalescream_4.ogg',
'sound/voice/human/femalescream_5.ogg')
code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+5
View File
@@ -123,6 +123,11 @@
*/
//SKYRAT EDIT REMOVAL END
/datum/species/lizard/get_scream_sound(mob/living/carbon/human/lizard)
return pick('sound/voice/lizard/lizard_scream_1.ogg',
'sound/voice/lizard/lizard_scream_2.ogg',
'sound/voice/lizard/lizard_scream_3.ogg')
/*
Lizard subspecies: ASHWALKERS
*/
code/modules/mob/living/carbon/human/species_types/monkeys.dm
+9
View File
@@ -104,3 +104,12 @@
if(SSevents.holidays && SSevents.holidays[MONKEYDAY])
return TRUE
return ..()
/datum/species/monkey/get_scream_sound(mob/living/carbon/human/monkey)
return pick('sound/creatures/monkey/monkey_screech_1.ogg',
'sound/creatures/monkey/monkey_screech_2.ogg',
'sound/creatures/monkey/monkey_screech_3.ogg',
'sound/creatures/monkey/monkey_screech_4.ogg',
'sound/creatures/monkey/monkey_screech_5.ogg',
'sound/creatures/monkey/monkey_screech_6.ogg',
'sound/creatures/monkey/monkey_screech_7.ogg')
code/modules/mob/living/carbon/human/species_types/mothmen.dm
+3
View File
@@ -67,3 +67,6 @@
human_mob.update_body()
*/
//SKYRAT EDIT REMOVAL END
/datum/species/moth/get_scream_sound(mob/living/carbon/human/human)
return 'sound/voice/moth/scream_moth.ogg'