From 3d37285c2f14436b919329decc4f0cf928fb3cad Mon Sep 17 00:00:00 2001 From: Crazylemon Date: Mon, 29 Feb 2016 16:03:11 -0800 Subject: [PATCH] Adds in returns, removes buildmode click speed limit on living mobs --- code/_onclick/ai.dm | 7 +++++-- code/_onclick/click.dm | 7 ++++--- code/_onclick/cyborg.dm | 6 ++++-- code/_onclick/observer.dm | 3 +++ code/game/gamemodes/miniantags/revenant/revenant.dm | 3 ++- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index 5f5c105862f..b44ba964628 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -12,6 +12,7 @@ /mob/living/silicon/ai/DblClickOn(var/atom/A, params) if(client.click_intercept) client.click_intercept.InterceptClickOn(src, params, A) + return if(control_disabled || stat) return @@ -22,12 +23,14 @@ /mob/living/silicon/ai/ClickOn(var/atom/A, params) + if(client.click_intercept) + client.click_intercept.InterceptClickOn(src, params, A) + return + if(world.time <= next_click) return next_click = world.time + 1 - if(client.click_intercept) - client.click_intercept.InterceptClickOn(src, params, A) if(control_disabled || stat) return diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 466f0d358e9..d43d12b1e8b 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -34,13 +34,14 @@ * mob/RangedAttack(atom,params) - used only ranged, only used for tk and laser eyes but could be changed */ /mob/proc/ClickOn( var/atom/A, var/params ) + if(client.click_intercept) + client.click_intercept.InterceptClickOn(src, params, A) + return + if(world.time <= next_click) return next_click = world.time + 1 - if(client.click_intercept) - client.click_intercept.InterceptClickOn(src, params, A) - var/list/modifiers = params2list(params) if(modifiers["shift"] && modifiers["ctrl"]) CtrlShiftClickOn(A) diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 39c5f965176..6fd00ba1f17 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -7,12 +7,14 @@ */ /mob/living/silicon/robot/ClickOn(var/atom/A, var/params) + if(client.click_intercept) + client.click_intercept.InterceptClickOn(src, params, A) + return + if(world.time <= next_click) return next_click = world.time + 1 - if(client.click_intercept) - client.click_intercept.InterceptClickOn(src, params, A) var/list/modifiers = params2list(params) if(modifiers["shift"] && modifiers["ctrl"]) diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index 2058ce86cb1..891601d2d51 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -1,6 +1,8 @@ /mob/dead/observer/DblClickOn(var/atom/A, var/params) if(client.click_intercept) client.click_intercept.InterceptClickOn(src, params, A) + return + if(can_reenter_corpse && mind && mind.current) if(A == mind.current || (mind.current in A)) // double click your corpse or whatever holds it reenter_corpse() // (cloning scanner, body bag, closet, mech, etc) @@ -18,6 +20,7 @@ /mob/dead/observer/ClickOn(var/atom/A, var/params) if(client.click_intercept) client.click_intercept.InterceptClickOn(src, params, A) + return if(world.time <= next_move) return diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index 817a24ff467..4f7c9608a2c 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -86,10 +86,11 @@ if(essence == 0) src << "You feel your essence fraying!" -/mob/living/simple_animal/revenant/ClickOn(var/atom/A, var/params) //Copypaste from ghost code - revenants can't interact with the world directly.if(client.click_intercept) +/mob/living/simple_animal/revenant/ClickOn(var/atom/A, var/params) //Copypaste from ghost code - revenants can't interact with the world directly. if(client.click_intercept) client.click_intercept.InterceptClickOn(src, params, A) + return var/list/modifiers = params2list(params) if(modifiers["middle"])