diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 47b88f6af7e7..5e5679cf094a 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -81,6 +81,7 @@
 			src.verbs += /client/proc/Debug2					//debug toggle switch
 			src.verbs += /client/proc/fix_next_move
 			src.verbs += /client/proc/ticklag
+			src.verbs += /client/proc/camera_view
 			src.verbs += /proc/givetestverbs
 			src.verbs += /obj/admins/proc/spawn_atom
 			src.verbs += /obj/admins/proc/toggletintedweldhelmets
diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm
index 24606ed6c05f..528b6b35bfdc 100644
--- a/code/modules/admin/verbs/diagnostics.dm
+++ b/code/modules/admin/verbs/diagnostics.dm
@@ -1,4 +1,14 @@
 
+var/camera_range_display_status = 0
+
+/obj/debugging/camera_range
+	icon = '480x480.dmi'
+	icon_state = "25percent"
+
+	New()
+		src.pixel_x = -224
+		src.pixel_y = -224
+
 /client/proc
 	general_report()
 		set category = "Debug"
@@ -22,6 +32,24 @@
 
 		usr << browse(output,"window=generalreport")
 
+	camera_view()
+		set category = "Debug"
+		set name = "Camera Range Display"
+
+		if(camera_range_display_status)
+			camera_range_display_status = 0
+		else
+			camera_range_display_status = 1
+
+
+
+		for(var/obj/debugging/camera_range/C in world)
+			del(C)
+
+		if(camera_range_display_status)
+			for(var/obj/machinery/camera/C in world)
+				new/obj/debugging/camera_range(C.loc)
+
 	air_report()
 		set category = "Debug"
 		set name = "Show Air Report"
@@ -145,5 +173,5 @@
 						output += "&nbsp;&nbsp;&nbsp;&nbsp;[device] ([device:x],[device:y],[device:z] in area [get_area(device:loc)])<br>"
 					else
 						output += "&nbsp;&nbsp;&nbsp;&nbsp;[device]<br>"
-					
+
 		usr << browse(output,"window=radioreport")
diff --git a/icons/480x480.dmi b/icons/480x480.dmi
new file mode 100644
index 000000000000..90ea9fbd55cb
Binary files /dev/null and b/icons/480x480.dmi differ