cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

WELDER fixed

Browse Source 
- 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:
baloh.matevz
2011-02-09 23:54:18 +00:00
parent c322b605b3
commit f82dbfe28d
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/recycling/disposal-construction.dm
View File

@@ -132,7 +132,7 @@
else if(istype(I, /obj/item/weapon/weldingtool)) else if(istype(I, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = I 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) playsound(src.loc, 'Welder2.ogg', 100, 1)
user << "Welding the pipe in place." user << "Welding the pipe in place."
if(do_after(user, 20)) if(do_after(user, 20))

2
code/WorkInProgress/recycling/disposal.dm
View File

@@ -685,7 +685,7 @@
var/obj/item/weapon/weldingtool/W = I var/obj/item/weapon/weldingtool/W = I
if(W.welding) if(W.welding)
if(W.remove_fuel(3)) if(W.remove_fuel(3,user))
playsound(src.loc, 'Welder2.ogg', 100, 1) playsound(src.loc, 'Welder2.ogg', 100, 1)
// check if anything changed over 2 seconds // check if anything changed over 2 seconds
var/turf/uloc = user.loc var/turf/uloc = user.loc

4
code/game/objects/items/weapons/tools.dm
View File

@@ -211,7 +211,7 @@ WELDINGTOOOL
reagents.remove_reagent("fuel", amount) reagents.remove_reagent("fuel", amount)
check_status() check_status()
if(M) 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 return 1
else else
if(M) if(M)
@@ -256,7 +256,7 @@ WELDINGTOOOL
eyecheck(mob/user as mob)//TODO:Move this over to /mob/ where it should be eyecheck(mob/user as mob)//TODO:Move this over to /mob/ where it should be
//check eye protection //check eye protection
if(!ishuman() && !ismonkey()) if(!ishuman(user) && !ismonkey(user))
return 1 return 1
var/safety = 0 var/safety = 0
if (istype(user, /mob/living/carbon/human)) if (istype(user, /mob/living/carbon/human))

2
code/modules/power/apc.dm
View File

@@ -366,7 +366,7 @@
user << "\blue You need more welding fuel to complete this task." user << "\blue You need more welding fuel to complete this task."
return return
user << "You start welding APC frame..." user << "You start welding APC frame..."
if(W:remove_fuel(2)) if(W:remove_fuel(2,user))
playsound(src.loc, 'Welder.ogg', 50, 1) playsound(src.loc, 'Welder.ogg', 50, 1)
if(do_after(user, 50)) if(do_after(user, 50))
if (emagged || malfhack || (stat & BROKEN) || opened==2) if (emagged || malfhack || (stat & BROKEN) || opened==2)

4
code/modules/power/singularity/emitter.dm
View File

@@ -143,7 +143,7 @@
user << "\red The [src.name] needs to be wrenched to the floor." user << "\red The [src.name] needs to be wrenched to the floor."
return return
if(1) if(1)
if (W:remove_fuel(2)) if (W:remove_fuel(2,user))
playsound(src.loc, 'Welder2.ogg', 50, 1) playsound(src.loc, 'Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \ user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
"You start to weld the [src] 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." user << "\blue You need more welding fuel to complete this task."
return return
if(2) if(2)
if (W:remove_fuel(2)) if (W:remove_fuel(2,user))
playsound(src.loc, 'Welder2.ogg', 50, 1) playsound(src.loc, 'Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \ 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.", \ "You start to cut the [src] free from the floor.", \