Merge branch 'incremental_tg' r5200 into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/__HELPERS/type2type.dm
	code/__HELPERS/unsorted.dm
	code/datums/datumvars.dm
	code/datums/disease.dm
	code/datums/organs/organ_external.dm
	code/datums/supplypacks.dm
	code/defines/obj.dm
	code/game/area/areas.dm
	code/game/atoms.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/hud.dm
	code/game/jobs/access.dm
	code/game/jobs/job/civilian.dm
	code/game/machinery/alarm.dm
	code/game/machinery/cloning.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/medical.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/objects/effects/decals/contraband.dm
	code/game/objects/effects/signs.dm
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/game/objects/items/weapons/photography.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/window.dm
	code/game/sound.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/DetectiveWork/footprints_and_rag.dm
	code/modules/DetectiveWork/scanner.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminhelp.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/awaymissions/gateway.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mint.dm
	code/modules/mining/ores_coins.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/alien/alien.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/say.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/mob/new_player/login.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/mob/new_player/savefile.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/setup.dm
	code/unused/mining/datum_processing_recipe.dm
	code/unused/powerarmor/powerarmor.dm
	code/world.dm
	html/changelog.html
	icons/effects/96x96.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/hydroponics.dmi
	icons/obj/items.dmi
	icons/turf/areas.dmi
	icons/turf/walls.dmi
	maps/RandomZLevels/fileList.txt
	maps/RandomZLevels/spacebattle.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

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

@@ -185,8 +185,6 @@
 		new /obj/item/clothing/shoes/brown(src)
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/weapon/cartridge/detective(src)
-		new /obj/item/weapon/storage/fcard_kit(src)
-		new /obj/item/weapon/fcardholder(src)
 		new /obj/item/weapon/clipboard(src)
 		new /obj/item/device/detective_scanner(src)
 		new /obj/item/weapon/storage/box/evidence(src)

code/game/objects/structures/crates_lockers/crates.dm

@@ -1,8 +1,8 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
 
 /obj/structure/closet/crate
-	desc = "A crate."
-	name = "Crate"
+	name = "crate"
+	desc = "A rectangular steel crate."
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "crate"
 	density = 1
@@ -12,6 +12,7 @@
 	opened = 0
 	flags = FPRINT
 //	mouse_drag_pointer = MOUSE_ACTIVE_POINTER	//???
+	var/rigged = 0
 
 /obj/structure/closet/crate/internals
 	desc = "A internals crate."
@@ -250,20 +251,30 @@
 	src.opened = 0
 
 /obj/structure/closet/crate/attack_hand(mob/user as mob)
-	if(opened) close()
-	else open()
+	if(opened)
+		close()
+	else
+		if(rigged && locate(/obj/item/device/radio/electropack) in src)
+			if(isliving(user))
+				var/mob/living/L = user
+				if(L.electrocute_act(17, src))
+					var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+					s.set_up(5, 1, src)
+					s.start()
+					return
+		open()
 	return
 
 /obj/structure/closet/crate/secure/attack_hand(mob/user as mob)
 	if(locked && !broken)
 		if (allowed(user))
-			user << "<span class='notice'>You unlock \the [src].</span>"
+			user << "<span class='notice'>You unlock [src].</span>"
 			src.locked = 0
 			overlays = null
 			overlays += greenlight
 			return
 		else
-			user << "<span class='notice'>\The [src] is locked.</span>"
+			user << "<span class='notice'>[src] is locked.</span>"
 			return
 	else
 		..()
@@ -300,6 +311,27 @@
 			W.loc = src.loc
 	else if(istype(W, /obj/item/weapon/packageWrap))
 		return
+	else if(istype(W, /obj/item/weapon/cable_coil))
+		if(rigged)
+			user << "<span class='notice'>[src] is already rigged!</span>"
+			return
+		user  << "<span class='notice'>You rig [src].</span>"
+		user.drop_item()
+		del(W)
+		rigged = 1
+		return
+	else if(istype(W, /obj/item/device/radio/electropack))
+		if(rigged)
+			user  << "<span class='notice'>You attach [W] to [src].</span>"
+			user.drop_item()
+			W.loc = src
+			return
+	else if(istype(W, /obj/item/weapon/wirecutters))
+		if(rigged)
+			user  << "<span class='notice'>You cut away the wiring.</span>"
+			playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
+			rigged = 0
+			return
 	else return attack_hand(user)
 
 /obj/structure/closet/crate/secure/emp_act(severity)

code/game/objects/structures/door_assembly.dm

@@ -289,30 +289,13 @@ obj/structure/door_assembly
 				if(!src || !WT.isOn()) return
 				user << "\blue You dissasembled the airlock assembly!"
 				new /obj/item/stack/sheet/metal(get_turf(src), 4)
-				switch(mineral)
-					if("glass")
+				if (mineral)
+					if (mineral == "glass")
 						new /obj/item/stack/sheet/rglass(get_turf(src))
-					if("gold")
-						new /obj/item/stack/sheet/gold(get_turf(src))
-						new /obj/item/stack/sheet/gold(get_turf(src))
-					if("silver")
-						new /obj/item/stack/sheet/silver(get_turf(src))
-						new /obj/item/stack/sheet/silver(get_turf(src))
-					if("diamond")
-						new /obj/item/stack/sheet/diamond(get_turf(src))
-						new /obj/item/stack/sheet/diamond(get_turf(src))
-					if("uranium")
-						new /obj/item/stack/sheet/uranium(get_turf(src))
-						new /obj/item/stack/sheet/uranium(get_turf(src))
-					if("plasma")
-						new /obj/item/stack/sheet/plasma(get_turf(src))
-						new /obj/item/stack/sheet/plasma(get_turf(src))
-					if("clown")
-						new /obj/item/stack/sheet/clown(get_turf(src))
-						new /obj/item/stack/sheet/clown(get_turf(src))
-					if("sandstone")
-						new /obj/item/stack/sheet/sandstone(get_turf(src))
-						new /obj/item/stack/sheet/sandstone(get_turf(src))
+					else
+						var/M = text2path("/obj/item/stack/sheet/mineral/[mineral]")
+						new M(get_turf(src))
+						new M(get_turf(src))
 				del(src)
 		else
 			user << "\blue You need more welding fuel to dissassemble the airlock assembly."
@@ -395,96 +378,28 @@ obj/structure/door_assembly
 		var/obj/item/stack/sheet/G = W
 		if(G)
 			if(G.amount>=1)
