Merge branch 'master' into upstream-merge-31737

code/modules/surgery/bodyparts/bodyparts.dm

@@ -1,7 +1,7 @@
 
 /obj/item/bodypart
 	name = "limb"
-	desc = "why is it detached..."
+	desc = "Why is it detached..."
 	force = 3
 	throwforce = 3
 	icon = 'icons/mob/human_parts.dmi'

code/modules/surgery/bodyparts/dismemberment.dm

@@ -219,6 +219,8 @@
 			var/obj/item/I = X
 			owner.dropItemToGround(I, TRUE)
 
+	owner.wash_cream() //clean creampie overlay
+
 	//Handle dental implants
 	for(var/datum/action/item_action/hands_free/activate_pill/AP in owner.actions)
 		AP.Remove(owner)

code/modules/surgery/bodyparts/robot_bodyparts.dm

@@ -135,7 +135,7 @@
 				flash2.forceMove(user.loc)
 				flash2 = null
 		else
-			to_chat(user, "<span class='warning'>There are no flash to remove from [src].</span>")
+			to_chat(user, "<span class='warning'>There is no flash to remove from [src].</span>")
 
 	else
 		return ..()

code/modules/surgery/organ_manipulation.dm

@@ -96,7 +96,8 @@
 			I = input("Remove which organ?", "Surgery", null, null) as null|anything in organs
 			if(I && user && target && user.Adjacent(target) && user.get_active_held_item() == tool)
 				I = organs[I]
-				if(!I) return -1
+				if(!I)
+					return -1
 				user.visible_message("[user] begins to extract [I] from [target]'s [parse_zone(target_zone)].",
 					"<span class='notice'>You begin to extract [I] from [target]'s [parse_zone(target_zone)]...</span>")
 			else

code/modules/surgery/organs/augments_arms.dm

@@ -181,7 +181,7 @@
 
 /obj/item/organ/cyberimp/arm/toolset
 	name = "integrated toolset implant"
-	desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm. Contains all necessary tools."
+	desc = "A stripped-down version of the engineering cyborg toolset, designed to be installed on subject's arm. Contains all necessary tools."
 	origin_tech = "materials=3;engineering=4;biotech=3;powerstorage=4"
 	contents = newlist(/obj/item/screwdriver/cyborg, /obj/item/wrench/cyborg, /obj/item/weldingtool/largetank/cyborg,
 		/obj/item/crowbar/cyborg, /obj/item/wirecutters/cyborg, /obj/item/device/multitool/cyborg)
@@ -198,7 +198,7 @@
 
 /obj/item/organ/cyberimp/arm/esword
 	name = "arm-mounted energy blade"
-	desc = "An illegal, and highly dangerous cybernetic implant that can project a deadly blade of concentrated energy."
+	desc = "An illegal and highly dangerous cybernetic implant that can project a deadly blade of concentrated energy."
 	contents = newlist(/obj/item/melee/transforming/energy/blade/hardlight)
 	origin_tech = "materials=4;combat=5;biotech=3;powerstorage=2;syndicate=5"
 
@@ -210,7 +210,7 @@
 
 /obj/item/organ/cyberimp/arm/flash
 	name = "integrated high-intensity photon projector" //Why not
-	desc = "An integrated projector mounted onto a user's arm, that is able to be used as a powerful flash."
+	desc = "An integrated projector mounted onto a user's arm that is able to be used as a powerful flash."
 	contents = newlist(/obj/item/device/assembly/flash/armimplant)
 	origin_tech = "materials=4;combat=3;biotech=4;magnets=4;powerstorage=3"
 
@@ -228,7 +228,7 @@
 
 /obj/item/organ/cyberimp/arm/combat
 	name = "combat cybernetics implant"
-	desc = "A powerful cybernetic implant that contains combat modules built into the user's arm"
+	desc = "A powerful cybernetic implant that contains combat modules built into the user's arm."
 	contents = newlist(/obj/item/melee/transforming/energy/blade/hardlight, /obj/item/gun/medbeam, /obj/item/borg/stun, /obj/item/device/assembly/flash/armimplant)
 	origin_tech = "materials=5;combat=7;biotech=5;powerstorage=5;syndicate=6;programming=5"
 
@@ -240,6 +240,6 @@
 
 /obj/item/organ/cyberimp/arm/surgery
 	name = "surgical toolset implant"
