Replaced engineering rig suits with sexy new environment suits, sprites courtesy of Baystation 12.

Fixed Erro's backpack derp- backpacks are wearable once again.

Added a obj/structure ex_act(), blob_act(), and meteorhit().

Made gasmasks block visibility of glasses and ears.

Fixed being able to wear plasma tanks on your back.

Fixed the gas mixer sprite not lining up with horizontal pipes correctly.

Removed a bunch of pointless text()s from a few files. I was going to get rid of all of them, but I gave up after a while. Most of the diffs are this.

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

code/game/objects/alien/resin.dm

@@ -50,7 +50,7 @@
 /obj/effect/alien/resin/hitby(AM as mob|obj)
 	..()
 	for(var/mob/O in viewers(src, null))
-		O.show_message(text("\red <B>[src] was hit by [AM].</B>"), 1)
+		O.show_message("\red <B>[src] was hit by [AM].</B>", 1)
 	var/tforce = 0
 	if(ismob(AM))
 		tforce = 10
@@ -64,9 +64,9 @@
 
 /obj/effect/alien/resin/attack_hand()
 	if ((usr.mutations & HULK))
-		usr << text("\blue You easily destroy the [name].")
+		usr << "\blue You easily destroy the [name]."
 		for(var/mob/O in oviewers(src))
-			O.show_message(text("\red [] destroys the [name]!", usr), 1)
+			O.show_message("\red [usr] destroys the [name]!", 1)
 		health = 0
 	healthcheck()
 	return
@@ -77,15 +77,15 @@
 /obj/effect/alien/resin/attack_alien()
 	if (islarva(usr))//Safety check for larva. /N
 		return
-	usr << text("\green You claw at the [name].")
+	usr << "\green You claw at the [name]."
 	for(var/mob/O in oviewers(src))
-		O.show_message(text("\red [] claws at the resin!", usr), 1)
+		O.show_message("\red [usr] claws at the resin!", 1)
 	playsound(loc, 'attackblob.ogg', 100, 1)
 	health -= rand(10, 20)
 	if(health <= 0)
-		usr << text("\green You slice the [name] to pieces.")
+		usr << "\green You slice the [name] to pieces."
 		for(var/mob/O in oviewers(src))
-			O.show_message(text("\red [] slices the [name] apart!", usr), 1)
+			O.show_message("\red [usr] slices the [name] apart!", 1)
 	healthcheck()
 	return
 

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

@@ -60,7 +60,7 @@
 			playsound(src.loc, 'blade1.ogg', 50, 1)
 			playsound(src.loc, "sparks", 50, 1)
 			for(var/mob/O in viewers(user, 3))
-				O.show_message(text("\blue The locker has been sliced open by [] with an energy blade!", user), 1, text("\red You hear metal being sliced and sparks flying."), 2)
+				O.show_message("\blue The locker has been sliced open by [user] with an energy blade!", 1, "\red You hear metal being sliced and sparks flying.", 2)
 	else
 		user << "\red Access Denied"
 	return

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

@@ -50,15 +50,15 @@
 			playsound(src.loc, 'blade1.ogg', 50, 1)
 			playsound(src.loc, "sparks", 50, 1)
 			for(var/mob/O in viewers(user, 3))
-				O.show_message(text("\blue The locker has been sliced open by [] with an energy blade!", user), 1, text("\red You hear metal being sliced and sparks flying."), 2)
+				O.show_message("\blue The locker has been sliced open by [user] with an energy blade!", 1, "\red You hear metal being sliced and sparks flying.", 2)
 		else
 			for(var/mob/O in viewers(user, 3))
-				O.show_message(text("\blue The locker has been broken by [] with an electromagnetic card!", user), 1, text("You hear a faint electrical spark."), 2)
+				O.show_message("\blue The locker has been broken by [user] with an electromagnetic card!", 1, "You hear a faint electrical spark.", 2)
 	else if(src.allowed(user))
 		src.locked = !src.locked
 		for(var/mob/O in viewers(user, 3))
 			if((O.client && !( O.blinded )))
-				O << text("\blue The locker has been []locked by [].", (src.locked ? null : "un"), user)
+				O << "\blue The locker has been [src.locked ? null : "un"]locked by [user]."
 		if(src.locked)
 			src.icon_state = src.icon_locked
 		else

code/game/objects/structures.dm

@@ -1,6 +1,27 @@
 obj/structure
 	icon = 'structures.dmi'
 
+obj/structure/blob_act()
+	if(prob(50))
+		del(src)
+
+obj/structure/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			del(src)
+			return
+		if(2.0)
+			if(prob(50))
+				del(src)
+				return
+		if(3.0)
+			return
+
+obj/structure/meteorhit(obj/O as obj)
+	del(src)
+
+
+
 /obj/structure/girder
 	icon_state = "girder"
 	anchored = 1

