cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6078 from PsiOmegaDelta/TurretExploit

Browse Source 
Fixes turret exploit
This commit is contained in:
Chinsky
2014-08-21 12:09:28 +04:00
parent ed496b8463 30c581c8b3
commit 77066d1f62
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/_onclick/ai.dm
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

8
code/game/machinery/turrets.dm
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)