Merge branch 'master' into reagentToDefines

code/modules/events/disease_outbreak.dm

@@ -3,7 +3,8 @@ GLOBAL_LIST_EMPTY(current_pending_diseases)
 	var/datum/disease/chosen_disease
 	var/list/disease_blacklist = list(
 		/datum/disease/advance,
-		/datum/disease/food_poisoning
+		/datum/disease/food_poisoning,
+		/datum/disease/gbs // Terrible. It's only in the code to scare people.
 	)
 	var/static/list/transmissable_symptoms = list()
 	var/static/list/diseases_minor = list()
@@ -44,7 +45,7 @@ GLOBAL_LIST_EMPTY(current_pending_diseases)
 				continue
 			if(!(A.z in using_map.station_levels))
 				continue
-			if(A.flags & RAD_SHIELDED)
+			if(A.flag_check(RAD_SHIELDED))
 				continue
 			if(isbelly(G.loc))
 				continue

code/modules/events/grubinfestation_vr.dm

@@ -12,7 +12,7 @@
 
 	for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in machines)
 		var/area/A = get_area(temp_vent)
-		if(A.forbid_events)
+		if(A.flag_check(AREA_FORBID_EVENTS))
 			continue
 		if(!temp_vent.welded && temp_vent.network && (temp_vent.loc.z in using_map.station_levels))
 			if(temp_vent.network.normal_members.len > 50)

code/modules/events/ian_storm_vr.dm

@@ -17,7 +17,7 @@
 			if(!(T.z in using_map.station_levels))
 				continue
 			var/area/A = get_area(T)
-			if(A.flags & RAD_SHIELDED || A.flags & BLUE_SHIELDED)
+			if(A.flag_check(RAD_SHIELDED | BLUE_SHIELDED))
 				continue
 			place_ian(T)
 

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.flags & RAD_SHIELDED) // Rad shielding will protect from ions too
+		if(!A || A.flag_check(RAD_SHIELDED)) // Rad shielding will protect from ions too
 			continue
 		to_chat(S, span_warning("Your integrated sensors detect an ionospheric anomaly. Your systems will be impacted as you begin a partial restart."))
 		var/ionbug = rand(3, 9)

code/modules/events/maint_lurker.dm

@@ -0,0 +1,22 @@
+/datum/event/maintenance_lurker
+	startWhen = 1
+	endWhen = 30
+
+/datum/event/maintenance_lurker/start()
+
+	var/obj/effect/landmark/spawnspot = null
+	var/list/possibleSpawnspots = list()
+	for(var/obj/effect/landmark/L in landmarks_list)
+		if(L.name == "maint_pred")
+			possibleSpawnspots += L
+	if(possibleSpawnspots.len)
+		spawnspot = pick(possibleSpawnspots)
+	else
+		kill()		// To prevent fake announcements
+		return
+
+	if(!spawnspot)
+		kill()		// To prevent fake announcements
+		return
+
+	new /obj/structure/ghost_pod/ghost_activated/maint_lurker(get_turf(spawnspot))

code/modules/events/radiation_storm.dm

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

code/modules/events/spider_infestation.dm

@@ -20,7 +20,7 @@
 		if(!temp_vent.welded && temp_vent.network && (temp_vent.loc.z in using_map.station_levels))
 			if(temp_vent.network.normal_members.len > 50)
 				var/area/A = get_area(temp_vent)
-				if(!(A.forbid_events))
+				if(!(A.flag_check(AREA_FORBID_EVENTS)))
 					vents += temp_vent
 
 	while((spawncount >= 1) && vents.len)

code/modules/events/spontaneous_appendicitis_vr.dm

@@ -5,7 +5,7 @@
 			continue
 		if(!(A.z in using_map.station_levels))
 			continue
-		if(A.flags & RAD_SHIELDED)
+		if(A.flag_check(RAD_SHIELDED))
 			continue
 		if(isbelly(H.loc))
 			continue

code/modules/events/wallrot.dm

@@ -12,7 +12,7 @@
 		if(istype(candidate, /turf/simulated/wall))
 			center = candidate
 			var/area/A = get_area(candidate)
-			if(!A.forbid_events)
+			if(!A.flag_check(AREA_FORBID_EVENTS))
 				return 1
 	return 0
 
@@ -35,4 +35,4 @@
 
 				// Only rot up to severity walls
 				if(rotcount >= actual_severity)
-					break
+					break