Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/modules/DetectiveWork/evidence.dm

@@ -26,6 +26,10 @@
 		user << "You are wearing that."
 		return
 
+	if(O in user) //TEMPORARY FIX. It seems trying to put items that are in your hand in the bags breaks them horribly. - Erthilo
+		user << "You'll need to put the evidence down to properly bag it."
+		return
+
 	if(contents.len)
 		user << "The [src] already has something inside it."
 		return ..()

code/modules/admin/admin.dm

@@ -1448,7 +1448,7 @@ var/global/BSACooldown = 0
 				special_role_description = "Role: <i>Mind datum missing</i> Antagonist: <i>Mind datum missing</i>; Has been rev: <i>Mind datum missing</i>;"
 
 			//Health
-			health_description = "Oxy: [M.oxyloss] - Tox: [M.toxloss] - Fire: [M.fireloss] - Brute: [M.bruteloss] - Clone: [M.cloneloss] - Brain: [M.brainloss]"
+			health_description = "Oxy: [M.getOxyLoss()] - Tox: [M.getToxLoss()] - Fire: [M:getFireLoss()] - Brute: [M:getBruteLoss()] - Clone: [M.getCloneLoss()] - Brain: [M.getBrainLoss()]"
 
 			src.owner << "<b>Info about [M.name]:</b> "
 			src.owner << "Mob type = [M.type]; Damage = [health_description]"

code/modules/admin/admin_verbs.dm

@@ -878,8 +878,9 @@
 	verbs -= /client/proc/hide_most_verbs
 	verbs += /client/proc/show_verbs
 
-	verbs += /client/proc/deadchat					//toggles deadchat
-	verbs += /obj/admins/proc/toggleooc				//toggle ooc
+	if(holder.level > 0)
+		verbs += /client/proc/deadchat					//toggles deadchat
+		verbs += /obj/admins/proc/toggleooc				//toggle ooc
 	verbs += /client/proc/cmd_admin_say//asay
 	verbs += /client/proc/cmd_mod_say//asay
 //	feedback_add_details("admin_verb","TAVVH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

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

@@ -947,7 +947,7 @@
 								emote("scream")
 					else if(E.name == "l_leg" || E.name == "l_foot" \
 						|| E.name == "r_leg" || E.name == "r_foot" && !lying)
-						if(!E.status & SPLINTED)
+						if(!(E.status & SPLINTED))
 							leg_tally--									// let it fail even if just foot&leg
 			// can't stand
 			if(leg_tally == 0 && !paralysis && !(lying || resting))

code/modules/mob/living/carbon/monkey/life.dm

@@ -450,7 +450,7 @@
 								emote("scream")
 					else if(E.name == "l_leg" || E.name == "l_foot" \
 						|| E.name == "r_leg" || E.name == "r_foot" && !lying)
-						if(!E.status & SPLINTED)
+						if(!(E.status & SPLINTED))
 							leg_tally--									// let it fail even if just foot&leg
 
 			// can't stand

code/modules/mob/living/silicon/say.dm

@@ -70,6 +70,12 @@
 				M.show_message(rendered_a, 2)
 			else//If they do not.
 				M.show_message(rendered_b, 2)
+
+		for (var/obj/item/device/taperecorder/O in range(T, 7)) //Puree hack for tap recorder
+			spawn (0)
+				if(O && !istype(O.loc, /obj/item/weapon/storage))
+					O.hear_talk(src, message_a)
+
 		/*Radios "filter out" this conversation channel so we don't need to account for them.
 		This is another way of saying that we won't bother dealing with them.*/
 	else

code/modules/mob/mob.dm

@@ -687,7 +687,7 @@
 		if(H.health - H.halloss <= config.health_threshold_crit)
 			for(var/name in H.organs)
 				var/datum/organ/external/e = H.organs[name]
-				if((H.lying) && ((e.status & BROKEN && !e.status & SPLINTED) || e.status & BLEEDING) && (H.getBruteLoss() + H.getFireLoss() >= 100))
+				if((H.lying) && ((e.status & BROKEN && !(e.status & SPLINTED)) || e.status & BLEEDING) && (H.getBruteLoss() + H.getFireLoss() >= 100))
 					return 1
 					break
 		return 0

code/modules/mob/new_player/preferences.dm

@@ -747,17 +747,23 @@ datum/preferences
 				if("input")
 					var/list/new_species = list("Human")
 					var/prev_species = species
+					var/whitelisted = 0
 					if(config.usealienwhitelist) //If we're using the whitelist, make sure to check it!
 						if(is_alien_whitelisted(user, "Soghun")) //Check for Soghun and admins
 							new_species += "Soghun"
+							whitelisted = 1
 						if(is_alien_whitelisted(user, "Tajaran")) //Check for Tajaran and admins
 							new_species += "Tajaran"
+							whitelisted = 1
 						if(is_alien_whitelisted(user, "Skrell")) //Check for Skrell and admins
 							new_species += "Skrell"
+							whitelisted = 1
 					else //Not using the whitelist? Aliens for everyone!
 						new_species += "Tajaran"
 						new_species += "Soghun"
 						new_species += "Skrell"
+					if(!whitelisted)
+						alert(user, "You cannot change your species as you need to be whitelisted. If you wish to be whitelisted contact an admin in-game, on the forums, or on IRC.")
 					species = input("Please select a species", "Character Generation", null) in new_species
 					if(prev_species != species)
 						h_style = "Bald" //Try not to carry face/head hair over.

code/modules/mob/say.dm

@@ -55,6 +55,10 @@
 	if(!text)
 		return "says, \"...\"";	//not the best solution, but it will stop a large number of runtimes. The cause is somewhere in the Tcomms code
 	var/ending = copytext(text, length(text))
+	if (is_speaking_soghun)
+		return "hisses, \"[text]\"";
+	if (is_speaking_skrell)
+		return "warbles, \"[text]\"";
 	if (src.disease_symptoms & DISEASE_HOARSE)
 		return "rasps, \"[text]\"";
 	if (src.stuttering)
@@ -67,10 +71,6 @@
 		return "asks, \"[text]\"";
 	if (ending == "!")
 		return "exclaims, \"[text]\"";
-	if (is_speaking_soghun)
-		return "hisses, \"[text]\"";
-	if (is_speaking_skrell)
-		return "warbles, \"[text]\"";
 
 	return "says, \"[text]\"";
 

code/modules/power/lighting.dm

@@ -127,7 +127,7 @@
 	var/oldlum = luminosity
 
 	//luminosity = on * brightness
-	ul_SetLuminosity(on * brightness, on * brightness, fitting != "bulb" ? on * brightness : max(on * (brightness - 2), 0) )		// *DAL*
+	ul_SetLuminosity(on * brightness, on * brightness, fitting != "bulb" ? on * brightness : max(on * (brightness - 1), 0) )		// *DAL*
 
 	// if the state changed, inc the switching counter
 	if(oldlum != luminosity)