From bffe666af7a400a47dcafed18bffa2d39472ef07 Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Sun, 24 Feb 2019 06:38:54 +1000
Subject: [PATCH] Preserves vorestation removals while porting tweaks

---
 .../human/species/station/prometheans.dm      | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
index eef43e1208..3c6d58fc55 100644
--- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm
+++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
@@ -153,15 +153,9 @@ var/datum/species/shapeshifter/promethean/prometheans
 			H.gib()
 
 /datum/species/shapeshifter/promethean/handle_environment_special(var/mob/living/carbon/human/H)
-<<<<<<< HEAD
-/* VOREStation Removal - Too crazy with our uncapped hunger and slowdown stuff.
-=======
-	var/regen_brute = 1
-	var/regen_burn = 1
-	var/regen_tox = 1
-	var/regen_oxy = 1
 
->>>>>>> 927311c... Merge pull request #5723 from Mechoid/PrometheanTweakening_The_Agonizing_One
+/* VOREStation Removal - Too crazy with our uncapped hunger and slowdown stuff.
+
 	var/turf/T = H.loc
 	if(istype(T))
 		var/obj/effect/decal/cleanable/C = locate() in T
@@ -170,11 +164,16 @@ var/datum/species/shapeshifter/promethean/prometheans
 			if (istype(T, /turf/simulated))
 				var/turf/simulated/S = T
 				S.dirt = 0
-
-<<<<<<< HEAD
 			H.nutrition = min(500, max(0, H.nutrition + rand(15, 30)))
 VOREStation Removal End */
-=======
+
+	var/regen_brute = 1
+	var/regen_burn = 1
+	var/regen_tox = 1
+	var/regen_oxy = 1
+
+	var/turf/T = H.loc	//VOREStation Addition: get the location as originally commented out
+
 	T = get_turf(H) // Swap over to an actual turf, because we need to get the pressure.
 	if(istype(T)) // Make sure it exists, and is a turf again.
 		var/datum/gas_mixture/environment = T.return_air()
@@ -184,7 +183,6 @@ VOREStation Removal End */
 			regen_brute = 0
 			regen_burn = 0
 
->>>>>>> 927311c... Merge pull request #5723 from Mechoid/PrometheanTweakening_The_Agonizing_One
 	// Heal remaining damage.
 	if(H.fire_stacks >= 0)
 		if(H.getBruteLoss() || H.getFireLoss() || H.getOxyLoss() || H.getToxLoss())
@@ -216,18 +214,13 @@ VOREStation Removal End */
 
 			H.nutrition -= (3 * nutrition_cost) //Costs Nutrition when damage is being repaired, corresponding to the amount of damage being repaired.
 			H.nutrition = max(0, H.nutrition) //Ensure it's not below 0.
-<<<<<<< HEAD
-	//else//VOREStation Removal
-		//H.adjustToxLoss(2*heal_rate)	// Doubled because 0.5 is miniscule, and fire_stacks are capped in both directions
-=======
 
 			var/agony_to_apply = ((1 / starve_mod) * nutrition_cost) //Regenerating damage causes minor pain over time. Small injures will be no issue, large ones will cause problems.
 			if((H.getHalLoss() + agony_to_apply) <= 70) // Don't permalock, but make it far easier to knock them down.
 				H.apply_damage(agony_to_apply, HALLOSS)
 
-	else
-		H.adjustToxLoss(2*heal_rate)	// Doubled because 0.5 is miniscule, and fire_stacks are capped in both directions
->>>>>>> 927311c... Merge pull request #5723 from Mechoid/PrometheanTweakening_The_Agonizing_One
+	//else//VOREStation Removal
+		//H.adjustToxLoss(2*heal_rate)	// Doubled because 0.5 is miniscule, and fire_stacks are capped in both directions
 
 /datum/species/shapeshifter/promethean/get_blood_colour(var/mob/living/carbon/human/H)
 	return (H ? rgb(H.r_skin, H.g_skin, H.b_skin) : ..())