diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm
index 310c3b94cca..7e85b46e654 100644
--- a/code/defines/obj/storage.dm
+++ b/code/defines/obj/storage.dm
@@ -313,7 +313,7 @@
 
 /obj/item/weapon/storage/flashbang_kit
 	name = "flashbangs (WARNING)"
-	desc = "<FONT color=red><B>WARNING: Do not use without reading these preautions!</B></FONT>\n<B>These devices are extremely dangerous and can cause blindness or deafness if used incorrectly.</B>\nThe chemicals contained in these devices have been tuned for maximal effectiveness and due to\nextreme safety precuaiotn shave been incased in a tamper-proof pack. DO NOT ATTEMPT TO OPEN\nFLASH WARNING: Do not use continually. Excercise extreme care when detonating in closed spaces.\n\tMake attemtps not to detonate withing range of 2 meters of the intended target. It is imperative\n\tthat the targets visit a medical professional after usage. Damage to eyes increases extremely per\n\tuse and according to range. Glasses with flash resistant filters DO NOT always work on high powered\n\tflash devices such as this. <B>EXERCISE CAUTION REGARDLESS OF CIRCUMSTANCES</B>\nSOUND WARNING: Do not use continually. Visit a medical professional if hearing is lost.\n\tThere is a slight chance per use of complete deafness. Exercise caution and restraint.\nSTUN WARNING: If the intended or unintended target is too close to detonation the resulting sound\n\tand flash have been known to cause extreme sensory overload resulting in temporary\n\tincapacitation.\n<B>DO NOT USE CONTINUALLY</B>\nOperating Directions:\n\t1. Pull detonnation pin. <B>ONCE THE PIN IS PULLED THE GRENADE CAN NOT BE DISARMED!</B>\n\t2. Throw grenade. <B>NEVER HOLD A LIVE FLASHBANG</B>\n\t3. The grenade will detonste 10 seconds hafter being primed. <B>EXCERCISE CAUTION</B>\n\t-<B>Never prime another grenade until after the first is detonated</B>\nNote: Usage of this pyrotechnic device without authorization is an extreme offense and can\nresult in severe punishment upwards of <B>10 years in prison per use</B>.\n\nDefault 3 second wait till from prime to detonation. This can be switched with a screwdriver\nto 10 seconds.\n\nCopyright of Nanotrasen Industries- Military Armnaments Division\nThis device was created by Nanotrasen Labs a member of the Expert Advisor Corporation"
+	desc = "<B>WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.</B>"
 	icon_state = "flashbang"
 	item_state = "syringe_kit"
 	foldable = /obj/item/stack/sheet/cardboard	//BubbleWrap
diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm
index c57b74659a2..551a4698da0 100644
--- a/code/game/atom_procs.dm
+++ b/code/game/atom_procs.dm
@@ -1034,8 +1034,6 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
 
 	if(istype(M.machine, /obj/machinery/computer/security)) //No examining by looking through cameras
 		return
-	if(!istype(M, /mob/living))
-		return
 
 	if(( abs(src.x-M.x)<8 || abs(src.y-M.y)<8 ) && src.z == M.z ) //This should prevent non-observers to examine stuff from outside their view.
 		examine()
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index 8b2162ec651..64a80961918 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -1,29 +1,171 @@
 /obj/machinery/shield
-		name = "shield"
-		desc = "An energy shield."
+		name = "emergency energy shield"
+		desc = "An energy shield usually used to contain hull breaches."
 		icon = 'effects.dmi'
 		icon_state = "shieldsparkles"
 		density = 1
-		opacity = 1
+		opacity = 0
 		anchored = 1
 		unacidable = 1
