Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

code/modules/spells/spell_types/construct_spells.dm

@@ -146,7 +146,7 @@
 	clothes_req = 0
 	invocation = "none"
 	invocation_type = "none"
-	proj_type = /obj/effect/proc_holder/spell/targeted/inflict_handler/magic_missile/lesser
+	proj_type = "/obj/effect/proc_holder/spell/targeted/inflict_handler/magic_missile/lesser"
 	proj_lifespan = 10
 	max_targets = 6
 	action_icon_state = "magicm"

code/modules/spells/spell_types/shapeshift.dm

@@ -13,7 +13,7 @@
 
 	var/revert_on_death = TRUE
 	var/die_with_shapeshifted_form = TRUE
-	var/convert_damage = FALSE //If you want to convert the caster's health to the shift, and vice versa.
+	var/convert_damage = TRUE //If you want to convert the caster's health to the shift, and vice versa.
 	var/convert_damage_type = BRUTE //Since simplemobs don't have advanced damagetypes, what to convert damage back into.
 	var/shapeshift_type
 	var/list/possible_shapes = list(/mob/living/simple_animal/mouse,\
@@ -101,8 +101,10 @@
 	stored.forceMove(src)
 	stored.notransform = TRUE
 	if(source.convert_damage)
-		var/damapply = (stored.maxHealth - (stored.health + stored.maxHealth)/2) //Carbons go from -100 to 100 naturally, while simplemobs only go from 0 to 100. Can't do a direct conversion.
-		shape.apply_damage(damapply, source.convert_damage_type)
+		var/damage_percent = (stored.maxHealth - stored.health)/stored.maxHealth;
+		var/damapply = damage_percent * shape.maxHealth;
+
+		shape.apply_damage(damapply, source.convert_damage_type, forced = TRUE);
 	slink = soullink(/datum/soullink/shapeshift, stored , shape)
 	slink.source = src
 
@@ -152,8 +154,10 @@
 		stored.death()
 	else if(source.convert_damage)
 		stored.revive(full_heal = TRUE)
-		var/damapply = (shape.maxHealth - 2*shape.health) //Since we halved incoming damage, double outgoing.
-		stored.apply_damage(damapply, source.convert_damage_type)
+		var/damage_percent = (shape.maxHealth - shape.health)/shape.maxHealth;
+		var/damapply = stored.maxHealth * damage_percent
+
+		stored.apply_damage(damapply, source.convert_damage_type, forced = TRUE)
 	qdel(shape)
 	qdel(src)
 

code/modules/spells/spell_types/summonitem.dm

@@ -61,6 +61,10 @@
 						organ.Remove(organ.owner)
 			else
 				while(!isturf(item_to_retrieve.loc) && infinite_recursion < 10) //if it's in something you get the whole thing.
+					if(isitem(item_to_retrieve.loc))
+						var/obj/item/I = item_to_retrieve.loc
+						if(I.item_flags & ABSTRACT) //Being able to summon abstract things because your item happened to get placed there is a no-no
+							break
 					if(ismob(item_to_retrieve.loc)) //If its on someone, properly drop it
 						var/mob/M = item_to_retrieve.loc