diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index fd41d7d8db5..5fe6a4c31f9 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -165,10 +165,8 @@
 			H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
 
 		if(H.backbag == 1)
-			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_l_hand)
 		else
-			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack)
 
 		return TRUE
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index f31c2f37c5d..6d4f57eda17 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -687,7 +687,7 @@ var/global/list/robot_modules = list(
 	channels = list("Supply" = 1)
 	networks = list(NETWORK_MINE)
 	sprites = list(
-					"Basic" = "robotMine",
+					"Basic" = "robotmine",
 					"Advanced Droid" = "droid-miner",
 					"Sleek" = "sleekminer",
 					"Treadhead" = "miner",
diff --git a/code/modules/projectiles/guns/projectile/improvised.dm b/code/modules/projectiles/guns/projectile/improvised.dm
index f854c3a4339..3cd0931e165 100644
--- a/code/modules/projectiles/guns/projectile/improvised.dm
+++ b/code/modules/projectiles/guns/projectile/improvised.dm
@@ -32,7 +32,7 @@
 
 
 /obj/item/weapon/gun/projectile/shotgun/improvised/attackby(var/obj/item/A as obj, mob/user as mob)
-	if(w_class == 3 && (istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/gun/energy/plasmacutter)))
+	if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/gun/energy/plasmacutter) && w_class != 3)
 		user << "<span class='notice'>You begin to shorten the barrel of \the [src].</span>"
 		if(loaded.len)
 			for(var/i in 1 to max_shells)
@@ -41,7 +41,7 @@
 			return
 		if(do_after(user, 30))
 			icon_state = "ishotgunsawn"
-			item_state = "sawnshotgun"
+			item_state = "ishotgunsawn"
 			w_class = 3
 			force = 5
 			slot_flags &= ~SLOT_BACK
@@ -227,5 +227,5 @@
 	fire_delay = 2
 	dispersion = list(1.0, -1.0, 2.0, -2.0)
 	jam_chance = 20
-	
+
 	firemodes = null
diff --git a/icons/obj/improvised.dmi b/icons/obj/improvised.dmi
index 9f13a85d53d..d926b7b2f50 100644
Binary files a/icons/obj/improvised.dmi and b/icons/obj/improvised.dmi differ
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index c5970f9ad60..b7e003bcdad 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -9631,10 +9631,6 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
-/obj/machinery/camera/network/medbay{
-	c_tag = "Virology Starboard";
-	dir = 8
-	},
 /obj/structure/sign/deathsposal{
 	pixel_x = 32
 	},
@@ -10558,10 +10554,6 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
-/obj/machinery/camera/network/medbay{
-	c_tag = "Virology Starboard";
-	dir = 8
-	},
 /obj/effect/floor_decal/corner/lime{
 	dir = 6
 	},
@@ -13816,11 +13808,6 @@
 	icon_state = "corner_white";
 	dir = 9
 	},
