cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10898 from Heroman3003/incorporeal-fires

Browse Source 
Makes incorporeal things properly immune to bonfires and lava (and tram and elevator...)
This commit is contained in:
Aronai Sieyes
2021-07-05 16:24:54 -04:00
committed by GitHub
parent 72b8c0a3ed 3d9dcddec6
commit 27ddf4ea97
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/bonfire.dm
+3 -2
View File
@@ -180,8 +180,9 @@
O.fire_act(null, 1000, 500)
else if(isliving(A) && get_fuel_amount() > 4)
var/mob/living/L = A
L.adjust_fire_stacks(get_fuel_amount() / 4)
L.IgniteMob()
if(!(L.is_incorporeal()))
L.adjust_fire_stacks(get_fuel_amount() / 4)
L.IgniteMob()
/obj/structure/bonfire/update_icon()
cut_overlays()