mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-31 01:00:59 +01:00
[MIRROR] Completes the /datum/component/shadekin work (#11148)
Co-authored-by: Cameron Lennox <killer65311@gmail.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
Cameron Lennox
Kashargul
parent
52b6360a09
commit
3e095bf5db
@@ -287,3 +287,41 @@
|
||||
emote_message_1p_target = "You prbt at TARGET."
|
||||
emote_message_3p_target = "prbts at TARGET."
|
||||
emote_sound = 'sound/voice/prbt.ogg'
|
||||
|
||||
//Some Spooky sounds.
|
||||
/decl/emote/audible/evil_laugh
|
||||
key = "evillaugh"
|
||||
emote_message_3p = "laughs!"
|
||||
emote_sound = 'sound/mob/spooky/laugh.ogg'
|
||||
|
||||
/decl/emote/audible/evil_no
|
||||
key = "evilno"
|
||||
emote_message_3p = "says no!"
|
||||
emote_sound = 'sound/mob/spooky/no.ogg'
|
||||
|
||||
/decl/emote/audible/evil_breathing
|
||||
key = "evilbreath"
|
||||
emote_message_3p = "breaths heavily!"
|
||||
emote_sound = 'sound/mob/spooky/breath1.ogg'
|
||||
|
||||
/decl/emote/audible/evil_breathing_2
|
||||
key = "evilbreath2"
|
||||
emote_message_3p = "breaths heavily!"
|
||||
emote_sound = 'sound/mob/spooky/breath2.ogg'
|
||||
|
||||
/decl/emote/audible/goodripsound
|
||||
key = "goodripsound"
|
||||
emote_message_3p = "drips goo."
|
||||
|
||||
/decl/emote/audible/goodripsound/do_extra(var/mob/user)
|
||||
..()
|
||||
var/goo_sounds = list (
|
||||
'sound/mob/spooky/decay1.ogg',
|
||||
'sound/mob/spooky/decay2.ogg',
|
||||
'sound/mob/spooky/decay3.ogg',
|
||||
'sound/mob/spooky/corrosion1.ogg',
|
||||
'sound/mob/spooky/corrosion2.ogg',
|
||||
'sound/mob/spooky/corrosion3.ogg'
|
||||
)
|
||||
var/sound = pick(goo_sounds)
|
||||
playsound(user.loc, sound, 100, 1)
|
||||
|
||||
@@ -331,3 +331,18 @@
|
||||
/decl/emote/visible/tilt
|
||||
key = "tilt"
|
||||
emote_message_3p = "tilts USER_THEIR head."
|
||||
|
||||
/decl/emote/visible/goodrip
|
||||
key = "goodrip"
|
||||
emote_message_3p = "drips goo."
|
||||
|
||||
/decl/emote/visible/goodrip/do_extra(var/mob/user)
|
||||
..()
|
||||
new /obj/effect/decal/cleanable/blood/oil(user)
|
||||
var/goo_sounds = list (
|
||||
'sound/mob/spooky/decay1.ogg',
|
||||
'sound/mob/spooky/decay2.ogg',
|
||||
'sound/mob/spooky/decay3.ogg'
|
||||
)
|
||||
var/sound = pick(goo_sounds)
|
||||
playsound(user.loc, sound, 100, 1)
|
||||
|
||||
@@ -27,15 +27,12 @@
|
||||
if(world.time < next_emote)
|
||||
to_chat(src, span_warning("You cannot use another emote yet."))
|
||||
return
|
||||
//VOREStation Addition Start
|
||||
if(forced_psay)
|
||||
pme(message)
|
||||
return
|
||||
if(autowhisper)
|
||||
return me_verb_subtle(message)
|
||||
|
||||
//VOREStation Addition End
|
||||
|
||||
if(act == "help")
|
||||
if(world.time >= next_emote_refresh)
|
||||
var/list/usable_emotes = list()
|
||||
|
||||
Reference in New Issue
Block a user