Fixes an exploit reported at tgstation/-tg-station#4491. Credits to @MrPerson for the fix.

This commit is contained in:
PsiOmega
2014-08-20 10:46:09 +02:00
parent 6cc4280c48
commit 30c581c8b3
2 changed files with 7 additions and 7 deletions
+2 -4
View File
@@ -124,8 +124,7 @@
Topic("breaker=1", list("breaker"="1"), 0) // 0 meaning no window (consistency! wait...)
/obj/machinery/turretid/AICtrlClick() //turns off/on Turrets
src.enabled = !src.enabled
src.updateTurrets()
Topic("toggleOn", list("toggleOn" = 1), 1) // 1 meaning no window (consistency!)
/atom/proc/AIAltClick(var/atom/A)
AltClick(A)
@@ -140,8 +139,7 @@
return
/obj/machinery/turretid/AIAltClick() //toggles lethal on turrets
src.lethal = !src.lethal
src.updateTurrets()
Topic("toggleLethal", list("toggleLethal" = 1), 1) // 1 meaning no window (consistency!)
/atom/proc/AIMiddleClick()
return
+5 -3
View File
@@ -436,8 +436,9 @@
/obj/machinery/turretid/Topic(href, href_list)
..()
/obj/machinery/turretid/Topic(href, href_list, var/nowindow = 0)
if(..(href, href_list))
return
if (src.locked)
if (!istype(usr, /mob/living/silicon))
usr << "Control panel is locked!"
@@ -449,7 +450,8 @@
else if (href_list["toggleLethal"])
src.lethal = !src.lethal
src.updateTurrets()
src.attack_hand(usr)
if(!nowindow)
src.attack_hand(usr)
/obj/machinery/turretid/proc/updateTurrets()
if(control_area)