diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm
index 7678a12606..56bb099674 100644
--- a/code/defines/obj/supplypacks.dm
+++ b/code/defines/obj/supplypacks.dm
@@ -11,7 +11,7 @@
 					"/obj/item/weapon/smokebomb",
 					"/obj/item/weapon/smokebomb",
 					"/obj/item/weapon/pen/paralysis",
-					"/obj/item/weapon/chem_grenade/incendiary")
+					"/obj/item/weapon/grenade/chem_grenade/incendiary")
 	cost = 20
 	containertype = "/obj/structure/closet/crate"
 	containername = "Special Ops crate"
@@ -441,9 +441,9 @@
 					"/obj/item/weapon/tank/plasma",
 					"/obj/item/weapon/tank/plasma",
 					"/obj/item/weapon/tank/plasma",
-					"/obj/item/weapon/chem_grenade/incendiary",
-					"/obj/item/weapon/chem_grenade/incendiary",
-					"/obj/item/weapon/chem_grenade/incendiary")
+					"/obj/item/weapon/grenade/chem_grenade/incendiary",
+					"/obj/item/weapon/grenade/chem_grenade/incendiary",
+					"/obj/item/weapon/grenade/chem_grenade/incendiary")
 	cost = 25
 	containertype = "/obj/structure/closet/crate/secure/weapon"
 	containername = "Experimental weapons crate"
diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm
index c4dc34db10..4b1e01c2f6 100644
--- a/code/defines/obj/vending.dm
+++ b/code/defines/obj/vending.dm
@@ -176,7 +176,7 @@
 	icon_state = "sec"
 	icon_deny = "sec-deny"
 	req_access_txt = "1"
-	product_paths = "/obj/item/weapon/handcuffs;/obj/item/weapon/flashbang;/obj/item/device/flash;/obj/item/weapon/reagent_containers/food/snacks/donut;/obj/item/weapon/storage/box/evidence"
+	product_paths = "/obj/item/weapon/handcuffs;/obj/item/weapon/grenade/flashbang;/obj/item/device/flash;/obj/item/weapon/reagent_containers/food/snacks/donut;/obj/item/weapon/storage/box/evidence"
 	product_amounts = "8;4;5;12;6"
 	product_hidden = "/obj/item/clothing/glasses/sunglasses;/obj/item/kitchen/donut_box"
 	product_hideamt = "2;2"
diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm
index 551a4698da..a02db80540 100644
--- a/code/game/atom_procs.dm
+++ b/code/game/atom_procs.dm
@@ -1035,8 +1035,9 @@ 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(( 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()
+	//I dont think this was ever really a problem and it's only creating more bugs...
+//	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()
 
 	return
 
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index 64a8096191..d0ce867c72 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -1,8 +1,8 @@
 /obj/machinery/shield
-		name = "emergency energy shield"
-		desc = "An energy shield usually used to contain hull breaches."
+		name = "Emergency energy shield"
+		desc = "An energy shield used to contain hull breaches."
 		icon = 'effects.dmi'
-		icon_state = "shieldsparkles"
+		icon_state = "shield-old"
 		density = 1
 		opacity = 0
 		anchored = 1
@@ -169,7 +169,7 @@
 
 
 /obj/machinery/shieldgen
-		name = "Shield generator"
+		name = "Emergency shield projector"
 		desc = "Used to seal minor hull breaches."
 		icon = 'objects.dmi'
 		icon_state = "shieldoff"
@@ -294,6 +294,9 @@
 		playsound(src.loc, 'Ratchet.ogg', 100, 1)
 		if(anchored)
 			user << "\blue You unsecure the [src] from the floor!"
+			if(active)
+				user << "The [src] shuts off!"
+				src.shields_down()
 			anchored = 0
 		else
 			user << "\blue You secure the [src] to the floor!"
diff --git a/code/game/objects/storage/belt.dm b/code/game/objects/storage/belt.dm
index cd9fd76b60..9265e3b07d 100644
--- a/code/game/objects/storage/belt.dm
+++ b/code/game/objects/storage/belt.dm
@@ -103,7 +103,7 @@
 	item_state = "security"//Could likely use a better one.
 	storage_slots = 4
 	can_hold = list(
-		"/obj/item/weapon/flashbang",
+		"/obj/item/weapon/grenade/flashbang",
 		"/obj/item/weapon/pepperspray",
 		"/obj/item/weapon/handcuffs",
 		"/obj/item/device/flash",