cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

ensure only slimes can bubble and pop (#22032)

Browse Source 
* ensure only slimes can bubble and pop

* ahhh eto
This commit is contained in:
Luc
2023-08-23 21:29:00 -05:00
committed by GitHub
parent 6f803bbca0
commit cb87070590
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_emote.dm
+15 -12
View File
@@ -625,17 +625,10 @@
species_type_whitelist_typecache = list(/datum/species/diona)
sound = "sound/voice/dionatalk1.ogg"
/datum/emote/living/carbon/human/squish
key = "squish"
key_third_person = "squishes"
message = "squishes."
message_param = "squishes at %t."
emote_type = EMOTE_SOUND
age_based = TRUE
// Credit to DrMinky (freesound.org) for the sound.
sound = "sound/effects/slime_squish.ogg"
/datum/emote/living/carbon/human/slime
/datum/emote/living/carbon/human/squish/can_run_emote(mob/user, status_check, intentional)
/datum/emote/living/carbon/human/slime/can_run_emote(mob/user, status_check, intentional)
. = ..()
if(!.)
return FALSE
@@ -648,7 +641,17 @@
return TRUE
return FALSE
/datum/emote/living/carbon/human/bubble
/datum/emote/living/carbon/human/slime/squish
key = "squish"
key_third_person = "squishes"
message = "squishes."
message_param = "squishes at %t."
emote_type = EMOTE_SOUND
age_based = TRUE
// Credit to DrMinky (freesound.org) for the sound.
sound = "sound/effects/slime_squish.ogg"
/datum/emote/living/carbon/human/slime/bubble
key = "bubble"
key_third_person = "bubbles"
message = "bubbles."
@@ -660,7 +663,7 @@
// https://freesound.org/people/audiolarx/sounds/263945/
sound = 'sound/effects/mob_effects/slime_bubble.ogg'
/datum/emote/living/carbon/human/pop
/datum/emote/living/carbon/human/slime/pop
key = "pop"
key_third_person = "pops"
message = "makes a popping sound."