From 7f65fd47d66d4e0686224b689374b863c89074ae Mon Sep 17 00:00:00 2001 From: AndroBetel <44546836+AndroBetel@users.noreply.github.com> Date: Thu, 16 May 2024 00:13:16 +0300 Subject: [PATCH] fixessszzs --- code/_onclick/click.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 202336a773..176cc973d8 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -146,7 +146,7 @@ /mob/proc/click_adjacent(atom/A, obj/item/W, mods) if(W) - if(W.attack_speed && !src.contains(A)) //Not being worn or carried in the user's inventory somewhere, including internal storages. + if(W.attack_speed && !src.contains(A) && !isturf(A)) //Not being worn or carried in the user's inventory somewhere, including internal storages. next_move += W.attack_speed if(SEND_SIGNAL(A, COMSIG_ATOM_MOB_ATTACKBY, W, src) & COMPONENT_CANCEL_ATTACKBY) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index c95f700c01..b3af96211d 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -177,6 +177,7 @@ if(D.spread_by_touch()) contract_disease(D, 0, 1, CONTACT_HANDS) + M.next_move += 11 return /mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0, def_zone = null)