+		var/const/max_health = 200
+		var/health = max_health //The shield can only take so much beating (prevents perma-prisons)
+
+/obj/machinery/shield/New()
+	src.dir = pick(1,2,3,4)
+	..()
+	update_nearby_tiles(need_rebuild=1)
+
+/obj/machinery/shield/Del()
+	opacity = 0
+	density = 0
+	update_nearby_tiles()
+	..()
+
+/obj/machinery/shield/CanPass(atom/movable/mover, turf/target, height, air_group)
+	if(!height || air_group) return 0
+	else return ..()
+
+//Looks like copy/pasted code... I doubt 'need_rebuild' is even used here - Nodrak
+/obj/machinery/shield/proc/update_nearby_tiles(need_rebuild)
+	if(!air_master) return 0
+
+	var/turf/simulated/source = loc
+	var/turf/simulated/north = get_step(source,NORTH)
+	var/turf/simulated/south = get_step(source,SOUTH)
+	var/turf/simulated/east = get_step(source,EAST)
+	var/turf/simulated/west = get_step(source,WEST)
+
+	if(need_rebuild)
+		if(istype(source)) //Rebuild/update nearby group geometry
+			if(source.parent)
+				air_master.groups_to_rebuild += source.parent
+			else
+				air_master.tiles_to_update += source
+		if(istype(north))
+			if(north.parent)
+				air_master.groups_to_rebuild += north.parent
+			else
+				air_master.tiles_to_update += north
+		if(istype(south))
+			if(south.parent)
+				air_master.groups_to_rebuild += south.parent
+			else
+				air_master.tiles_to_update += south
+		if(istype(east))
+			if(east.parent)
+				air_master.groups_to_rebuild += east.parent
+			else
+				air_master.tiles_to_update += east
+		if(istype(west))
+			if(west.parent)
+				air_master.groups_to_rebuild += west.parent
+			else
+				air_master.tiles_to_update += west
+	else
+		if(istype(source)) air_master.tiles_to_update += source
+		if(istype(north)) air_master.tiles_to_update += north
+		if(istype(south)) air_master.tiles_to_update += south
+		if(istype(east)) air_master.tiles_to_update += east
+		if(istype(west)) air_master.tiles_to_update += west
+
+	return 1
+
+
+/obj/machinery/shield/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(!istype(W)) return
+
+	//Calculate damage
+	var/aforce = W.force
+	if(W.damtype == BRUTE || W.damtype == BURN)
+		src.health -= aforce
+
+	//Play a fitting sound
+	playsound(src.loc, 'EMPulse.ogg', 75, 1)
+
+
+	if (src.health <= 0)
+		for(var/mob/O in viewers(src, null))
+			O.show_message("\blue The [src] dissapates")
+		del(src)
+		return
+
+	opacity = 1
+	spawn(20) if(src) opacity = 0
+
+	..()
+
+/obj/machinery/shield/meteorhit()
+	src.health -= max_health*0.75 //3/4 health as damage
+
+	if(src.health <= 0)
+		for(var/mob/O in viewers(src, null))
+			O.show_message("\blue The [src] dissapates")
+		del(src)
+		return
+
+	opacity = 1
+	spawn(20) if(src) opacity = 0
+	return
+
+/obj/machinery/shield/bullet_act(var/obj/item/projectile/Proj)
+	health -= Proj.damage
+	..()
+	if(health <=0)
+		for(var/mob/O in viewers(src, null))
+			O.show_message("\blue The [src] dissapates")
+		del(src)
+		return
+	opacity = 1
+	spawn(20) if(src) opacity = 0
+
+/obj/machinery/shield/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			if (prob(75))
+				del(src)
+		if(2.0)
+			if (prob(50))
+				del(src)
+		if(3.0)
+			if (prob(25))
+				del(src)
+	return
+
+/obj/machinery/shield/blob_act()
+	del(src)
+
+
+/obj/machinery/shield/hitby(AM as mob|obj)
+	//Let everyone know we've been hit!
+	for(var/mob/O in viewers(src, null))
+		O.show_message("\red <B>[src] was hit by [AM].</B>", 1)
+
+	//Super realistic, resource-intensive, real-time damage calculations.
+	var/tforce = 0
+	if(ismob(AM))
+		tforce = 40
+	else
+		tforce = AM:throwforce
+
+	src.health -= tforce
+
+	//This seemed to be the best sound for hitting a force field.
+	playsound(src.loc, 'EMPulse.ogg', 100, 1)
+
+	//Handle the destruction of the shield
+	if (src.health <= 0)
+		for(var/mob/O in viewers(src, null))
+			O.show_message("\blue The [src] dissapates")
+		del(src)
+		return
+
+	//The shield becomes dense to absorb the blow.. purely asthetic.
+	opacity = 1
+	spawn(20) if(src) opacity = 0
+
+	..()
+	return
 
