Damns Devils Gamemode to Hell (#15672)

* Damns Devils Gamemode to Hell

* Update config.txt

code/modules/admin/player_panel.dm

@@ -494,9 +494,6 @@
 		if(SSticker.mode.vampire_enthralled.len)
 			dat += check_role_table("Vampire Thralls", SSticker.mode.vampire_enthralled)
 
-		if(SSticker.mode.devils.len)
-			dat += check_role_table("Devils", SSticker.mode.devils)
-
 		if(SSticker.mode.xenos.len)
 			dat += check_role_table("Xenos", SSticker.mode.xenos)
 

code/modules/client/preference/preferences.dm

@@ -23,8 +23,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
 	ROLE_BORER = 21,
 	ROLE_NINJA = 21,
 	ROLE_GSPIDER = 21,
-	ROLE_ABDUCTOR = 30,
-	ROLE_DEVIL = 14
+	ROLE_ABDUCTOR = 30
 ))
 
 /proc/player_old_enough_antag(client/C, role)

code/modules/hydroponics/grown/replicapod.dm

@@ -31,19 +31,15 @@
 			for(var/datum/reagent/blood/bloodSample in W.reagents.reagent_list)
 				var/datum/dna/dna = bloodSample.data["dna"]
 				if(bloodSample.data["mind"] && bloodSample.data["cloneable"] && !(NO_CLONESCAN in dna.species.species_traits))
-					var/datum/mind/tempmind = bloodSample.data["mind"]
-					if(tempmind.is_revivable())
-						mind = bloodSample.data["mind"]
-						ckey = bloodSample.data["ckey"]
-						realName = bloodSample.data["real_name"]
-						blood_gender = bloodSample.data["gender"]
-						blood_type = bloodSample.data["blood_type"]
-						factions = bloodSample.data["factions"]
-						W.reagents.clear_reagents()
-						to_chat(user, "<span class='notice'>You inject the contents of the syringe into the seeds.</span>")
-						contains_sample = 1
-					else
-						to_chat(user, "<span class='warning'>The seeds reject the sample!</span>")
+					mind = bloodSample.data["mind"]
+					ckey = bloodSample.data["ckey"]
+					realName = bloodSample.data["real_name"]
+					blood_gender = bloodSample.data["gender"]
+					blood_type = bloodSample.data["blood_type"]
+					factions = bloodSample.data["factions"]
+					W.reagents.clear_reagents()
+					to_chat(user, "<span class='notice'>You inject the contents of the syringe into the seeds.</span>")
+					contains_sample = 1
 				else
 					to_chat(user, "<span class='warning'>The seeds reject the sample!</span>")
 		else
@@ -85,9 +81,6 @@
 					ckey_holder = M.ckey
 					break
 
-	if(mind && !mind.is_revivable())
-		make_podman = 0
-
 	if(make_podman)	//all conditions met!
 		var/mob/living/carbon/human/pod_diona/podman = new /mob/living/carbon/human/pod_diona(parent.loc)
 		if(realName)

code/modules/library/codex_gigas.dm

@@ -1,5 +1,6 @@
 /obj/item/book/codex_gigas
-	name = "Codex Gigas"
+	name = "\improper Codex Gigas"
+	desc = "A book documenting the nature of devils."
 	icon_state ="demonomicon"
 	throw_speed = 1
 	throw_range = 10
@@ -7,47 +8,3 @@
 	author = "Forces beyond your comprehension"
 	unique = TRUE
 	title = "The codex gigas"
