Merge commit 'stash'

code/modules/clothing/glasses/glasses.dm

@@ -91,8 +91,8 @@
 		return
 
 /obj/item/clothing/glasses/thermal
-	name = "Optical Thermal Scanner"
-	desc = "Thermals in the shape of glasses."
+	name = "sunglasses"
+	desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes. Has an odd tint."
 	//icon_state = "thermal"
 	//item_state = "glasses"
 	icon_state = "sun"

code/modules/clothing/suits/miscellaneous.dm

@@ -8,7 +8,7 @@
 
 /obj/item/clothing/suit/storage/wcoat
 	name = "waistcoat"
-	desc = "For some classy, murderous fun."
+	desc = "The height of class."
 	icon_state = "vest"
 	item_state = "wcoat"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -25,7 +25,7 @@
 
 /obj/item/clothing/suit/storage/chef
 	name = "Chef's apron"
-	desc = "An apron used by a high class chef.  Has a few pockets for nic-naks."
+	desc = "An apron used by a high class chef. Has a few pockets for nic-naks."
 	icon_state = "chef"
 	item_state = "chef"
 	gas_transfer_coefficient = 0.90
@@ -62,7 +62,7 @@
 	name = "red space suit replica"
 	icon_state = "syndicate"
 	item_state = "space_suit_syndicate"
-	desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
+	desc = "A plastic replica of a famous space suit. This is a toy, not for use in space!"
 	w_class = 3
 	flags = FPRINT | TABLEPASS
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy)
@@ -108,7 +108,7 @@
 
 /obj/item/clothing/suit/imperium_monk
 	name = "Imperium monk"
-	desc = "Have YOU killed a xenos today?"
+	desc = "A set of strange robes."
 	icon_state = "imperium_monk"
 	item_state = "imperium_monk"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
@@ -116,7 +116,7 @@
 
 /obj/item/clothing/suit/chickensuit
 	name = "Chicken Suit"
-	desc = "A suit made long ago by the ancient empire KFC."
+	desc = "Bwak!"
 	icon_state = "chickensuit"
 	item_state = "chickensuit"
 	body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET|HEAD

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

@@ -2454,9 +2454,8 @@ It can still be worn/put on as normal.
 		return
 	src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss() - src.getCloneLoss() -src.halloss
 
-
 /mob/living/carbon/human/abiotic(var/full_body = 0)
-	if(full_body && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.l_ear || src.r_ear || src.gloves)))
+	if(full_body && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask)))
 		return 1
 
 	if((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )))
@@ -2464,6 +2463,15 @@ It can still be worn/put on as normal.
 
 	return 0
 
+/mob/living/carbon/human/abiotic2(var/full_body2 = 0)
+	if(full_body2 && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.l_ear || src.r_ear || src.gloves || src.handcuffed)))
+		return 1
+
+	if((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.l_ear || src.r_ear || src.gloves || src.handcuffed))
+		return 1
+
+	return 0
+
 /mob/living/carbon/human/getBruteLoss()
 	var/amount = 0.0
 	for(var/name in organs)

code/modules/mob/mob_helpers.dm

@@ -323,6 +323,15 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 
 	return 0
 
+/mob/proc/abiotic2(var/full_body2 = 0)
+	if(full_body2 && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask)))
+		return 1
+
+	if((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )))
+		return 1
+
+	return 0
+
 /mob/proc/put_in_hands(var/obj/item/I)
 	if(!r_hand)
 		I.loc = src