Fixed a light issue in Security Maintenance (thanks to muskets).

Update to Bridge.
More updates to CentCom. Added doors (elevator sprite) to CentCom but they are inaccessible at the moment.
Added new weapon sounds: blaster, laser, pulse, wave, emitter, and one for the marauder canon. Not all are used at the moment.
New sounds for the energy sword on and off states (they're unlicensed, I promise).
Added/changed alien attack sounds.
Added some more messages for aliens attacking mechs.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@700 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/machinery/doors/airlock.dm

@@ -120,6 +120,12 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 	opacity = 0
 	doortype = 7
 
+/obj/machinery/door/airlock/centcom
+	name = "Airlock"
+	icon = 'Doorele.dmi'
+	opacity = 0
+	doortype = 8
+
 /*
 About the new airlock wires panel:
 *	An airlock wire dialog can be accessed by the normal way or by using wirecutters or a multitool on the door while the wire-panel is open. This would show the following wires, which you can either wirecut/mend or send a multitool pulse through. There are 9 wires.

code/game/machinery/singularity.dm

@@ -27,7 +27,7 @@ However people seem to like it for some reason.
 
 /obj/machinery/the_singularitygen/attackby(obj/item/W, mob/user)
 	if(istype(W, /obj/item/weapon/wrench))
-		anchored = !anchored 
+		anchored = !anchored
 		playsound(src.loc, 'Ratchet.ogg', 75, 1)
 		if(anchored)
 			user.visible_message("[user.name] secure [src.name] to the floor.", \
@@ -86,7 +86,7 @@ However people seem to like it for some reason.
 			del(src) //TODO: some animation
 			return
 		if(2.0 to 3.0) //no way
-			return 
+			return
 	return
 
 /obj/machinery/the_singularity/process()
@@ -125,7 +125,7 @@ However people seem to like it for some reason.
 		move()
 		spawn(5)
 			move()
-	
+
 
 
 /obj/machinery/the_singularity
@@ -136,7 +136,7 @@ However people seem to like it for some reason.
 		/turf/space, \
 		/obj/effects, \
 		/obj/beam, /* not sure*/ \
-		/obj/overlay 
+		/obj/overlay
 	)
 
 /obj/machinery/the_singularity/proc/is_eatable(atom/X)
@@ -151,7 +151,7 @@ However people seem to like it for some reason.
 			continue
 		if (!is_eatable(X))
 			continue
-				
+
 		if(istype(X,/obj/machinery/field_generator))
 			var/obj/machinery/field_generator/F = X
 			if(F.active)
@@ -267,7 +267,7 @@ However people seem to like it for some reason.
 	)
 
 //looks like I need new function istypefromlist
-/obj/machinery/the_singularity/proc/is_strippable(turf/simulated/X) 
+/obj/machinery/the_singularity/proc/is_strippable(turf/simulated/X)
 	for(var/Type in unstrippable)
 		if (istype(X,Type))
 			return 0
@@ -626,7 +626,7 @@ However people seem to like it for some reason.
 		use_power(1000)
 		var/obj/beam/a_laser/A = new /obj/beam/a_laser( src.loc )
 		A.icon_state = "u_laser"
-		playsound(src.loc, 'Laser.ogg', 75, 1)
+		playsound(src.loc, 'emitter.ogg', 75, 1)
 
 		if(prob(35))
 			var/datum/effects/system/spark_spread/s = new /datum/effects/system/spark_spread
@@ -682,7 +682,7 @@ However people seem to like it for some reason.
 		else
 			user << "\red [src] is welded to the floor!"
 			return 1
-			
+
 	else if(istype(W, /obj/item/weapon/weldingtool) && W:welding)
 		if (state == 0)
 			user << "\red The emitter needs to be wrenched to the floor first."
@@ -923,7 +923,7 @@ However people seem to like it for some reason.
 	S = list()
 	for(var/obj/machinery/the_singularity/myS in orange(12,src))
 		S += myS
-		
+
 	for (var/ca_dir in cardinal)
 		var/obj/machinery/power/collector_array/newCA = locate() in get_step(src,ca_dir)
 		if (isnull(newCA))
@@ -1032,7 +1032,7 @@ However people seem to like it for some reason.
 			return 1
 
 		playsound(src.loc, 'Ratchet.ogg', 75, 1)