-				switch(G.type)
-					if(/obj/item/stack/sheet/rglass)
+				if(G.type == /obj/item/stack/sheet/rglass)
+					playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+					user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.")
+					if(do_after(user, 40))
+						user << "\blue You installed reinforced glass windows into the airlock assembly!"
+						G.use(1)
+						src.mineral = "glass"
+						src.name = "Near finished Window Airlock Assembly"
+						src.airlock_type = /obj/machinery/door/airlock/glass
+						src.base_icon_state = "door_as_g" //this will be applied to the icon_state with the correct state number at the proc's end.
+				else if(istype(G, /obj/item/stack/sheet/mineral))
+					var/M = G.sheettype
+					if(G.amount>=2)
 						playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
 						user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.")
 						if(do_after(user, 40))
-							user << "\blue You installed reinforced glass windows into the airlock assembly!"
-							G.use(1)
-							src.mineral = "glass"
-							src.name = "Near finished Window Airlock Assembly"
-							src.airlock_type = /obj/machinery/door/airlock/glass
-							src.base_icon_state = "door_as_g" //this will be applied to the icon_state with the correct state number at the proc's end.
-					if(/obj/item/stack/sheet/gold)
-						if(G.amount>=2)
-							playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
-							user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.")
-							if(do_after(user, 40))
-								user << "\blue You installed gold plating into the airlock assembly!"
-								G.use(2)
-								src.mineral = "gold"
-								src.name = "Near finished Gold Airlock Assembly"
-								src.airlock_type = /obj/machinery/door/airlock/gold
-								src.base_icon_state = "door_as_gold"
-					if(/obj/item/stack/sheet/silver)
-						if(G.amount>=2)
-							playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
-							user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.")
-							if(do_after(user, 40))
-								user << "\blue You installed silver plating into the airlock assembly!"
-								G.use(2)
-								src.mineral = "silver"
-								src.name = "Near finished Silver Airlock Assembly"
-								src.airlock_type = /obj/machinery/door/airlock/silver
-								src.base_icon_state = "door_as_silver"
-					if(/obj/item/stack/sheet/diamond)
-						if(G.amount>=2)
-							playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
-							user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.")
-							if(do_after(user, 40))
-								user << "\blue You installed diamond plating into the airlock assembly!"
-								G.use(2)
-								src.mineral = "diamond"
-								src.name = "Near finished Diamond Airlock Assembly"
-								src.airlock_type = /obj/machinery/door/airlock/diamond
-								src.base_icon_state = "door_as_diamond"
-					if(/obj/item/stack/sheet/uranium)
-						if(G.amount>=2)
-							playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
-							user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.")
-							if(do_after(user, 40))
-								user << "\blue You installed uranium plating into the airlock assembly!"
-								G.use(2)
-								src.mineral = "uranium"
-								src.name = "Near finished Uranium Airlock Assembly"
-								src.airlock_type = /obj/machinery/door/airlock/uranium
-								src.base_icon_state = "door_as_uranium"
-					if(/obj/item/stack/sheet/plasma)
-						if(G.amount>=2)
-							playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
-							user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.")
-							if(do_after(user, 40))
-								user << "\blue You installed plasma plating into the airlock assembly!"
-								G.use(2)
-								src.mineral = "plasma"
-								src.name = "Near finished Plasma Airlock Assembly"
-								src.airlock_type = /obj/machinery/door/airlock/plasma
-								src.base_icon_state = "door_as_plasma"
-					if(/obj/item/stack/sheet/clown)
-						if(G.amount>=2)
-							playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
-							user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.")
-							if(do_after(user, 40))
-								user << "\blue You installed bananium plating into the airlock assembly!"
-								G.use(2)
-								playsound(src.loc, 'sound/items/bikehorn.ogg', 15, 1, -3)
-								src.mineral = "clown"
-								src.name = "Near finished Bananium Airlock Assembly"
-								src.airlock_type = /obj/machinery/door/airlock/clown
-								src.base_icon_state = "door_as_clown"
-					if(/obj/item/stack/sheet/sandstone)
-						if(G.amount>=2)
-							playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
-							user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.")
-							if(do_after(user, 40))
-								user << "\blue You installed sandstone plating into the airlock assembly!"
-								G.use(2)
-								src.mineral = "sandstone"
-								src.name = "Near finished Sandstone Airlock Assembly"
-								src.airlock_type = /obj/machinery/door/airlock/sandstone
-								src.base_icon_state = "door_as_sandstone"
-
+							user << "\blue You installed [M] plating into the airlock assembly!"
+							G.use(2)
+							src.mineral = "[M]"
+							src.name = "Near finished [M] Airlock Assembly"
+							src.airlock_type = text2path ("/obj/machinery/door/airlock/[M]")
+							src.base_icon_state = "door_as_[M]"
 	else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 )
 		playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
 		user << "\blue Now finishing the airlock."
@@ -493,33 +408,9 @@ obj/structure/door_assembly
 			if(!src) return
 			user << "\blue You finish the airlock!"
 			var/obj/machinery/door/airlock/door
-			switch(mineral)
-				if("glass")
-					airlock_type = /obj/machinery/door/airlock/glass
-					door = new src.airlock_type( src.loc )
-				if("gold")
-					airlock_type = /obj/machinery/door/airlock/gold
-					door = new src.airlock_type( src.loc )
-				if("silver")
-					airlock_type = /obj/machinery/door/airlock/silver
-					door = new src.airlock_type( src.loc )
-				if("diamond")
-					airlock_type = /obj/machinery/door/airlock/diamond
-					door = new src.airlock_type( src.loc )
-				if("uranium")
-					airlock_type = /obj/machinery/door/airlock/uranium
-					door = new src.airlock_type( src.loc )
-				if("plasma")
-					airlock_type = /obj/machinery/door/airlock/plasma
-					door = new src.airlock_type( src.loc )
-				if("clown")
-					airlock_type = /obj/machinery/door/airlock/clown
-					door = new src.airlock_type( src.loc )
-				if("sandstone")
-					airlock_type = /obj/machinery/door/airlock/sandstone
-					door = new src.airlock_type( src.loc )
-				else
-					door = new src.airlock_type( src.loc )
+			if (mineral)
+				airlock_type = text2path("/obj/machinery/door/airlock/[mineral]")
+			door = new src.airlock_type( src.loc )
 			//door.req_access = src.req_access
 			door.electronics = src.electronics
 			door.req_access = src.electronics.conf_access

code/game/objects/structures/false_walls.dm

@@ -1,5 +1,6 @@
 /obj/structure/falsewall
 	name = "wall"
+	desc = "A huge chunk of metal used to seperate rooms."
 	anchored = 1
 	icon = 'icons/turf/walls.dmi'
 	var/mineral = "metal"
@@ -25,25 +26,25 @@
 
 /obj/structure/falsewall/gold
 	name = "gold wall"
-	desc = "A wall with gold plating. Swag"
+	desc = "A wall with gold plating. Swag!"
 	icon_state = ""
 	mineral = "gold"
 
 /obj/structure/falsewall/silver
 	name = "silver wall"
