mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Changes lizard hiss and increases staff, mentor, and donor retention by allowing felinids to hiss. (#17814)
* adds sound * felinids can hiss * felinids can purr * You can no longer purr at people NanoTrasen has noticed an increase in harassment complaints from stations that employ felinids. The reports indicate that felinids would purr at people. NanoTrasen has since banned workplace purring at people. * removes purring * update lizard hiss
This commit is contained in:
@@ -59,6 +59,7 @@
|
||||
key = "hiss"
|
||||
key_third_person = "hisses"
|
||||
message = "hisses."
|
||||
message_param = "hisses at %t."
|
||||
emote_type = EMOTE_AUDIBLE
|
||||
var/list/viable_tongues = list(/obj/item/organ/tongue/lizard, /obj/item/organ/tongue/polysmorph)
|
||||
|
||||
@@ -71,13 +72,17 @@
|
||||
return 'sound/voice/lizard/hiss.ogg'
|
||||
if(istype(T, /obj/item/organ/tongue/polysmorph))
|
||||
return pick('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg')
|
||||
if(iscatperson(user))//yogs: catpeople can hiss!
|
||||
return pick('sound/voice/feline/hiss1.ogg', 'sound/voice/feline/hiss2.ogg', 'sound/voice/feline/hiss3.ogg')
|
||||
|
||||
/datum/emote/living/carbon/hiss/can_run_emote(mob/living/user, status_check = TRUE, intentional)
|
||||
if(!ishuman(user))
|
||||
return FALSE
|
||||
var/mob/living/carbon/human/H = user
|
||||
var/obj/item/organ/tongue/T = H?.getorganslot(ORGAN_SLOT_TONGUE)
|
||||
return is_type_in_list(T, viable_tongues) && ..()
|
||||
var/obj/item/organ/tongue/T = H.getorganslot(ORGAN_SLOT_TONGUE)
|
||||
if(iscatperson(user)) //yogs: cat people can hiss!
|
||||
return TRUE
|
||||
return is_type_in_list(T, viable_tongues)
|
||||
|
||||
/datum/emote/living/carbon/human/hug
|
||||
key = "hug"
|
||||
|
||||
BIN
sound/voice/feline/hiss1.ogg
Normal file
BIN
sound/voice/feline/hiss1.ogg
Normal file
Binary file not shown.
BIN
sound/voice/feline/hiss2.ogg
Normal file
BIN
sound/voice/feline/hiss2.ogg
Normal file
Binary file not shown.
BIN
sound/voice/feline/hiss3.ogg
Normal file
BIN
sound/voice/feline/hiss3.ogg
Normal file
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user