diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 0f4079bad2e..2e29135f36f 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -138,23 +138,22 @@ UnarmedAttack(A, 1) return - else - if(!isturf(loc)) // This is going to stop you from telekinesing from inside a closet, but I don't shed many tears for that - return TRUE - - if(can_reach(A, W)) - if(W) - W.melee_attack_chain(src, A, params) - else - if(ismob(A)) - changeNext_move(CLICK_CD_MELEE) - UnarmedAttack(A, 1) + if(!isturf(loc)) // This is going to stop you from telekinesing from inside a closet, but I don't shed many tears for that + return TRUE + if(can_reach(A, W)) + if(W) + W.melee_attack_chain(src, A, params) else - if(W) - W.afterattack(A, src, 0, params) // 0: not Adjacent - else - RangedAttack(A, params) + if(ismob(A)) + changeNext_move(CLICK_CD_MELEE) + UnarmedAttack(A, 1) + + else + if(W) + W.afterattack(A, src, 0, params) // 0: not Adjacent + else + RangedAttack(A, params) /** diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index d1a1ef14322..b033af4692d 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -98,9 +98,8 @@ if(can_reach(A, W)) W.melee_attack_chain(src, A, params) return - else - W.afterattack(A, src, 0, params) - return + W.afterattack(A, src, 0, params) + return //Ctrl+Middle click cycles through modules /mob/living/silicon/robot/proc/CtrlMiddleClickOn(atom/A) diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 04085714b37..215ce2db5e2 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -134,7 +134,7 @@ if(parent_organ == "r_arm" ? !owner.put_in_r_hand(holder) : !owner.put_in_l_hand(holder)) to_chat(owner, "Your [src] fails to activate!") return - + // Activate the hand that now holds our item. if(parent_organ == "r_arm" ? owner.hand : !owner.hand) owner.swap_hand() @@ -501,16 +501,8 @@ /obj/item/organ/internal/cyberimp/arm/razorwire/examine_more(mob/user) . = ..() - . += "A byproduct of Cybersun Incorporated's mistakes turned concept, the Razorwire Spool is a remarkable accident in itself. \ - It consists of a fine, thread-like laser capable of being manipulated and swung like a whip. Designed for ease of deployment, the wire originates from the wrist, \ - allowing users with the implant to perform wide swings and precise cuts against soft targets. It's the same energy found in other common energy weapons, such as swords and daggers." - . += "Cybersun's investment into energy weapon development inadvertently led to the Razorwire Spool. Initially attempting to create an Energy Sword, \ - they ended up with a material that, while superheated and correctly composed, failed to maintain a solid blade shape. Curious about this error, \ - Cybersun repeated the process, producing an energy as thin as a wire. After several prototypes, they achieved a long, energy-like thread. \ - Further innovation allowed them to conceal this in a forearm-sized container, \ - with a hand and wrist replacement made of the same durable material used to contain energy weapons. They would call it, the Razorwire." - . += "Favored by assassins for their stealth and efficiency, Cybersun exercises discretion in its distribution, favoring clients in their good graces. \ - It falls behind other energy weapons due to its thinner and more loose pressure, however it is praised more as a side-arm for unarmored soft targets." + for(var/obj/I in contents) + return I.examine_more() // Shell launch system, an arm mounted single-shot shotgun that comes out of your arm diff --git a/code/modules/surgery/organs/autosurgeon.dm b/code/modules/surgery/organs/autosurgeon.dm index 4e825c13d60..f64f973273b 100644 --- a/code/modules/surgery/organs/autosurgeon.dm +++ b/code/modules/surgery/organs/autosurgeon.dm @@ -100,16 +100,8 @@ /obj/item/autosurgeon/organ/syndicate/razorwire/examine_more(mob/user) . = ..() - . += "A byproduct of Cybersun Incorporated's mistakes turned concept, the Razorwire Spool is a remarkable accident in itself. \ - It consists of a fine, thread-like laser capable of being manipulated and swung like a whip. Designed for ease of deployment, the wire originates from the wrist, \ - allowing users with the implant to perform wide swings and precise cuts against soft targets. It's the same energy found in other common energy weapons, such as swords and daggers." - . += "Cybersun's investment into energy weapon development inadvertently led to the Razorwire Spool. Initially attempting to create an Energy Sword, \ - they ended up with a material that, while superheated and correctly composed, failed to maintain a solid blade shape. Curious about this error, \ - Cybersun repeated the process, producing an energy as thin as a wire. After several prototypes, they achieved a long, energy-like thread. \ - Further innovation allowed them to conceal this in a forearm-sized container, \ - with a hand and wrist replacement made of the same durable material used to contain energy weapons. They would call it, the Razorwire." - . += "Favored by assassins for their stealth and efficiency, Cybersun exercises discretion in its distribution, favoring clients in their good graces. \ - It falls behind other energy weapons due to its thinner and more loose pressure, however it is praised more as a side-arm for unarmored soft targets." + if(storedorgan) + return storedorgan.examine_more() /obj/item/autosurgeon/organ/syndicate/hackerman_deck desc = "A single use autosurgeon that contains a Binyat wireless hacking system. A screwdriver can be used to remove it, but implants can't be placed back in."