-	desc = "A wall with silver plating. Shiny"
+	desc = "A wall with silver plating. Shiny."
 	icon_state = ""
 	mineral = "silver"
 
 /obj/structure/falsewall/diamond
 	name = "diamond wall"
-	desc = "A wall with diamond plating. You monster"
+	desc = "A wall with diamond plating. You monster."
 	icon_state = ""
 	mineral = "diamond"
 
 /obj/structure/falsewall/uranium
 	name = "uranium wall"
-	desc = "A wall with uranium plating. This is probably a bad idea"
+	desc = "A wall with uranium plating. This is probably a bad idea."
 	icon_state = ""
 	mineral = "uranium"
 	var/active = null
@@ -51,30 +52,26 @@
 
 /obj/structure/falsewall/plasma
 	name = "plasma wall"
-	desc = "A wall with plasma plating. This is definately a bad idea"
+	desc = "A wall with plasma plating. This is definately a bad idea."
 	icon_state = ""
 	mineral = "plasma"
 
 //-----------wtf?-----------start
-/obj/structure/falsewall/bananium
-	name = "bananium wall"
-	desc = "A wall with bananium plating. Honk"
-	icon_state = ""
-
 /obj/structure/falsewall/clown
+	name = "bananium wall"
+	desc = "A wall with bananium plating. Honk!"
+	icon_state = ""
 	mineral = "clown"
 
-/obj/structure/falsewall/sand
+/obj/structure/falsewall/sandstone
 	name = "sandstone wall"
 	desc = "A wall with sandstone plating."
 	icon_state = ""
-
-/obj/structure/falsewall/sandstone
 	mineral = "sandstone"
 //------------wtf?------------end
 
 /obj/structure/falserwall
-	name = "r wall"
+	name = "reinforced wall"
 	desc = "A huge chunk of reinforced metal used to seperate rooms."
 	icon = 'icons/turf/walls.dmi'
 	icon_state = "r_wall"

code/game/objects/structures/flora.dm

@@ -0,0 +1,63 @@
+//trees
+/obj/structure/flora/tree
+	name = "tree"
+	anchored = 1
+	density = 1
+	pixel_x = -16
+	layer = 9
+
+
+/obj/structure/flora/tree/pine
+	name = "pine tree"
+	icon = 'icons/obj/flora/pinetrees.dmi'
+	icon_state = "pine_1"
+
+/obj/structure/flora/tree/pine/New()
+	icon_state = "pine_[rand(1, 3)]"
+
+
+/obj/structure/flora/tree/dead
+	icon = 'icons/obj/flora/deadtrees.dmi'
+	icon_state = "tree_1"
+
+/obj/structure/flora/tree/dead/New()
+	icon_state = "tree_[rand(1, 6)]"
+
+
+//grass
+/obj/structure/flora/grass
+	name = "grass"
+	icon = 'icons/obj/flora/snowflora.dmi'
+	anchored = 1
+
+
+/obj/structure/flora/grass/brown
+	icon_state = "snowgrass1bb"
+
+/obj/structure/flora/grass/brown/New()
+	icon_state = "snowgrass[rand(1, 3)]bb"
+
+
+/obj/structure/flora/grass/green
+	icon_state = "snowgrass1gb"
+
+/obj/structure/flora/grass/green/New()
+	icon_state = "snowgrass[rand(1, 3)]gb"
+
+
+/obj/structure/flora/grass/both
+	icon_state = "snowgrassall1"
+
+/obj/structure/flora/grass/both/New()
+	icon_state = "snowgrassall[rand(1, 3)]"
+
+
+//bushes
+/obj/structure/flora/bush
+	name = "bush"
+	icon = 'icons/obj/flora/snowflora.dmi'
+	icon_state = "snowbush1"
+	anchored = 1
+
+/obj/structure/flora/bush/New()
+	icon_state = "snowbush[rand(1, 6)]"

code/game/objects/structures/girders.dm

@@ -83,8 +83,6 @@
 							user << "\blue You added the plating!"
 							var/turf/Tsrc = get_turf(src)
 							Tsrc.ChangeTurf(/turf/simulated/wall)
-							for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
-								P.layer = 1
 							for(var/turf/simulated/wall/X in Tsrc.loc)
 								if(X)	X.add_hiddenprint(usr)
 							del(src)
@@ -106,9 +104,7 @@
 								S.use(1)
 								user << "\blue Wall fully reinforced!"
 								var/turf/Tsrc = get_turf(src)
-								Tsrc.ChangeTurf(/turf/simulated/wall)
-								for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
-									P.layer = 1
+								Tsrc.ChangeTurf(/turf/simulated/wall/r_wall)
 								for(var/turf/simulated/wall/r_wall/X in Tsrc.loc)
 									if(X)	X.add_hiddenprint(usr)
 								del(src)
@@ -124,166 +120,28 @@
 								del(src)
 							return
 
-				if(/obj/item/stack/sheet/gold)
-					if(!anchored)
-						if(S.amount < 2) return
+			if(S.sheettype)
+				var/M = S.sheettype
+				if(!anchored)
+					if(S.amount < 2) return
+					S.use(2)
+					user << "\blue You create a false wall! Push on it to open or close the passage."
+					var/F = text2path("/obj/structure/falsewall/[M]")
+					new F (src.loc)
+					del(src)
+				else
+					if(S.amount < 2) return ..()
+					user << "\blue Now adding plating..."
+					if (do_after(user,40))
+						if(!src || !S || S.amount < 2) return
 						S.use(2)
-						user << "\blue You create a false wall! Push on it to open or close the passage."
-						new /obj/structure/falsewall/gold (src.loc)
+						user << "\blue You added the plating!"
+						var/turf/Tsrc = get_turf(src)
+						Tsrc.ChangeTurf(text2path("/turf/simulated/wall/mineral/[M]"))
+						for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
+							if(X)	X.add_hiddenprint(usr)
 						del(src)
