shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into slime-puddle

Browse Source
This commit is contained in:
Timothy Teakettle
2020-09-30 18:43:25 +01:00
parent 2223cfeb28 477422607f
commit 7cab2c658d
17 changed files with 33 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_globalvars/lists/flavor_misc.dm
+1 -1
View File
@@ -267,7 +267,7 @@ GLOBAL_LIST_INIT(redacted_strings, list("\[REDACTED\]", "\[CLASSIFIED\]", "\[ARC
GLOBAL_LIST_INIT(wisdoms, world.file2list("strings/wisdoms.txt"))
GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "declares", "bellows", "buzzes" ,"beeps", "chirps" ,"hisses" ,"poofs" ,"rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters"))
GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps" ,"hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles"))
GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc))
code/modules/mob/living/emote.dm
+15
View File
@@ -227,6 +227,21 @@
return
else if(isinsect(C))
playsound(C, 'sound/voice/moth/mothlaugh.ogg', 50, 1)
else if(isjellyperson(C))
var/mob/living/carbon/human/H = C
if(H.dna.features["mam_ears"] == "Cat" || H.dna.features["mam_ears"] == "Cat, Big") //slime have cat ear. slime go nya.
playsound(C, pick('sound/voice/jelly/nyahaha1.ogg',
'sound/voice/jelly/nyahaha2.ogg',
'sound/voice/jelly/nyaha.ogg',
'sound/voice/jelly/nyahehe.ogg'),
50, 1)
return
else if(user.gender == FEMALE)
playsound(C, 'sound/voice/jelly/womanlaugh.ogg', 50, 1)
return
else
playsound(C, pick('sound/voice/jelly/manlaugh1.ogg', 'sound/voice/jelly/manlaugh2.ogg'), 50, 1)
return
else if(ishumanbasic(C))
if(user.gender == FEMALE)
playsound(C, 'sound/voice/human/womanlaugh.ogg', 50, 1)