code/game/objects/tables_racks.dm

@@ -39,10 +39,10 @@ TABLE AND RACK OBJECT INTERATIONS
 
 /obj/structure/table/attack_paw(mob/user as mob)
 	if ((usr.mutations & HULK))
-		usr << text("\blue You destroy the table.")
+		usr << "\blue You destroy the table."
 		for(var/mob/O in oviewers())
 			if ((O.client && !( O.blinded )))
-				O << text("\red [] smashes the table apart!", usr)
+				O << "\red [user] smashes the table apart!"
 		if(istype(src, /obj/structure/table/reinforced))
 			new /obj/item/weapon/table_parts/reinforced( src.loc )
 		else if(istype(src, /obj/structure/table/woodentable))
@@ -57,16 +57,16 @@ TABLE AND RACK OBJECT INTERATIONS
 			user.layer = TURF_LAYER
 			for(var/mob/O in oviewers())
 				if ((O.client && !( O.blinded )))
-					O << text("[] hides under the table!", user)
+					O << "[user] hides under the table!"
 				//Foreach goto(69)
 	return
 
 
 /obj/structure/table/attack_alien(mob/user as mob) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N
-	usr << text("\green You destroy the table.")
+	usr << "\green You destroy the table."
 	for(var/mob/O in oviewers())
 		if ((O.client && !( O.blinded )))
-			O << text("\red [] slices the table apart!", user)
+			O << "\red [user] slices the table apart!"
 	if(istype(src, /obj/structure/table/reinforced))
 		new /obj/item/weapon/table_parts/reinforced( src.loc )
 	else if(istype(src, /obj/structure/table/woodentable))
@@ -80,10 +80,10 @@ TABLE AND RACK OBJECT INTERATIONS
 
 /obj/structure/table/attack_animal(mob/living/simple_animal/user as mob) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N
 	if(user.wall_smash)
-		usr << text("\red You destroy the table.")
+		usr << "\red You destroy the table."
 		for(var/mob/O in oviewers())
 			if ((O.client && !( O.blinded )))
-				O << text("\red [] smashes the table apart!", user)
+				O << "\red [user] smashes the table apart!"
 		if(istype(src, /obj/structure/table/reinforced))
 			new /obj/item/weapon/table_parts/reinforced( src.loc )
 		else if(istype(src, /obj/structure/table/woodentable))
@@ -99,10 +99,10 @@ TABLE AND RACK OBJECT INTERATIONS
 
 /obj/structure/table/attack_hand(mob/user as mob)
 	if ((usr.mutations & HULK))
-		usr << text("\blue You destroy the table.")
+		usr << "\blue You destroy the table."
 		for(var/mob/O in oviewers())
 			if ((O.client && !( O.blinded )))
-				O << text("\red [] smashes the table apart!", usr)
+				O << "\red [user] smashes the table apart!"
 		if(istype(src, /obj/structure/table/reinforced))
 			new /obj/item/weapon/table_parts/reinforced( src.loc )
 		else if(istype(src, /obj/structure/table/woodentable))
@@ -145,7 +145,7 @@ TABLE AND RACK OBJECT INTERATIONS
 		G.affecting.Weaken(5)
 		for(var/mob/O in viewers(world.view, src))
 			if (O.client)
-				O << text("\red [] puts [] on the table.", G.assailant, G.affecting)
+				O << "\red [G.assailant] puts [G.affecting] on the table."
 		del(W)
 		return
 
@@ -169,7 +169,7 @@ TABLE AND RACK OBJECT INTERATIONS
 		playsound(src.loc, 'blade1.ogg', 50, 1)
 		playsound(src.loc, "sparks", 50, 1)
 		for(var/mob/O in viewers(user, 4))
-			O.show_message(text("\blue The table was sliced apart by []!", user), 1, text("\red You hear metal coming apart."), 2)
+			O.show_message("\blue The table was sliced apart by [user]!", 1, "\red You hear metal coming apart.", 2)
 		new /obj/item/weapon/table_parts( src.loc )
 		del(src)
 		return
@@ -191,7 +191,7 @@ TABLE AND RACK OBJECT INTERATIONS
 		G.affecting.Weaken(5)
 		for(var/mob/O in viewers(world.view, src))
 			if (O.client)
-				O << text("\red [] puts [] on the wooden table.", G.assailant, G.affecting)
+				O << "\red [G.assailant] puts [G.affecting] on the wooden table."
 		del(W)
 		return
 	if (istype(W, /obj/item/weapon/wrench))
@@ -211,7 +211,7 @@ TABLE AND RACK OBJECT INTERATIONS
 		playsound(src.loc, 'blade1.ogg', 50, 1)
 		playsound(src.loc, "sparks", 50, 1)
 		for(var/mob/O in viewers(user, 4))
