Added reminder message for deathsquad armored squad. Also, new deathsquad helmet, now with more space protection.

Added Seraph exosuit. A command-type marauder with slightly better stats and different equipment. Found in CentCom.
Changed Marauder access to centcom special ops. Marauders now come equipped with an armor booster module.
When entering exosuits, the exosuit will now face in the appropriate direction. Affects Durand, Gygax, and Phazon.
Minor changes to CentCom.
Fixed a minor bug with respawn character. It should no longer report character destroyed for object completion for brand-new characters.
Fixed gas mask icons for monkeys.
Nerfed monkey vent crawling. Monkey needs to be naked to crawl through vents. And not hold anything in their hands/paws.
Merged CentCom with z-level 6 (hand tele adjusted for z level 2). Deleted ship building docks since they are not used. Z-level 6 left empty.
Detectives can now name their gun. Right click to use the verb, when holding the item.
Energy swords/cutlasses will properly change icons now when activated or deactivated. Same with energy axes. Changed some melee weapon paths a bit to accomodate this (and so they're easier to track).
Replaced cigar icons with sprites by Matty. Made matches smaller.
Added a welder and assassin costumes to admin equip list.

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

code/game/objects/closets/secure/personal.dm

@@ -47,12 +47,12 @@
 				src.desc = "Owned by [I.registered]."
 		else
 			user << "\red Access Denied"
-	else if( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/blade)) && !src.broken)
+	else if( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken)
 		broken = 1
 		locked = 0
 		desc = "It appears to be broken."
 		icon_state = src.icon_broken
-		if(istype(W, /obj/item/weapon/blade))
+		if(istype(W, /obj/item/weapon/melee/energy/blade))
 			var/datum/effects/system/spark_spread/spark_system = new /datum/effects/system/spark_spread()
 			spark_system.set_up(5, 0, src.loc)
 			spark_system.start()

code/game/objects/closets/secure/security.dm

@@ -13,7 +13,7 @@
 	new /obj/item/clothing/suit/armor/vest(src)
 	new /obj/item/clothing/head/helmet(src)
 	new /obj/item/clothing/glasses/sunglasses(src)
-	new /obj/item/weapon/baton(src)
+	new /obj/item/weapon/melee/baton(src)
 	return
 
 /obj/secure_closet/security1/proc/prison_break()
@@ -73,7 +73,7 @@
 	new /obj/item/weapon/storage/id_kit( src )
 	new /obj/item/weapon/storage/flashbang_kit(src)
 	new /obj/item/weapon/handcuffs(src)
-	new /obj/item/weapon/baton(src)
+	new /obj/item/weapon/melee/baton(src)
 	return
 
 /obj/secure_closet/injection/New()

code/game/objects/closets/thunderdome.dm

@@ -8,15 +8,15 @@
 	new /obj/item/clothing/suit/armor/tdome/red(src)
 	new /obj/item/clothing/suit/armor/tdome/red(src)
 	new /obj/item/clothing/suit/armor/tdome/red(src)
-	new /obj/item/weapon/sword(src)
-	new /obj/item/weapon/sword(src)
-	new /obj/item/weapon/sword(src)
+	new /obj/item/weapon/melee/energy/sword(src)
+	new /obj/item/weapon/melee/energy/sword(src)
+	new /obj/item/weapon/melee/energy/sword(src)
 	new /obj/item/weapon/gun/energy/laser(src)
 	new /obj/item/weapon/gun/energy/laser(src)
 	new /obj/item/weapon/gun/energy/laser(src)
-	new /obj/item/weapon/baton(src)
-	new /obj/item/weapon/baton(src)
-	new /obj/item/weapon/baton(src)
+	new /obj/item/weapon/melee/baton(src)
+	new /obj/item/weapon/melee/baton(src)
+	new /obj/item/weapon/melee/baton(src)
 	new /obj/item/weapon/storage/flashbang_kit(src)
 	new /obj/item/weapon/storage/flashbang_kit(src)
 	new /obj/item/weapon/storage/flashbang_kit(src)
@@ -30,15 +30,15 @@
 	new /obj/item/clothing/suit/armor/tdome/green(src)
 	new /obj/item/clothing/suit/armor/tdome/green(src)
 	new /obj/item/clothing/suit/armor/tdome/green(src)
-	new /obj/item/weapon/sword(src)
-	new /obj/item/weapon/sword(src)
-	new /obj/item/weapon/sword(src)
+	new /obj/item/weapon/melee/energy/sword(src)
+	new /obj/item/weapon/melee/energy/sword(src)
+	new /obj/item/weapon/melee/energy/sword(src)
 	new /obj/item/weapon/gun/energy/laser(src)
 	new /obj/item/weapon/gun/energy/laser(src)
 	new /obj/item/weapon/gun/energy/laser(src)
