Bleeding edgy refresh (#303)

* not code stuff * other things * global vars, defines, helpers * onclick hud stuff, orphans, world.dm * controllers and datums * game folder * everything not client/mobs in modules * client folder * stage 1 mob stuff * simple animal things * silicons * carbon things * ayylmaos and monkeys * hyoomahn * icons n shit * sprite fixes * compile fixes * some fixes I cherrypicked. * qdel fixes * forgot brain refractors
2017-03-21 11:44:10 -05:00
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
@@ -51,7 +51,7 @@
 /datum/game_mode/devil/post_setup()
 	for(var/datum/mind/devil in devils)
 		spawn(rand(10,100))
-			finalize_devil(devil, objective_count)
+			finalize_devil(devil, TRUE)
 			spawn(100)
 				add_devil_objectives(devil, objective_count) //This has to be in a separate loop, as we need devil names to be generated before we give objectives in devil agent.
 				devil.announceDevilLaws()
@@ -94,6 +94,7 @@ var/global/list/lawlorify = list (
 	/obj/effect/proc_holder/spell/targeted/summon_contract,
 	/obj/effect/proc_holder/spell/targeted/conjure_item/violin,
 	/obj/effect/proc_holder/spell/targeted/summon_dancefloor)
+	var/ascendable = FALSE


 /datum/devilinfo/New()
@@ -156,11 +157,11 @@ var/global/list/lawlorify = list (
 		return
 	soulsOwned += soul
 	owner.current.nutrition = NUTRITION_LEVEL_FULL
-	owner.current << "<span class='warning'>You feel satiated as you received a new soul.</span>"
+	to_chat(owner.current, "<span class='warning'>You feel satiated as you received a new soul.</span>")
 	update_hud()
 	switch(SOULVALUE)
 		if(0)
-			owner.current << "<span class='warning'>Your hellish powers have been restored."
+			to_chat(owner.current, "<span class='warning'>Your hellish powers have been restored.")
 			give_base_spells()
 		if(BLOOD_THRESHOLD)
 			increase_blood_lizard()
@@ -172,7 +173,7 @@ var/global/list/lawlorify = list (
 /datum/devilinfo/proc/remove_soul(datum/mind/soul)
 	if(soulsOwned.Remove(soul))
 		check_regression()
-		owner.current << "<span class='warning'>You feel as though a soul has slipped from your grasp.</span>"
+		to_chat(owner.current, "<span class='warning'>You feel as though a soul has slipped from your grasp.</span>")
 		update_hud()

 /datum/devilinfo/proc/check_regression()
@@ -185,19 +186,10 @@ var/global/list/lawlorify = list (
 		regress_humanoid()
 	if(SOULVALUE < 0)
 		remove_spells()
-		owner.current << "<span class='warning'>As punishment for your failures, all of your powers except contract creation have been revoked."
-
-/datum/devilinfo/proc/increase_form()
-	switch(form)
-		if(BASIC_DEVIL)
-			increase_blood_lizard()
-		if(BLOOD_LIZARD)
-			increase_true_devil()
-		if(TRUE_DEVIL)
-			increase_arch_devil()
+		to_chat(owner.current, "<span class='warning'>As punishment for your failures, all of your powers except contract creation have been revoked.")

 /datum/devilinfo/proc/regress_humanoid()
-	owner.current << "<span class='warning'>Your powers weaken, have more contracts be signed to regain power."
+	to_chat(owner.current, "<span class='warning'>Your powers weaken, have more contracts be signed to regain power.")
 	if(ishuman(owner.current))
 		var/mob/living/carbon/human/H = owner.current
 		H.set_species(/datum/species/human, 1)
@@ -209,7 +201,7 @@ var/global/list/lawlorify = list (

 /datum/devilinfo/proc/regress_blood_lizard()
 	var/mob/living/carbon/true_devil/D = owner.current
-	D << "<span class='warning'>Your powers weaken, have more contracts be signed to regain power."
+	to_chat(D, "<span class='warning'>Your powers weaken, have more contracts be signed to regain power.")
 	D.oldform.loc = D.loc
 	owner.transfer_to(D.oldform)
 	give_lizard_spells()
@@ -219,7 +211,7 @@ var/global/list/lawlorify = list (


 /datum/devilinfo/proc/increase_blood_lizard()
-	owner.current << "<span class='warning'>You feel as though your humanoid form is about to shed.  You will soon turn into a blood lizard."
+	to_chat(owner.current, "<span class='warning'>You feel as though your humanoid form is about to shed.  You will soon turn into a blood lizard.")
 	sleep(50)
 	if(ishuman(owner.current))
 		var/mob/living/carbon/human/H = owner.current
@@ -237,7 +229,7 @@ var/global/list/lawlorify = list (


 /datum/devilinfo/proc/increase_true_devil()
-	owner.current << "<span class='warning'>You feel as though your current form is about to shed.  You will soon turn into a true devil."
+	to_chat(owner.current, "<span class='warning'>You feel as though your current form is about to shed.  You will soon turn into a true devil.")
 	sleep(50)
 	var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(owner.current.loc)
 	A.faction |= "hell"
@@ -251,8 +243,10 @@ var/global/list/lawlorify = list (


 /datum/devilinfo/proc/increase_arch_devil()
+	if(!ascendable)
+		return
 	var/mob/living/carbon/true_devil/D = owner.current
-	D << "<span class='warning'>You feel as though your form is about to ascend."
+	to_chat(D, "<span class='warning'>You feel as though your form is about to ascend.")
 	sleep(50)
 	if(!D)
 		return
@@ -271,19 +265,19 @@ var/global/list/lawlorify = list (
 	sleep(40)
 	if(!D)
 		return
-	D << "<i><b>Yes!</b></i>"
+	to_chat(D, "<i><b>Yes!</b></i>")
 	sleep(10)
 	if(!D)
 		return
-	D << "<i><b><span class='big'>YES!!</span></b></i>"
+	to_chat(D, "<i><b><span class='big'>YES!!</span></b></i>")
 	sleep(10)
 	if(!D)
 		return
-	D << "<i><b><span class='reallybig'>YE--</span></b></i>"
+	to_chat(D, "<i><b><span class='reallybig'>YE--</span></b></i>")
 	sleep(1)
 	if(!D)
 		return
-	world << "<font size=5><span class='danger'><b>\"SLOTH, WRATH, GLUTTONY, ACEDIA, ENVY, GREED, PRIDE! FIRES OF HELL AWAKEN!!\"</font></span>"
+	to_chat(world, "<font size=5><span class='danger'><b>\"SLOTH, WRATH, GLUTTONY, ACEDIA, ENVY, GREED, PRIDE! FIRES OF HELL AWAKEN!!\"</font></span>")
 	world << 'sound/hallucinations/veryfar_noise.ogg'
 	give_arch_spells()
 	D.convert_to_archdevil()
@@ -339,23 +333,23 @@ var/global/list/lawlorify = list (

 /datum/devilinfo/proc/beginResurrectionCheck(mob/living/body)
 	if(SOULVALUE>0)
-		owner.current<< "<span class='userdanger'>Your body has been damaged to the point that you may no longer use it.  At the cost of some of your power, you will return to life soon.  Remain in your body.</span>"
+		to_chat(owner.current, "<span class='userdanger'>Your body has been damaged to the point that you may no longer use it.  At the cost of some of your power, you will return to life soon.  Remain in your body.</span>")
 		sleep(DEVILRESURRECTTIME)
 		if (!body ||  body.stat == DEAD)
 			if(SOULVALUE>0)
 				if(check_banishment(body))
-					owner.current<< "<span class='userdanger'>Unfortunately, the mortals have finished a ritual that prevents your resurrection.</span>"
+					to_chat(owner.current, "<span class='userdanger'>Unfortunately, the mortals have finished a ritual that prevents your resurrection.</span>")
 					return -1
 				else
-					owner.current<< "<span class='userdanger'>WE LIVE AGAIN!</span>"
+					to_chat(owner.current, "<span class='userdanger'>WE LIVE AGAIN!</span>")
 					return hellish_resurrection(body)
 			else
-				owner.current<< "<span class='userdanger'>Unfortunately, the power that stemmed from your contracts has been extinguished.  You no longer have enough power to resurrect.</span>"
+				to_chat(owner.current, "<span class='userdanger'>Unfortunately, the power that stemmed from your contracts has been extinguished.  You no longer have enough power to resurrect.</span>")
 				return -1
 		else
-			owner.current << "<span class='danger'> You seem to have resurrected without your hellish powers.</span>"
+			to_chat(owner.current, "<span class='danger'> You seem to have resurrected without your hellish powers.</span>")
 	else
-		owner.current << "<span class='userdanger'>Your hellish powers are too weak to resurrect yourself.</span>"
+		to_chat(owner.current, "<span class='userdanger'>Your hellish powers are too weak to resurrect yourself.</span>")

 /datum/devilinfo/proc/check_banishment(mob/living/body)
 	switch(banish)
@@ -403,7 +397,7 @@ var/global/list/lawlorify = list (

 /datum/devilinfo/proc/hellish_resurrection(mob/living/body)
 	message_admins("[owner.name] (true name is: [truename]) is resurrecting using hellish energy.</a>")
-	if(SOULVALUE <= ARCH_THRESHOLD) // once ascended, arch devils do not go down in power by any means.
+	if(SOULVALUE < ARCH_THRESHOLD && ascendable) // once ascended, arch devils do not go down in power by any means.
 		reviveNumber += LOSS_PER_DEATH
 		update_hud()
 	if(body)
@@ -414,41 +408,50 @@ var/global/list/lawlorify = list (
 			var/mob/living/carbon/true_devil/D = body
 			if(D.oldform)
 				D.oldform.revive(1,0) // Heal the old body too, so the devil doesn't resurrect, then immediately regress into a dead body.
+		if(body.stat == DEAD)
+			create_new_body()
 	else
-		if(blobstart.len > 0)
-			var/turf/targetturf = get_turf(pick(blobstart))
-			var/mob/currentMob = owner.current
-			if(!currentMob)
-				currentMob = owner.get_ghost()
-				if(!currentMob)
-					message_admins("[owner.name]'s devil resurrection failed due to client logoff.  Aborting.")
-					return -1 //
-			if(currentMob.mind != owner)
-				message_admins("[owner.name]'s devil resurrection failed due to becoming a new mob.  Aborting.")
-				return -1
-			currentMob.change_mob_type( /mob/living/carbon/human , targetturf, null, 1)
-			var/mob/living/carbon/human/H  = owner.current
-			give_summon_contract()
-			if(SOULVALUE >= BLOOD_THRESHOLD)
-				H.set_species(/datum/species/lizard, 1)
-				H.underwear = "Nude"
-				H.undershirt = "Nude"
-				H.socks = "Nude"
-				H.dna.features["mcolor"] = "511"
-				H.regenerate_icons()
-				if(SOULVALUE >= TRUE_THRESHOLD) //Yes, BOTH this and the above if statement are to run if soulpower is high enough.
-					var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(targetturf)
-					A.faction |= "hell"
-					H.forceMove(A)
-					A.oldform = H
-					A.set_name()
-					owner.transfer_to(A)
-					if(SOULVALUE >= ARCH_THRESHOLD)
-						A.convert_to_archdevil()
-		else
-			throw EXCEPTION("Unable to find a blobstart landmark for hellish resurrection")
+		create_new_body()
 	check_regression()

+/datum/devilinfo/proc/create_new_body()
+	if(blobstart.len > 0)
+		var/turf/targetturf = get_turf(pick(blobstart))
+		var/mob/currentMob = owner.current
+		if(!currentMob)
+			currentMob = owner.get_ghost()
+			if(!currentMob)
+				message_admins("[owner.name]'s devil resurrection failed due to client logoff.  Aborting.")
+				return -1
+		if(currentMob.mind != owner)
+			message_admins("[owner.name]'s devil resurrection failed due to becoming a new mob.  Aborting.")
+			return -1
+		currentMob.change_mob_type( /mob/living/carbon/human, targetturf, null, 1)
+		var/mob/living/carbon/human/H = owner.current
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/lawyer/black(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase(H), slot_hands)
+		H.equip_to_slot_or_del(new /obj/item/weapon/pen(H), slot_l_store)
+		if(SOULVALUE >= BLOOD_THRESHOLD)
+			H.set_species(/datum/species/lizard, 1)
+			H.underwear = "Nude"
+			H.undershirt = "Nude"
+			H.socks = "Nude"
+			H.dna.features["mcolor"] = "511"
+			H.regenerate_icons()
+			if(SOULVALUE >= TRUE_THRESHOLD) //Yes, BOTH this and the above if statement are to run if soulpower is high enough.
+				var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(targetturf)
+				A.faction |= "hell"
+				H.forceMove(A)
+				A.oldform = H
+				A.set_name()
+				owner.transfer_to(A)
+				if(SOULVALUE >= ARCH_THRESHOLD && ascendable)
+					A.convert_to_archdevil()
+	else
+		throw EXCEPTION("Unable to find a blobstart landmark for hellish resurrection")
+	
+
 /datum/devilinfo/proc/update_hud()
 	if(istype(owner.current, /mob/living/carbon))
 		var/mob/living/C = owner.current
@@ -14,7 +14,7 @@
 			text += printobjectives(sintouched_mind)
 			text += "<br>"
 		text += "<br>"
-	world << text
+	to_chat(world, text)

 /datum/game_mode/proc/auto_declare_completion_devils()
 	/var/text = ""
@@ -27,14 +27,15 @@
 			text += printobjectives(devil)
 			text += "<br>"
 		text += "<br>"
-	world << text
+	to_chat(world, text)


-/datum/game_mode/proc/finalize_devil(datum/mind/devil_mind)
+/datum/game_mode/proc/finalize_devil(datum/mind/devil_mind, ascendable = FALSE)

 	var/trueName= randomDevilName()

 	devil_mind.devilinfo = devilInfo(trueName, 1)
+	devil_mind.devilinfo.ascendable = ascendable
 	devil_mind.store_memory("Your devilic true name is [devil_mind.devilinfo.truename]<br>[lawlorify[LAW][devil_mind.devilinfo.ban]]<br>You may not use violence to coerce someone into selling their soul.<br>You may not directly and knowingly physically harm a devil, other than yourself.<br>[lawlorify[LAW][devil_mind.devilinfo.bane]]<br>[lawlorify[LAW][devil_mind.devilinfo.obligation]]<br>[lawlorify[LAW][devil_mind.devilinfo.banish]]<br>")
 	devil_mind.devilinfo.owner = devil_mind
 	devil_mind.devilinfo.give_base_spells(1)
@@ -42,7 +43,7 @@
 		devil_mind.devilinfo.update_hud()
 		if(devil_mind.assigned_role == "Clown" && ishuman(devil_mind.current))
 			var/mob/living/carbon/human/S = devil_mind.current
-			S << "<span class='notice'>Your infernal nature has allowed you to overcome your clownishness.</span>"
+			to_chat(S, "<span class='notice'>Your infernal nature has allowed you to overcome your clownishness.</span>")
 			S.dna.remove_mutation(CLOWNMUT)
 	if(issilicon(devil_mind.current))
 		add_law_sixsixsix(devil_mind.current)
@@ -62,15 +63,15 @@
 /datum/mind/proc/announceDevilLaws()
 	if(!devilinfo)
 		return
-	current << "<span class='warning'><b>You remember your link to the infernal.  You are [src.devilinfo.truename], an agent of hell, a devil.  And you were sent to the plane of creation for a reason.  A greater purpose.  Convince the crew to sin, and embroiden Hell's grasp.</b></span>"
-	current << "<span class='warning'><b>However, your infernal form is not without weaknesses.</b></span>"
-	current << "You may not use violence to coerce someone into selling their soul."
-	current << "You may not directly and knowingly physically harm a devil, other than yourself."
-	current << lawlorify[LAW][src.devilinfo.bane]
-	current << lawlorify[LAW][src.devilinfo.ban]
-	current << lawlorify[LAW][src.devilinfo.obligation]
-	current << lawlorify[LAW][src.devilinfo.banish]
-	current << "<br/><br/><span class='warning'>Remember, the crew can research your weaknesses if they find out your devil name.</span><br>"
+	to_chat(current, "<span class='warning'><b>You remember your link to the infernal.  You are [src.devilinfo.truename], an agent of hell, a devil.  And you were sent to the plane of creation for a reason.  A greater purpose.  Convince the crew to sin, and embroiden Hell's grasp.</b></span>")
+	to_chat(current, "<span class='warning'><b>However, your infernal form is not without weaknesses.</b></span>")
+	to_chat(current, "You may not use violence to coerce someone into selling their soul.")
+	to_chat(current, "You may not directly and knowingly physically harm a devil, other than yourself.")
+	to_chat(current, lawlorify[LAW][src.devilinfo.bane])
+	to_chat(current, lawlorify[LAW][src.devilinfo.ban])
+	to_chat(current, lawlorify[LAW][src.devilinfo.obligation])
+	to_chat(current, lawlorify[LAW][src.devilinfo.banish])
+	to_chat(current, "<br/><br/><span class='warning'>Remember, the crew can research your weaknesses if they find out your devil name.</span><br>")

 /datum/game_mode/proc/printdevilinfo(datum/mind/ply)
 	if(!ply.devilinfo)
@@ -38,7 +38,7 @@
 							Though you are not obligated to help, perhaps by aiding a higher ranking devil, you might just get a promotion.  However, you are incapable	\
 							of intentionally harming a fellow devil.</B>"

-/mob/living/simple_animal/imp/New()
+/mob/living/simple_animal/imp/Initialize()
 	..()
 	boost = world.time + 30

@@ -27,7 +27,7 @@



-/mob/living/carbon/true_devil/New()
+/mob/living/carbon/true_devil/Initialize()
 	create_bodyparts() //initialize bodyparts

 	create_internal_organs()
@@ -87,7 +87,7 @@
 	else if(health < (maxHealth/2))
 		msg += "<span class='warning'>You can see hellfire inside its wounds.</span>\n"
 	msg += "*---------*</span>"
-	user << msg
+	to_chat(user, msg)


 /mob/living/carbon/true_devil/IsAdvancedToolUser()
@@ -151,8 +151,8 @@
 		var/datum/objective/newobjective = new
 		newobjective.explanation_text = "Try to get a promotion to a higher devilic rank."
 		S.mind.objectives += newobjective
-		S << S.playstyle_string
-		S << "<B>Objective #[1]</B>: [newobjective.explanation_text]"
+		to_chat(S, S.playstyle_string)
+		to_chat(S, "<B>Objective #[1]</B>: [newobjective.explanation_text]")
 		return
 	else
 		return ..()