-			O.show_message(text("\blue The wooden table was sliced apart by []!", user), 1, text("\red You hear wood coming apart."), 2)
+			O.show_message("\blue The wooden table was sliced apart by [user]!", 1, "\red You hear wood coming apart.", 2)
 		new /obj/item/weapon/table_parts/wood( src.loc )
 		del(src)
 		return
@@ -233,7 +233,7 @@ TABLE AND RACK OBJECT INTERATIONS
 		G.affecting.Weaken(5)
 		for(var/mob/O in viewers(world.view, src))
 			if (O.client)
-				O << text("\red [] puts [] on the reinforced table.", G.assailant, G.affecting)
+				O << "\red [G.assailant] puts [G.affecting] on the reinforced table."
 		del(W)
 		return
 
@@ -241,6 +241,7 @@ TABLE AND RACK OBJECT INTERATIONS
 		if(W:welding == 1)
 			if(src.status == 2)
 				W:welding = 2
+				W:eyecheck(user)
 				user << "\blue Now weakening the reinforced table"
 				playsound(src.loc, 'Welder.ogg', 50, 1)
 				if (do_after(user, 50))
@@ -281,7 +282,7 @@ TABLE AND RACK OBJECT INTERATIONS
 		playsound(src.loc, 'blade1.ogg', 50, 1)
 		playsound(src.loc, "sparks", 50, 1)
 		for(var/mob/O in viewers(user, 4))
-			O.show_message(text("\blue The reinforced table was sliced apart by []!", user), 1, text("\red You hear metal coming apart."), 2)
+			O.show_message("\blue The reinforced table was sliced apart by [user]!", 1, "\red You hear metal coming apart.", 2)
 		new /obj/item/weapon/table_parts/reinforced( src.loc )
 		del(src)
 		return

code/game/objects/tank.dm

@@ -35,7 +35,7 @@
 		set src in usr
 		..()
 		if(air_contents.oxygen < 1 && loc==usr)
-			usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
+			usr << "\red <B>The meter on the [src.name] indicates you are almost out of air!</B>"
 			usr << sound('alert.ogg')
 
 
@@ -44,6 +44,7 @@
 	desc = "Contains dangerous plasma. Do not inhale."
 	icon_state = "plasma"
 	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = null	//they have no straps!
 
 /obj/item/weapon/tank/blob_act()
 	if(prob(50))
@@ -282,7 +283,7 @@
 	else
 		descriptive = "furiously hot"
 
-	usr << text("\blue \The \icon[][src] feels []", icon, descriptive)
+	usr << "\blue \The \icon[icon][src] feels [descriptive]"
 
 	return
 

code/game/objects/watercloset.dm

@@ -177,7 +177,7 @@
 		else
 			C.clean_blood()						//other things that can't wear gloves should just wash the mob.
 	for(var/mob/V in viewers(src, null))
-		V.show_message(text("\blue [M] washes their hands using \the [src]."))
+		V.show_message("\blue [M] washes their hands using \the [src].")
 
 /obj/structure/sink/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	if(busy)

code/game/objects/weapons.dm

@@ -84,7 +84,7 @@
 
 	if(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey))
 		for(var/mob/O in viewers(world.view, src.loc))
-			O << text("<font color='red'>[M] triggered the \icon[] [src]</font>", src)
+			O << "<font color='red'>[M] triggered the \icon[src] [src]</font>"
 		triggered = 1
 		call(src,triggerproc)(M)
 
@@ -164,7 +164,7 @@
 			for(var/mob/O in viewers(user, null))
 				if(O == user)
 					continue
-				O.show_message(text("\red <B>[user] accidentally sets off the mousetrap, breaking their fingers.</B>"), 1)
+				O.show_message("\red <B>[user] accidentally sets off the mousetrap, breaking their fingers.</B>", 1)
 			return
 		user << "\blue You disarm the mousetrap."
 	armed = !armed
@@ -181,7 +181,7 @@
 			for(var/mob/O in viewers(user, null))
 				if(O == user)
 					continue
-				O.show_message(text("\red <B>[user] accidentally sets off the mousetrap, breaking their fingers.</B>"), 1)
+				O.show_message("\red <B>[user] accidentally sets off the mousetrap, breaking their fingers.</B>", 1)
 			return
 	..()
 
@@ -194,12 +194,12 @@
 			for(var/mob/O in viewers(H, null))
 				if(O == H)
 					continue
-				O.show_message(text("\red <B>[H] accidentally steps on the mousetrap.</B>"), 1)
+				O.show_message("\red <B>[H] accidentally steps on the mousetrap.</B>", 1)
 	..()
 
 /obj/item/weapon/mousetrap/hitby(A as mob|obj)
 	if(!armed)
 		return ..()
 	for(var/mob/O in viewers(src, null))
