fixing merge conflicts

code/modules/spells/spell_types/rightandwrong.dm

@@ -102,6 +102,12 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE)
 	var/gun_type = pick(GLOB.summoned_guns)
 	var/obj/item/gun/G = new gun_type(get_turf(H))
 	G.unlock()
+	var/datum/antagonist/survivalist/guns/our_antag_datum = H.mind.has_antag_datum(/datum/antagonist/survivalist/guns)
+	if(our_antag_datum)
+		var/datum/objective/hoard/O = new()
+		O.owner = H
+		O.set_target(G)
+		our_antag_datum.objectives += O
 	playsound(get_turf(H),'sound/magic/summon_guns.ogg', 50, 1)
 
 	var/in_hand = H.put_in_hands(G) // not always successful
@@ -128,6 +134,13 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE)
 	var/obj/item/M = new magic_type(get_turf(H))
 	playsound(get_turf(H),'sound/magic/summon_magic.ogg', 50, 1)
 
+	var/datum/antagonist/survivalist/magic/our_antag_datum = H.mind.has_antag_datum(/datum/antagonist/survivalist/magic)
+	if(istype(our_antag_datum))
+		var/datum/objective/hoard/O = new()
+		O.owner = H
+		O.set_target(M)
+		our_antag_datum.objectives += O
+
 	var/in_hand = H.put_in_hands(M)
 
 	to_chat(H, "<span class='warning'>\A [M] appears [in_hand ? "in your hand" : "at your feet"]!</span>")

code/modules/spells/spell_types/wizard.dm

@@ -248,6 +248,7 @@
 	mutations = list(BLINDMUT)
 	duration = 300
 	sound = 'sound/magic/blind.ogg'
+
 /obj/effect/proc_holder/spell/aoe_turf/repulse
 	name = "Repulse"
 	desc = "This spell throws everything around the user away."
@@ -266,15 +267,22 @@
 	action_icon_state = "repulse"
 
 /obj/effect/proc_holder/spell/aoe_turf/repulse/cast(list/targets,mob/user = usr, stun_amt = 50)
+	var/list/mobs = list()
+	var/list/objs = list()
 	var/list/thrownatoms = list()
 	var/atom/throwtarget
 	var/distfromcaster
 	playMagSound()
 	for(var/turf/T in targets) //Done this way so things don't get thrown all around hilariously.
-		for(var/atom/movable/AM in T)
-			thrownatoms += AM
-
+		for(var/mob/M in T)
+			mobs += M
+		for(var/obj/O in T)
+			objs += O
+	thrownatoms = mobs + objs		//mobs first
+	var/safety = 50
 	for(var/am in thrownatoms)
+		if(!safety)
+			break
 		var/atom/movable/AM = am
 		if(AM == user || AM.anchored)
 			continue
@@ -299,6 +307,7 @@
 				M.Knockdown(stun_amt, override_hardstun = stun_amt * 0.2)
 				to_chat(M, "<span class='userdanger'>You're thrown back by [user]!</span>")
 			AM.throw_at(throwtarget, ((CLAMP((maxthrow - (CLAMP(distfromcaster - 2, 0, distfromcaster))), 3, maxthrow))), 1,user)//So stuff gets tossed around at the same time.
+			safety--
 
 /obj/effect/proc_holder/spell/aoe_turf/repulse/xeno //i fixed conflicts only to find out that this is in the WIZARD file instead of the xeno file?!
 	name = "Tail Sweep"