Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum

# Conflicts:
#	code/modules/ninja/suit/ninjaDrainAct.dm

code/modules/mob/living/silicon/ai/multicam.dm

@@ -92,12 +92,9 @@
 	name = "ai_multicam_room"
 	icon_state = "ai_camera_room"
 	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
-	valid_territory = FALSE
-	ambientsounds = list()
-	blob_allowed = FALSE
-	noteleport = TRUE
-	hidden = TRUE
-	safe = TRUE
+	area_flags = NOTELEPORT | HIDDEN_AREA | UNIQUE_AREA
+	ambientsounds = null
+	flags_1 = NONE
 
 GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room)