Damns Devils Gamemode to Hell (#15672)

* Damns Devils Gamemode to Hell

* Update config.txt

code/game/objects/items/toys.dm

@@ -1226,6 +1226,7 @@
 	icon = 'icons/obj/library.dmi'
 	icon_state = "demonomicon"
 	w_class = WEIGHT_CLASS_SMALL
+	var/list/messages = list("You must challenge the devil to a dance-off!", "The devils true name is Ian", "The devil hates salt!", "Would you like infinite power?", "Would you like infinite wisdom?", " Would you like infinite healing?")
 	var/cooldown = FALSE
 
 /obj/item/toy/codex_gigas/attack_self(mob/user)
@@ -1234,21 +1235,12 @@
 			"<span class='notice'>[user] presses the button on \the [src].</span>",
 			"<span class='notice'>You press the button on \the [src].</span>",
 			"<span class='notice'>You hear a soft click.</span>")
-		var/list/messages = list()
-		var/datum/devilinfo/devil = randomDevilInfo()
-		messages += "Some fun facts about: [devil.truename]"
-		messages += "[GLOB.lawlorify[LORE][devil.bane]]"
-		messages += "[GLOB.lawlorify[LORE][devil.obligation]]"
-		messages += "[GLOB.lawlorify[LORE][devil.ban]]"
-		messages += "[GLOB.lawlorify[LORE][devil.banish]]"
-		playsound(loc, 'sound/machines/click.ogg', 20, 1)
+		playsound(loc, 'sound/machines/click.ogg', 20, TRUE)
 		cooldown = TRUE
-		for(var/message in messages)
+		addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 60)
+		for(var/message in pick(messages))
 			user.loc.visible_message("<span class='danger'>[bicon(src)] [message]</span>")
 			sleep(10)
-		spawn(20)
-			cooldown = FALSE
-		return
 
 /obj/item/toy/owl
 	name = "owl action figure"

code/game/objects/items/weapons/defib.dm

@@ -420,7 +420,7 @@
 					for(var/obj/item/organ/external/O in H.bodyparts)
 						total_brute	+= O.brute_dam
 						total_burn	+= O.burn_dam
-					if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !HAS_TRAIT(H, TRAIT_HUSK)  && !HAS_TRAIT(H, TRAIT_BADDNA) && (H.mind && H.mind.is_revivable()) && (H.get_int_organ(/obj/item/organ/internal/heart) || H.get_int_organ(/obj/item/organ/internal/brain/slime)))
+					if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !HAS_TRAIT(H, TRAIT_HUSK)  && !HAS_TRAIT(H, TRAIT_BADDNA) && (H.get_int_organ(/obj/item/organ/internal/heart) || H.get_int_organ(/obj/item/organ/internal/brain/slime)))
 						tobehealed = min(health + threshold, 0) // It's HILARIOUS without this min statement, let me tell you
 						tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived
 						H.adjustOxyLoss(tobehealed)
@@ -539,7 +539,7 @@
 					for(var/obj/item/organ/external/O in H.bodyparts)
 						total_brute	+= O.brute_dam
 						total_burn	+= O.burn_dam
-					if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !HAS_TRAIT(H, TRAIT_HUSK) && (H.mind && H.mind.is_revivable()))
+					if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !HAS_TRAIT(H, TRAIT_HUSK))
 						tobehealed = min(health + threshold, 0) // It's HILARIOUS without this min statement, let me tell you
 						tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived
 						H.adjustOxyLoss(tobehealed)

code/game/objects/items/weapons/explosives.dm

@@ -109,8 +109,6 @@
 				message_say = "FOR THE REVOLOUTION!"
 			else if(role == "death commando" || role == ROLE_ERT)
 				message_say = "FOR NANOTRASEN!"
-			else if(role == ROLE_DEVIL)
-				message_say = "FOR INFERNO!"
 	user.say(message_say)
 	target = user
 	sleep(10)

