From 96354bb56d3c0dc939b21bfad9a94c898aecd369 Mon Sep 17 00:00:00 2001
From: Robson Richards <toiletbrush95@gmail.com>
Date: Thu, 19 Jun 2014 16:13:10 +0100
Subject: [PATCH] Lockers now take 40 ticks to weld + Sounds + Feedback
 messages Minor reformat of code for Locker welding

---
 code/game/machinery/doors/airlock.dm          | 14 ++++++--------
 .../structures/crates_lockers/closets.dm      | 19 ++++++++++++-------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 2caa118eb63..b1ab5887bd9 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -883,15 +883,13 @@ About the new airlock wires panel:
 		if(do_after(user,40,5,1))
 			if(W.remove_fuel(0,user))
 				playsound(loc, 'sound/items/welder.ogg', 50, 1)
-				if(!src.welded)
-					src.welded = 1
-				else
-					src.welded = null
+				welded = !welded
 				user << "<span class='notice'>You [welded ? "welded the airlock shut":"unwelded the airlock"]</span>"
-				src.update_icon()
-			return
-		else
-			return
+				update_icon()
+				user.visible_message("<span class='warning'>[src] has been [welded? "welded shut":"unwelded"] by [user.name].</span>")
+			else
+				user << "<span class='notice'>You need more welding fuel to complete this task.</span>"
+		return
 	else if(istype(C, /obj/item/weapon/screwdriver))
 		src.p_open = !( src.p_open )
 		user << "<span class='notice'>You [p_open ? "open":"close"] the maintenance panel of the airlock.</span>"
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 97d55bedaab..de0021c4f96 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -198,13 +198,18 @@
 		return
 	else if(istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
-		if(!WT.remove_fuel(0,user))
-			user << "<span class='notice'>You need more welding fuel to complete this task.</span>"
-			return
-		src.welded =! src.welded
-		src.update_icon()
-		for(var/mob/M in viewers(src))
-			M.show_message("<span class='warning'>[src] has been [welded?"welded shut":"unwelded"] by [user.name].</span>", 3, "You hear welding.", 2)
+		user << "<span class='notice'>You begin [welded ? "unwelding":"welding"] the [src]...</span>"
+		playsound(loc, 'sound/items/Welder2.ogg', 40, 1)
+		if(do_after(user,40,5,1))
+			if(WT.remove_fuel(0,user))
+				playsound(loc, 'sound/items/welder.ogg', 50, 1)
+				welded = !welded
+				user << "<span class='notice'>You [welded ? "welded the [src] shut":"unwelded the [src]"]</span>"
+				update_icon()
+				user.visible_message("<span class='warning'>[src] has been [welded? "welded shut":"unwelded"] by [user.name].</span>")
+			else
+				user << "<span class='notice'>You need more welding fuel to complete this task.</span>"
+		return
 	else if(!place(user, W))
 		src.attack_hand(user)
 	return