-					else
-						if(S.amount < 2) return ..()
-						user << "\blue Now adding plating..."
-						if (do_after(user,40))
-							if(!src || !S || S.amount < 2) return
-							S.use(2)
-							user << "\blue You added the plating!"
-							var/turf/Tsrc = get_turf(src)
-							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/gold)
-							for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
-								P.layer = 1
-							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
-								if(X)	X.add_hiddenprint(usr)
-							del(src)
-						return
-
-				if(/obj/item/stack/sheet/silver)
-					if(!anchored)
-						if(S.amount < 2) return
-						S.use(2)
-						user << "\blue You create a false wall! Push on it to open or close the passage."
-						new /obj/structure/falsewall/silver (src.loc)
-						del(src)
-					else
-						if(S.amount < 2) return ..()
-						user << "\blue Now adding plating..."
-						if (do_after(user,40))
-							if(!src || !S || S.amount < 2) return
-							S.use(2)
-							user << "\blue You added the plating!"
-							var/turf/Tsrc = get_turf(src)
-							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/silver)
-							for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
-								P.layer = 1
-							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
-								if(X)	X.add_hiddenprint(usr)
-							del(src)
-						return
-
-				if(/obj/item/stack/sheet/diamond)
-					if(!anchored)
-						if(S.amount < 2) return
-						S.use(2)
-						user << "\blue You create a false wall! Push on it to open or close the passage."
-						new /obj/structure/falsewall/diamond (src.loc)
-						del(src)
-					else
-						if(S.amount < 2) return ..()
-						user << "\blue Now adding plating..."
-						if (do_after(user,40))
-							if(!src || !S || S.amount < 2) return
-							S.use(2)
-							user << "\blue You added the plating!"
-							var/turf/Tsrc = get_turf(src)
-							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/diamond)
-							for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
-								P.layer = 1
-							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
-								if(X)	X.add_hiddenprint(usr)
-							del(src)
-						return
-
-				if(/obj/item/stack/sheet/uranium)
-					if(!anchored)
-						if(S.amount < 2) return
-						S.use(2)
-						user << "\blue You create a false wall! Push on it to open or close the passage."
-						new /obj/structure/falsewall/uranium (src.loc)
-						del(src)
-					else
-						if(S.amount < 2) return ..()
-						user << "\blue Now adding plating..."
-						if (do_after(user,40))
-							if(!src || !S || S.amount < 2) return
-							S.use(2)
-							user << "\blue You added the plating!"
-							var/turf/Tsrc = get_turf(src)
-							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/uranium)
-							for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
-								P.layer = 1
-							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
-								if(X)	X.add_hiddenprint(usr)
-							del(src)
-						return
-
-				if(/obj/item/stack/sheet/plasma)
-					if(!anchored)
-						if(S.amount < 2) return
-						S.use(2)
-						user << "\blue You create a false wall! Push on it to open or close the passage."
-						new /obj/structure/falsewall/plasma (src.loc)
-						del(src)
-					else
-						if(S.amount < 2) return ..()
-						user << "\blue Now adding plating..."
-						if (do_after(user,40))
-							if(!src || !S || S.amount < 2) return
-							S.use(2)
-							user << "\blue You added the plating!"
-							var/turf/Tsrc = get_turf(src)
-							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/plasma)
-							for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
-								P.layer = 1
-							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
-								if(X)	X.add_hiddenprint(usr)
-							del(src)
-						return
-
-				if(/obj/item/stack/sheet/clown)
-					if(!anchored)
-						if(S.amount < 2) return
-						S.use(2)
-						user << "\blue You create a false wall! Push on it to open or close the passage."
-						new /obj/structure/falsewall/clown (src.loc)
-						del(src)
-					else
-						if(S.amount < 2) return ..()
-						user << "\blue Now adding plating..."
-						if (do_after(user,40))
-							if(!src || !S || S.amount < 2) return
-							S.use(2)
-							user << "\blue You added the plating!"
-							var/turf/Tsrc = get_turf(src)
-							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/clown)
-							for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
-								P.layer = 1
-							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
-								if(X)	X.add_hiddenprint(usr)
-							del(src)
-						return
-
-				if(/obj/item/stack/sheet/sandstone)
-					if(!anchored)
-						if(S.amount < 2) return
-						S.use(2)
-						user << "\blue You create a false wall! Push on it to open or close the passage."
-						new /obj/structure/falsewall/sandstone (src.loc)
-						del(src)
-					else
-						if(S.amount < 2) return ..()
-						user << "\blue Now adding plating..."
-						if (do_after(user,40))
-							if(!src || !S || S.amount < 2) return
-							S.use(2)
-							user << "\blue You added the plating!"
-							var/turf/Tsrc = get_turf(src)
-							Tsrc.ChangeTurf(/turf/simulated/wall/mineral/sandstone)
-							for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
-								P.layer = 1
-							for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
-								if(X)	X.add_hiddenprint(usr)
-							del(src)
-						return
+					return
 
 			add_hiddenprint(usr)
 

code/game/objects/structures/grille.dm

@@ -202,7 +202,7 @@
 	if(C)
 		if(electrocute_mob(user, C, src))
 			var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
-			s.set_up(5, 1, src)
+			s.set_up(3, 1, src)
 			s.start()
 			return 1
 		else

code/game/objects/structures/mineral_doors.dm

@@ -56,8 +56,13 @@
 		if(ismob(user))
 			var/mob/M = user
 			if(world.time - user.last_bumped <= 60) return //NOTE do we really need that?
-			if(M.client && !M:handcuffed)
-				SwitchState()
+			if(M.client)
+				if(iscarbon(M))
+					var/mob/living/carbon/C = M
+					if(!C.handcuffed)
+						SwitchState()
+				else
+					SwitchState()
 		else if(istype(user, /obj/mecha))
 			SwitchState()
 
@@ -116,13 +121,23 @@
 
 	proc/Dismantle(devastated = 0)
 		if(!devastated)
-			var/ore = text2path("/obj/item/stack/sheet/[mineralType]")
-			for(var/i = 1, i <= oreAmount, i++)
-				new ore(get_turf(src))
+			if (mineralType == "metal")
+				var/ore = /obj/item/stack/sheet/metal
+				for(var/i = 1, i <= oreAmount, i++)
+					new ore(get_turf(src))
+			else
+				var/ore = text2path("/obj/item/stack/sheet/mineral/[mineralType]")
+				for(var/i = 1, i <= oreAmount, i++)
+					new ore(get_turf(src))
 		else
-			var/ore = text2path("/obj/item/stack/sheet/[mineralType]")
-			for(var/i = 3, i <= oreAmount, i++)
-				new ore(get_turf(src))
+			if (mineralType == "metal")
+				var/ore = /obj/item/stack/sheet/metal
+				for(var/i = 3, i <= oreAmount, i++)
+					new ore(get_turf(src))
+			else
+				var/ore = text2path("/obj/item/stack/sheet/mineral/[mineralType]")
+				for(var/i = 3, i <= oreAmount, i++)
+					new ore(get_turf(src))
 		del(src)
 
 	ex_act(severity = 1)

code/game/objects/structures/mirror.dm

@@ -6,8 +6,12 @@
 	icon_state = "mirror"
 	density = 0
 	anchored = 1
+	var/shattered = 0
+
 
 /obj/structure/mirror/attack_hand(mob/user as mob)
+	if(shattered)	return
+
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
 
@@ -29,4 +33,63 @@
 		if(new_style)
 			H.h_style = new_style
 