-	var/inUse = 0
-
-
-/obj/item/book/codex_gigas/attack_self(mob/user)
-	if(!user.has_vision())
-		return
-	if(inUse)
-		to_chat(user,"<span class='notice'>Someone else is reading it.</span>")
-		return
-	if(!user.is_literate())
-		to_chat(user,"<span class='notice'>You don't know how to read.</span>")
-		return
-	if(ishuman(user))
-		var/mob/living/carbon/human/U = user
-		if(U.check_acedia())
-			to_chat(user,"<span class='notice'>None of this matters, why are you reading this?  You put the [title] down.</span>")
-			return
-		inUse = 1
-		var/devilName = copytext(sanitize(input(user, "What infernal being do you wish to research?", "Codex Gigas", null)  as text),1,MAX_MESSAGE_LEN)
-		var/speed = 300
-		var/correctness = 85
-		var/willpower = 95
-		if(U.job in list("Librarian")) // the librarian is both faster, and more accurate than normal crew members at research
-			speed = 45
-			correctness = 100
-			willpower = 100
-		if(U.job in list("Captain", "Security Officer", "Head of Security", "Detective", "Warden"))
-			willpower = 99
-		if(U.job in list("Clown")) // WHO GAVE THE CLOWN A DEMONOMICON?  BAD THINGS WILL HAPPEN!
-			willpower = 25
-		correctness -= U.getBrainLoss() *0.5 //Brain damage makes researching hard.
-		speed += U.getBrainLoss() * 3
-		user.visible_message("[user] opens [title] and begins reading intently.")
-		if(do_after(U, speed, 0, U))
-			var/usedName = devilName
-			if(!prob(correctness))
-				usedName += "x"
-			var/datum/devilinfo/devil = devilInfo(usedName, 0)
-			user << browse("Information on [devilName]<br><br><br>[GLOB.lawlorify[LORE][devil.ban]]<br>[GLOB.lawlorify[LORE][devil.bane]]<br>[GLOB.lawlorify[LORE][devil.obligation]]<br>[GLOB.lawlorify[LORE][devil.banish]]", "window=book")
-		inUse = 0
-		sleep(10)
-		if(!prob(willpower))
-			U.influenceSin()
-		onclose(user, "book")

code/modules/mob/living/carbon/carbon.dm

@@ -389,15 +389,11 @@
 
 			else
 				to_chat(src, "<span class='warning'>Your eyes are really starting to hurt. This can't be good for you!</span>")
-		if(mind && has_bane(BANE_LIGHT))
-			mind.disrupt_spells(-500)
 		return 1
 
 	else if(damage == 0) // just enough protection
 		if(prob(20))
 			to_chat(src, "<span class='notice'>Something bright flashes in the corner of your vision!</span>")
-			if(mind && has_bane(BANE_LIGHT))
-				mind.disrupt_spells(0)
 
 
 /mob/living/carbon/proc/tintcheck()

code/modules/mob/living/carbon/human/appearance.dm

@@ -465,12 +465,3 @@
 		valid_alt_heads += alternate_head
 
 	return sortTim(valid_alt_heads, /proc/cmp_text_asc)
-
-/mob/living/carbon/human/proc/scramble_appearance()
-	scramble(1, src, 100)
-	real_name = random_name(gender, dna.species.name) //Give them a name that makes sense for their species.
-	sync_organ_dna(assimilate = 1)
-	update_body()
-	reset_hair() //No more winding up with hairstyles you're not supposed to have, and blowing your cover.
-	reset_markings() //...Or markings.
-	dna.ResetUIFrom(src)

code/modules/mob/living/carbon/human/human.dm

@@ -1904,38 +1904,6 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
 	if(mind && mind.assigned_role == "Cluwne") //HUNKE your suffering never stops
 		makeCluwne()
 
-/mob/living/carbon/human/proc/influenceSin()
-	var/datum/objective/sintouched/O
-	switch(rand(1,7))//traditional seven deadly sins... except lust.
-		if(1) // acedia
-			log_game("[src] was influenced by the sin of Acedia.")
-			O = new /datum/objective/sintouched/acedia
-		if(2) // Gluttony
-			log_game("[src] was influenced by the sin of gluttony.")
-			O = new /datum/objective/sintouched/gluttony
-		if(3) // Greed
-			log_game("[src] was influenced by the sin of greed.")
-			O = new /datum/objective/sintouched/greed
-		if(4) // sloth
-			log_game("[src] was influenced by the sin of sloth.")
-			O = new /datum/objective/sintouched/sloth
-		if(5) // Wrath
-			log_game("[src] was influenced by the sin of wrath.")
-			O = new /datum/objective/sintouched/wrath
-		if(6) // Envy
-			log_game("[src] was influenced by the sin of envy.")
-			O = new /datum/objective/sintouched/envy
-		if(7) // Pride
-			log_game("[src] was influenced by the sin of pride.")
-			O = new /datum/objective/sintouched/pride
-	SSticker.mode.sintouched += src.mind
-	src.mind.objectives += O
-	var/obj_count = 1
-	to_chat(src, "<span class='notice> Your current objectives:")
-	for(var/datum/objective/objective in src.mind.objectives)
-		to_chat(src, "<B>Objective #[obj_count]</B>: [objective.explanation_text]")
-		obj_count++
-
 /mob/living/carbon/human/is_literate()
 	return getBrainLoss() < 100
 
