Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'

code/modules/mob/living/carbon/alien/special/alien_embryo.dm

@@ -83,7 +83,7 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
 				AttemptGrow()
 
 /obj/item/alien_embryo/proc/AttemptGrow(var/gib_on_success = 1)
-	var/list/candidates = get_candidates(BE_ALIEN,ALIEN_AFK_BRACKET,1)
+	var/list/candidates = get_candidates(ROLE_ALIEN,ALIEN_AFK_BRACKET,1)
 	var/client/C = null
 
 	// To stop clientless larva, we will check that our host has a client

code/modules/mob/living/carbon/brain/posibrain.dm

@@ -32,8 +32,9 @@
 /obj/item/device/mmi/posibrain/proc/request_player()
 	for(var/mob/dead/observer/O in player_list)
 		if(check_observer(O))
-			O << "\blue <b>\A [src] has been activated. (<a href='?src=\ref[O];jump=\ref[src]'>Teleport</a> | <a href='?src=\ref[src];signup=\ref[O]'>Sign Up</a>)"
-			//question(O.client)
+			O << "<span class='boldnotice'>\A [src] has been activated. (<a href='?src=\ref[O];jump=\ref[src]'>Teleport</a> | <a href='?src=\ref[src];signup=\ref[O]'>Sign Up</a>)</span>"
+//			if(ROLE_POSIBRAIN in O.client.prefs.be_special) The Guardian implementation looks cleaner
+//				question(O.client)
 
 /obj/item/device/mmi/posibrain/proc/check_observer(var/mob/dead/observer/O)
 	if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
@@ -52,7 +53,7 @@
 		if(response == "Yes")
 			transfer_personality(C.mob)
 		else if (response == "Never for this round")
-			C.prefs.be_special ^= BE_PAI
+			C.prefs.be_special -= ROLE_POSIBRAIN
 
 // This should not ever happen, but let's be safe
 /obj/item/device/mmi/posibrain/dropbrain(var/turf/dropspot)

code/modules/mob/living/carbon/human/species/species.dm

@@ -413,6 +413,7 @@
 				if(H.client)
 					H.client.screen += global_hud.darkMask
 
+		var/minimum_darkness_view = INFINITY
 		if(H.glasses)
 			if(istype(H.glasses, /obj/item/clothing/glasses))
 				var/obj/item/clothing/glasses/G = H.glasses
@@ -420,6 +421,7 @@
 
 				if(G.darkness_view)
 					H.see_in_dark = G.darkness_view
+					minimum_darkness_view = G.darkness_view
 
 				if(!G.see_darkness)
 					H.see_invisible = SEE_INVISIBLE_MINIMUM
@@ -437,6 +439,9 @@
 				var/obj/item/clothing/head/hat = H.head
 				H.sight |= hat.vision_flags
 
+				if(hat.darkness_view && hat.darkness_view < minimum_darkness_view) // Pick the lowest of the two darkness_views between the glasses and helmet.
+					H.see_in_dark = hat.darkness_view
+
 				if(!hat.see_darkness)
 					H.see_invisible = SEE_INVISIBLE_MINIMUM
 

code/modules/mob/living/carbon/metroid/metroid.dm

@@ -789,7 +789,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 	user << "<span class='notice'>You offer the sentience potion to [M]...</span>"
 	being_used = 1
 
-	var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET)
+	var/list/candidates = get_candidates(ROLE_SENTIENT, ALIEN_AFK_BRACKET)
 
 	shuffle(candidates)
 

code/modules/mob/living/silicon/pai/recruit.dm

@@ -348,15 +348,15 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 
 	proc/requestRecruits(var/obj/item/device/paicard/P)
 		for(var/mob/dead/observer/O in player_list)
-			if(O.client && O.client.prefs.be_special & BE_PAI)
-				if(player_old_enough_antag(O.client,BE_PAI))
+			if(O.client && (ROLE_PAI in O.client.prefs.be_special))
+				if(player_old_enough_antag(O.client,ROLE_PAI))
 					if(check_recruit(O))
 						O << "\blue <b>A pAI card is looking for personalities. (<a href='?src=\ref[O];jump=\ref[P]'>Teleport</a> | <a href='?src=\ref[src];signup=\ref[O]'>Sign Up</a>)</b>"
 						//question(O.client)
 	proc/check_recruit(var/mob/dead/observer/O)
 		if(jobban_isbanned(O, "pAI") || jobban_isbanned(O,"nonhumandept"))
 			return 0