-	new /obj/item/weapon/baton(src)
-	new /obj/item/weapon/baton(src)
-	new /obj/item/weapon/baton(src)
+	new /obj/item/weapon/melee/baton(src)
+	new /obj/item/weapon/melee/baton(src)
+	new /obj/item/weapon/melee/baton(src)
 	new /obj/item/weapon/storage/flashbang_kit(src)
 	new /obj/item/weapon/storage/flashbang_kit(src)
 	new /obj/item/weapon/storage/flashbang_kit(src)

code/game/objects/devices/PDA/uplink.dm

@@ -140,7 +140,7 @@
 			if("sword")
 				if (uses >= 4)
 					uses -= 4
-					new /obj/item/weapon/sword(get_turf(hostpda))
+					new /obj/item/weapon/melee/energy/sword(get_turf(hostpda))
 			if("bomb")
 				if (uses >= 2)
 					uses -= 2

code/game/objects/items.dm

@@ -441,8 +441,8 @@
 		istype(W, /obj/item/clothing/mask/cigarette) && W:lit     || \
 		istype(W, /obj/item/weapon/wirecutters)                   || \
 		istype(W, /obj/item/weapon/circular_saw)                  || \
-		istype(W, /obj/item/weapon/sword)            && W:active  || \
-		istype(W, /obj/item/weapon/blade)                         || \
+		istype(W, /obj/item/weapon/melee/energy/sword)            && W:active  || \
+		istype(W, /obj/item/weapon/melee/energy/blade)                         || \
 		istype(W, /obj/item/weapon/shovel)                        || \
 		istype(W, /obj/item/weapon/kitchenknife)                  || \
 		istype(W, /obj/item/weapon/scalpel)                       || \

code/game/objects/items/clothing.dm

@@ -353,7 +353,7 @@ THERMAL GLASSES
 	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
 	armor = list(melee = 40, bullet = 30, laser = 20, taser = 15, bomb = 25, bio = 10, rad = 10)
-	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/gun,/obj/item/weapon/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/gun,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
 	slowdown = 9
 	var/fuel = 0
 	var/list/togglearmor = list(melee = 90, bullet = 70, laser = 60, taser = 40, bomb = 75, bio = 75, rad = 75)

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

@@ -318,6 +318,25 @@ var/const/PROJECTILE_DART = 8
 						return 1
 					M << "\red You just don't feel cool enough to use this gun looking like that."
 				return 0
+
+			verb
+				rename_gun()
+					set name = "Name Gun"
+					set desc = "Click to rename your gun. If you're the detective."
+
+					var/mob/U = usr
+					if(ishuman(U)&&U.mind&&U.mind.assigned_role=="Detective")
+						var/input = input("What do you want to name the gun?",,"")
+						input = sanitize(input)
+						if(input)
+							if(in_range(U,src)&&(!isnull(src))&&!U.stat)
+								name = input
+								U << "You name the gun [input]. Say hello to your new friend."
+							else
+								U << "\red Can't let you do that, detective!"
+					else
+						U << "\red You don't feel cool enough to name this gun, chump."
+
 		mateba
 			name = "mateba"
 			desc = "When you absolutely, positively need a 10mm hole in the other guy. Uses .357 ammo."

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

@@ -571,7 +571,7 @@ CLIPBOARDS
 			del(src)
 			return
 		if("sword")
-			var/obj/item/weapon/sword/W = new /obj/item/weapon/sword( M )
+			var/obj/item/weapon/melee/energy/sword/W = new /obj/item/weapon/melee/energy/sword( M )
 			if (M.hand)
 				M.l_hand = W
 			else
@@ -582,7 +582,7 @@ CLIPBOARDS
 			del(src)
 			return
 		if("axe")
-			var/obj/item/weapon/axe/W = new /obj/item/weapon/axe( M )
+			var/obj/item/weapon/melee/energy/axe/W = new /obj/item/weapon/melee/energy/axe( M )
 			if (M.hand)
 				M.l_hand = W
 			else

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

@@ -10,43 +10,43 @@ STUN BATON
 
 
 // SWORD
-/obj/item/weapon/sword/attack(target as mob, mob/user as mob)
+/obj/item/weapon/melee/energy/sword/attack(target as mob, mob/user as mob)
 	..()
 
-/obj/item/weapon/sword/New()
+/obj/item/weapon/melee/energy/sword/New()
 	color = pick("red","blue","green","purple")
 
