cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Mechas no longer get their attack cooldowns taken up by clicking the floor, and phazons finally deal burn on the burn mode

* lewc cooldown timer review
This commit is contained in:
1080pCat
2025-01-27 04:13:31 +00:00
committed by GitHub
parent fd76dcdc40
commit c18ef364e6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/mecha.dm
+6 -6
View File
@@ -90,7 +90,7 @@
var/destruction_sleep_duration = 2 SECONDS //Time that mech pilot is put to sleep for if mech is destroyed
var/melee_cooldown = 10
var/melee_can_hit = TRUE
var/mecha_melee_cooldown = FALSE
/// How many ion thrusters we got on this bad boy
var/thruster_count = 0
@@ -263,12 +263,12 @@
else
if(internal_damage & MECHA_INT_CONTROL_LOST)
target = safepick(oview(1, src))
if(!melee_can_hit || !isatom(target))
if(mecha_melee_cooldown || !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)
mecha_melee_cooldown = TRUE
addtimer(VARSET_CALLBACK(src, mecha_melee_cooldown, FALSE), melee_cooldown)
/obj/mecha/proc/mech_toxin_damage(mob/living/target)
playsound(src, 'sound/effects/spray2.ogg', 50, 1)
code/modules/mob/living/carbon/human/human_defense.dm
+1 -1
View File
@@ -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)