Merge remote-tracking branch 'upstream/master' into upstream-merge

code/datums/elements/photosynthesis.dm

@@ -39,7 +39,7 @@
 	attached_atoms[target]++
 
 /datum/element/photosynthesis/Detach(datum/target)
-	if(attached_atoms)
+	if(attached_atoms && LAZYLEN(attached_atoms))
 		attached_atoms[target]--
 		if(!attached_atoms[target])
 			attached_atoms -= target

code/datums/mind.dm

@@ -88,7 +88,7 @@
 	/// A lazy list of statuses to add next to this mind in the traitor panel
 	var/list/special_statuses
 
-/datum/mind/New(var/key)
+/datum/mind/New(key)
 	skill_holder = new(src)
 	src.key = key
 	soulOwner = src

code/datums/mutations/actions.dm

@@ -479,7 +479,6 @@
 	been_places = TRUE
 	chems = new
 	chems.transfered = WEAKREF(embedded_mob)
-	chems.spikey = src
 	var/mob/fired_by_mob = fired_by.resolve()
 	if(fired_by_mob)
 		to_chat(fired_by_mob, span_notice("Link established! Use the \"Transfer Chemicals\" ability to send your chemicals to the linked target!"))
@@ -514,4 +513,3 @@
 	//this is where it would deal damage, if it transfers chems it removes itself so no damage
 	spikey.forceMove(get_turf(L))
 	transfered_mob.visible_message(span_notice("[spikey] falls out of [transfered_mob]!"))
-