Merge branch 'master' into upstream-merge-26129

code/modules/surgery/organs/ears.dm

@@ -22,7 +22,7 @@
 	if(C.disabilities & DEAF)
 		deaf = max(deaf, 1)
 	else
-		if(HAS_SECONDARY_FLAG(C.ears, HEALS_EARS))
+		if(C.ears && HAS_SECONDARY_FLAG(C.ears, HEALS_EARS))
 			deaf = max(deaf - 1, 1)
 			ear_damage = max(ear_damage - 0.10, 0)
 		// if higher than UNHEALING_EAR_DAMAGE, no natural healing occurs.

code/modules/surgery/surgery.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm	(rejected hunks)
+@@ -54,7 +54,7 @@
+ 	return new step_type
+ 
+ /datum/surgery/proc/complete()
+-	feedback_add_details("surgeries_completed", type)
++	feedback_add_details("surgeries_completed", "[type]")
+ 	qdel(src)
+ 
+