From d5ef5d6a05dfbdbbd5b9d9944f3ee91f7f7eb657 Mon Sep 17 00:00:00 2001 From: Heroman Date: Mon, 19 Dec 2022 06:33:30 +1000 Subject: [PATCH] Gives borgs access to human emotes --- code/modules/admin/verbs/smite_vr.dm | 2 +- code/modules/mob/living/silicon/robot/emote.dm | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/verbs/smite_vr.dm b/code/modules/admin/verbs/smite_vr.dm index f1a1a08deb..fc8452831c 100644 --- a/code/modules/admin/verbs/smite_vr.dm +++ b/code/modules/admin/verbs/smite_vr.dm @@ -130,7 +130,7 @@ if(SMITE_AD_SPAM) if(target.client) - create_fake_ad_popup_multiple(/obj/screen/popup/default, 15) + target.client.create_fake_ad_popup_multiple(/obj/screen/popup/default, 15) else return //Injection? Don't print any messages. diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 018c2b4336..79df20a324 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -33,4 +33,6 @@ var/list/_robot_default_emotes = list( ) /mob/living/silicon/robot/get_available_emotes() - return global._robot_default_emotes.Copy() + var/list/fulllist = global._robot_default_emotes.Copy() + fulllist |= _human_default_emotes + return fulllist \ No newline at end of file