Fixes for previous commits.

This commit is contained in:
Zuhayr
2015-08-24 18:31:52 +09:30
parent 8bc72a465c
commit c6964a9b0e
6 changed files with 30 additions and 32 deletions

View File

@@ -31,7 +31,7 @@
build_click(src, client.buildmode, params, A)
return
if(control_disabled || stat)
if(stat)
return
var/list/modifiers = params2list(params)
@@ -51,7 +51,7 @@
CtrlClickOn(A)
return
if(!canClick())
if(control_disabled || !canClick())
return
if(aiCamera.in_camera_mode)
@@ -89,24 +89,25 @@
*/
/mob/living/silicon/ai/ShiftClickOn(var/atom/A)
if(A.AIShiftClick(src))
if(!control_disabled && A.AIShiftClick(src))
return
..()
..()
/mob/living/silicon/ai/CtrlClickOn(var/atom/A)
if(A.AICtrlClick(src))
if(!control_disabled && A.AICtrlClick(src))
return
..()
..()
/mob/living/silicon/ai/AltClickOn(var/atom/A)
if(A.AIAltClick(src))
if(!control_disabled && A.AIAltClick(src))
return
..()
..()
/mob/living/silicon/ai/MiddleClickOn(var/atom/A)
if(A.AIMiddleClick(src))
if(!control_disabled && A.AIMiddleClick(src))
return
..()
..()
/*
The following criminally helpful code is just the previous code cleaned up;
I have no idea why it was in atoms.dm instead of respective files.
@@ -115,11 +116,6 @@
/atom/proc/AICtrlShiftClick()
return
/obj/machinery/door/airlock/AICtrlShiftClick()
if(emagged)
return
return
/atom/proc/AIShiftClick()
return