Merge remote-tracking branch 'citadel/master' into mobility_flags

code/modules/spells/spell_types/conjure.dm

@@ -63,7 +63,7 @@
 	clothes_req = FALSE
 	charge_max = 600
 	cooldown_min = 200
-	summon_type = list(/mob/living/simple_animal/hostile/spawner/nether)
+	summon_type = list(/obj/structure/spawner/nether)
 	summon_amt = 1
 	range = 1
 	cast_sound = 'sound/weapons/marauder.ogg'

code/modules/spells/spell_types/ethereal_jaunt.dm

@@ -101,5 +101,6 @@
 
 /obj/effect/dummy/phased_mob/spell_jaunt/ex_act(blah)
 	return
+
 /obj/effect/dummy/phased_mob/spell_jaunt/bullet_act(blah)
-	return
+	return BULLET_ACT_FORCE_PIERCE

code/modules/spells/spell_types/shadow_walk.dm

@@ -90,7 +90,7 @@
 	return
 
 /obj/effect/dummy/phased_mob/shadow/bullet_act()
-	return
+	return BULLET_ACT_FORCE_PIERCE
 
 /obj/effect/dummy/phased_mob/shadow/singularity_act()
 	return

code/modules/spells/spell_types/wizard.dm

@@ -363,7 +363,7 @@
 	icon_state = "snappop"
 	w_class = WEIGHT_CLASS_TINY
 
-/obj/item/spellpacket/lightningbolt/throw_impact(atom/hit_atom)
+/obj/item/spellpacket/lightningbolt/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
 	if(!..())
 		if(isliving(hit_atom))
 			var/mob/living/M = hit_atom