-		H.update_hair()
+		H.update_hair()
+
+
+/obj/structure/mirror/proc/shatter()
+	if(shattered)	return
+	shattered = 1
+	icon_state = "mirror_broke"
+	playsound(src, "shatter", 70, 1)
+	desc = "Oh no, seven years of bad luck!"
+
+
+/obj/structure/mirror/bullet_act(var/obj/item/projectile/Proj)
+	if(prob(Proj.damage * 2))
+		if(!shattered)
+			shatter()
+		else
+			playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+	..()
+
+
+/obj/structure/mirror/attackby(obj/item/I as obj, mob/user as mob)
+	if(shattered)
+		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+		return
+
+	if(prob(I.force * 2))
+		visible_message("<span class='warning'>[user] smashes [src] with [I]!</span>")
+		shatter()
+	else
+		visible_message("<span class='warning'>[user] hits [src] with [I]!</span>")
+		playsound(src.loc, 'sound/effects/Glasshit.ogg', 70, 1)
+
+
+/obj/structure/mirror/attack_alien(mob/user as mob)
+	if(islarva(user)) return
+	if(shattered)
+		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+		return
+	user.visible_message("<span class='danger'>[user] smashes [src]!</span>")
+	shatter()
+
+
+/obj/structure/mirror/attack_animal(mob/user as mob)
+	if(!isanimal(user)) return
+	var/mob/living/simple_animal/M = user
+	if(M.melee_damage_upper <= 0) return
+	if(shattered)
+		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+		return
+	user.visible_message("<span class='danger'>[user] smashes [src]!</span>")
+	shatter()
+
+
+/obj/structure/mirror/attack_metroid(mob/user as mob)
+	if(!ismetroidadult(user)) return
+	if(shattered)
+		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+		return
+	user.visible_message("<span class='danger'>[user] smashes [src]!</span>")
+	shatter()

code/game/objects/structures/shuttle_engines.dm

@@ -1,37 +0,0 @@
-
-/obj/structure/shuttle
-	name = "shuttle"
-	icon = 'icons/turf/shuttle.dmi'
-
-/obj/structure/shuttle/engine
-	name = "engine"
-	density = 1
-	anchored = 1.0
-
-/obj/structure/shuttle/engine/heater
-	name = "heater"
-	icon_state = "heater"
-
-/obj/structure/shuttle/engine/platform
-	name = "platform"
-	icon_state = "platform"
-
-/obj/structure/shuttle/engine/propulsion
-	name = "propulsion"
-	icon_state = "propulsion"
-	opacity = 1
-
-/obj/structure/shuttle/engine/propulsion/burst
-	name = "burst"
-
-/obj/structure/shuttle/engine/propulsion/burst/left
-	name = "left"
-	icon_state = "burst_l"
-
-/obj/structure/shuttle/engine/propulsion/burst/right
-	name = "right"
-	icon_state = "burst_r"
-
-/obj/structure/shuttle/engine/router
-	name = "router"
-	icon_state = "router"

code/game/objects/structures/signs.dm

@@ -0,0 +1,133 @@
+/obj/structure/sign
+	icon = 'icons/obj/decals.dmi'
+	anchored = 1
+	opacity = 0
+	density = 0
+	layer = 3.5
+
+/obj/structure/sign/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			del(src)
+			return
+		if(2.0)
+			del(src)
+			return
+		if(3.0)
+			del(src)
+			return
+		else
+	return
+
+
+/obj/structure/sign/blob_act()
+	del(src)
+	return
+
+
+/obj/structure/sign/map
+	name = "station map"
+	desc = "A framed picture of the station."
+
+/obj/structure/sign/map/left
+	icon_state = "map-left"
+
+/obj/structure/sign/map/right
+	icon_state = "map-right"
+
+/obj/structure/sign/securearea
+	name = "\improper SECURE AREA"
+	desc = "A warning sign which reads 'SECURE AREA'."
+	icon_state = "securearea"
+
+/obj/structure/sign/biohazard
+	name = "\improper BIOHAZARD"
+	desc = "A warning sign which reads 'BIOHAZARD'"
+	icon_state = "bio"
+
+/obj/structure/sign/electricshock
+	name = "\improper HIGH VOLTAGE"
+	desc = "A warning sign which reads 'HIGH VOLTAGE'"
+	icon_state = "shock"
+
+/obj/structure/sign/examroom
+	name = "\improper EXAM"
+	desc = "A guidance sign which reads 'EXAM ROOM'"
+	icon_state = "examroom"
+
+/obj/structure/sign/vacuum
+	name = "\improper HARD VACUUM AHEAD"
+	desc = "A warning sign which reads 'HARD VACUUM AHEAD'"
+	icon_state = "space"
+
+/obj/structure/sign/deathsposal
+	name = "\improper DISPOSAL LEADS TO SPACE"
+	desc = "A warning sign which reads 'DISPOSAL LEADS TO SPACE'"
+	icon_state = "deathsposal"
+
+/obj/structure/sign/pods
+	name = "\improper ESCAPE PODS"
+	desc = "A warning sign which reads 'ESCAPE PODS'"
+	icon_state = "pods"
+
+/obj/structure/sign/fire
+	name = "\improper DANGER: FIRE"
+	desc = "A warning sign which reads 'DANGER: FIRE'"
+	icon_state = "fire"
+
+
+/obj/structure/sign/nosmoking_1
+	name = "\improper NO SMOKING"
+	desc = "A warning sign which reads 'NO SMOKING'"
+	icon_state = "nosmoking"
+
+
+/obj/structure/sign/nosmoking_2
+	name = "\improper NO SMOKING"
+	desc = "A warning sign which reads 'NO SMOKING'"
+	icon_state = "nosmoking2"
+
+/obj/structure/sign/redcross
+	name = "medbay"
+	desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here.'"
+	icon_state = "redcross"
+
+/obj/structure/sign/goldenplaque
+	name = "The Most Robust Men Award for Robustness"
+	desc = "To be Robust is not an action or a way of life, but a mental state. Only those with the force of Will strong enough to act during a crisis, saving friend from foe, are truly Robust. Stay Robust my friends."
+	icon_state = "goldenplaque"
+
+/obj/structure/sign/kiddieplaque
+	name = "AI developers plaque"
+	desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child appears to be retarded. Beneath the image, someone has scratched the word \"PACKETS\""
+	icon_state = "kiddieplaque"
+
+/obj/structure/sign/atmosplaque
+	name = "\improper FEA Atmospherics Division plaque"
+	desc = "This plaque commemorates the fall of the Atmos FEA division. For all the charred, dizzy, and brittle men who have died in its hands."
+	icon_state = "atmosplaque"
+
+/obj/structure/sign/maltesefalcon	//The sign is 64x32, so it needs two tiles. ;3
+	name = "The Maltese Falcon"
+	desc = "The Maltese Falcon, Space Bar and Grill."
+
+/obj/structure/sign/maltesefalcon/left
+	icon_state = "maltesefalcon-left"
+
+/obj/structure/sign/maltesefalcon/right
+	icon_state = "maltesefalcon-right"
+
+/obj/structure/sign/science			//These 3 have multiple types, just var-edit the icon_state to whatever one you want on the map
+	name = "\improper SCIENCE!"
+	desc = "A warning sign which reads 'SCIENCE!'"
+	icon_state = "science1"
+
+/obj/structure/sign/chemistry
+	name = "\improper CHEMISTRY"
+	desc = "A warning sign which reads 'CHEMISTRY'"
+	icon_state = "chemistry1"
+
+/obj/structure/sign/botany
+	name = "\improper HYDROPONICS"
+	desc = "A warning sign which reads 'HYDROPONICS'"
+	icon_state = "hydro1"