-/obj/item/weapon/sword/attack_self(mob/living/user as mob)
+/obj/item/weapon/melee/energy/sword/attack_self(mob/living/user as mob)
 	if ((user.mutations & CLOWN) && prob(50))
 		user << "\red You accidentally cut yourself with [src]."
 		user.take_organ_damage(5,5)
-	src.active = !( src.active )
-	if (src.active)
-		user << "\blue [src] is now active."
-		src.force = 30
-		if(istype(src,/obj/item/weapon/sword/pirate))
-			src.icon_state = "cutlass1"
+	active = !active
+	if (active)
+		force = 30
+		if(istype(src,/obj/item/weapon/melee/energy/sword/pirate))
+			icon_state = "cutlass1"
 		else
-			src.icon_state = "sword[color]"
-		src.w_class = 4
+			icon_state = "sword[color]"
+		w_class = 4
 		playsound(user, 'saberon.ogg', 50, 1)
+		user << "\blue [src] is now active."
 	else
-		user << "\blue [src] can now be concealed."
-		src.force = 3
-		if(istype(src,/obj/item/weapon/sword/pirate))
-			src.icon_state = "cutlass0"
+		force = 3
+		if(istype(src,/obj/item/weapon/melee/energy/sword/pirate))
+			icon_state = "cutlass0"
 		else
-			src.icon_state = "sword0"
-		src.w_class = 2
+			icon_state = "sword0"
+		w_class = 2
 		playsound(user, 'saberoff.ogg', 50, 1)
-	src.add_fingerprint(user)
+		user << "\blue [src] can now be concealed."
+	add_fingerprint(user)
 	return
 
-/obj/item/weapon/sword/green
+/obj/item/weapon/melee/energy/sword/green
 	New()
 		color = "green"
 
-/obj/item/weapon/sword/red
+/obj/item/weapon/melee/energy/sword/red
 	New()
 		color = "red"
 
@@ -54,26 +54,26 @@ STUN BATON
 // BLADE
 //Most of the other special functions are handled in their own files.
 
-/obj/item/weapon/blade/New()
+/obj/item/weapon/melee/energy/blade/New()
 	spark_system = new /datum/effects/system/spark_spread()
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
 	return
 
-/obj/item/weapon/blade/dropped()
+/obj/item/weapon/melee/energy/blade/dropped()
 	del(src)
 	return
 
-/obj/item/weapon/blade/proc/throw()
+/obj/item/weapon/melee/energy/blade/proc/throw()
 	del(src)
 	return
 
 // AXE
 
-/obj/item/weapon/axe/attack(target as mob, mob/user as mob)
+/obj/item/weapon/melee/energy/axe/attack(target as mob, mob/user as mob)
 	..()
 
-/obj/item/weapon/axe/attack_self(mob/user as mob)
+/obj/item/weapon/melee/energy/axe/attack_self(mob/user as mob)
 	src.active = !( src.active )
 	if (src.active)
 		user << "\blue The axe is now energised."
@@ -90,13 +90,13 @@ STUN BATON
 
 // STUN BATON
 
-/obj/item/weapon/baton/update_icon()
+/obj/item/weapon/melee/baton/update_icon()
 	if(src.status)
 		icon_state = "stunbaton_active"
 	else
 		icon_state = "stunbaton"
 
-/obj/item/weapon/baton/attack_self(mob/user as mob)
+/obj/item/weapon/melee/baton/attack_self(mob/user as mob)
 	src.status = !( src.status )
 	if ((usr.mutations & CLOWN) && prob(50))
 		usr << "\red You grab the stunbaton on the wrong side."
@@ -113,7 +113,7 @@ STUN BATON
 	src.add_fingerprint(user)
 	return
 
-/obj/item/weapon/baton/attack(mob/M as mob, mob/user as mob)
+/obj/item/weapon/melee/baton/attack(mob/M as mob, mob/user as mob)
 	if ((usr.mutations & CLOWN) && prob(50))
 		usr << "\red You grab the stunbaton on the wrong side."
 		usr.weakened += 30
@@ -199,14 +199,14 @@ STUN BATON
 		for(var/mob/O in viewers(M))
 			if (O.client)	O.show_message("\red <B>[M] has been stunned with the stun baton by [user]!</B>", 1, "\red You hear someone fall", 2)
 
-/obj/item/weapon/baton/emp_act(severity)
+/obj/item/weapon/melee/baton/emp_act(severity)
 	switch(severity)
 		if(1)
 			src.charges = 0
 		if(2)
 			charges -= 5
 