@@ -1948,6 +1916,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
 /mob/living/carbon/human/fakefireextinguish()
 	overlays_standing[FIRE_LAYER] = null
 	update_icons()
+
 /mob/living/carbon/human/proc/cleanSE()	//remove all disabilities/powers
 	for(var/block = 1; block <= DNA_SE_LENGTH; block++)
 		dna.SetSEState(block, FALSE, TRUE)

code/modules/mob/living/carbon/human/human_defense.dm

@@ -435,8 +435,6 @@ emp_act
 
 	send_item_attack_message(I, user, hit_area)
 
-	var/weakness = check_weakness(I,user)
-
 	if(!I.force)
 		return 0 //item force is zero
 
@@ -448,7 +446,7 @@ emp_act
 		return 0
 	var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords)
 
-	apply_damage(I.force * weakness, I.damtype, affecting, armor, sharp = weapon_sharp, used_weapon = I)
+	apply_damage(I.force, I.damtype, affecting, armor, sharp = weapon_sharp, used_weapon = I)
 
 	var/bloody = 0
 	if(I.damtype == BRUTE && I.force && prob(25 + I.force * 2))

code/modules/mob/living/death.dm

@@ -78,13 +78,6 @@
 	if(!gibbed && !QDELETED(src))
 		addtimer(CALLBACK(src, .proc/med_hud_set_status), DEFIB_TIME_LIMIT + 1)
 
-	for(var/s in ownedSoullinks)
-		var/datum/soullink/S = s
-		S.ownerDies(gibbed, src)
-	for(var/s in sharedSoullinks)
-		var/datum/soullink/S = s
-		S.sharerDies(gibbed, src)
-
 	if(!gibbed)
 		update_canmove()
 
@@ -104,8 +97,6 @@
 
 	if(SSticker && SSticker.mode)
 		SSticker.mode.check_win()
-	if(mind && mind.devilinfo) // Expand this into a general-purpose death-response system when appropriate
-		mind.devilinfo.beginResurrectionCheck(src)
 
 	// u no we dead
 	return TRUE

code/modules/mob/living/living.dm

@@ -997,35 +997,6 @@
 	..()
 	update_z(new_z)
 
-/mob/living/proc/owns_soul()
-	if(mind)
-		return mind.soulOwner == mind
-	return 1
-
-/mob/living/proc/return_soul()
-	if(mind)
-		if(mind.soulOwner.devilinfo)//Not sure how this could happen, but whatever.
-			mind.soulOwner.devilinfo.remove_soul(mind)
-		mind.soulOwner = mind
-		mind.damnation_type = 0
-
-/mob/living/proc/has_bane(banetype)
-	if(mind)
-		if(mind.devilinfo)
-			return mind.devilinfo.bane == banetype
-	return 0
-
-/mob/living/proc/check_weakness(obj/item/weapon, mob/living/attacker)
-	if(mind && mind.devilinfo)
-		return check_devil_bane_multiplier(weapon, attacker)
-	return 1
-
-/mob/living/proc/check_acedia()
-	if(src.mind && src.mind.objectives)
-		for(var/datum/objective/sintouched/acedia/A in src.mind.objectives)
-			return 1
-	return 0
-
 /mob/living/rad_act(amount)
 	. = ..()
 

code/modules/mob/living/simple_animal/friendly/dog.dm

@@ -580,11 +580,6 @@
 			"<span class='cult big bold'>DELICIOUS SOULS</span>")
 			playsound(src, 'sound/misc/demon_attack1.ogg', 75, TRUE)
 			narsie_act()
-			if(P.mind)
-				if(P.mind.hasSoul)
-					P.mind.hasSoul = FALSE //Nars-Ian ate your soul; you don't have one anymore
-				else
-					visible_message("<span class='cult big bold'>... Aw, someone beat me to this one.</span>")
 			P.gib()
 
 /mob/living/simple_animal/pet/dog/corgi/narsie/update_corgi_fluff()