-/obj/machinery/shieldwall
-		name = "Shield"
-		desc = "An energy shield."
-		icon = 'effects.dmi'
-		icon_state = "shieldwall"
-		anchored = 1
-		density = 1
-		unacidable = 1
-		var/needs_power = 0
-		var/active = 1
-//		var/power = 10
-		var/delay = 5
-		var/last_active
-		var/mob/U
-		var/obj/machinery/shieldwallgen/gen_primary
-		var/obj/machinery/shieldwallgen/gen_secondary
 
 
 /obj/machinery/shieldgen
@@ -36,76 +178,60 @@
 		anchored = 0
 		pressure_resistance = 2*ONE_ATMOSPHERE
 		var/active = 0
-		var/health = 100
-		var/malfunction = 0
-		var/list/obj/machinery/shield/deployed_shields
+		var/const/max_health = 100
+		var/health = max_health
+		var/malfunction = 0 //Malfunction causes parts of the shield to slowly dissapate
+		var/list/deployed_shields = list()
+		var/is_open = 0 //Whether or not the wires are exposed
 
 /obj/machinery/shieldgen/Del()
 	for(var/obj/machinery/shield/shield_tile in deployed_shields)
 		del(shield_tile)
-
 	..()
 
 
 /obj/machinery/shieldgen/proc/shields_up()
-	if(active) return 0
+	if(active) return 0 //If it's already turned on, how did this get called?
+
+	src.active = 1
+	update_icon()
 
 	for(var/turf/target_tile in range(2, src))
 		if (istype(target_tile,/turf/space) && !(locate(/obj/machinery/shield) in target_tile))
 			if (malfunction && prob(33) || !malfunction)
 				deployed_shields += new /obj/machinery/shield(target_tile)
 
-	src.anchored = 1
-	src.active = 1
-	src.icon_state = malfunction ? "shieldonbr":"shieldon"
-
-	spawn src.process()
-
 /obj/machinery/shieldgen/proc/shields_down()
-	if(!active) return 0
+	if(!active) return 0 //If it's already off, how did this get called?
+
+	src.active = 0
+	update_icon()
 
 	for(var/obj/machinery/shield/shield_tile in deployed_shields)
 		del(shield_tile)
 
-	src.anchored = 0
-	src.active = 0
-	src.icon_state = malfunction ? "shieldoffbr":"shieldoff"
-
 /obj/machinery/shieldgen/process()
-	if(active)
-		src.icon_state = malfunction ? "shieldonbr":"shieldon"
+	if(malfunction && active)
+		if(deployed_shields && prob(5))
+			del(pick(deployed_shields))
 
-		if(malfunction)
-			if(prob(10) || deployed_shields)
-				del(pick(deployed_shields))
-
-		//spawn(30) //The MC does this for us...
-		//	src.process()
 	return
 
 /obj/machinery/shieldgen/proc/checkhp()
 	if(health <= 30)
 		src.malfunction = 1
-	if(health <= 10 && prob(75))
+	if(health <= 0)
 		del(src)
-	if (active)
-		src.icon_state = malfunction ? "shieldonbr":"shieldon"
-	else
-		src.icon_state = malfunction ? "shieldoffbr":"shieldoff"
+	update_icon()
 	return
 
 /obj/machinery/shieldgen/meteorhit(obj/O as obj)
-	src.health -= 25
+	src.health -= max_health*0.25 //A quarter of the machine's health
 	if (prob(5))
 		src.malfunction = 1
 	src.checkhp()
 	return
 
-/obj/machinery/shield/meteorhit(obj/O as obj)
-	if (prob(75))
-		del(src)
-	return
-
 /obj/machinery/shieldgen/ex_act(severity)
 	switch(severity)
 		if(1.0)
