Merge pull request #10332 from VOREStation/Arokha/emoflip

Touch up emote port
This commit is contained in:
Novacat
2021-05-15 15:13:23 +00:00
committed by Chompstation Bot
parent bddfb995a2
commit d5a6cb16a3
7 changed files with 31 additions and 17 deletions
+1
View File
@@ -27,6 +27,7 @@ var/list/_default_mob_emotes = list(
/mob
var/list/usable_emotes
var/nextemote = 1 //VOREStation Add
/mob/proc/update_emotes(var/skip_sort)
usable_emotes = list()
@@ -27,7 +27,12 @@
/decl/emote/visible/flip/do_extra(mob/user)
. = ..()
if(istype(user))
// VOREStation Add - Fancy flips
if(ishuman(user))
var/mob/living/carbon/human/H = user
H.handle_flip_vr()
// VOREStation Add End
else if(istype(user))
user.SpinAnimation(7,1)
/decl/emote/visible/floorspin
+5
View File
@@ -1,4 +1,9 @@
/mob/proc/can_emote(var/emote_type)
//VOREStation Add
if(src.nextemote >= world.time)
return FALSE
src.nextemote = world.time + 12
//VOREStation Add End
return (stat == CONSCIOUS)
/mob/living/can_emote(var/emote_type)