Merge pull request #8786 from MistakeNot4892/boda

Standardized area flag defines, added vendor rampancy flag check.

code/modules/events/brand_intelligence.dm

@@ -14,7 +14,11 @@
 
 /datum/event/brand_intelligence/start()
 	for(var/obj/machinery/vending/V in machines)
-		if(isNotStationLevel(V.z))	continue
+		if(isNotStationLevel(V.z))
+			continue
+		var/area/A = get_area(V)
+		if(!(A?.area_flags & AREA_FLAG_IS_STATION_AREA))
+			continue
 		vendingMachines.Add(V)
 
 	if(!vendingMachines.len)

code/modules/events/ion_storm.dm

@@ -37,7 +37,7 @@
 		if(!(S.z in affecting_z))
 			continue
 		var/area/A = get_area(S)
-		if(!A || A.area_flags & RAD_SHIELDED) // Rad shielding will protect from ions too
+		if(!A || A.area_flags & AREA_FLAG_IS_RAD_SHIELDED) // Rad shielding will protect from ions too
 			continue
 		to_chat(S, "<span class='warning'>Your integrated sensors detect an ionospheric anomaly. Your systems will be impacted as you begin a partial restart.</span>")
 		var/ionbug = rand(3, 9)

code/modules/events/radiation_storm.dm

@@ -37,7 +37,7 @@
 		var/area/A = get_area(C)
 		if(!A)
 			continue
-		if(A.area_flags & RAD_SHIELDED)
+		if(A.area_flags & AREA_FLAG_IS_RAD_SHIELDED)
 			continue
 		if(istype(C,/mob/living/carbon/human))
 			var/mob/living/carbon/human/H = C

code/modules/radiation/radiation.dm

@@ -4,7 +4,7 @@
 	var/turf/source_turf		// Location of the radiation source.
 	var/rad_power				// Strength of the radiation being emitted.
 	var/decay = TRUE			// True for automatic decay.  False if owner promises to handle it (i.e. supermatter)
-	var/respect_maint = FALSE	// True for not affecting RAD_SHIELDED areas.
+	var/respect_maint = FALSE	// True for not affecting AREA_FLAG_IS_RAD_SHIELDED areas.
 	var/flat = FALSE			// True for power falloff with distance.
 	var/range					// Cached maximum range, used for quick checks against mobs.