From 6e09f685cda5d384fbf00b977754068d8542af2d Mon Sep 17 00:00:00 2001
From: tmtmtl30 <53132901+tmtmtl30@users.noreply.github.com>
Date: Fri, 29 Sep 2023 21:13:04 -0700
Subject: [PATCH] trickwine balance changes / fixes

Signed-off-by: tmtmtl30 <53132901+tmtmtl30@users.noreply.github.com>
---
 .../chemistry/reagents/trickwine_reagents.dm  | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm b/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm
index 7e1a09692ef6..db33d69ac87d 100644
--- a/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm
@@ -52,12 +52,19 @@
 
 /datum/reagent/consumable/ethanol/ice_wine/expose_mob(mob/living/M, method=TOUCH, reac_volume)
 	if(method == TOUCH)
+		var/paralyze_dur
 		if(!iscarbon(M))
 			reac_volume = reac_volume * 2
-		M.adjust_bodytemperature((-20*reac_volume) * TEMPERATURE_DAMAGE_COEFFICIENT)
-		M.Paralyze(reac_volume)
+			paralyze_dur = reac_volume
+		else
+			if(reac_volume <= 50)
+				paralyze_dur = reac_volume
+			else
+				paralyze_dur = 50 + ((reac_volume - 50) / 4)
+		M.adjust_bodytemperature((-20*reac_volume) * TEMPERATURE_DAMAGE_COEFFICIENT, 150)
+		M.Paralyze(paralyze_dur)
 		walk(M, 0) //stops them mid pathing even if they're stunimmunee
-		M.apply_status_effect(/datum/status_effect/ice_block_talisman,reac_volume)
+		M.apply_status_effect(/datum/status_effect/ice_block_talisman, paralyze_dur)
 
 /datum/reagent/consumable/ethanol/shock_wine
 	name = "Shockwine"
@@ -113,14 +120,12 @@
 		M.fire_act()
 		var/turf/T = get_turf(M)
 		T.IgniteTurf(reac_volume)
-		new /obj/effect/hotspot(T)
-		T.hotspot_expose(reac_volume*10,reac_volume*1)
+		new /obj/effect/hotspot(T, reac_volume * 1, FIRE_MINIMUM_TEMPERATURE_TO_EXIST + reac_volume * 10)
 		var/turf/otherT
 		for(var/direction in GLOB.cardinals)
 			otherT = get_step(T, direction)
 			otherT.IgniteTurf(reac_volume)
-			new /obj/effect/hotspot(otherT)
-			otherT.hotspot_expose(reac_volume*10,reac_volume*1)
+			new /obj/effect/hotspot(otherT, reac_volume * 1, FIRE_MINIMUM_TEMPERATURE_TO_EXIST + reac_volume * 10)
 
 /datum/reagent/consumable/ethanol/force_wine
 	name = "Forcewine"
@@ -181,10 +186,10 @@
 			var/mob/living/simple_animal/hostile/asteroid/the_animal = M
 			the_animal.armor.modifyRating(energy = -50)
 			spawn(reac_volume SECONDS)
-			the_animal.armor.modifyRating(energy = 50)
+				the_animal.armor.modifyRating(energy = 50)
 		if(ishuman(M))
 			var/mob/living/carbon/human/the_human = M
-			if(the_human.physiology.burn_mod <= 2)
+			if(the_human.physiology.burn_mod < 2)
 				the_human.physiology.burn_mod *= 2
 				the_human.visible_message("<span class='warning'>[the_human] seemed weakend!</span>")
 				spawn(reac_volume SECONDS)