-		O.show_message(text("\red <B>The mousetrap is triggered by [A].</B>"), 1)
+		O.show_message("\red <B>The mousetrap is triggered by [A].</B>", 1)
 	src.triggered(null)

code/game/objects/window.dm

@@ -68,7 +68,7 @@
 
 	..()
 	for(var/mob/O in viewers(src, null))
-		O.show_message(text("\red <B>[src] was hit by [AM].</B>"), 1)
+		O.show_message("\red <B>[src] was hit by [AM].</B>", 1)
 	var/tforce = 0
 	if(ismob(AM))
 		tforce = 40
@@ -90,12 +90,14 @@
 	..()
 	return
 
+//These all need to be rewritten to use visiblemessage()
+
 /obj/structure/window/attack_hand()
 	if ((usr.mutations & HULK))
-		usr << text("\blue You smash through the window.")
+		usr << "\blue You smash through the window."
 		for(var/mob/O in oviewers())
 			if ((O.client && !( O.blinded )))
-				O << text("\red [] smashes through the window!", usr)
+				O << "\red [usr] smashes through the window!"
 		src.health = 0
 		new /obj/item/weapon/shard( src.loc )
 		if(reinf) new /obj/item/stack/rods( src.loc)
@@ -105,10 +107,10 @@
 
 /obj/structure/window/attack_paw()
 	if ((usr.mutations & HULK))
-		usr << text("\blue You smash through the window.")
+		usr << "\blue You smash through the window."
 		for(var/mob/O in oviewers())
 			if ((O.client && !( O.blinded )))
-				O << text("\red [] smashes through the window!", usr)
+				O << "\red [usr] smashes through the window!"
 		src.health = 0
 		new /obj/item/weapon/shard( src.loc )
 		if(reinf) new /obj/item/stack/rods( src.loc)
@@ -119,17 +121,17 @@
 /obj/structure/window/attack_alien()
 	if (istype(usr, /mob/living/carbon/alien/larva))//Safety check for larva. /N
 		return
-	usr << text("\green You smash against the window.")
+	usr << "\green You smash against the window."
 	for(var/mob/O in oviewers())
 		if ((O.client && !( O.blinded )))
-			O << text("\red [] smashes against the window.", usr)
+			O << "\red [usr] smashes against the window."
 	playsound(src.loc, 'Glasshit.ogg', 100, 1)
 	src.health -= 15
 	if(src.health <= 0)
-		usr << text("\green You smash through the window.")
+		usr << "\green You smash through the window."
 		for(var/mob/O in oviewers())
 			if ((O.client && !( O.blinded )))
-				O << text("\red [] smashes through the window!", usr)
+				O << "\red [usr] smashes through the window!"
 		src.health = 0
 		new /obj/item/weapon/shard(src.loc)
 		if(reinf)
@@ -143,17 +145,17 @@
 /obj/structure/window/attack_animal(mob/living/simple_animal/M as mob)
 	if (M.melee_damage_upper == 0)
 		return
-	M << text("\green You smash against the window.")
+	M << "\green You smash against the window."
 	for(var/mob/O in viewers(src, null))
 		if ((O.client && !( O.blinded )))
-			O << text("\red [] smashes against the window.", M)
+			O << "\red [M] smashes against the window."
 	playsound(src.loc, 'Glasshit.ogg', 100, 1)
 	src.health -= M.melee_damage_upper
 	if(src.health <= 0)
-		M << text("\green You smash through the window.")
+		M << "\green You smash through the window."
 		for(var/mob/O in viewers(src, null))
 			if ((O.client && !( O.blinded )))
-				O << text("\red [] smashes through the window!", M)
+				O << "\red [M] smashes through the window!"
 		src.health = 0
 		new /obj/item/weapon/shard(src.loc)
 		if(reinf)
@@ -167,17 +169,17 @@
 	if(!istype(usr, /mob/living/carbon/metroid/adult))
 		return
 
-	usr<< text("\green You smash against the window.")
+	usr<< "\green You smash against the window."
 	for(var/mob/O in oviewers())
 		if ((O.client && !( O.blinded )))
-			O << text("\red [] smashes against the window.", usr)
+			O << "\red [usr] smashes against the window."
 	playsound(src.loc, 'Glasshit.ogg', 100, 1)
 	src.health -= rand(10,15)
 	if(src.health <= 0)
-		usr << text("\green You smash through the window.")
+		usr << "\green You smash through the window."
 		for(var/mob/O in oviewers())
 			if ((O.client && !( O.blinded )))
-				O << text("\red [] smashes through the window!", usr)
+				O << "\red [usr] smashes through the window!"
 		src.health = 0
 		new /obj/item/weapon/shard(src.loc)
 		if(reinf)