code/game/objects/structures/tables_racks.dm

@@ -243,7 +243,7 @@
 /obj/structure/table/attack_paw(mob/user as mob)
 	if ((HULK in usr.mutations))
 		usr << "\blue You destroy the table."
-		usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+		usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 		visible_message("\red [user] smashes the table apart!")
 		if(istype(src, /obj/structure/table/reinforced))
 			new /obj/item/weapon/table_parts/reinforced( src.loc )
@@ -297,7 +297,7 @@
 	if ((HULK in usr.mutations) || (SUPRSTR in usr.augmentations))
 		usr << "\blue You destroy the table."
 		visible_message("\red [user] smahes the table apart!")
-		usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+		usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 		if(istype(src, /obj/structure/table/reinforced))
 			new /obj/item/weapon/table_parts/reinforced( src.loc )
 		else if(istype(src, /obj/structure/table/woodentable))

code/game/objects/structures/window.dm

@@ -1,211 +1,145 @@
 /obj/structure/window
 	name = "window"
-	icon = 'icons/obj/structures.dmi'
 	desc = "A window."
+	icon = 'icons/obj/structures.dmi'
 	density = 1
 	layer = 3.2//Just above doors
+	pressure_resistance = 4*ONE_ATMOSPHERE
+	anchored = 1.0
+	flags = ON_BORDER
 	var/health = 14.0
 	var/ini_dir = null
 	var/state = 0
 	var/reinf = 0
-	var/silicate = 0 // number of units of silicate
-	var/icon/silicateIcon = null // the silicated icon
-	pressure_resistance = 4*ONE_ATMOSPHERE
-	anchored = 1.0
-	flags = ON_BORDER
+//	var/silicate = 0 // number of units of silicate
+//	var/icon/silicateIcon = null // the silicated icon
+
 
 /obj/structure/window/bullet_act(var/obj/item/projectile/Proj)
 	health -= Proj.damage
 	..()
-	if(health <=0)
-		new /obj/item/weapon/shard( src.loc )
-		new /obj/item/stack/rods( src.loc )
-		src.density = 0
+	if(health <= 0)
+		new /obj/item/weapon/shard(loc)
+		new /obj/item/stack/rods(loc)
 		del(src)
 	return
 
+
 /obj/structure/window/ex_act(severity)
 	switch(severity)
 		if(1.0)
 			del(src)
 			return
 		if(2.0)
-			new /obj/item/weapon/shard( src.loc )
-			if(reinf) new /obj/item/stack/rods( src.loc)
-			//SN src = null
+			new /obj/item/weapon/shard(loc)
+			if(reinf) new /obj/item/stack/rods(loc)
 			del(src)
 			return
 		if(3.0)
-			if (prob(50))
-				new /obj/item/weapon/shard( src.loc )
-				if(reinf) new /obj/item/stack/rods( src.loc)
-
+			if(prob(50))
+				new /obj/item/weapon/shard(loc)
+				if(reinf) new /obj/item/stack/rods(loc)
 				del(src)
 				return
-	return
+
 
 /obj/structure/window/blob_act()
-	if(reinf) new /obj/item/stack/rods( src.loc)
-	density = 0
+	new /obj/item/weapon/shard(loc)
+	if(reinf) new /obj/item/stack/rods(loc)
 	del(src)
 
+
+/obj/structure/window/meteorhit()
+	//world << "glass at [x],[y],[z] Mhit"
+	new /obj/item/weapon/shard( loc )
+	if(reinf) new /obj/item/stack/rods( loc)
+	del(src)
+
+
 /obj/structure/window/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 	if(istype(mover) && mover.checkpass(PASSGLASS))
 		return 1
-	if (src.dir == SOUTHWEST || src.dir == SOUTHEAST || src.dir == NORTHWEST || src.dir == NORTHEAST)
-		return 0 //full tile window, you can't move into it!
+	if(dir == SOUTHWEST || dir == SOUTHEAST || dir == NORTHWEST || dir == NORTHEAST)
+		return 0	//full tile window, you can't move into it!
 	if(get_dir(loc, target) == dir)
 		return !density
 	else
 		return 1
 
+
 /obj/structure/window/CheckExit(atom/movable/O as mob|obj, target as turf)
 	if(istype(O) && O.checkpass(PASSGLASS))
 		return 1
-	if (get_dir(O.loc, target) == dir)
+	if(get_dir(O.loc, target) == dir)
 		return 0
 	return 1
 
-/obj/structure/window/meteorhit()
-
-	//*****RM
-	//world << "glass at [x],[y],[z] Mhit"
-	src.health = 0
-	new /obj/item/weapon/shard( src.loc )
-	if(reinf) new /obj/item/stack/rods( src.loc)
-	src.density = 0
-
-
-	del(src)
-	return
-
 
 /obj/structure/window/hitby(AM as mob|obj)
-
 	..()
-	for(var/mob/O in viewers(src, null))
-		O.show_message("\red <B>[src] was hit by [AM].</B>", 1)
+	visible_message("<span class='danger'>[src] was hit by [AM].</span>")
 	var/tforce = 0
 	if(ismob(AM))
 		tforce = 40
-	else
-		tforce = AM:throwforce
-	if(reinf) tforce /= 4.0
-	playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1)
-	src.health = max(0, src.health - tforce)
-	if (src.health <= 7 && !reinf)
-		src.anchored = 0
+	else if(isobj(AM))
+		var/obj/item/I = AM
+		tforce = I.throwforce
+	if(reinf) tforce *= 0.25
+	playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
+	health = max(0, health - tforce)
+	if(health <= 7 && !reinf)
+		anchored = 0
 		update_nearby_icons()
 		step(src, get_dir(AM, src))
