Fix some missed click check stuff

This commit is contained in:
Aronai Sieyes
2020-04-30 19:33:23 -04:00
parent 0afc02f4a3
commit 1eb7a7bc03
3 changed files with 9 additions and 10 deletions
+3 -2
View File
@@ -23,9 +23,10 @@
/mob/living/silicon/ai/ClickOn(var/atom/A, params)
if(world.time <= next_click)
if(!checkClickCooldown())
return
next_click = world.time + 1
setClickCooldown(1)
if(client.buildmode) // comes after object.Click to allow buildmode gui objects to be clicked
build_click(src, client.buildmode, params, A)
+3 -5
View File
@@ -7,9 +7,10 @@
*/
/mob/living/silicon/robot/ClickOn(var/atom/A, var/params)
if(world.time <= next_click)
if(!checkClickCooldown())
return
next_click = world.time + 1
setClickCooldown(1)
if(client.buildmode) // comes after object.Click to allow buildmode gui objects to be clicked
build_click(src, client.buildmode, params, A)
@@ -35,9 +36,6 @@
if(stat || lockdown || weakened || stunned || paralysis)
return
if(!checkClickCooldown())
return
face_atom(A) // change direction to face what you clicked on
if(aiCamera && aiCamera.in_camera_mode)
+3 -3
View File
@@ -154,10 +154,10 @@
set category = "Object"
set src = usr
if(world.time <= next_click) // This isn't really a 'click' but it'll work for our purposes.
if(!checkClickCooldown())
return
next_click = world.time + 1
setClickCooldown(1)
if(istype(loc,/obj/mecha)) return