needed emote

This commit is contained in:
Metis
2024-10-15 01:07:10 -04:00
parent 4800f35a3a
commit 2b19d9084f
4 changed files with 18 additions and 5 deletions
+16 -4
View File
@@ -1,7 +1,3 @@
/datum/emote/proc/get_sound(mob/living/user)
return sound //by default just return this var.
/datum/emote/speen
key = "speen"
key_third_person = "speeeeens!"
@@ -31,3 +27,19 @@
playsound(user, 'GainStation13/sound/voice/speen.ogg', 50, 1, -1)
. = ..()
/datum/emote/living/cackle
key = "cackle"
key_third_person = "cackles"
message = "cackles hysterically!"
emote_type = EMOTE_AUDIBLE
muzzle_ignore = FALSE
restraint_check = FALSE
/datum/emote/living/cackle/run_emote(mob/living/user, params)
if(ishuman(user))
if(user.nextsoundemote >= world.time)
return
user.nextsoundemote = world.time + 7
playsound(user, 'GainStation13/sound/voice//cackle_yeen.ogg', 50, 1, -1)
. = ..()
Binary file not shown.
+1 -1
View File
@@ -139,7 +139,7 @@
to_chat(user, "<span class='warning'>[src] is unpowered!</span>")
teleporting = FALSE
return
if(!target_pad || QDELETED(target_pad) || (needs_power && (target_pad.machine_stat & NOPOWER))) // GS13 EDIT
if(!target_pad || QDELETED(target_pad) || (target_pad.needs_power && (target_pad.machine_stat & NOPOWER))) // GS13 EDIT
to_chat(user, "<span class='warning'>Linked pad is not responding to ping. Teleport aborted.</span>")
teleporting = FALSE
return
+1
View File
@@ -3968,6 +3968,7 @@
#include "GainStation13\code\mechanics\den abductors\purchaseble_goodies.dm"
#include "GainStation13\code\mobs\cakegolem.dm"
#include "GainStation13\code\mobs\chocoslime.dm"
#include "GainStation13\code\mobs\emote.dm"
#include "GainStation13\code\mobs\races\caloritegolem.dm"
#include "GainStation13\code\modules\arousal\arousal.dm"
#include "GainStation13\code\modules\cargo\packs.dm"