Merge branch 'master' into refactor-spawning-from-vents

code/modules/events/abductor.dm

@@ -9,7 +9,7 @@
 			makeAbductorTeam()
 
 /datum/event/abductor/proc/makeAbductorTeam()
-	var/list/mob/dead/observer/candidates = pollCandidates("Do you wish to be considered for an Abductor Team?", ROLE_ABDUCTOR, 1)
+	var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you wish to be considered for an Abductor Team?", ROLE_ABDUCTOR, TRUE)
 
 	if(candidates.len >= 2)
 		//Oh god why we can't have static functions

code/modules/events/alien_infestation.dm

@@ -21,7 +21,7 @@
 		spawncount = 4
 
 	spawn()
-		var/list/candidates = pollCandidates("Do you want to play as an alien?", ROLE_ALIEN, 1)
+		var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as an alien?", ROLE_ALIEN, TRUE, source = /mob/living/carbon/alien/larva)
 		while(spawncount && length(vents) && length(candidates))
 			var/obj/vent = pick_n_take(vents)
 			var/mob/C = pick_n_take(candidates)

code/modules/events/blob.dm

@@ -16,16 +16,16 @@
 	if(!T)
 		return kill()
 
-	var/list/candidates = pollCandidates("Do you want to play as a blob infested mouse?", ROLE_BLOB, 1)
-	if(!candidates.len)
+	var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a blob infested mouse?", ROLE_BLOB, TRUE, source = /mob/living/simple_animal/mouse/blobinfected)
+	if(!length(candidates))
 		return kill()
 
 	var/list/vents = get_valid_vent_spawns(exclude_mobs_nearby = TRUE, exclude_visible_by_mobs = TRUE)
 	if(!length(vents))
 		return
+
 	var/obj/vent = pick(vents)
 	var/mob/living/simple_animal/mouse/blobinfected/B = new(vent.loc)
-	var/mob/M = pick(candidates)
 	B.key = M.key
 	SSticker.mode.update_blob_icons_added(B.mind)
 

code/modules/events/event_procs.dm

@@ -1,9 +1,9 @@
 
 /client/proc/forceEvent(var/type in SSevents.allEvents)
-	set name = "Trigger Event (Debug Only)"
+	set name = "Trigger Event"
 	set category = "Debug"
 
-	if(!holder)
+	if(!check_rights(R_EVENT))
 		return
 
 	if(ispath(type))

code/modules/events/mass_hallucination.dm

@@ -6,6 +6,9 @@
 		var/mob/living/carbon/human/H = thing
 		if(H.stat == DEAD)
 			continue
+		var/turf/T = get_turf(H)
+		if(!is_station_level(T.z))
+			continue
 		var/armor = H.getarmor(type = "rad")
 		if((RADIMMUNE in H.dna.species.species_traits) || armor >= 75) // Leave radiation-immune species/rad armored players completely unaffected
 			continue

code/modules/events/sentience.dm

@@ -3,8 +3,7 @@
 /datum/event/sentience/start()
 	processing = FALSE //so it won't fire again in next tick
 
-	var/ghostmsg = "Do you want to awaken as a sentient being?"
-	var/list/candidates = pollCandidates(ghostmsg, ROLE_SENTIENT, 1)
+	var/list/candidates = SSghost_spawns.poll_candidates("Do you want to awaken as a sentient being?", ROLE_SENTIENT, TRUE)
 	var/list/potential = list()
 	var/sentience_type = SENTIENCE_ORGANIC
 

code/modules/events/slaughterevent.dm

@@ -3,7 +3,7 @@
 
 /datum/event/spawn_slaughter/proc/get_slaughter(var/end_if_fail = 0)
 	spawn()
-		var/list/candidates = pollCandidates("Do you want to play as a slaughter demon?", ROLE_DEMON, 1)
+		var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a slaughter demon?", ROLE_DEMON, TRUE, source = /mob/living/simple_animal/slaughter)
 		if(!candidates.len)
 			key_of_slaughter = null
 			return kill()

code/modules/events/traders.dm

@@ -34,7 +34,7 @@ GLOBAL_LIST_INIT(unused_trade_stations, list("sol"))
 	trader_objectives = forge_trader_objectives()
 
 	spawn()
-		var/list/candidates = pollCandidates("Do you want to play as a trader?", ROLE_TRADER, 1)
+		var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a Sol Trader?", ROLE_TRADER, TRUE)
 		var/index = 1
 		while(spawn_count > 0 && candidates.len > 0)
 			if(index > spawnlocs.len)