-	desc = "A set of surgical tools hidden behind a concealed panel on the user's arm"
+	desc = "A set of surgical tools hidden behind a concealed panel on the user's arm."
 	contents = newlist(/obj/item/retractor/augment, /obj/item/hemostat/augment, /obj/item/cautery/augment, /obj/item/surgicaldrill/augment, /obj/item/scalpel/augment, /obj/item/circular_saw/augment, /obj/item/surgical_drapes)
 	origin_tech = "materials=3;engineering=3;biotech=3;programming=2;magnets=3"

code/modules/surgery/organs/augments_chest.dm

@@ -1,13 +1,13 @@
 /obj/item/organ/cyberimp/chest
 	name = "cybernetic torso implant"
-	desc = "implants for the organs in your torso"
+	desc = "Implants for the organs in your torso."
 	icon_state = "chest_implant"
 	implant_overlay = "chest_implant_overlay"
 	zone = "chest"
 
 /obj/item/organ/cyberimp/chest/nutriment
 	name = "Nutriment pump implant"
-	desc = "This implant with synthesize and pump into your bloodstream a small amount of nutriment when you are starving."
+	desc = "This implant will synthesize and pump into your bloodstream a small amount of nutriment when you are starving."
 	icon_state = "chest_implant"
 	implant_color = "#00AA00"
 	var/hunger_threshold = NUTRITION_LEVEL_STARVING

code/modules/surgery/organs/augments_internal.dm

@@ -2,7 +2,7 @@
 
 /obj/item/organ/cyberimp
 	name = "cybernetic implant"
-	desc = "a state-of-the-art implant that improves a baseline's functionality"
+	desc = "A state-of-the-art implant that improves a baseline's functionality."
 	status = ORGAN_ROBOTIC
 	var/implant_color = "#FFFFFF"
 	var/implant_overlay
@@ -23,7 +23,7 @@
 
 /obj/item/organ/cyberimp/brain
 	name = "cybernetic brain implant"
-	desc = "injectors of extra sub-routines for the brain"
+	desc = "Injectors of extra sub-routines for the brain."
 	icon_state = "brain_implant"
 	implant_overlay = "brain_implant_overlay"
 	zone = "head"

code/modules/surgery/organs/eyes.dm

@@ -68,7 +68,7 @@
 
 /obj/item/organ/eyes/night_vision/zombie
 	name = "undead eyes"
-	desc = "Somewhat counterintuitively, these half rotten eyes actually have superior vision to those of a living human."
+	desc = "Somewhat counterintuitively, these half-rotten eyes actually have superior vision to those of a living human."
 
 /obj/item/organ/eyes/night_vision/nightmare
 	name = "burning red eyes"
@@ -100,8 +100,8 @@
 	sight_flags = SEE_MOBS | SEE_OBJS | SEE_TURFS
 
 /obj/item/organ/eyes/robotic/thermals
-	name = "Thermals eyes"
-	desc = "These cybernetic eye implants will give you Thermal vision. Vertical slit pupil included."
+	name = "thermal eyes"
+	desc = "These cybernetic eye implants will give you thermal vision. Vertical slit pupil included."
 	eye_color = "FC0"
 	origin_tech = "materials=5;programming=4;biotech=4;magnets=4;syndicate=1"
 	sight_flags = SEE_MOBS
@@ -111,7 +111,7 @@
 
 /obj/item/organ/eyes/robotic/flashlight
 	name = "flashlight eyes"
-	desc = "It's two flashlights rigged together with some wire. Why would you put these in someones head?"
+	desc = "It's two flashlights rigged together with some wire. Why would you put these in someone's head?"
 	eye_color ="fee5a3"
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "flashlight_eyes"

code/modules/surgery/organs/lungs.dm

@@ -332,7 +332,7 @@
 
 /obj/item/organ/lungs/cybernetic/upgraded
 	name = "upgraded cybernetic lungs"
-	desc = "A more advanced version of the stock cybernetic lungs. They are capable of filtering out lower levels of toxins and carbon-dioxide."
+	desc = "A more advanced version of the stock cybernetic lungs. They are capable of filtering out lower levels of toxins and carbon dioxide."
 	icon_state = "lungs-c-u"
 	origin_tech = "biotech=5"
 

code/modules/surgery/organs/vocal_cords.dm

@@ -22,7 +22,7 @@
 
 /obj/item/organ/adamantine_resonator
 	name = "adamantine resonator"
-	desc = "Fragments of adamantine exists in all golems, stemming from their origins as purely magical constructs. These are used to \"hear\" messages from their leaders."
+	desc = "Fragments of adamantine exist in all golems, stemming from their origins as purely magical constructs. These are used to \"hear\" messages from their leaders."
 	zone = "head"
 	slot = ORGAN_SLOT_ADAMANTINE_RESONATOR
 	icon_state = "adamantine_resonator"