From 91f5598ddba9d9f7139421354c00eb3ed2b9a891 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 13 Aug 2015 01:13:31 -0400 Subject: [PATCH] Lets Borgs and Drones Flip --- code/game/objects/items/weapons/storage/toolbox.dm | 1 - code/modules/mob/living/silicon/robot/emote.dm | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index ab18b07e737..fb10938e6f4 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -81,7 +81,6 @@ New() ..() - var/color = pick("red","yellow","green","blue","pink","orange","cyan","white") new /obj/item/weapon/screwdriver(src) new /obj/item/weapon/wrench(src) new /obj/item/weapon/weldingtool(src) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 8efab8a0f57..11f6ad0de7e 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -13,7 +13,7 @@ var/on_CD = 0 switch(act) //Cooldown-inducing emotes - if("ping","buzz","beep","law") //halt is exempt because it's used to stop criminal scum + if("ping","buzz","beep","law","flip") //halt is exempt because it's used to stop criminal scum on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm //Everything else, including typos of the above emotes else @@ -220,6 +220,11 @@ else src << "You are not security." + if ("flip") + m_type = 1 + message = "[src] does a flip!" + src.SpinAnimation(5,1) + if ("help") src << "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt" else