•Softcaps, flippable

•Improved bodybags, also changed sprites. Scream at me if you don't like them, I'll change them back. Also sorry for the 114KB new sound.
•Sorry but I really have to defecate while writing this

•You can find the unused newscaster sprite of my new project in terminals.dmi

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

code/game/objects/bodybag.dm

@@ -39,10 +39,10 @@
 	density = 0
 
 
-	attackby(P as obj, mob/user as mob)
-		if (istype(P, /obj/item/weapon/pen))
+	attackby(W as obj, mob/user as mob)
+		if (istype(W, /obj/item/weapon/pen))
 			var/t = input(user, "What would you like the label to be?", text("[]", src.name), null)  as text
-			if (user.equipped() != P)
+			if (user.equipped() != W)
 				return
 			if (!in_range(src, user) && src.loc != user)
 				return
@@ -50,10 +50,16 @@
 			if (t)
 				src.name = "body bag - "
 				src.name += t
+				src.overlays += image(src.icon, "bodybag_label")
 			else
 				src.name = "body bag"
-		..()
-		return
+		//..() //Doesn't need to run the parent. Since when can fucking bodybags be welded shut? -Agouri
+			return
+		else if(istype(W, /obj/item/weapon/wirecutters))
+			user << "You cut the tag off the bodybag"
+			src.name = "body bag"
+			src.overlays = null
+			return
 
 
 	close()

code/game/objects/closets.dm

@@ -37,7 +37,10 @@
 
 	src.icon_state = src.icon_opened
 	src.opened = 1
-	playsound(src.loc, 'click.ogg', 15, 1, -3)
+	if(istype(src, /obj/structure/closet/body_bag))
+		playsound(src.loc, 'zip.wav', 15, 1, -3)
+	else
+		playsound(src.loc, 'click.ogg', 15, 1, -3)
 	density = 0
 	return 1
 
@@ -64,7 +67,10 @@
 		M.loc = src
 	src.icon_state = src.icon_closed
 	src.opened = 0
-	playsound(src.loc, 'click.ogg', 15, 1, -3)
+	if(istype(src, /obj/structure/closet/body_bag))
+		playsound(src.loc, 'zip.wav', 15, 1, -3)
+	else
+		playsound(src.loc, 'click.ogg', 15, 1, -3)
 	density = 1
 	return 1
 
@@ -130,7 +136,7 @@
 		if(istype(W, /obj/item/weapon/grab))
 			src.MouseDrop_T(W:affecting, user)      //act like they were dragged onto the closet
 
-		if(istype(W, /obj/item/weapon/weldingtool) && W:welding)
+		if(istype(W, /obj/item/weapon/weldingtool) && W:welding )
 			if(!W:remove_fuel(0,user))
 				user << "\blue You need more welding fuel to complete this task."
 				return
@@ -148,7 +154,7 @@
 		if(W)
 			W.loc = src.loc
 
-	else if(istype(W, /obj/item/weapon/weldingtool) && W:welding)
+	else if(istype(W, /obj/item/weapon/weldingtool) && W:welding )
 		if(!W:remove_fuel(0,user))
 			user << "\blue You need more welding fuel to complete this task."
 			return

code/game/objects/items/clothing.dm

@@ -264,6 +264,23 @@ THERMAL GLASSES
 		icon_state = "weldingup"
 		usr << "You push the mask up out of your face."
 
+/obj/item/clothing/head/cargosoft/dropped()
+	src.icon_state = "cargosoft"
+	src.flipped=0
+	..()
+
+/obj/item/clothing/head/cargosoft/verb/flip()
+	set category = "Object"
+	set name = "Flip cap"
+	src.flipped = !src.flipped
+	if(src.flipped)
+		icon_state = "cargosoft_flipped"
+		usr << "You flip the hat backwards."
+	else
+		icon_state = "cargosoft"
+		usr << "You flip the hat back in normal position."
+
+
 /obj/item/clothing/shoes/magboots/verb/toggle()
 	set name = "Toggle Magboots"
 	set category = "Object"