Merge remote-tracking branch 'hyper/master' into xenoarchtime

code/modules/atmospherics/machinery/components/unary_devices/cryo.dm

@@ -1,5 +1,3 @@
-#define CRYOMOBS 'icons/obj/cryo_mobs.dmi'
-
 /obj/machinery/atmospherics/components/unary/cryo_cell
 	name = "cryo cell"
 	icon = 'icons/obj/cryogenics.dmi'

code/modules/crafting/recipes.dm

@@ -916,7 +916,7 @@
 	time = 30
 	category = CAT_CLOTHING
 
-	/datum/crafting_recipe/durathread_helmet
+/datum/crafting_recipe/durathread_helmet
 	name = "Makeshift Durathread Helmet"
 	result = /obj/item/clothing/head/helmet/durathread
 	reqs = list(/obj/item/stack/sheet/durathread = 4,
@@ -974,4 +974,4 @@
 	reqs = list(/obj/item/stack/sheet/mineral/bamboo = 2,
 				/obj/item/reagent_containers/food/snacks/grown/coconut = 1)
 	time = 70
-	category = CAT_MISC
+	category = CAT_MISC

code/modules/surgery/bodyparts/bodyparts.dm

@@ -377,7 +377,7 @@
 			Smark = GLOB.mam_body_markings_list[H.dna.features["mam_body_markings"]]
 			if(Smark)
 				body_markings_icon = Smark.icon
-			if(H.dna.features.["mam_body_markings"] != "None")
+			if(H.dna.features["mam_body_markings"] != "None")
 				body_markings = Smark?.icon_state || lowertext(H.dna.features["mam_body_markings"])
 				auxmarking = Smark?.icon_state || lowertext(H.dna.features["mam_body_markings"])
 			else

code/modules/surgery/organs/organ_internal.dm

@@ -1,6 +1,3 @@
-#define STANDARD_ORGAN_THRESHOLD 100
-#define STANDARD_ORGAN_HEALING 0.001
-
 /obj/item/organ
 	name = "organ"
 	icon = 'icons/obj/surgery.dmi'