Trickwine Hotfix (#2492)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

It took me 1-2 rounds the gather up a list of small issues and bugs
- [x] Stray pixel somewhere in the flask sprites.
- [x] Color of reagents doesn't match the sprites.
- [x] Typo in vintage flasks.
- [x] Prism wine needs buff: maybe give it a real reflect and make prism
wine actually reflect lasers.
- [x] The breakaway flask recipe should go in the drinks tab. 
- [x] The distiller's icon state gets turned back to barrel when you
open it. Use a variable in the barrel to update icons so they acctually
get updated proper

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

fixing my mistakes and oversights is.. good c:
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
fix: fixed shitty trickwine code (who let this guy cook)
balance: buff to prismwine to make it useful
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

code/__DEFINES/traits.dm

@@ -425,6 +425,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_FISH_SAFE_STORAGE "fish_case"
 /// Stuff that can go inside fish cases
 #define TRAIT_FISH_CASE_COMPATIBILE "fish_case_compatibile"
+/// Granted by prismwine
+#define TRAIT_REFLECTIVE "reflective"
 
 /// Trait granted by [mob/living/silicon/ai]
 /// Applied when the ai anchors itself

code/datums/components/crafting/recipes.dm

@@ -1169,7 +1169,7 @@
 	reqs = list(/obj/item/stack/sheet/glass = 5,
 				/obj/item/stack/sheet/mineral/plasma = 1)
 	tools = list(TOOL_WELDER)
-	category = CAT_MISC
+	category = CAT_DRINK
 
 /datum/crafting_recipe/fermenting_barrel
 	name = "Wooden Barrel"

code/datums/components/outline.dm

@@ -50,3 +50,4 @@
 		playsound(A, 'sound/effects/slosh.ogg', 50, TRUE)
 		A.visible_message("<span class='notice'>The outline around [A] is washed away!")
 		qdel(src)
+

code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm

@@ -49,36 +49,36 @@
 	. = ..()
 
 /obj/item/reagent_containers/food/drinks/breakawayflask/vintage
-	name = "Vintange Saint-Roumain Trickwine"
+	name = "Vintage Saint-Roumain Trickwine"
 	desc = "Supposedly one of the first bottles made"
 	vintage = TRUE
 
 /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine
-	name = "Vintange Saint-Roumain Ashwine"
+	name = "Vintage Saint-Roumain Ashwine"
 	list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/ash_wine = 45, /datum/reagent/consumable/ethanol/absinthe  = 5)
 	desc = "Ashwine was originally created using herbs native to Illestren, as a means of relaxing after a long hunt. The Saint-Roumain Militia has no prohibition on a little fun."
 
 /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine
-	name = "Vintange Saint-Roumain Icewine"
+	name = "Vintage Saint-Roumain Icewine"
 	list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/ice_wine = 45, /datum/reagent/consumable/ethanol/sake = 5)
 	desc = "Icewine, inspired by the frigid slopes of the 'Godforsaken Precipice' that forged the group's reputation as valiant survivalists, was engineered to both soothe overheated Hunters and freeze their foes in their tracks."
 
 /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine
-	name = "Vintange Saint-Roumain Shockwine"
+	name = "Vintage Saint-Roumain Shockwine"
 	list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/shock_wine = 45, /datum/reagent/consumable/ethanol/vodka = 5)
 	desc = "Shockwine, made to invigorate consumers and incapacitate targets, took inspiration from an incident early in the Saint-Roumain Militia's history, when a young Shadow stopped a rampaging beast by plunging an electrical cable that had been dislodged in the fighting into its side."
 
 /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine
-	name = "Vintange Saint-Roumain Hearthwine"
+	name = "Vintage Saint-Roumain Hearthwine"
 	list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/hearth_wine = 45, /datum/reagent/consumable/ethanol/hcider = 5)
 	desc = "Hearthwine is one of the most important tonics devised by the SRM – both for its potent abilities in staunching wounds or setting enemies aflame, and for its closeness to the divine fire associated with the Ashen Huntsman."
 
 /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine
-	name = "Vintange Saint-Roumain Forcewine"
+	name = "Vintage Saint-Roumain Forcewine"
 	list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/force_wine = 45, /datum/reagent/consumable/ethanol/tequila = 5)
 	desc = "Forcewine was originally created as a means to create temporary shelters during long tracking expeditions. While the structures proved to be not as versatile in shape as its brewers had hoped, its utility in creating barricades or heming in hostiles was still greatly appreciated."
 
 /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine
-	name = "Vintange Saint-Roumain Prismwine"
+	name = "Vintage Saint-Roumain Prismwine"
 	list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/prism_wine = 45, /datum/reagent/consumable/ethanol/gin = 5)
 	desc = "Prismwine is one of the most recent additions to the Saint-Roumain Militia's reserve of trickwines. It was purpose-created for fighting hostiles that utilized more advanced energy projection attacks, such as the cryonic beams of watchers or the laser guns of interstellar pirates."

code/modules/hydroponics/fermenting_barrel.dm

@@ -7,6 +7,7 @@
 	anchored = FALSE
 	pressure_resistance = 2 * ONE_ATMOSPHERE
 	max_integrity = 300
+	var/closed_state = "barrel"
 	var/open = FALSE
 	var/speed_multiplier = 1 //How fast it distills. Defaults to 100% (1.0). Lower is better.
 
@@ -70,19 +71,13 @@
 
 /obj/structure/fermenting_barrel/update_icon_state()
 	if(open)
-		icon_state = "barrel_open"
+		icon_state = closed_state+"_open"
 	else
-		icon_state = "barrel"
+		icon_state = closed_state
 	return ..()
 
 /obj/structure/fermenting_barrel/distiller
 	name = "Distiller"
 	icon_state = "distiller"
+	closed_state = "distiller"
 	desc = "A repurposed barrel and keg host to a special culture of bacteria native to Illestren"
-
-/obj/structure/fermenting_barrel/distiller/update_icon_state()
-	if(open)
-		icon_state = "distiller_open"
-	else
-		icon_state = "distiller"
-	return ..()

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

@@ -97,6 +97,9 @@
 	for(var/obj/item/I in held_items)
 		if(I.IsReflect(def_zone))
 			return TRUE
+	///Granted by prismwine
+	if(HAS_TRAIT(src, TRAIT_REFLECTIVE) && prob(50))
+		return TRUE
 	return FALSE
 
 /mob/living/carbon/human/proc/check_shields(atom/AM, damage, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0)

code/modules/reagents/chemistry/reagents/trickwine_reagents.dm

@@ -5,7 +5,7 @@
 /datum/reagent/consumable/ethanol/trickwine/ash_wine
 	name = "Ashwine"
 	description = "A traditional sacrament for members of the Saint-Roumain Militia. Known to grant visions, and is used both for ritual and entertainment purposes aboard Saint-Roumain vessels."
-	color = "#293D25"
+	color = "#6CC66C"
 	boozepwr = 80
 	quality = DRINK_VERYGOOD
 	taste_description = "devotional energy and a hint of high-potency hallucinogens"
@@ -41,7 +41,7 @@
 /datum/reagent/consumable/ethanol/trickwine/ice_wine
 	name = "Icewine"
 	description = "A specialized brew utilized by members of the Saint-Roumain Militia, designed to assist in temperature regulation while working in hot environments. Known to give one the cold shoulder when thrown."
-	color = "#21EFEB"
+	color = "#C0F1EE"
 	boozepwr = 70
 	taste_description = "a cold night on the hunt"
 	glass_name = "Icewine"
