Let ghosts use the jump emote (#86168)

This commit is contained in:
oranges
2024-09-04 16:39:42 -06:00
committed by GitHub
parent a49c840896
commit 883eb18803
3 changed files with 25 additions and 15 deletions
+24
View File
@@ -142,3 +142,27 @@
#undef BEYBLADE_DIZZINESS_DURATION
#undef BEYBLADE_CONFUSION_INCREMENT
#undef BEYBLADE_CONFUSION_LIMIT
/datum/emote/jump
key = "jump"
key_third_person = "jumps"
message = "jumps!"
// Allows ghosts to jump
mob_type_ignore_stat_typecache = list(/mob/dead/observer)
/datum/emote/jump/run_emote(mob/user, params, type_override, intentional)
. = ..()
var/original_transform = user.transform
animate(user, transform = user.transform.Translate(0, 4), time = 0.1 SECONDS, flags = ANIMATION_PARALLEL)
animate(transform = original_transform, time = 0.1 SECONDS)
/datum/emote/jump/get_sound(mob/user)
return 'sound/weapons/thudswoosh.ogg'
// Avoids playing sounds if we're a ghost
/datum/emote/jump/should_play_sound(mob/user, intentional)
if ishuman(user)
return ..()
return FALSE
-14
View File
@@ -235,20 +235,6 @@
key_third_person = "grimaces"
message = "grimaces."
/datum/emote/living/jump
key = "jump"
key_third_person = "jumps"
message = "jumps!"
hands_use_check = TRUE
/datum/emote/living/jump/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
animate(user, pixel_y = user.pixel_y + 4, time = 0.1 SECONDS)
animate(pixel_y = user.pixel_y - 4, time = 0.1 SECONDS)
/datum/emote/living/jump/get_sound(mob/living/user)
return 'sound/weapons/thudswoosh.ogg'
/datum/emote/living/kiss
key = "kiss"
key_third_person = "kisses"
@@ -429,7 +429,7 @@ GLOBAL_LIST_EMPTY(virtual_pets_list)
var/static/list/possible_emotes = list(
/datum/emote/flip,
/datum/emote/living/jump,
/datum/emote/jump,
/datum/emote/living/shiver,
/datum/emote/spin,
/datum/emote/silicon/beep,