code/modules/mob/living/stat_states.dm

@@ -64,12 +64,6 @@
 		hud_used?.reload_fullscreen()
 
 	SEND_SIGNAL(src, COMSIG_LIVING_REVIVE, updating)
-	for(var/s in ownedSoullinks)
-		var/datum/soullink/S = s
-		S.ownerRevives(src)
-	for(var/s in sharedSoullinks)
-		var/datum/soullink/S = s
-		S.sharerRevives(src)
 
 	if(mind)
 		for(var/S in mind.spell_list)

code/modules/paperwork/contract.dm

@@ -13,7 +13,6 @@
 /obj/item/paper/contract/update_icon()
 	return
 
-
 /obj/item/paper/contract/employment
 	icon_state = "good_contract"
 	signed = TRUE
@@ -36,299 +35,3 @@
 	<BR>In exchange for paltry payments, SLAVE agrees to work for the omnipresent and helpful watcher of humanity, for the remainder of his or her current and future lives.\
 	<BR>Further, SLAVE agrees to transfer ownership of his or her soul to the loyalty department of the omnipresent and helpful watcher of humanity.\
 	<BR>Should transfership of a soul not be possible, a lien shall be placed instead.<BR>Signed,<BR><i>[target]</i>"
-
-/obj/item/paper/contract/employment/attack(mob/living/M, mob/living/carbon/human/user)
-	var/deconvert = 0
-	if(M.mind == target && target.soulOwner != target)
-		if(user.mind && (user.mind.assigned_role == "Internal Affairs Agent"))
-			deconvert = 25
-		else if (user.mind && (user.mind.assigned_role =="Head of Personnel") || (user.mind.assigned_role == "Centcom Commander") || (user.mind.assigned_role == "Magistrate"))
-			deconvert = 10 // the HoP doesn't have AS much legal training
-		else
-			deconvert = 0.0001 // one out of a million
-	if(prob(deconvert))
-		M.visible_message("<span class='notice'>[user] reminds [M] that [M]'s soul was already purchased by Nanotrasen!</span>")
-		to_chat(M,"<span class='boldnotice'>You feel that your soul has returned to its rightful owner, Nanotrasen.</span>")
-		M.return_soul()
-	return ..()
-
-
-/obj/item/paper/contract/infernal
-	var/contractType = 0
-	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-	var/datum/mind/owner
-	icon_state = "evil_contract"
-
-/obj/item/paper/contract/infernal/power
-	name = "paper- contract for infernal power"
-	contractType = CONTRACT_POWER
-
-/obj/item/paper/contract/infernal/wealth
-	name = "paper- contract for unlimited wealth"
-	contractType = CONTRACT_WEALTH
-
-/obj/item/paper/contract/infernal/prestige
-	name = "paper- contract for prestige"
-	contractType = CONTRACT_PRESTIGE
-
-/obj/item/paper/contract/infernal/magic
-	name = "paper- contract for magical power"
-	contractType = CONTRACT_MAGIC
-
-/obj/item/paper/contract/infernal/revive
-	name = "paper- contract of resurrection"
-	contractType = CONTRACT_REVIVE
-
-/obj/item/paper/contract/infernal/knowledge
-	name = "paper- contract for knowledge"
-	contractType = CONTRACT_KNOWLEDGE
-
-/obj/item/paper/contract/infernal/unwilling
-	name = "paper- infernal contract"
-	contractType = CONTRACT_UNWILLING
-
-/obj/item/paper/contract/infernal/friendship
-	name = "paper- contract for friendship"
-	contractType = CONTRACT_FRIENDSHIP
-
-/obj/item/paper/contract/infernal/New(atom/loc, mob/living/nTarget, datum/mind/nOwner)
-	..()
-	owner = nOwner
-	target = nTarget
-	update_text()
-
-/obj/item/paper/contract/infernal/suicide_act(mob/user)
-	if(signed && (user == target.current) && istype(user,/mob/living/carbon/human/))
-		var/mob/living/carbon/human/H = user
-		H.forcesay("OH GREAT INFERNO!  I DEMAND YOU COLLECT YOUR BOUNTY IMMEDIATELY!")
-		H.visible_message("<span class='suicide'>[H] holds up a contract claiming his soul, then immediately catches fire.  It looks like \he's trying to commit suicide!</span>")
-		H.adjust_fire_stacks(20)
-		H.IgniteMob()
-		return FIRELOSS
-	else
-		..()
-
-/obj/item/paper/contract/infernal/update_text()
-	info = "This shouldn't be seen.  Error DEVIL:6"
-
-/obj/item/paper/contract/infernal/power/update_text(var/signature = "____________", blood = 0)
-	info = "<center><B>Contract for infernal power</B></center><BR><BR><BR>I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [owner.devilinfo.truename], in exchange for power and physical strength.  I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life.  I also understand that this will prevent my brain from being used in an MMI.<BR><BR><BR>Signed, "
-	if(blood)
-		info += "<font face=\"REBUFFED\" color=#600A0A size=6><i>[signature]</i></font>"
-	else
-		info += "<i>[signature]</i>"
-
-/obj/item/paper/contract/infernal/wealth/update_text(var/signature = "____________", blood = 0)
-	info = "<center><B>Contract for unlimited wealth</B></center><BR><BR><BR>I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [owner.devilinfo.truename], in exchange for a pocket that never runs out of valuable resources.  I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life.  I also understand that this will prevent my brain from being used in an MMI.<BR><BR><BR>Signed, "
-	if(blood)
-		info += "<font face=\"REBUFFED\" color=#600A0A size=6><i>[signature]</i></font>"
-	else
-		info += "<i>[signature]</i>"
-
-/obj/item/paper/contract/infernal/prestige/update_text(var/signature = "____________", blood = 0)
-	info = "<center><B>Contract for prestige</B></center><BR><BR><BR>I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [owner.devilinfo.truename], in exchange for prestige and esteem among my peers.  I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life.  I also understand that this will prevent my brain from being used in an MMI.<BR><BR><BR>Signed, "
-	if(blood)
-		info += "<font face=\"REBUFFED\" color=#600A0A size=6><i>[signature]</i></font>"
-	else
-		info += "<i>[signature]</i>"
-
-/obj/item/paper/contract/infernal/magic/update_text(var/signature = "____________", blood = 0)
-	info = "<center><B>Contract for magic</B></center><BR><BR><BR>I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [owner.devilinfo.truename], in exchange for arcane abilities beyond normal human ability.  I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life.  I also understand that this will prevent my brain from being used in an MMI.<BR><BR><BR>Signed, "
-	if(blood)
-		info += "<font face=\"REBUFFED\" color=#600A0A size=6><i>[signature]</i></font>"
-	else
-		info += "<i>[signature]</i>"
-
-/obj/item/paper/contract/infernal/revive/update_text(var/signature = "____________", blood = 0)
-	info = "<center><B>Contract for resurrection</B></center><BR><BR><BR>I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [owner.devilinfo.truename], in exchange for resurrection and curing of all injuries.  I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life.  I also understand that this will prevent my brain from being used in an MMI.<BR><BR><BR>Signed, "
-	if(blood)
-		info += "<font face=\"REBUFFED\" color=#600A0A size=6><i>[signature]</i></font>"
-	else
-		info += "<i>[signature]</i>"
-
-/obj/item/paper/contract/infernal/knowledge/update_text(var/signature = "____________", blood = 0)
-	info = "<center><B>Contract for knowledge</B></center><BR><BR><BR>I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [owner.devilinfo.truename], in exchange for boundless knowledge.  I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life.  I also understand that this will prevent my brain from being used in an MMI.<BR><BR><BR>Signed, "
-	if(blood)
-		info += "<font face=\"REBUFFED\" color=#600A0A size=6><i>[signature]</i></font>"
-	else
-		info += "<i>[signature]</i>"
-
-/obj/item/paper/contract/infernal/friendship/update_text(var/signature = "____________", blood = 0)
-	info = "<center><B>Contract for friendship</B></center><BR><BR><BR>I, [target] of sound mind, do hereby willingly offer my soul to the infernal hells by way of the infernal agent [owner.devilinfo.truename], in exchange for true unconditional friendship.  I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life.  I also understand that this will prevent my brain from being used in an MMI.<BR><BR><BR>Signed, "
-	if(blood)
-		info += "<font face=\"REBUFFED\" color=#600A0A size=6><i>[signature]</i></font>"
-	else
-		info += "<i>[signature]</i>"
-
-/obj/item/paper/contract/infernal/unwilling/update_text(var/signature = "____________", blood = 0)
-	info = "<center><B>Contract for slave</B></center><BR><BR><BR>I, [target], hereby offer my soul to the infernal hells by way of the infernal agent [owner.devilinfo.truename].  I understand that upon my demise, my soul shall fall into the infernal hells, and my body may not be resurrected, cloned, or otherwise brought back to life.  I also understand that this will prevent my brain from being used in an MMI.<BR><BR><BR>Signed, "
-	if(blood)
-		info += "<font face=\"REBUFFED\" color=#600A0A size=6><i>[signature]</i></font>"
-	else
-		info += "<i>[signature]</i>"
-
-/obj/item/paper/contract/infernal/attackby(obj/item/P, mob/living/carbon/human/user, params)
-	add_fingerprint(user)
-	if(istype(P, /obj/item/pen) || istype(P, /obj/item/toy/crayon))
-		attempt_signature(user)
-	else if(istype(P, /obj/item/stamp))
-		to_chat(user,"<span class='notice'>You stamp the paper with your rubber stamp, however the ink ignites as you release the stamp.</span>")
-	else if(is_hot(P))
-		user.visible_message("<span class='danger'>[user] brings [P] next to [src], but [src] does not catch fire!</span>", "<span class='danger'>The [src] refuses to ignite!</span>")
-	else
-		return ..()
-
-/obj/item/paper/contract/infernal/attack(mob/M, mob/living/user)
-	add_fingerprint(user)
-	if(M == user && target == M.mind && M.mind.soulOwner != owner && attempt_signature(user, 1))
-		user.visible_message("<span class='danger'>[user] slices their wrist with [src], and scrawls their name in blood.</span>", "<span class='danger'>You slice your wrist open and scrawl your name in blood.</span>")
-		if(istype(user, /mob/living/carbon/human))
-			var/mob/living/carbon/human/C = user
-			C.blood_volume = max(0, C.blood_volume - 100)
-	else
-		return ..()
-
-/obj/item/paper/contract/infernal/proc/attempt_signature(mob/living/carbon/human/user, blood = 0)
-	if(!(user.IsAdvancedToolUser() && user.is_literate()))
-		to_chat(user, "<span class='notice'>You don't know how to read or write.</span>")
-		return FALSE
-
-	if(user.mind != target)
-		to_chat(user,"<span class='notice'>Your signature simply slides off the sheet, it seems this contract is not meant for you to sign.</span>")
-		return FALSE
-
-	if(!user.mind.hasSoul)
-		to_chat(user, "<span class='notice'>You lack a soul to sign away!</span>")
-
-	if(user.mind.soulOwner == owner)
-		to_chat(user, "<span class='notice'>This devil already owns your soul, you may not sell it to them again.</span>")
-		return FALSE
-
-	if(contractType == CONTRACT_REVIVE) // :eyes:
-		to_chat(user,"<span class='notice'>You are already alive, this contract would do nothing.</span>")
-		return FALSE
-
-	if(signed)
-		to_chat(user,"<span class='notice'>This contract has already been signed. It may not be signed again.</span>")
-		return FALSE
-
-	to_chat(user,"<span class='notice'>You quickly scrawl your name on the contract</span>")
-
-	if(FulfillContract(target.current, blood) <= 0)
-		to_chat(user,"<span class='notice'>But it seemed to have no effect, perhaps even Hell itself cannot grant this boon?</span>")
-	return TRUE
-
-/obj/item/paper/contract/infernal/revive/attack(mob/M, mob/living/user)
-	if(target == M.mind && M.stat == DEAD && M.mind.hasSoul && M.mind.soulOwner == M.mind)
-		if(!ishuman(M))
-			return
-		var/mob/living/carbon/human/H = M
-		var/mob/dead/observer/ghost = M.get_ghost(1)
-		var/response = "No"
-		if(ghost)
-			if(!ghost.client)
-				return
-			ghost.notify_cloning("A devil has offered you revival, at the cost of your soul.",'sound/effects/genetics.ogg', H)
-			response = alert(ghost, "A devil is offering you another chance at life, at the price of your soul, do you accept?", "Infernal Resurrection", "Yes", "No")
-			if(!ghost)
-				return		//handle logouts that happen whilst the alert is waiting for a response.
-			if(response == "Yes")
-				ghost.reenter_corpse()
-		else
-			response = alert(target.current, "A devil is offering you another chance at life, at the price of your soul, do you accept?", "Infernal Resurrection", "Yes", "No")
-		if(response == "Yes")
-			H.revive()
-			add_attack_logs(user, H, "infernally revived via contract")
-			user.visible_message("<span class='notice'>With a sudden blaze, [H] stands back up.</span>")
-			H.fakefire()
-			FulfillContract(H, 1)//Revival contracts are always signed in blood
-			spawn(5)
-				H.fakefireextinguish(TRUE)
-	else
-		..()
-
-
-/obj/item/paper/contract/infernal/proc/FulfillContract(mob/living/carbon/human/user = target.current, blood = 0)
-	signed = 1
-	if(!user.mind)
-		return 0
-	if(user.mind.soulOwner != user.mind && user.mind.soulOwner.devilinfo) //They already sold their soul to someone else?
-		user.mind.soulOwner.devilinfo.remove_soul(user.mind) //Then they lose their claim.
-	user.mind.soulOwner = owner
-	user.mind.damnation_type = contractType
-	owner.devilinfo.add_soul(user.mind)
-	update_text(user.real_name, blood)
-	to_chat(user, "<span class='notice'>A profound emptiness washes over you as you lose ownership of your soul.</span>")
-	to_chat(user, "<span class='boldnotice'>This does NOT make you an antagonist if you were not already.</span>")
-	return 1
-
-/obj/item/paper/contract/infernal/power/FulfillContract(mob/living/carbon/human/user = target.current, blood = 0)
-	if(!user.dna)
-		return -1
-	user.dna.SetSEState(GLOB.hulkblock,1)
-	singlemutcheck(user, GLOB.hulkblock, MUTCHK_FORCED)
-	// Demonic power gives you consequenceless hulk
-	user.gene_stability += GENE_INSTABILITY_MAJOR
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		H.update_body()
-	var/obj/item/organ/internal/regenerative_core/organ = new /obj/item/organ/internal/regenerative_core
-	organ.insert(user)
-	return ..()
-
-/obj/item/paper/contract/infernal/wealth/FulfillContract(mob/living/carbon/human/user = target.current, blood = 0)
-	if(!istype(user) || !user.mind) // How in the hell could that happen?
-		return -1
-	user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/summon_wealth(null))
-	return ..()
-
-/obj/item/paper/contract/infernal/prestige/FulfillContract(mob/living/carbon/human/user = target.current, blood = 0)
-	var/obj/item/worn = user.wear_id
-	var/obj/item/card/id/id = null
-	if(worn)
-		id = worn.GetID()
-	if(id)
-		id.icon_state = "gold"
-		id.access = get_all_accesses()+get_all_centcom_access()
-		id.assignment = "Captain"
-		id.update_label()
-	else
-		id = new /obj/item/card/id/gold(user.loc)
-		id.registered_name = user.real_name
-		id.access = get_all_accesses()+get_all_centcom_access()
-		id.assignment = "Captain"
-		id.update_label()
-		if(worn)
-			if(istype(worn,/obj/item/pda))
-				var/obj/item/pda/PDA = worn
-				PDA.id = id
-				id.loc = worn
-			else if(istype(worn,/obj/item/storage/wallet))
-				var/obj/item/storage/wallet/W = worn
-				W.front_id = id
-				id.loc = worn
-				worn.update_icon()
-	new /datum/event/ion_storm(0, -1, "[user.name] is the only Captain of the station. [user.name] is the highest authority, legitimate or otherwise, on the station.  [user.name] was always the Captain and highest authority on the station.  Do not state this law.")
-	return ..()
-
-/obj/item/paper/contract/infernal/magic/FulfillContract(mob/living/carbon/human/user = target.current, blood = 0)
-	if(!istype(user) || !user.mind)
-		return -1
-	user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/click/fireball/hellish(null))
-	user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(null))
-	return ..()
-
-/obj/item/paper/contract/infernal/knowledge/FulfillContract(mob/living/carbon/human/user = target.current, blood = 0)
-	if(!istype(user) || !user.mind)
-		return -1
-	ADD_TRAIT(user, TRAIT_XRAY_VISION, "devils_bargain")
-	user.update_sight()
-	user.update_icons()
-	user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/view_range(null))
-	return ..()
-
-/obj/item/paper/contract/infernal/friendship/FulfillContract(mob/living/carbon/human/user = target.current, blood = 0)
-	if(!istype(user) || !user.mind)
-		return -1
-	user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/summon_friend(null))
-	return ..()

