Merge remote-tracking branch 'polaris/master' into polaris-sync

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm

code/modules/mob/living/carbon/alien/diona/life.dm

@@ -4,12 +4,7 @@
 	var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
 	if(isturf(loc)) //else, there's considered to be no light
 		var/turf/T = loc
-		var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
-		if(L)
-			light_amount = 2 * (min(5,L.lum_r + L.lum_g + L.lum_b) - 2.5) //hardcapped so it's not abused by having a ton of flashlights
-		else
-			light_amount =  5
-
+		light_amount = T.get_lumcount() * 5
 
 	nutrition += light_amount
 

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

@@ -706,7 +706,7 @@
 	if(istype(src.glasses, /obj/item/clothing/glasses/sunglasses))
 		if(istype(src.glasses, /obj/item/clothing/glasses/sunglasses/sechud/aviator))
 			var/obj/item/clothing/glasses/sunglasses/sechud/aviator/S = src.glasses
-			if(!S.active)
+			if(!S.on)
 				number += 1
 		else if(istype(src.glasses, /obj/item/clothing/glasses/sunglasses/medhud/aviator))
 			number += 0

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

@@ -235,8 +235,6 @@
 
 	nutrition -= 200
 
-	// Theoretically the only internal organ a slime will have
-	// is the slime core. but we might as well be thorough.
 	for(var/obj/item/organ/I in internal_organs)
 		if(I.damage > 0)
 			I.damage = 0
@@ -245,6 +243,7 @@
 	// Replace completely missing limbs.
 	for(var/limb_type in src.species.has_limbs)
 		var/obj/item/organ/external/E = src.organs_by_name[limb_type]
+		E.disfigured = 0
 		if(E && (E.is_stump() || (E.status & (ORGAN_DESTROYED|ORGAN_DEAD|ORGAN_MUTATED))))
 			E.removed()
 			qdel(E)

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

@@ -817,11 +817,7 @@
 			var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
 			if(isturf(loc)) //else, there's considered to be no light
 				var/turf/T = loc
-				var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
-				if(L)
-					light_amount = min(10,L.lum_r + L.lum_g + L.lum_b) - 2 //hardcapped so it's not abused by having a ton of flashlights
-				else
-					light_amount =  10
+				light_amount = T.get_lumcount() * 10
 			nutrition += light_amount
 			traumatic_shock -= light_amount
 
@@ -840,11 +836,7 @@
 		var/light_amount = 0
 		if(isturf(loc))
 			var/turf/T = loc
-			var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
-			if(L)
-				light_amount = L.lum_r + L.lum_g + L.lum_b //hardcapped so it's not abused by having a ton of flashlights
-			else
-				light_amount =  10
+			light_amount = T.get_lumcount() * 10
 		if(light_amount > species.light_dam) //if there's enough light, start dying
 			take_overall_damage(1,1)
 		else //heal in the dark
@@ -921,9 +913,9 @@
 
 		//Brain damage from Oxyloss
 		if(should_have_organ("brain"))
-			var/brainOxPercent = 0.02		//Default2% of your current oxyloss is applied as brain damage, 50 oxyloss is 1 brain damage
+			var/brainOxPercent = 0.015		//Default 1.5% of your current oxyloss is applied as brain damage, 50 oxyloss is 1 brain damage
 			if(CE_STABLE in chem_effects)
-				brainOxPercent = 0.01		//Halved in effect
+				brainOxPercent = 0.008		//Halved in effect
 			if(oxyloss >= 20 && prob(5))
 				adjustBrainLoss(brainOxPercent * oxyloss)
 
@@ -1364,8 +1356,7 @@
 	//0.1% chance of playing a scary sound to someone who's in complete darkness
 	if(isturf(loc) && rand(1,1000) == 1)
 		var/turf/T = loc
-		var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
-		if(L && L.lum_r + L.lum_g + L.lum_b == 0)
+		if(T.get_lumcount() <= LIGHTING_SOFT_THRESHOLD)
 			playsound_local(src,pick(scarySounds),50, 1, -1)
 
 /mob/living/carbon/human/handle_stomach()

code/modules/mob/mob_grab.dm

@@ -75,14 +75,10 @@
 	if(affecting)
 		if(affecting.buckled)
 			return null
-		if(!affecting.Adjacent(affecting.grabbed_by))
-			qdel(src)
-			return null
 		if(state >= GRAB_AGGRESSIVE)
 			animate(affecting, pixel_x = 0, pixel_y = 0, 4, 1)
-			. = affecting
-			qdel(src)
-			return
+			return affecting
+
 	return null
 
 
@@ -299,9 +295,6 @@
 		return
 	if(world.time < (last_action + 20))
 		return
-	if(!M.Adjacent(user))
-		qdel(src)
-		return
 
 	last_action = world.time
 	reset_kill_state() //using special grab moves will interrupt choking them
@@ -347,9 +340,6 @@
 		qdel(src)
 
 /obj/item/weapon/grab/proc/reset_kill_state()
-	if(!assailant)
-		qdel(src)
-		return
 	if(state == GRAB_KILL)
 		assailant.visible_message("<span class='warning'>[assailant] lost \his tight grip on [affecting]'s neck!</span>")
 		hud.icon_state = "kill"

code/modules/mob/new_player/sprite_accessories.dm

@@ -388,7 +388,7 @@
 	balding
 		name = "Balding Hair"
 		icon_state = "hair_e"
-		gender = MALE // turnoff!
+		gender = MALE
 
 	familyman
 		name = "The Family Man"
@@ -529,9 +529,19 @@
 		icon_state = "hair_coffeehouse"
 		gender = MALE
 
-	undercut
+	undercut1
 		name = "Undercut"
-		icon_state = "hair_undercut"
+		icon_state = "hair_undercut1"
+		gender = MALE
+
+	undercut2
+		name = "Undercut Swept Right"
+		icon_state = "hair_undercut2"
+		gender = MALE
+
+	undercut3
+		name = "Undercut Swept Left"
+		icon_state = "hair_undercut3"
 		gender = MALE
 
 	partfade
@@ -551,7 +561,7 @@
 /datum/sprite_accessory/facial_hair
 
 	icon = 'icons/mob/Human_face.dmi'
-	gender = MALE // barf (unless you're a dorf, dorfs dig chix /w beards :P)
+	gender = MALE
 
 	shaved
 		name = "Shaved"