diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index 0f9f1ae9d73..1372c501a09 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -84,8 +84,8 @@ range = -1 include_user = 1 - emp_heavy = 5 - emp_light = 7 + emp_heavy = 6 + emp_light = 10 /obj/effect/proc_holder/spell/targeted/turf_teleport/blink name = "Blink" diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 3e7ed3ef435..6f239aa82f3 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -38,9 +38,10 @@ var/list/recentmessages = list() // global list of recent messages broadcasted : if(signal.data["message"]) // Prevents massive radio spam - if("[signal.data["message"]]:[signal.data["realname"]]:[listening_level]" in recentmessages) + var/signal_message = "[signal.data["message"]]:[signal.data["realname"]]:[listening_level]" + if(signal_message in recentmessages) return - recentmessages.Add("[signal.data["message"]]:[signal.data["realname"]]:[listening_level]") + recentmessages.Add(signal_message) signal.data["done"] = 1 // mark the signal as being broadcasted @@ -88,7 +89,7 @@ var/list/recentmessages = list() // global list of recent messages broadcasted : signal.data["name"], signal.data["job"], signal.data["realname"], signal.data["vname"], 4, signal.data["compression"], listening_level) - spawn(5) + spawn(10) recentmessages = list() /* --- Do a snazzy animation! --- */ diff --git a/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm b/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm index a95eef1c4e0..a571838a770 100644 --- a/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm +++ b/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm @@ -33,6 +33,19 @@ if(ticker) cameranet.updateVisibility(src) +// EFFECTS + +/obj/effect/Del() + if(ticker) + cameranet.updateVisibility(src) + ..() + +/obj/effect/New() + ..() + if(ticker) + cameranet.updateVisibility(src) + + // DOORS // Simply updates the visibility of the area when it opens/closes/destroyed.