-	if (src.health <= 0)
-		new /obj/item/weapon/shard( src.loc )
-		if(reinf) new /obj/item/stack/rods( src.loc)
-		src.density = 0
+	if(health <= 0)
+		new /obj/item/weapon/shard(loc)
+		if(reinf) new /obj/item/stack/rods(loc)
 		del(src)
-		return
-	//..() //Does this really need to be here twice? The parent proc doesn't even do anything yet. - Nodrak
-	return
 
-//These all need to be rewritten to use visiblemessage()
 
-/obj/structure/window/attack_hand()
-	if ((HULK in usr.mutations) || (SUPRSTR in usr.augmentations))
-		usr << "\blue You smash through the window."
-		usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
-		for(var/mob/O in oviewers())
-			if ((O.client && !( O.blinded )))
-				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)
-		src.density = 0
+/obj/structure/window/attack_hand(mob/user as mob)
+	if((HULK in user.mutations) || (SUPRSTR in user.augmentations))
+		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
+		user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
+		new /obj/item/weapon/shard(loc)
+		if(reinf) new /obj/item/stack/rods(loc)
 		del(src)
-	return
+	else
+		user.visible_message("<span class='notice'>[user] knocks on [src].</span>")
+		playsound(loc, 'sound/effects/Glasshit.ogg', 50, 1)
 
-/obj/structure/window/attack_paw()
-	if ((HULK in usr.mutations))
-		usr << "\blue You smash through the window."
-		usr.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
-		for(var/mob/O in oviewers())
-			if ((O.client && !( O.blinded )))
-				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)
-		src.density = 0
+
+/obj/structure/window/attack_paw(mob/user as mob)
+	return attack_hand(user)
+
+
+/obj/structure/window/proc/attack_generic(mob/user as mob, damage = 0)	//used by attack_alien, attack_animal, and attack_metroid
+	health -= damage
+	if(health <= 0)
+		user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
+		new /obj/item/weapon/shard(loc)
+		if(reinf) new /obj/item/stack/rods(loc)
 		del(src)
-	return
-
-/obj/structure/window/attack_alien()
-	if (istype(usr, /mob/living/carbon/alien/larva))//Safety check for larva. /N
-		return
-	usr << "\green You smash against the window."
-	for(var/mob/O in oviewers())
-		if ((O.client && !( O.blinded )))
-			O << "\red [usr] smashes against the window."
-	playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1)
-	src.health -= 15
-	if(src.health <= 0)
-		usr << "\green You smash through the window."
-		for(var/mob/O in oviewers())
-			if ((O.client && !( O.blinded )))
-				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)
-		src.density = 0
-		del(src)
-		return
-	return
+	else	//for nicer text~
+		user.visible_message("<span class='danger'>[user] smashes into [src]!</span>")
+		playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
 
 
-/obj/structure/window/attack_animal(mob/living/simple_animal/M as mob)
-	if (M.melee_damage_upper == 0)
-		return
-	M << "\green You smash against the window."
-	for(var/mob/O in viewers(src, null))
-		if ((O.client && !( O.blinded )))
-			O << "\red [M] smashes against the window."
-	playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1)
-	src.health -= M.melee_damage_upper
-	if(src.health <= 0)
-		M << "\green You smash through the window."
-		for(var/mob/O in viewers(src, null))
-			if ((O.client && !( O.blinded )))
-				O << "\red [M] smashes through the window!"
-		src.health = 0
-		new /obj/item/weapon/shard(src.loc)
-		if(reinf)
-			new /obj/item/stack/rods(src.loc)
-		src.density = 0
-		del(src)
-		return
-	return
+/obj/structure/window/attack_alien(mob/user as mob)
+	if(islarva(user)) return
+	attack_generic(user, 15)
 
-/obj/structure/window/attack_metroid()
-	if(!istype(usr, /mob/living/carbon/metroid/adult))
-		return
+/obj/structure/window/attack_animal(mob/user as mob)
+	if(!isanimal(user)) return
+	var/mob/living/simple_animal/M = user
+	if(M.melee_damage_upper <= 0) return
+	attack_generic(M, M.melee_damage_upper)
+
+
+/obj/structure/window/attack_metroid(mob/user as mob)
+	if(!ismetroidadult(user)) return
+	attack_generic(user, rand(10, 15))
 
-	usr<< "\green You smash against the window."
-	for(var/mob/O in oviewers())
-		if ((O.client && !( O.blinded )))
-			O << "\red [usr] smashes against the window."
-	playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1)
-	src.health -= rand(10,15)
-	if(src.health <= 0)
-		usr << "\green You smash through the window."
-		for(var/mob/O in oviewers())
-			if ((O.client && !( O.blinded )))
-				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)
-		src.density = 0
-		del(src)
-		return
-	return
 
 /obj/structure/window/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(!istype(W)) return//I really wish I did not need this
@@ -232,56 +166,53 @@
 					hit(50)
 					visible_message("\red <big><b>[user] crushes [M] against \the [src]!</b></big>")
 			return
-
-	if (istype(W, /obj/item/weapon/screwdriver))
+	if(istype(W, /obj/item/weapon/screwdriver))
 		if(reinf && state >= 1)
 			state = 3 - state
-			playsound(src.loc, 'sound/items/Screwdriver.ogg', 75, 1)
-			usr << ( state==1? "You have unfastened the window from the frame." : "You have fastened the window to the frame." )
+			playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
+			user << (state == 1 ? "<span class='notice'>You have unfastened the window from the frame.</span>" : "<span class='notice'>You have fastened the window to the frame.</span>")
 		else if(reinf && state == 0)
 			anchored = !anchored
 			update_nearby_icons()
-			playsound(src.loc, 'sound/items/Screwdriver.ogg', 75, 1)
-			user << (src.anchored ? "You have fastened the frame to the floor." : "You have unfastened the frame from the floor.")
+			playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
+			user << (anchored ? "<span class='notice'>You have fastened the frame to the floor.</span>" : "<span class='notice'>You have unfastened the frame from the floor.</span>")
 		else if(!reinf)
-			src.anchored = !( src.anchored )
+			anchored = !anchored
 			update_nearby_icons()
-			playsound(src.loc, 'sound/items/Screwdriver.ogg', 75, 1)
-			user << (src.anchored ? "You have fastened the window to the floor." : "You have unfastened the window.")
-	else if(istype(W, /obj/item/weapon/crowbar) && reinf && state <=1)
-		state = 1-state;
-		playsound(src.loc, 'sound/items/Crowbar.ogg', 75, 1)
-		user << (state ? "You have pried the window into the frame." : "You have pried the window out of the frame.")
+			playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
+			user << (anchored ? "<span class='notice'>You have fastened the window to the floor.</span>" : "<span class='notice'>You have unfastened the window.</span>")
+	else if(istype(W, /obj/item/weapon/crowbar) && reinf && state <= 1)
+		state = 1 - state
+		playsound(loc, 'sound/items/Crowbar.ogg', 75, 1)
+		user << (state ? "<span class='notice'>You have pried the window into the frame.</span>" : "<span class='notice'>You have pried the window out of the frame.</span>")
 	else
 		if(W.damtype == BRUTE || W.damtype == BURN)
 			hit(W.force)