-		if(!player_old_enough_antag(O.client,BE_PAI))
+		if(!player_old_enough_antag(O.client,ROLE_PAI))
 			return 0
 		if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
 			return 0

code/modules/mob/living/silicon/robot/drone/drone.dm

@@ -259,7 +259,7 @@
 		if(jobban_isbanned(O,"nonhumandept") || jobban_isbanned(O,"Drone"))
 			continue
 		if(O.client)
-			if(O.client.prefs.be_special & BE_PAI)
+			if(ROLE_PAI in O.client.prefs.be_special)
 				question(O.client,O)
 
 /mob/living/silicon/robot/drone/proc/question(var/client/C,var/mob/M)

code/modules/mob/living/simple_animal/borer.dm

@@ -16,7 +16,7 @@
 		if (!message)
 			return
 		log_say("[key_name(src)] : [message]")
-		if (stat == 2)
+		if (stat == DEAD)
 			return say_dead(message)
 		var/mob/living/simple_animal/borer/B = src.loc
 		src << "You whisper silently, \"[message]\""
@@ -302,7 +302,7 @@
 		detatch()
 		leave_host()
 
-mob/living/simple_animal/borer/proc/detatch()
+/mob/living/simple_animal/borer/proc/detatch()
 
 	if(!host) return
 
@@ -416,7 +416,7 @@ mob/living/simple_animal/borer/proc/detatch()
 		src << "You cannot infest a target in your current state."
 		return
 
-	if(M.stat == 2)
+	if(M.stat == DEAD)
 		src << "That is not an appropriate target."
 		return
 
@@ -457,15 +457,15 @@ mob/living/simple_animal/borer/proc/detatch()
 	return
 
 //Procs for grabbing players.
-mob/living/simple_animal/borer/proc/request_player()
+/mob/living/simple_animal/borer/proc/request_player()
 	for(var/mob/O in respawnable_list)
 		if(jobban_isbanned(O, "Syndicate"))
 			continue
 		if(O.client)
-			if(O.client.prefs.be_special & BE_ALIEN && !jobban_isbanned(O, "alien"))
+			if((ROLE_BORER in O.client.prefs.be_special) && !jobban_isbanned(O, "alien"))
 				question(O.client)
 
-mob/living/simple_animal/borer/proc/question(var/client/C)
+/mob/living/simple_animal/borer/proc/question(var/client/C)
 	spawn(0)
 		if(!C)	return
 		var/response = alert(C, "A cortical borer needs a player. Are you interested?", "Cortical borer request", "Yes", "No", "Never for this round")
@@ -474,9 +474,9 @@ mob/living/simple_animal/borer/proc/question(var/client/C)
 		if(response == "Yes")
 			transfer_personality(C)
 		else if (response == "Never for this round")
-			C.prefs.be_special ^= BE_ALIEN
+			C.prefs.be_special -= ROLE_BORER
 
-mob/living/simple_animal/borer/proc/transfer_personality(var/client/candidate)
+/mob/living/simple_animal/borer/proc/transfer_personality(var/client/candidate)
 
 	if(!candidate)
 		return

code/modules/mob/living/simple_animal/guardian/guardian.dm

@@ -641,7 +641,7 @@
 		return
 	used = TRUE
 	user << "[use_message]"
-	var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the [mob_name] of [user.real_name]?",BE_PAI, null, FALSE, 100)
+	var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the [mob_name] of [user.real_name]?",ROLE_GUARDIAN, null, FALSE, 100)
 	var/mob/dead/observer/theghost = null
 
 	if(candidates.len)

code/modules/mob/living/simple_animal/revenant/revenant.dm

@@ -442,7 +442,7 @@
 
 	if(!key_of_revenant)
 		message_admins("The new revenant's old client either could not be found or is in a new, living mob - grabbing a random candidate instead...")
-		var/list/candidates = get_candidates(BE_REVENANT)
+		var/list/candidates = get_candidates(ROLE_REVENANT)
 		if(!candidates.len)
 			qdel(R)
 			message_admins("No candidates were found for the new revenant. Oh well!")

code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm

@@ -13,7 +13,7 @@
 		return
 	key_of_revenant = null
 	if(!key_of_revenant)
-		var/list/candidates = get_candidates(BE_REVENANT)
+		var/list/candidates = get_candidates(ROLE_REVENANT)
 		if(!candidates.len)
 			if(end_if_fail)
 				return 0