Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

removes artificial click delay (11 ticks! whole ass second!) #260

Closed
wants to merge 5 commits into from
Closed

removes artificial click delay (11 ticks! whole ass second!) #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c22c114
Update click.dm
AndroBetel May 11, 2024
69471e7
Update carbon.dm
AndroBetel May 11, 2024
92e3bde
pb should still have some kind of delay i think
AndroBetel May 11, 2024
984049e
Update gun.dm
AndroBetel May 11, 2024
7f65fd4
fixessszzs
AndroBetel May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions code/_onclick/click.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/carbon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
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.
M.next_move += 11
return

/mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0, def_zone = null)
Expand Down
1 change: 1 addition & 0 deletions code/modules/projectiles/gun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
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.
Expand Down
Loading