From 93d7aa68c29f8016ef30afd7db4998ee4314bfd0 Mon Sep 17 00:00:00 2001
From: ikarrus <ericgfwong@hotmail.com>
Date: Sat, 6 Sep 2014 10:06:17 -0600
Subject: [PATCH] Consistent welding sounds

Starting a weld job will always play welder.ogg
Finishing a weld job will always play welder2.ogg

Closets and airlocks were backwards.
---
 code/ATMOSPHERICS/components/unary/vent_pump.dm        | 1 +
 code/game/machinery/doors/airlock.dm                   | 4 ++--
 code/game/objects/structures/crates_lockers/closets.dm | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm
index 837e70ef4eb..06b9c4ce5d2 100644
--- a/code/ATMOSPHERICS/components/unary/vent_pump.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm
@@ -281,6 +281,7 @@
 	if(istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
 		if (WT.remove_fuel(0,user))
+			playsound(loc, 'sound/items/Welder.ogg', 40, 1)
 			user << "<span class='notice'>Now welding the vent.</span>"
 			if(do_after(user, 20))
 				if(!src || !WT.isOn()) return
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index efa7140e7fb..13e5221017d 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -889,11 +889,11 @@ About the new airlock wires panel:
 	if((istype(C, /obj/item/weapon/weldingtool) && !( src.operating ) && src.density))
 		var/obj/item/weapon/weldingtool/W = C
 		user << "<span class='notice'>You begin [welded ? "unwelding":"welding"] the airlock...</span>"
-		playsound(loc, 'sound/items/Welder2.ogg', 40, 1)
+		playsound(loc, 'sound/items/Welder.ogg', 40, 1)
 		if(do_after(user,40,5,1))
 			if(density && !operating)//Door must be closed to weld.
 				if(W.remove_fuel(0,user))
-					playsound(loc, 'sound/items/welder.ogg', 50, 1)
+					playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
 					welded = !welded
 					user << "<span class='notice'>You [welded ? "welded the airlock shut":"unwelded the airlock"]</span>"
 					update_icon()
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 1ce6e22f988..9c772d349b2 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -180,11 +180,11 @@
 		if(istype(W, /obj/item/weapon/weldingtool))
 			var/obj/item/weapon/weldingtool/WT = W
 			user << "<span class='notice'>You begin cutting the [src] apart...</span>"
-			playsound(loc, 'sound/items/Welder2.ogg', 40, 1)
+			playsound(loc, 'sound/items/Welder.ogg', 40, 1)
 			if(do_after(user,40,5,1))
 				if(src.opened)
 					if(WT.remove_fuel(0,user))
-						playsound(loc, 'sound/items/welder.ogg', 50, 1)
+						playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
 						new /obj/item/stack/sheet/metal(src.loc)
 						for(var/mob/M in viewers(src))
 							M.show_message("<span class='notice'>\The [src] has been cut apart by [user] with \the [WT].</span>", 3, "You hear welding.", 2)