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

Merge pull request #6086 from Heroman3003/welder-fires

Browse Source 
Fixes self-refueling welders starting fires when off
This commit is contained in:
Neerti
2019-04-15 18:30:15 -04:00
committed by VirgoBot
parent 1fef84eb16
commit 197bedb2eb
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/tools/weldingtool.dm
+8 -9
View File
@@ -121,15 +121,14 @@
remove_fuel(1)
if(get_fuel() < 1)
setWelding(0)
//I'm not sure what this does. I assume it has to do with starting fires...
//...but it doesnt check to see if the welder is on or not.
var/turf/location = src.loc
if(istype(location, /mob/living))
var/mob/living/M = location
if(M.item_is_in_hands(src))
location = get_turf(M)
if (istype(location, /turf))
location.hotspot_expose(700, 5)
else //Only start fires when its on and has enough fuel to actually keep working
var/turf/location = src.loc
if(istype(location, /mob/living))
var/mob/living/M = location
if(M.item_is_in_hands(src))
location = get_turf(M)
if (istype(location, /turf))
location.hotspot_expose(700, 5)
/obj/item/weapon/weldingtool/afterattack(obj/O as obj, mob/user as mob, proximity)
if(!proximity) return