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

Mechas no longer get their attack cooldowns taken up by clicking the floor. And phazons finally deal burn on the burn mode #28042

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −5
Open

Mechas no longer get their attack cooldowns taken up by clicking the floor. And phazons finally deal burn on the burn mode #28042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions code/game/mecha/mecha.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,11 @@
target = safepick(oview(1, src))
if(!melee_can_hit || !isatom(target))
return
target.mech_melee_attack(src)
melee_can_hit = FALSE
spawn(melee_cooldown)
melee_can_hit = TRUE
if(iswallturf(target) || isliving(target) || isobj(target))
target.mech_melee_attack(src)
melee_can_hit = FALSE
spawn(melee_cooldown)
melee_can_hit = TRUE
Comment on lines +270 to +272
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replace this spawn with a VARSET_CALLBACK on a timer while you're here, please!


/obj/mecha/proc/mech_toxin_damage(mob/living/target)
playsound(src, 'sound/effects/spray2.ogg', 50, 1)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/human_defense.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ emp_act
update |= affecting.receive_damage(dmg, 0)
playsound(src, 'sound/weapons/punch4.ogg', 50, TRUE)
if("fire")
update |= affecting.receive_damage(dmg, 0)
update |= affecting.receive_damage(0, dmg)
playsound(src, 'sound/items/welder.ogg', 50, TRUE)
if("tox")
M.mech_toxin_damage(src)
Expand Down
Loading