code/game/objects/items/weapons/twohanded.dm

@@ -806,76 +806,3 @@
 				Z.ex_act(2)
 				charged = 3
 				playsound(user, 'sound/weapons/marauder.ogg', 50, 1)
-
-/obj/item/twohanded/pitchfork
-	icon_state = "pitchfork0"
-	name = "pitchfork"
-	desc = "A simple tool used for moving hay."
-	force = 7
-	throwforce = 15
-	w_class = WEIGHT_CLASS_BULKY
-	force_unwielded = 7
-	force_wielded = 15
-	attack_verb = list("attacked", "impaled", "pierced")
-	hitsound = 'sound/weapons/bladeslice.ogg'
-	max_integrity = 200
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
-	resistance_flags = FIRE_PROOF
-
-/obj/item/twohanded/pitchfork/demonic
-	name = "demonic pitchfork"
-	desc = "A red pitchfork, it looks like the work of the devil."
-	force = 19
-	throwforce = 24
-	force_unwielded = 19
-	force_wielded = 25
-
-/obj/item/twohanded/pitchfork/demonic/greater
-	force = 24
-	throwforce = 50
-	force_unwielded = 24
-	force_wielded = 34
-
-/obj/item/twohanded/pitchfork/demonic/ascended
-	force = 100
-	throwforce = 100
-	force_unwielded = 100
-	force_wielded = 500000 // Kills you DEAD.
-
-/obj/item/twohanded/pitchfork/update_icon()
-	icon_state = "pitchfork[wielded]"
-
-/obj/item/twohanded/pitchfork/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] impales \himself in \his abdomen with [src]! It looks like \he's trying to commit suicide...</span>")
-	return BRUTELOSS
-
-/obj/item/twohanded/pitchfork/demonic/pickup(mob/user)
-	. = ..()
-	if(istype(user, /mob/living))
-		var/mob/living/U = user
-		if(U.mind && !U.mind.devilinfo && (U.mind.soulOwner == U.mind)) //Burn hands unless they are a devil or have sold their soul
-			U.visible_message("<span class='warning'>As [U] picks [src] up, [U]'s arms briefly catch fire.</span>", \
-				"<span class='warning'>\"As you pick up the [src] your arms ignite, reminding you of all your past sins.\"</span>")
-			if(ishuman(U))
-				var/mob/living/carbon/human/H = U
-				H.apply_damage(rand(force/2, force), BURN, pick("l_arm", "r_arm"))
-			else
-				U.adjustFireLoss(rand(force/2,force))
-
-/obj/item/twohanded/pitchfork/demonic/attack(mob/target, mob/living/carbon/human/user)
-	if(user.mind && !user.mind.devilinfo && (user.mind.soulOwner != user.mind))
-		to_chat(user, "<span class ='warning'>The [src] burns in your hands.</span>")
-		user.apply_damage(rand(force/2, force), BURN, pick("l_arm", "r_arm"))
-	..()
-
-// It's no fun being the lord of all hell if you can't get out of a simple room
-/obj/item/twohanded/pitchfork/demonic/ascended/afterattack(atom/target, mob/user, proximity)
-	if(!proximity || !wielded)
-		return
-	if(istype(target, /turf/simulated/wall))
-		var/turf/simulated/wall/W = target
-		user.visible_message("<span class='danger'>[user] blasts \the [target] with \the [src]!</span>")
-		playsound(target, 'sound/magic/Disintegrate.ogg', 100, 1)
-		W.devastate_wall(TRUE)
-		return 1
-	..()

code/game/objects/structures/morgue.dm

@@ -49,7 +49,7 @@
 			if(M)
 				var/mob/dead/observer/G = M.get_ghost()
 
-				if(M.mind && M.mind.is_revivable() && !M.mind.suicided)
+				if(M.mind && !M.mind.suicided)
 					if(M.client)
 						icon_state = "morgue3"
 						desc = initial(desc) + "\n[status_descriptors[4]]"