[MIRROR] Devil refactor+small revamp (#887)

* Devil refactor+small revamp

* Delete mind.dm.rej

* clean up rej

* Delete admin_investigate.dm.rej

* Delete mapping.dm.rej

* compile fix

code/modules/spells/spell_types/devil.dm

@@ -52,7 +52,7 @@
 					user.put_in_hands(contract)
 			else
 				var/obj/item/weapon/paper/contract/infernal/contract  // = new(user.loc, C.mind, contractType, user.mind)
-				var/contractTypeName = input(user, "What type of contract?") in list ("Power", "Wealth", "Prestige", "Magic", "Knowledge")
+				var/contractTypeName = input(user, "What type of contract?") in list ("Power", "Wealth", "Prestige", "Magic", "Knowledge", "Friendship")
 				switch(contractTypeName)
 					if("Power")
 						contract = new /obj/item/weapon/paper/contract/infernal/power(C.loc, C.mind, user.mind)
@@ -64,6 +64,8 @@
 						contract = new /obj/item/weapon/paper/contract/infernal/magic(C.loc, C.mind, user.mind)
 					if("Knowledge")
 						contract = new /obj/item/weapon/paper/contract/infernal/knowledge(C.loc, C.mind, user.mind)
+					if("Friendship")
+						contract = new /obj/item/weapon/paper/contract/infernal/friend(C.loc, C.mind, user.mind)
 				C.put_in_hands(contract)
 		else
 			to_chat(user, "<span class='notice'>[C] seems to not be sentient.  You cannot summon a contract for [C.p_them()].</span>")
@@ -106,7 +108,7 @@
 				continuing = 1
 			else
 				for(var/mob/living/C in orange(2, get_turf(user.loc))) //Can also phase in when nearby a potential buyer.
-					if (C.mind && C.mind.soulOwner == C.mind)
+					if (C.owns_soul())
 						continuing = 1
 						break
 			if(continuing)

code/modules/spells/spell_types/devil_boons.dm

@@ -35,10 +35,39 @@
 	charge_max = 50
 	cooldown_min = 10
 	action_icon_state = "camera_jump"
-	var/ranges = list(7,8,9,10/*,11,12*/)
+	var/ranges = list(7,8,9,10)
 
 /obj/effect/proc_holder/spell/targeted/view_range/cast(list/targets, mob/user = usr)
 	for(var/mob/C in targets)
 		if(!C.client)
 			continue
-		C.client.change_view(input("Select view range:", "Range", 4) in ranges)
+		C.client.change_view(input("Select view range:", "Range", 4) in ranges)
+
+/obj/effect/proc_holder/spell/targeted/summon_friend
+	name = "Summon Friend"
+	desc = "The reward for selling your soul."
+	invocation_type = "none"
+	include_user = 1
+	range = -1
+	clothes_req = 0
+	charge_max = 50
+	cooldown_min = 10
+	action_icon_state = "sacredflame"
+	var/mob/living/friend
+	var/obj/effect/mob_spawn/human/demonic_friend/friendShell
+
+/obj/effect/proc_holder/spell/targeted/summon_friend/cast(list/targets, mob/user = usr)
+	if(!QDELETED(friend))
+		to_chat(friend, "<span class='userdanger'>Your master has deemed you a poor friend.  Your durance in hell will now resume.</span>")
+		friend.dust(TRUE)
+		qdel(friendShell)
+		return
+	if(!QDELETED(friendShell))
+		qdel(friendShell)
+		return
+	for(var/C in targets)
+		var/mob/living/L = C
+		friendShell = new /obj/effect/mob_spawn/human/demonic_friend(L.loc, L.mind, src)
+
+/obj/effect/proc_holder/spell/targeted/conjure_item/spellpacket/robeless
+	clothes_req = FALSE