Merge branch 'master' into more_implants

code/modules/surgery/organs/augments_arms.dm

@@ -92,7 +92,7 @@
 	ADD_TRAIT(holder, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
 	holder.resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	holder.slot_flags = null
-	holder.materials = null
+	holder.set_custom_materials(null)
 
 	if(istype(holder, /obj/item/assembly/flash/armimplant))
 		var/obj/item/assembly/flash/F = holder

code/modules/surgery/organs/eyes.dm

@@ -56,7 +56,7 @@
 			var/mob/living/carbon/human/H = C
 			H.eye_color = old_eye_color
 			if(!special)
-				H.dna.species.handle_body()
+				H.dna.species.handle_body(H)
 		if(!special)
 			C.update_tint()
 			C.update_sight()