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

Merge pull request #7909 from Citinited/nothing-could-go-wrong

Browse Source 
Adds flaming shots and Flaming Moes
This commit is contained in:
Crazy Lemon
2017-09-02 18:53:11 -07:00
committed by GitHub
parent 0467316082 49ca1abc2a
commit 32e665aa97
5 changed files with 102 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+2 -2
View File
@@ -202,7 +202,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
to_chat(user, msg)
/obj/item/attack_hand(mob/user as mob)
/obj/item/attack_hand(mob/user as mob, pickupfireoverride = FALSE)
if(!user) return 0
if(hasorgans(user))
var/mob/living/carbon/human/H = user
@@ -216,7 +216,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
to_chat(user, "<span class='warning'>You try to move your [temp.name], but cannot!</span>")
return 0
if(burn_state == ON_FIRE)
if(burn_state == ON_FIRE && !pickupfireoverride)
var/mob/living/carbon/human/H = user
if(istype(H))
if(H.gloves && (H.gloves.max_heat_protection_temperature > 360))