-/obj/item/weapon/classic_baton/attack(mob/M as mob, mob/living/user as mob)
+/obj/item/weapon/melee/classic_baton/attack(mob/M as mob, mob/living/user as mob)
 	if ((user.mutations & CLOWN) && prob(50))
 		user << "\red You club yourself over the head."
 		user.weakened = max(3 * force, user.weakened)

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

@@ -29,7 +29,7 @@ Frequency:
 	if (usr.stat || usr.restrained())
 		return
 	var/turf/current_location = get_turf(usr)//What turf is the user on?
-	if(!current_location||current_location.z==6)//If turf was not found or they're on z level 6.
+	if(!current_location||current_location.z==2)//If turf was not found or they're on z level 2.
 		usr << "The [src] is malfunctioning."
 		return
 	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))))
@@ -104,7 +104,7 @@ Frequency:
 
 /obj/item/weapon/hand_tele/attack_self(mob/user as mob)
 	var/turf/current_location = get_turf(user)//What turf is the user on?
-	if(!current_location||current_location.z==6)//If turf was not found or they're on z level 6.
+	if(!current_location||current_location.z==2)//If turf was not found or they're on z level 2.
 		user << "The [src] is malfunctioning."
 		return
 	var/list/L = list(  )

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

@@ -135,7 +135,7 @@ SYNDICATE UPLINK
 				if("sword")
 					if (src.uses >= 4)
 						src.uses -= 4
-						new /obj/item/weapon/sword(get_turf(src))
+						new /obj/item/weapon/melee/energy/sword(get_turf(src))
 				if("bomb")
 					if (src.uses >= 2)
 						src.uses -= 2

code/game/objects/secstorage/secstorage.dm

@@ -94,14 +94,14 @@
 
 /obj/item/weapon/secstorage/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()
-	if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/blade)) && (src.locked == 1) && (!src.emagged))
+	if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && (src.locked == 1) && (!src.emagged))
 		emagged = 1
 		src.overlays += image('storage.dmi', icon_sparking)
 		sleep(6)
 		src.overlays = null
 		overlays += image('storage.dmi', icon_locking)
 		locked = 0
-		if(istype(W, /obj/item/weapon/blade))
+		if(istype(W, /obj/item/weapon/melee/energy/blade))
 			var/datum/effects/system/spark_spread/spark_system = new /datum/effects/system/spark_spread()
 			spark_system.set_up(5, 0, src.loc)
 			spark_system.start()

code/game/objects/secure_closets.dm

@@ -167,12 +167,12 @@
 	else if(src.broken)
 		user << "\red It appears to be broken."
 		return
-	else if( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/blade)) && !src.broken)
+	else if( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken)
 		broken = 1
 		locked = 0
 		desc = "It appears to be broken."
 		icon_state = src.icon_broken
-		if(istype(W, /obj/item/weapon/blade))
+		if(istype(W, /obj/item/weapon/melee/energy/blade))
 			var/datum/effects/system/spark_spread/spark_system = new /datum/effects/system/spark_spread()
 			spark_system.set_up(5, 0, src.loc)
 			spark_system.start()

code/game/objects/storage/crates.dm

@@ -247,7 +247,7 @@
 		overlays = null
 		overlays += redlight
 		return
-	else if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/blade)) && locked &&!broken)
+	else if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && locked &&!broken)
 		overlays = null
 		overlays += emag
 		overlays += sparks

code/game/objects/tables_racks.dm

@@ -138,7 +138,7 @@ TABLE AND RACK OBJECT INTERATIONS
 	if(isrobot(user))
 		return
 
-	if(istype(W, /obj/item/weapon/blade))
+	if(istype(W, /obj/item/weapon/melee/energy/blade))
 		var/datum/effects/system/spark_spread/spark_system = new /datum/effects/system/spark_spread()
 		spark_system.set_up(5, 0, src.loc)
 		spark_system.start()
@@ -179,7 +179,7 @@ TABLE AND RACK OBJECT INTERATIONS
 		return
 	if(isrobot(user))
 		return
-	if(istype(W, /obj/item/weapon/blade))
+	if(istype(W, /obj/item/weapon/melee/energy/blade))
 		var/datum/effects/system/spark_spread/spark_system = new /datum/effects/system/spark_spread()
 		spark_system.set_up(5, 0, src.loc)
 		spark_system.start()
@@ -248,7 +248,7 @@ TABLE AND RACK OBJECT INTERATIONS
 	if(isrobot(user))
 		return
 
-	if(istype(W, /obj/item/weapon/blade))
+	if(istype(W, /obj/item/weapon/melee/energy/blade))
 		var/datum/effects/system/spark_spread/spark_system = new /datum/effects/system/spark_spread()
 		spark_system.set_up(5, 0, src.loc)
 		spark_system.start()