@@ -121,19 +247,6 @@
 			src.checkhp()
 	return
 
-/obj/machinery/shield/ex_act(severity)
-	switch(severity)
-		if(1.0)
-			if (prob(75))
-				del(src)
-		if(2.0)
-			if (prob(50))
-				del(src)
-		if(3.0)
-			if (prob(25))
-				del(src)
-	return
-
 /obj/machinery/shieldgen/attack_hand(mob/user as mob)
 	if (src.active)
 		user.visible_message("\blue \icon[src] [user] deactivated the shield generator.", \
@@ -141,10 +254,60 @@
 			"You hear heavy droning fade out.")
 		src.shields_down()
 	else
-		user.visible_message("\blue \icon[src] [user] activated the shield generator.", \
-			"\blue \icon[src] You activate the shield generator.", \
-			"You hear heavy droning.")
-		src.shields_up()
+		if(anchored)
+			user.visible_message("\blue \icon[src] [user] activated the shield generator.", \
+				"\blue \icon[src] You activate the shield generator.", \
+				"You hear heavy droning.")
+			src.shields_up()
+		else
+			user << "The device must first be secured to the floor."
+	return
+
+/obj/machinery/shieldgen/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/card/emag))
+		malfunction = 1
+		update_icon()
+
+	else if(istype(W, /obj/item/weapon/screwdriver))
+		playsound(src.loc, 'Screwdriver.ogg', 100, 1)
+		if(is_open)
+			user << "\blue You close the panel."
+			is_open = 0
+		else
+			user << "\blue You open the panel and expose the wiring."
+			is_open = 1
+
+	else if(istype(W, /obj/item/weapon/cable_coil) && malfunction && is_open)
+		var/obj/item/weapon/cable_coil/coil = W
+		user << "\blue You begin to repair the cables."
+		//if(do_after(user, min(60, round( ((maxhealth/health)*10)+(malfunction*10) ))) //Take longer to repair heavier damage
+		if(do_after(user, 30))
+			if(!src || !coil) return
+			coil.use(1)
+			health = max_health
+			malfunction = 0
+			user << "\blue You repair the [src]!"
+			update_icon()
+
+	else if(istype(W, /obj/item/weapon/wrench))
+		if(istype(get_turf(src), /turf/space)) return //No wrenching these in space!
+		playsound(src.loc, 'Ratchet.ogg', 100, 1)
+		if(anchored)
+			user << "\blue You unsecure the [src] from the floor!"
+			anchored = 0
+		else
+			user << "\blue You secure the [src] to the floor!"
+			anchored = 1
+	else
+		..()
+
+
+/obj/machinery/shieldgen/update_icon()
+	if(active)
+		src.icon_state = malfunction ? "shieldonbr":"shieldon"
+	else
+		src.icon_state = malfunction ? "shieldoffbr":"shieldoff"
+	return
 
 ////FIELD GEN START //shameless copypasta from fieldgen, powersink, and grille
 #define maxstoredpower 500
@@ -380,70 +543,23 @@
 	return
 
 
-/obj/machinery/shield
-	New()
-		src.dir = pick(1,2,3,4)
-
-		..()
-
-		update_nearby_tiles(need_rebuild=1)
-
-	Del()
-		update_nearby_tiles()
-
-		..()
-
-	CanPass(atom/movable/mover, turf/target, height, air_group)
-		if(!height || air_group) return 0
-		else return ..()
-
-	proc/update_nearby_tiles(need_rebuild)
-		if(!air_master) return 0
-
-		var/turf/simulated/source = loc
-		var/turf/simulated/north = get_step(source,NORTH)
-		var/turf/simulated/south = get_step(source,SOUTH)
-		var/turf/simulated/east = get_step(source,EAST)
-		var/turf/simulated/west = get_step(source,WEST)
-
-		if(need_rebuild)
-			if(istype(source)) //Rebuild/update nearby group geometry
-				if(source.parent)
-					air_master.groups_to_rebuild += source.parent
-				else
-					air_master.tiles_to_update += source
-			if(istype(north))
-				if(north.parent)
-					air_master.groups_to_rebuild += north.parent
-				else
-					air_master.tiles_to_update += north
-			if(istype(south))
-				if(south.parent)
-					air_master.groups_to_rebuild += south.parent
-				else
-					air_master.tiles_to_update += south
-			if(istype(east))
-				if(east.parent)
-					air_master.groups_to_rebuild += east.parent
-				else
-					air_master.tiles_to_update += east
-			if(istype(west))
-				if(west.parent)
-					air_master.groups_to_rebuild += west.parent
-				else
-					air_master.tiles_to_update += west
-		else
-			if(istype(source)) air_master.tiles_to_update += source
-			if(istype(north)) air_master.tiles_to_update += north
-			if(istype(south)) air_master.tiles_to_update += south
-			if(istype(east)) air_master.tiles_to_update += east
-			if(istype(west)) air_master.tiles_to_update += west
-
-		return 1
-
-
 //////////////Contaiment Field START
