mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-15 20:52:41 +00:00
WELDER fixed
- Now hurts your eyes again if you use it unprotected. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1011 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -132,7 +132,7 @@
|
||||
|
||||
else if(istype(I, /obj/item/weapon/weldingtool))
|
||||
var/obj/item/weapon/weldingtool/W = I
|
||||
if(W.remove_fuel(2))
|
||||
if(W.remove_fuel(2,user))
|
||||
playsound(src.loc, 'Welder2.ogg', 100, 1)
|
||||
user << "Welding the pipe in place."
|
||||
if(do_after(user, 20))
|
||||
|
||||
@@ -685,7 +685,7 @@
|
||||
var/obj/item/weapon/weldingtool/W = I
|
||||
|
||||
if(W.welding)
|
||||
if(W.remove_fuel(3))
|
||||
if(W.remove_fuel(3,user))
|
||||
playsound(src.loc, 'Welder2.ogg', 100, 1)
|
||||
// check if anything changed over 2 seconds
|
||||
var/turf/uloc = user.loc
|
||||
|
||||
@@ -211,7 +211,7 @@ WELDINGTOOOL
|
||||
reagents.remove_reagent("fuel", amount)
|
||||
check_status()
|
||||
if(M)
|
||||
eyecheck()//TODO:eyecheck should really be in mob not here
|
||||
eyecheck(M)//TODO:eyecheck should really be in mob not here
|
||||
return 1
|
||||
else
|
||||
if(M)
|
||||
@@ -256,7 +256,7 @@ WELDINGTOOOL
|
||||
|
||||
eyecheck(mob/user as mob)//TODO:Move this over to /mob/ where it should be
|
||||
//check eye protection
|
||||
if(!ishuman() && !ismonkey())
|
||||
if(!ishuman(user) && !ismonkey(user))
|
||||
return 1
|
||||
var/safety = 0
|
||||
if (istype(user, /mob/living/carbon/human))
|
||||
|
||||
@@ -366,7 +366,7 @@
|
||||
user << "\blue You need more welding fuel to complete this task."
|
||||
return
|
||||
user << "You start welding APC frame..."
|
||||
if(W:remove_fuel(2))
|
||||
if(W:remove_fuel(2,user))
|
||||
playsound(src.loc, 'Welder.ogg', 50, 1)
|
||||
if(do_after(user, 50))
|
||||
if (emagged || malfhack || (stat & BROKEN) || opened==2)
|
||||
|
||||
@@ -143,7 +143,7 @@
|
||||
user << "\red The [src.name] needs to be wrenched to the floor."
|
||||
return
|
||||
if(1)
|
||||
if (W:remove_fuel(2))
|
||||
if (W:remove_fuel(2,user))
|
||||
playsound(src.loc, 'Welder2.ogg', 50, 1)
|
||||
user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
|
||||
"You start to weld the [src] to the floor.", \
|
||||
@@ -155,7 +155,7 @@
|
||||
user << "\blue You need more welding fuel to complete this task."
|
||||
return
|
||||
if(2)
|
||||
if (W:remove_fuel(2))
|
||||
if (W:remove_fuel(2,user))
|
||||
playsound(src.loc, 'Welder2.ogg', 50, 1)
|
||||
user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
|
||||
"You start to cut the [src] free from the floor.", \
|
||||
|
||||
Reference in New Issue
Block a user