shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11410 from necromanceranne/harvesters_and_mechs

Browse Source 
Ports tg#44633: Fixes blood beam oneshotting mech pilots.
This commit is contained in:
Ghom
2020-03-12 00:28:03 +01:00
committed by GitHub
parent 5c4663d364 8caea8e83a
commit 199272ca9d
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/mecha_defense.dm
+1 -5
View File
@@ -320,11 +320,7 @@
clearInternalDamage(MECHA_INT_CONTROL_LOST) clearInternalDamage(MECHA_INT_CONTROL_LOST)
/obj/mecha/narsie_act() /obj/mecha/narsie_act()
if(occupant) emp_act(EMP_HEAVY)
var/mob/living/L = occupant
go_out(TRUE)
if(L)
L.narsie_act()
/obj/mecha/ratvar_act() /obj/mecha/ratvar_act()
if((GLOB.ratvar_awakens || GLOB.clockwork_gateway_activated) && occupant) if((GLOB.ratvar_awakens || GLOB.clockwork_gateway_activated) && occupant)