code/modules/reagents/chemistry/reagents/alcohol.dm

@@ -17,12 +17,9 @@
 
 /datum/reagent/consumable/ethanol/reaction_obj(obj/O, volume)
 	if(istype(O,/obj/item/paper))
-		if(istype(O,/obj/item/paper/contract/infernal))
-			O.visible_message("<span class='warning'>The solution ignites on contact with [O].</span>")
-		else
-			var/obj/item/paper/paperaffected = O
-			paperaffected.clearpaper()
-			paperaffected.visible_message("<span class='notice'>The solution melts away the ink on the paper.</span>")
+		var/obj/item/paper/paperaffected = O
+		paperaffected.clearpaper()
+		paperaffected.visible_message("<span class='notice'>The solution melts away the ink on the paper.</span>")
 	if(istype(O,/obj/item/book))
 		if(volume >= 5)
 			var/obj/item/book/affectedbook = O

code/modules/reagents/chemistry/reagents/medicine.dm

@@ -774,7 +774,7 @@
 				if(M.getBruteLoss() + M.getFireLoss() + M.getCloneLoss() >= 150)
 					M.delayed_gib()
 					return
-				if(!M.suiciding && !HAS_TRAIT(M, TRAIT_HUSK) && !HAS_TRAIT(M, TRAIT_BADDNA) && (!M.mind || M.mind && M.mind.is_revivable()))
+				if(!M.suiciding && !HAS_TRAIT(M, TRAIT_HUSK) && !HAS_TRAIT(M, TRAIT_BADDNA))
 					var/time_dead = world.time - M.timeofdeath
 					M.visible_message("<span class='warning'>[M] seems to rise from the dead!</span>")
 					M.adjustCloneLoss(50)