-/obj/machinery/camera/network/medbay{
-	c_tag = "Medical - Virology South";
-	dir = 8;
-	icon_state = "camera"
-	},
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_wing)
 "xB" = (
@@ -17391,14 +17378,14 @@
 /area/medical/patient_wing)
 "Dv" = (
 /obj/structure/disposalpipe/junction,
-/obj/machinery/camera/network/medbay{
-	c_tag = "Medbay Equipment Storage";
-	dir = 1
-	},
 /obj/machinery/light,
 /obj/structure/sign/nosmoking_1{
 	pixel_y = -32
 	},
+/obj/machinery/camera/network/medbay{
+	c_tag = "Medical - Patient Wing Hallway South";
+	dir = 1
+	},
 /turf/simulated/floor/tiled{
 	icon_state = "vault";
 	dir = 5
@@ -19476,13 +19463,13 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/camera/network/medbay{
-	c_tag = "Medical - Operating Theatre One"
-	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/medbreak)
 "Ha" = (
 /obj/machinery/vending/cigarette,
+/obj/machinery/camera/network/medbay{
+	c_tag = "Medical - Staff Smoking Lounge"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/medbreak)
 "Hb" = (
@@ -20753,7 +20740,7 @@
 	dir = 8
 	},
 /obj/machinery/camera/network/medbay{
-	c_tag = "Virology Starboard";
+	c_tag = "Medical - Staff Dormitories";
 	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
@@ -20781,7 +20768,7 @@
 	pixel_y = -24
 	},
 /obj/machinery/camera/network/medbay{
-	c_tag = "Medbay Equipment Storage";
+	c_tag = "Medical - Staff Hygiene Facilities";
 	dir = 1
 	},
 /turf/simulated/floor/tiled/freezer,
@@ -22360,6 +22347,17 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/sublevel)
+"Mn" = (
+/obj/effect/floor_decal/corner/lime{
+	icon_state = "corner_white";
+	dir = 9
+	},
+/obj/machinery/camera/network/medbay{
+	c_tag = "Medical - Patient Ward Entrance";
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/patient_wing)
 
 (1,1,1) = {"
 aa
@@ -62086,7 +62084,7 @@ rm
 rm
 uf
 uP
-vQ
+Mn
 vQ
 xA
 ye
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 18583eb0f9d..82f83cc1371 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -4288,7 +4288,7 @@
 /obj/structure/table/standard,
 /obj/item/device/flashlight/lamp,
 /obj/item/device/taperecorder,
-/turf/simulated/wall/r_wall,
+/turf/simulated/floor/tiled,
 /area/security/brig)
 "aiJ" = (
 /obj/item/device/radio/intercom{
@@ -34844,9 +34844,8 @@
 	},
 /obj/structure/bed/roller,
 /obj/machinery/camera/network/medbay{
-	c_tag = "Medical - Staff Area Hallway";
-	dir = 8;
-	icon_state = "camera"
+	c_tag = "Medical - Cloning Laboratory";
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/genetics_cloning)
@@ -38212,6 +38211,9 @@
 	icon_state = "corner_white_full";
 	dir = 1
 	},
+/obj/machinery/camera/network/medbay{
+	c_tag = "Medical - CMO's Office"
+	},
 /mob/living/simple_animal/cat/fluff/Runtime{
 	name = "Bones"
 	},
@@ -40557,11 +40559,6 @@
 	dir = 1
 	},
 /obj/structure/window/reinforced,
-/obj/machinery/camera/network/medbay{
-	c_tag = "Medical - Virology South";
-	dir = 8;
-	icon_state = "camera"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -40575,6 +40572,10 @@
 /obj/effect/landmark/start{
 	name = "Medical Doctor"
 	},
+/obj/machinery/camera/network/medbay{
+	c_tag = "Medical - Briefing Room";
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay2)
 "bsf" = (
@@ -40669,11 +40670,6 @@
 	pixel_x = 30;
 	pixel_y = 0
 	},
-/obj/machinery/camera/network/medbay{
-	c_tag = "Medical - Morgue";
-	dir = 8;
-	icon_state = "camera"
-	},
 /obj/machinery/light{
 	dir = 4;
 	icon_state = "tube1";
@@ -43494,9 +43490,6 @@
 /obj/machinery/light/small/emergency{
 	dir = 1
 	},
-/obj/machinery/camera/network/engineering{
-	c_tag = "Engineering - Engine Cooling EVA"
-	},
 /turf/simulated/floor/plating,
 /area/maintenance/research_port)
 "bwG" = (
@@ -43903,13 +43896,12 @@
 	icon_state = "corner_white";
 	dir = 6
 	},
-/obj/machinery/camera/network/medbay{
-	c_tag = "Medical - Virology South";
-	dir = 8;
-	icon_state = "camera"
-	},
 /obj/item/weapon/packageWrap,
 /obj/item/weapon/hand_labeler,
+/obj/machinery/camera/network/medbay{
+	c_tag = "Medical - Medical Office";
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay)
 "bxq" = (
@@ -46136,9 +46128,8 @@
 	dir = 5
 	},
 /obj/machinery/camera/network/medbay{
-	c_tag = "Medical - Patient Ward";
-	dir = 1;
-	icon_state = "camera"
+	c_tag = "Medical - Pre/Post Operatory Room";
+	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgerywing)
@@ -91195,7 +91186,7 @@ bMI
 bJa
 bIl
 ceF
-bRE
+bMI
 bJa
 bOf
 bSG
@@ -96258,7 +96249,7 @@ ahy
 cfn
 alC
 amn
-cfr
+cfq
 aoc
 cfu
 ard
diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm
index 20657ba03bb..40bed5255c3 100644
--- a/maps/aurora/aurora-5_interstitial.dmm
+++ b/maps/aurora/aurora-5_interstitial.dmm
@@ -1648,6 +1648,19 @@
 /obj/structure/lattice/catwalk,
 /turf/simulated/open,
 /area/maintenance/library)
+"da" = (
+/obj/machinery/door/airlock/maintenance{
+	req_access = list(50)
+	},
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2";
+	pixel_y = 0
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/library)
 
 (1,1,1) = {"
 aa
@@ -27020,7 +27033,7 @@ cw
 cw
 cw
 cK
-cN
+da
 cO
 cO
 cO