Merge pull request #14210 from Heroman3003/borg-human-emotes

Gives borgs access to human emotes
This commit is contained in:
Casey
2022-12-18 16:55:23 -05:00
committed by GitHub
2 changed files with 4 additions and 2 deletions
+1 -1
View File
@@ -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.
@@ -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