Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state

Conflicts:
	code/modules/clothing/clothing.dm

code/modules/mob/living/bot/secbot.dm

@@ -85,6 +85,18 @@
 			declare_arrests = !declare_arrests
 	attack_hand(usr)
 
+/mob/living/bot/secbot/emag_act(var/remaining_uses, var/mob/user)
+	. = ..()
+	if(!emagged)
+		if(user)
+			user << "<span class='notice'>\The [src] buzzes and beeps.</span>"
+		emagged = 1
+		patrol_speed = 3
+		target_speed = 4
+		return 1
+	else
+		user << "<span class='notice'>\The [src] is already corrupt.</span>"
+
 /mob/living/bot/secbot/attackby(var/obj/item/O, var/mob/user)
 	var/curhealth = health
 	..()

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

@@ -154,7 +154,16 @@ emp_act
 	if(user == src) // Attacking yourself can't miss
 		return target_zone
 
-	var/hit_zone = get_zone_with_miss_chance(target_zone, src)
+	// Certain statuses make it harder to score a hit.  These are the same as gun accuracy, however melee doesn't use multiples of 15.
+	var/accuracy_penalty = 0
+	if(user.eye_blind)
+		accuracy_penalty += 75
+	if(user.eye_blurry)
+		accuracy_penalty += 15
+	if(user.confused)
+		accuracy_penalty += 30
+
+	var/hit_zone = get_zone_with_miss_chance(target_zone, src, accuracy_penalty)
 
 	if(!hit_zone)
 		visible_message("<span class='danger'>\The [user] misses [src] with \the [I]!</span>")

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

@@ -1324,7 +1324,7 @@
 
 	// Puke if toxloss is too high
 	if(!stat)
-		if (getToxLoss() >= 45 && nutrition > 20)
+		if (getToxLoss() >= 45)
 			spawn vomit()
 
 	//0.1% chance of playing a scary sound to someone who's in complete darkness

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

@@ -57,7 +57,7 @@
 	cold_discomfort_level = 180
 
 	has_limbs = list(
-		BP_CHEST =  list("path" = /obj/item/organ/external/chest),
+		BP_TORSO =  list("path" = /obj/item/organ/external/chest),
 		BP_GROIN =  list("path" = /obj/item/organ/external/groin),
 		BP_HEAD =   list("path" = /obj/item/organ/external/head/seromi),
 		BP_L_ARM =  list("path" = /obj/item/organ/external/arm),

code/modules/mob/living/living.dm

@@ -814,38 +814,35 @@ default behaviour is:
 		return
 
 	if(!lastpuke)
-
+		lastpuke = 1
 		if (nutrition <= 100)
 			src << "<span class='danger'>You gag as you want to throw up, but there's nothing in your stomach!</span>"
 			src.Weaken(10)
-			src.adjustToxLoss(3)
-			return
-
-		lastpuke = 1
-		src << "<span class='warning'>You feel nauseous...</span>"
-
-		if(!skip_wait)
-			sleep(150)	//15 seconds until second warning
-			src << "<span class='warning'>You feel like you are about to throw up!</span>"
-			sleep(100)	//and you have 10 more for mad dash to the bucket
-
-		Stun(5)
-		src.visible_message("<span class='warning'>[src] throws up!</span>","<span class='warning'>You throw up!</span>")
-		playsound(loc, 'sound/effects/splat.ogg', 50, 1)
-
-		var/turf/simulated/T = get_turf(src)
-		if(istype(T))
-			if(blood_vomit)
-				T.add_blood_floor(src)
-			else
-				T.add_vomit_floor(src, 1)
-
-		if(blood_vomit)
-			if(getBruteLoss() < 50)
-				adjustBruteLoss(3)
 		else
-			nutrition -= 40
-			adjustToxLoss(-3)
+			src << "<span class='warning'>You feel nauseous...</span>"
+
+			if(!skip_wait)
+				sleep(150)	//15 seconds until second warning
+				src << "<span class='warning'>You feel like you are about to throw up!</span>"
+				sleep(100)	//and you have 10 more for mad dash to the bucket
+
+			Stun(5)
+			src.visible_message("<span class='warning'>[src] throws up!</span>","<span class='warning'>You throw up!</span>")
+			playsound(loc, 'sound/effects/splat.ogg', 50, 1)
+
+			var/turf/simulated/T = get_turf(src)
+			if(istype(T))
+				if(blood_vomit)
+					T.add_blood_floor(src)
+				else
+					T.add_vomit_floor(src, 1)
+
+			if(blood_vomit)
+				if(getBruteLoss() < 50)
+					adjustBruteLoss(3)
+			else
+				nutrition -= 40
+				adjustToxLoss(-3)
 
 		sleep(350)
 		lastpuke = 0