From 268fbf4ffd13418283becbff6ef878046efd0034 Mon Sep 17 00:00:00 2001 From: Markolie Date: Sat, 15 Oct 2016 12:28:10 +0200 Subject: [PATCH 1/2] Drone emote fix --- code/modules/mob/living/say.dm | 10 ++++++++-- .../mob/living/silicon/robot/drone/drone_say.dm | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index e534d67ee72..2f44caf161a 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -283,8 +283,14 @@ proc/get_radio_key_from_channel(var/channel) /mob/living/proc/GetVoice() return name -/mob/living/emote(var/act, var/type, var/message) //emote code is terrible, this is so that anything that isn't - if(stat) return 0 //already snowflaked to shit can call the parent and handle emoting sanely +/mob/living/emote(var/act, var/type, var/message) //emote code is terrible, this is so that anything that isn't already snowflaked to shit can call the parent and handle emoting sanely + if(client) + if(client.prefs.muted & MUTE_IC) + to_chat(src, "You cannot speak in IC (Muted).") + return + + if(stat) + return 0 if(..(act, type, message)) return 1 diff --git a/code/modules/mob/living/silicon/robot/drone/drone_say.dm b/code/modules/mob/living/silicon/robot/drone/drone_say.dm index 0a98e276c43..053384baba5 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_say.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_say.dm @@ -1,4 +1,7 @@ -/mob/living/silicon/robot/drone/say(var/message, var/datum/language/speaking = null) +/mob/living/silicon/robot/drone/say(var/message, var/datum/language/speaking = null) + if(copytext(message, 1, 2) == "*") + return emote(copytext(message, 2)) + if(!speaking) speaking = parse_language(message) if(!speaking) From e60e93e706b1ded27f193cb975de16fccf13fe79 Mon Sep 17 00:00:00 2001 From: Markolie Date: Sat, 15 Oct 2016 12:47:38 +0200 Subject: [PATCH 2/2] Fix light fixture frame progress bar --- code/game/objects/items/mountable_frames/lights.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/mountable_frames/lights.dm b/code/game/objects/items/mountable_frames/lights.dm index 3655070ce2f..b108240b332 100644 --- a/code/game/objects/items/mountable_frames/lights.dm +++ b/code/game/objects/items/mountable_frames/lights.dm @@ -11,7 +11,7 @@ playsound(get_turf(src), 'sound/machines/click.ogg', 75, 1) var/constrdir = user.dir var/constrloc = get_turf(user) - if(!do_after(user, 30, target = src)) + if(!do_after(user, 30, target = on_wall)) return var/obj/machinery/light_construct/newlight switch(fixture_type)