-
+/obj/machinery/shieldwall
+		name = "Shield"
+		desc = "An energy shield."
+		icon = 'effects.dmi'
+		icon_state = "shieldwall"
+		anchored = 1
+		density = 1
+		unacidable = 1
+		var/needs_power = 0
+		var/active = 1
+//		var/power = 10
+		var/delay = 5
+		var/last_active
+		var/mob/U
+		var/obj/machinery/shieldwallgen/gen_primary
+		var/obj/machinery/shieldwallgen/gen_secondary
 
 /obj/machinery/shieldwall/New(var/obj/machinery/shieldwallgen/A, var/obj/machinery/shieldwallgen/B)
 	..()
@@ -454,17 +570,6 @@
 	spawn(1)
 		src.sd_SetLuminosity(3)
 
-/*	for(var/mob/M as mob in src.loc) //does not work for some reason.
-	 	if(istype(M,/mob/living/carbon))
-			M.adjustBruteLoss(100)
-	 		M.updatehealth()
-			M << "\red <B>You feel as the very atoms of your body divide!</B>"
-		else
-			M.adjustBruteLoss(50)
-	 		M.updatehealth()
-			M << "\red <B>Strong energy field detected. Damage from field dampened.</B>"
-*/
-
 /obj/machinery/shieldwall/attack_hand(mob/user as mob)
 	return
 
@@ -506,4 +611,4 @@
 		if (istype(mover, /obj/item/projectile))
 			return prob(10)
 		else
-			return !src.density
+			return !src.density
\ No newline at end of file
diff --git a/code/game/master_controller.dm b/code/game/master_controller.dm
index f61bf43d57f..a35e7fd69f5 100644
--- a/code/game/master_controller.dm
+++ b/code/game/master_controller.dm
@@ -7,10 +7,6 @@ var/global/controller_iteration = 0
 var/global/last_tick_timeofday = world.timeofday
 var/global/last_tick_duration = 0
 
-var/global/obj/machinery/last_obj_processed			//Used for MC 'proc break' debugging
-var/global/datum/disease/last_disease_processed		//Used for MC 'proc break' debugging
-var/global/obj/machinery/last_machine_processed		//Used for MC 'proc break' debugging
-
 datum/controller/game_controller
 	var/processing = 1
 
@@ -25,6 +21,13 @@ datum/controller/game_controller
 	var/global/powernets_ready = 0
 	var/global/ticker_ready = 0
 
+	//Used for MC 'proc break' debugging
+	var/global/obj/last_obj_processed
+	var/global/datum/disease/last_disease_processed
+	var/global/obj/machinery/last_machine_processed
+	var/global/mob/last_mob_processed
+
+
 	proc/setup()
 		if(master_controller && (master_controller != src))
 			del(src)
@@ -142,6 +145,7 @@ datum/controller/game_controller
 
 		spawn(0)
 			for(var/mob/M in world)
+				last_mob_processed = M
 				M.Life()
 			mobs_ready = 1
 
@@ -155,6 +159,7 @@ datum/controller/game_controller
 				last_disease_processed = D
 				D.process()
 			diseases_ready = 1
+
 		spawn(0)
 			for(var/obj/machinery/machine in machines)
 				if(machine)