code/modules/reagents/chemistry/reagents/misc.dm

@@ -117,11 +117,6 @@
 	color = "#D0D0D0" // rgb: 208, 208, 208
 	taste_description = "sub-par bling"
 
-/datum/reagent/silver/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
-	if(M.has_bane(BANE_SILVER))
-		M.reagents.add_reagent("toxin", volume)
-	. = ..()
-
 /datum/reagent/aluminum
 	name = "Aluminum"
 	id = "aluminum"
@@ -169,11 +164,6 @@
 				H.blood_volume += 0.8
 	return ..()
 
-/datum/reagent/iron/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
-	if(M.has_bane(BANE_IRON) && holder && holder.chem_temp < 150) //If the target is weak to cold iron, then poison them.
-		M.reagents.add_reagent("toxin", volume)
-	..()
-
 //foam
 /datum/reagent/fluorosurfactant
 	name = "Fluorosurfactant"

code/modules/surgery/organs/vocal_cords.dm

@@ -188,12 +188,6 @@ GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby"))
 
 	for(var/V in listeners)
 		var/mob/living/L = V
-		if(L.mind && L.mind.devilinfo && findtext(message, L.mind.devilinfo.truename))
-			var/start = findtext(message, L.mind.devilinfo.truename)
-			listeners = list(L) //let's be honest you're never going to find two devils with the same name
-			power_multiplier *= 5 //if you're a devil and god himself addressed you, you fucked up
-			//Cut out the name so it doesn't trigger commands
-			message = copytext(message, 0, start)+copytext(message, start + length(L.mind.devilinfo.truename), length(message) + 1)
 		if(findtext(message, L.real_name) == 1)
 			specific_listeners += L //focus on those with the specified name
 			//Cut out the name so it doesn't trigger commands