-		src.anchored = !src.anchored 
+		src.anchored = !src.anchored
 		if(src.anchored == 1)
 			user.visible_message("[user.name] secure [src.name] to the floor.", \
 				"You secure the [src.name] to the floor.", \

code/game/mecha/combat/weapons/weapons.dm

@@ -115,7 +115,7 @@
 		if (targloc == curloc)
 			return
 
-		playsound(chassis, 'Laser.ogg', 50, 1)
+		playsound(chassis, 'marauder.ogg', 50, 1)
 		var/obj/beam/a_laser/A = new /obj/beam/a_laser/pulse_laser(curloc)
 		A.current = curloc
 		A.yo = targloc.y - curloc.y

code/game/mecha/mecha.dm

@@ -213,9 +213,17 @@
 /obj/mecha/attack_alien(mob/user as mob)
 	if(!prob(src.deflect_chance))
 		src.take_damage(15)
-	//TODO: Add text
+		playsound(src.loc, 'slash.ogg', 50, 1, -1)
+		user << "\red You slash at the armored suit!"
+		for (var/mob/V in viewers(src))
+			if(V.client && !(V.blinded))
+				V.show_message("The [user] slashes at [src.name]'s armor!", 1)
 	else
-		user << "No effect"
+		user << "\green Your claws had no effect!"
+		src.occupant_message("\blue The [user]'s claws are stopped by the armor.")
+		for (var/mob/V in viewers(src))
+			if(V.client && !(V.blinded))
+				V.show_message("The [user] rebounds off the [src.name] armor!", 1)
 	return
 
 

code/game/objects/items/weapons/guns_ammo.dm

@@ -60,7 +60,7 @@ TELEPORT GUN
 			return
 
 		var/obj/beam/a_laser/A = new /obj/beam/a_laser/pulse_laser(user.loc)
-		playsound(user, 'Laser.ogg', 50, 1)
+		playsound(user, 'pulse.ogg', 50, 1)
 		A.current = curloc
 		A.yo = targloc.y - curloc.y
 		A.xo = targloc.x - curloc.x
@@ -990,7 +990,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
 			user << "\red *click* *click*";
 			return
 
-		playsound(user, 'Taser.ogg', 50, 1)
+		playsound(user, 'laser3.ogg', 50, 1)
 		src.charges--
 		update_icon()
 

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -30,6 +30,7 @@ STUN BATON
 		else
 			src.icon_state = "sword1"
 		src.w_class = 4
+		playsound(user, 'saberon.ogg', 50, 1)
 	else
 		user << "\blue [src] can now be concealed."
 		src.force = 3
@@ -38,6 +39,7 @@ STUN BATON
 		else
 			src.icon_state = "sword0"
 		src.w_class = 2
+		playsound(user, 'saberoff.ogg', 50, 1)
 	src.add_fingerprint(user)
 	return
 

code/modules/mob/living/carbon/human/human.dm

@@ -1444,7 +1444,7 @@
 				if (src.organs[def_zone])
 					affecting = src.organs[def_zone]
 				if ((istype(affecting, /datum/organ/external) && prob(95)))
-					playsound(src.loc, "punch", 25, 1, -1)
+					playsound(src.loc, 'slice.ogg', 25, 1, -1)
 					for(var/mob/O in viewers(src, null))
 						O.show_message(text("\red <B>[] has slashed at []!</B>", M, src), 1)
 					if (def_zone == "head")
@@ -1469,7 +1469,7 @@
 								if (prob(50))
 									if (src.weakened < 5)
 										src.weakened = 5
-									playsound(src.loc, 'thudswoosh.ogg', 50, 1, -1)
+									playsound(src.loc, 'slashmiss.ogg', 50, 1, -1)
 									for(var/mob/O in viewers(src, null))
 										O.show_message(text("\red <B>[] has tackled down []!</B>", M, src), 1, "\red You hear someone fall.", 2)
 								else
@@ -1504,6 +1504,7 @@
 
 					src.updatehealth()
 				else
+					playsound(src.loc, 'slashmiss.ogg', 50, 1, -1)
 					for(var/mob/O in viewers(src, null))
 						O.show_message(text("\red <B>[M] has lunged at [src] but missed!</B>"), 1)
 					return
@@ -1514,15 +1515,18 @@
 						src.w_uniform.add_fingerprint(M)
 					var/randn = rand(1, 100)
 					if (randn <= 25)
+						playsound(src.loc, 'pierce.ogg', 25, 1, -1)
 						src.weakened = 2
 						for(var/mob/O in viewers(src, null))
 							O.show_message(text("\red <B>[] has tackled over []!</B>", M, src), 1)
 					else
 						if (randn <= 60)
+							playsound(src.loc, 'slash.ogg', 25, 1, -1)
 							src.drop_item()
 							for(var/mob/O in viewers(src, null))
 								O.show_message(text("\red <B>[] has knocked the item out of []'s hand!</B>", M, src), 1)
 						else
+							playsound(src.loc, 'slashmiss.ogg', 50, 1, -1)
 							for(var/mob/O in viewers(src, null))
 								O.show_message(text("\red <B>[] has tried to knock the item out of []'s hand!</B>", M, src), 1)
 	return

code/modules/mob/living/carbon/monkey/monkey.dm

@@ -292,7 +292,7 @@
 					if ((O.client && !( O.blinded )))
 						O.show_message(text("\red <B>[] has slashed [src.name]!</B>", M), 1)
 
-				playsound(src.loc, "punch", 25, 1, -1)
+				playsound(src.loc, 'slice.ogg', 25, 1, -1)
 				var/damage = rand(5, 10)
 				if (prob(40))
 					damage = rand(20, 40)
@@ -306,7 +306,7 @@
 				src.bruteloss += damage
 				src.updatehealth()
 			else
-				playsound(src.loc, 'punchmiss.ogg', 25, 1, -1)
+				playsound(src.loc, 'slashmiss.ogg', 25, 1, -1)
 				for(var/mob/O in viewers(src, null))
 					if ((O.client && !( O.blinded )))
 						O.show_message(text("\red <B>[] has attempted to lunge at [src.name]!</B>", M), 1)
@@ -329,15 +329,14 @@
 					O.show_message(text("\red [] has grabbed [src.name] passively!", M), 1)
 			else
 				if (!( src.paralysis ))
-					if (prob(25))
+					playsound(src.loc, 'pierce.ogg', 25, 1, -1)
+					if(prob(25))
 						src.paralysis = 2
-						playsound(src.loc, 'thudswoosh.ogg', 50, 1, -1)
 						for(var/mob/O in viewers(src, null))
 							if ((O.client && !( O.blinded )))
 								O.show_message(text("\red <B>[] has tackled down [src.name]!</B>", M), 1)
 					else
 						drop_item()
-						playsound(src.loc, 'thudswoosh.ogg', 50, 1, -1)
 						for(var/mob/O in viewers(src, null))
 							if ((O.client && !( O.blinded )))
 								O.show_message(text("\red <B>[] has disarmed [src.name]!</B>", M), 1)

code/modules/mob/living/silicon/hivebot/hivebot.dm

@@ -227,7 +227,7 @@
 					src.weakened = max(src.weakened,4)
 					src.stunned = max(src.stunned,4)
 		*/
-			playsound(src.loc, "punch", 25, 1, -1)
+			playsound(src.loc, 'slash.ogg', 25, 1, -1)
 			for(var/mob/O in viewers(src, null))
 				O.show_message(text("\red <B>[] has slashed at []!</B>", M, src), 1)
 			if(prob(8))
@@ -235,7 +235,7 @@
 			src.bruteloss += damage
 			src.updatehealth()
 		else
-			playsound(src.loc, 'punchmiss.ogg', 25, 1, -1)
+			playsound(src.loc, 'slashmiss.ogg', 25, 1, -1)
 			for(var/mob/O in viewers(src, null))
 				O.show_message(text("\red <B>[] took a swipe at []!</B>", M, src), 1)
 			return
@@ -247,11 +247,11 @@
 				src.stunned = 5
 				step(src,get_dir(M,src))
 				spawn(5) step(src,get_dir(M,src))
-				playsound(src.loc, 'thudswoosh.ogg', 50, 1, -1)
+				playsound(src.loc, 'slash.ogg', 50, 1, -1)
 				for(var/mob/O in viewers(src, null))
 					O.show_message(text("\red <B>[] has pushed back []!</B>", M, src), 1)
 			else
-				playsound(src.loc, 'punchmiss.ogg', 25, 1, -1)
+				playsound(src.loc, 'slashmiss.ogg', 25, 1, -1)
 				for(var/mob/O in viewers(src, null))
 					O.show_message(text("\red <B>[] attempted to push back []!</B>", M, src), 1)
 	return

code/modules/mob/living/silicon/robot/robot.dm

@@ -493,7 +493,7 @@
 					src.stunned = max(src.stunned,4)
 			*/
 
-			playsound(src.loc, "punch", 25, 1, -1)
+			playsound(src.loc, 'slash.ogg', 25, 1, -1)
 			for(var/mob/O in viewers(src, null))
 				O.show_message(text("\red <B>[] has slashed at []!</B>", M, src), 1)
 			if(prob(8))
@@ -501,7 +501,7 @@
 			src.bruteloss += damage
 			src.updatehealth()
 		else
-			playsound(src.loc, 'punchmiss.ogg', 25, 1, -1)
+			playsound(src.loc, 'slashmiss.ogg', 25, 1, -1)
 			for(var/mob/O in viewers(src, null))
 				O.show_message(text("\red <B>[] took a swipe at []!</B>", M, src), 1)
 			return
@@ -513,11 +513,11 @@
 				src.stunned = 5
 				step(src,get_dir(M,src))
 				spawn(5) step(src,get_dir(M,src))
-				playsound(src.loc, 'thudswoosh.ogg', 50, 1, -1)
+				playsound(src.loc, 'slash.ogg', 50, 1, -1)
 				for(var/mob/O in viewers(src, null))
 					O.show_message(text("\red <B>[] has pushed back []!</B>", M, src), 1)
 			else
-				playsound(src.loc, 'punchmiss.ogg', 25, 1, -1)
+				playsound(src.loc, 'slashmiss.ogg', 25, 1, -1)
 				for(var/mob/O in viewers(src, null))
 					O.show_message(text("\red <B>[] attempted to push back []!</B>", M, src), 1)
 	return