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

Merge branch 'master' into upstream-merge-37486

Browse Source
This commit is contained in:
LetterJay
2018-05-21 11:59:57 -05:00
committed by GitHub
parent 931a950adb 6489ef5511
commit 359d31238d
228 changed files with 1640 additions and 1643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/lava.dm
+2 -2
View File
@@ -128,8 +128,8 @@
continue
if(iscarbon(L))
var/mob/living/carbon/C = L
var/obj/item/clothing/S = C.get_item_by_slot(slot_wear_suit)
var/obj/item/clothing/H = C.get_item_by_slot(slot_head)
var/obj/item/clothing/S = C.get_item_by_slot(SLOT_WEAR_SUIT)
var/obj/item/clothing/H = C.get_item_by_slot(SLOT_HEAD)
if(S && H && S.clothing_flags & LAVAPROTECT && H.clothing_flags & LAVAPROTECT)
return