-			if (src.health <= 7)
-				src.anchored = 0
+			if(health <= 7)
+				anchored = 0
 				update_nearby_icons()
 				step(src, get_dir(user, src))
 		else
-			playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
+			playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
 		..()
 	return
 
 /obj/structure/window/proc/hit(var/damage, var/sound_effect = 1)
-
-	if(reinf) damage /= 2.0
-	src.health = max(0, src.health - damage)
+	if(reinf) damage *= 0.5
+	health = max(0, health - damage)
 	if(sound_effect)
-		playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
-	if (src.health <= 0)
-		if (src.dir == SOUTHWEST)
+		playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
+	if(health <= 0)
+		if(dir == SOUTHWEST)
 			var/index = null
 			index = 0
 			while(index < 2)
-				new /obj/item/weapon/shard( src.loc )
-				if(reinf) new /obj/item/stack/rods( src.loc)
+				new /obj/item/weapon/shard(loc)
+				if(reinf) new /obj/item/stack/rods(loc)
 				index++
 		else
-			new /obj/item/weapon/shard( src.loc )
-			if(reinf) new /obj/item/stack/rods( src.loc)
-		src.density = 0
+			new /obj/item/weapon/shard(loc)
+			if(reinf) new /obj/item/stack/rods(loc)
 		del(src)
 		return
 
@@ -291,44 +222,39 @@
 	set category = "Object"
 	set src in oview(1)
 
-	if (src.anchored)
-		usr << "It is fastened to the floor; therefore, you can't rotate it!"
+	if(anchored)
+		usr << "It is fastened to the floor therefore you can't rotate it!"
 		return 0
 
 	update_nearby_tiles(need_rebuild=1) //Compel updates before
-
-	src.dir = turn(src.dir, 90)
-
-	updateSilicate()
-
+	dir = turn(dir, 90)
+//	updateSilicate()
 	update_nearby_tiles(need_rebuild=1)
-
-	src.ini_dir = src.dir
+	ini_dir = dir
 	return
 
+
 /obj/structure/window/verb/revrotate()
 	set name = "Rotate Window Clockwise"
 	set category = "Object"
 	set src in oview(1)
 
-	if (src.anchored)
-		usr << "It is fastened to the floor; therefore, you can't rotate it!"
+	if(anchored)
+		usr << "It is fastened to the floor therefore you can't rotate it!"
 		return 0
 
 	update_nearby_tiles(need_rebuild=1) //Compel updates before
-
-	src.dir = turn(src.dir, 270)
-
-	updateSilicate()
-
+	dir = turn(dir, 270)
+//	updateSilicate()
 	update_nearby_tiles(need_rebuild=1)
-
-	src.ini_dir = src.dir
+	ini_dir = dir
 	return
 
+
+/*
 /obj/structure/window/proc/updateSilicate()
 	if(silicateIcon && silicate)
-		src.icon = initial(icon)
+		icon = initial(icon)
 
 		var/icon/I = icon(icon,icon_state,dir)
 
@@ -338,13 +264,15 @@
 		I.SetIntensity(r,g,b)
 		icon = I
 		silicateIcon = I
+*/
+
 
 /obj/structure/window/New(Loc,re=0)
 	..()
 
 	if(re)	reinf = re
 
-	src.ini_dir = src.dir
+	ini_dir = dir
 	if(reinf)
 		icon_state = "rwindow"
 		desc = "A reinforced window."
@@ -361,26 +289,21 @@
 
 	return
 
+
 /obj/structure/window/Del()
 	density = 0
-
 	update_nearby_tiles()
-
 	playsound(src, "shatter", 70, 1)
-
 	update_nearby_icons()
-
 	..()
 
+
 /obj/structure/window/Move()
 	update_nearby_tiles(need_rebuild=1)
-
 	..()
-
-	src.dir = src.ini_dir
+	dir = ini_dir
 	update_nearby_tiles(need_rebuild=1)
 
-	return
 
 //This proc has to do with airgroups and atmos, it has nothing to do with smoothwindows, that's update_nearby_tiles().
 /obj/structure/window/proc/update_nearby_tiles(need_rebuild)
@@ -410,7 +333,7 @@
 
 //This proc is used to update the icons of nearby windows. It should not be confused with update_nearby_tiles(), which is an atmos proc!
 /obj/structure/window/proc/update_nearby_icons()
-	src.update_icon()
+	update_icon()
 	for(var/direction in cardinal)
 		for(var/obj/structure/window/W in get_step(src,direction) )
 			W.update_icon()
@@ -422,21 +345,21 @@
 	//This spawn is here so windows get properly updated when one gets deleted.
 	spawn(2)
 		if(!src) return
-		if (!is_fulltile())
+		if(!is_fulltile())
 			return
 		var/junction = 0 //will be used to determine from which side the window is connected to other windows
-		if (src.anchored)
+		if(anchored)
 			for(var/obj/structure/window/W in orange(src,1))
-				if (W.anchored && W.density	&& W.is_fulltile()) //Only counts anchored, not-destroyed fill-tile windows.
-					if (abs(src.x-W.x)-abs(src.y-W.y) ) 		//doesn't count windows, placed diagonally to src
+				if(W.anchored && W.density	&& W.is_fulltile()) //Only counts anchored, not-destroyed fill-tile windows.
+					if(abs(x-W.x)-abs(y-W.y) ) 		//doesn't count windows, placed diagonally to src
 						junction |= get_dir(src,W)
-		if (opacity)
-			src.icon_state = "twindow[junction]"
+		if(opacity)
+			icon_state = "twindow[junction]"
 		else
-			if (reinf)
-				src.icon_state = "rwindow[junction]"
+			if(reinf)
+				icon_state = "rwindow[junction]"
 			else
-				src.icon_state = "window[junction]"
+				icon_state = "window[junction]"
 
 		return
 
@@ -451,9 +374,9 @@
 	icon_state = "window"
 
 /obj/structure/window/reinforced
-	reinf = 1
-	icon_state = "rwindow"
 	name = "reinforced window"
+	icon_state = "rwindow"
+	reinf = 1
 
 /obj/structure/window/reinforced/tinted
 	name = "tinted window"
@@ -461,5 +384,5 @@
 	opacity = 1
 
 /obj/structure/window/reinforced/tinted/frosted
-	icon_state = "fwindow"
 	name = "frosted window"
+	icon_state = "fwindow"