@@ -74,7 +74,7 @@
 /datum/reagent/consumable/ethanol/trickwine/shock_wine
 	name = "Shockwine"
 	description = "A stimulating brew utilized by members of the Saint-Roumain Militia, created to allow trackers to keep up with highly mobile prey. Known to have a shocking effect when thrown"
-	color = "#00008b"
+	color = "#FEFEB8"
 	boozepwr = 70
 	taste_description = "the adrenaline of the chase"
 	glass_name = "Shockwine"
@@ -104,7 +104,7 @@
 /datum/reagent/consumable/ethanol/trickwine/hearth_wine
 	name = "Hearthwine"
 	description = "A fiery brew utilized by members of the Saint-Roumain Militia, engineered to cauterize wounds in the field. Goes out in a blaze of glory when thrown."
-	color = "#ff8c00"
+	color = "#FEE185"
 	boozepwr = 70
 	taste_description = "the heat of battle"
 	glass_name = "Hearthwine"
@@ -136,7 +136,7 @@
 /datum/reagent/consumable/ethanol/trickwine/force_wine
 	name = "Forcewine"
 	description = "A fortifying brew utilized by members of the Saint-Roumain Militia, created to protect against the esoteric. Known to act defensively when thrown."
-	color = "#8b009b"
+	color = "#709AAF"
 	boozepwr = 70
 	taste_description = "the strength of your convictions"
 	glass_name = "Forcewine"
@@ -170,7 +170,7 @@
 /datum/reagent/consumable/ethanol/trickwine/prism_wine
 	name = "Prismwine"
 	description = "A glittering brew utilized by members of the Saint-Roumain Militia, mixed to provide defense against the blasts and burns of foes and fauna alike. Softens targets against your own burns when thrown."
-	color = "#add8e6"
+	color = "#F0F0F0"
 	boozepwr = 70
 	taste_description = "the reflective quality of meditation"
 	glass_name = "Prismwine"
@@ -179,14 +179,18 @@
 
 /datum/reagent/consumable/ethanol/trickwine/prism_wine/on_mob_metabolize(mob/living/carbon/human/M)
 	..()
+	ADD_TRAIT(M, TRAIT_REFLECTIVE, "trickwine")
 	if(M.physiology.burn_mod <= initial(M.physiology.burn_mod))
 		M.physiology.burn_mod *= 0.5
-		M.visible_message("<span class='warning'>[M] seems to shimmer with power!</span>")
+	M.add_filter("prism-wine", 2, list("type"="outline", "color"="#8FD7DF", "size"=1))
+	M.visible_message("<span class='warning'>[M] seems to shimmer with power!</span>")
 
 /datum/reagent/consumable/ethanol/trickwine/prism_wine/on_mob_end_metabolize(mob/living/carbon/human/M)
+	REMOVE_TRAIT(M, TRAIT_REFLECTIVE, "trickwine")
 	if(M.physiology.burn_mod > initial(M.physiology.burn_mod))
 		M.physiology.burn_mod *= 2
-		M.visible_message("<span class='warning'>[M] has returned to normal!</span>")
+	M.remove_filter("prism-wine")
+	M.visible_message("<span class='warning'>[M] has returned to normal!</span>")
 	..()
 
 /datum/reagent/consumable/ethanol/trickwine/prism_wine/expose_mob(mob/living/M, method=TOUCH, reac_volume)

shiptest.dme

@@ -1954,8 +1954,8 @@
 #include "code\modules\clothing\outfits\gezena.dm"
 #include "code\modules\clothing\outfits\plasmaman.dm"
 #include "code\modules\clothing\outfits\solgov.dm"
-#include "code\modules\clothing\outfits\syndicate.dm"
 #include "code\modules\clothing\outfits\standard.dm"
+#include "code\modules\clothing\outfits\syndicate.dm"
 #include "code\modules\clothing\outfits\vv_outfit.dm"
 #include "code\modules\clothing\shoes\_shoes.dm"
 #include "code\modules\clothing\shoes\bananashoes.dm"