From c22c114674d8acc08dc6314d13516d42b93e77d6 Mon Sep 17 00:00:00 2001 From: AndroBetel <44546836+AndroBetel@users.noreply.github.com> Date: Sat, 11 May 2024 05:45:01 +0300 Subject: [PATCH 1/5] Update click.dm --- code/_onclick/click.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index fe0c9e7b72..202336a773 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -160,8 +160,6 @@ W.afterattack(A, src, 1, mods) else - if(!isitem(A) && !issurface(A)) - next_move += 4 UnarmedAttack(A, 1, mods) /mob/proc/check_click_intercept(params,A) From 69471e705483fdfff85605c56aab9bc06964c10b Mon Sep 17 00:00:00 2001 From: AndroBetel <44546836+AndroBetel@users.noreply.github.com> Date: Sat, 11 May 2024 05:55:55 +0300 Subject: [PATCH 2/5] Update carbon.dm --- code/modules/mob/living/carbon/carbon.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index b63ce0174a..c95f700c01 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -177,7 +177,6 @@ if(D.spread_by_touch()) contract_disease(D, 0, 1, CONTACT_HANDS) - M.next_move += 7 //Adds some lag to the 'attack'. Adds up to 11 in combination with click_adjacent. return /mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0, def_zone = null) From 92e3bde1d5b763dc02d310b6fce949b264a9ff0e Mon Sep 17 00:00:00 2001 From: AndroBetel <44546836+AndroBetel@users.noreply.github.com> Date: Sat, 11 May 2024 05:59:18 +0300 Subject: [PATCH 3/5] pb should still have some kind of delay i think --- code/modules/projectiles/gun.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 6ab143b8d8..1b66ba7f57 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -1437,6 +1437,7 @@ and you're good to go. if(bullets_fired == 1) //First shot gives the PB message. user.visible_message(SPAN_DANGER("[user] fires [src] point blank at [attacked_mob]!"), SPAN_WARNING("You fire [src] point blank at [attacked_mob]!"), null, null, CHAT_TYPE_WEAPON_USE) + next_move += 4 user.track_shot(initial(name)) apply_bullet_effects(projectile_to_fire, user, bullets_fired, dual_wield) //We add any damage effects that we need. From 984049eddfaac0fe3b4165e238d42ab16dbeeeb2 Mon Sep 17 00:00:00 2001 From: AndroBetel <44546836+AndroBetel@users.noreply.github.com> Date: Sat, 11 May 2024 18:40:58 +0300 Subject: [PATCH 4/5] Update gun.dm --- code/modules/projectiles/gun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 1b66ba7f57..1a75429b86 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -1437,7 +1437,7 @@ and you're good to go. if(bullets_fired == 1) //First shot gives the PB message. user.visible_message(SPAN_DANGER("[user] fires [src] point blank at [attacked_mob]!"), SPAN_WARNING("You fire [src] point blank at [attacked_mob]!"), null, null, CHAT_TYPE_WEAPON_USE) - next_move += 4 + user.next_move += 4 user.track_shot(initial(name)) apply_bullet_effects(projectile_to_fire, user, bullets_fired, dual_wield) //We add any damage effects that we need. 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 5/5] 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)