Merge branch 'master' into development

# Conflicts:
#	html/changelogs/.all_changelog.yml

code/modules/admin/admin_verbs.dm

@@ -377,7 +377,8 @@ var/list/admin_verbs_cciaa = list(
 	/client/proc/view_duty_log,
 	/datum/admins/proc/create_admin_fax,
 	/client/proc/check_fax_history,
-	/client/proc/aooc
+	/client/proc/aooc,
+	/client/proc/check_antagonists
 )
 
 /client/proc/add_admin_verbs()
@@ -1123,7 +1124,7 @@ var/list/admin_verbs_cciaa = list(
 
 	SSsunlight.apply_sun_state(S)
 	log_and_message_admins("has set the sun state to '[S]'.")
-#else 
+#else
 /client/proc/apply_sunstate()
 	set hidden = TRUE
 

code/modules/admin/verbs/bluespacetech.dm

@@ -445,6 +445,7 @@
 	vision_flags = (SEE_TURFS|SEE_OBJS|SEE_MOBS)
 	see_invisible = SEE_INVISIBLE_NOLIGHTING
 	canremove = 0
+	flash_protection = FLASH_PROTECTION_MAJOR
 
 /obj/item/clothing/glasses/sunglasses/bst/verb/toggle_xray(mode in list("X-Ray without Lighting", "X-Ray with Lighting", "Normal"))
 	set name = "Change Vision Mode"