Merge pull request #15626 from SandPoot/emotes

Minor touches on emotes
This commit is contained in:
Lin
2022-05-18 03:27:08 +00:00
committed by GitHub
4 changed files with 37 additions and 17 deletions
+2
View File
@@ -518,6 +518,8 @@
/datum/emote/living/circle/run_emote(mob/user, params)
. = ..()
if(!.)
return
var/obj/item/circlegame/N = new(user)
if(user.put_in_hands(N))
to_chat(user, "<span class='notice'>You make a circle with your hand.</span>")
@@ -8,7 +8,7 @@
var/unrestricted = TRUE
/datum/emote/sound/silicon/run_emote(mob/user, params)
if(!unrestricted && !(issilicon(user) || isipcperson(user)))
if(!unrestricted && !(issilicon(user) || isrobotic(user)))
return
return ..()
@@ -27,6 +27,8 @@
/datum/emote/slime/mood/run_emote(mob/user, params)
. = ..()
if(!.)
return
var/mob/living/simple_animal/slime/S = user
S.mood = mood
S.regenerate_icons()