Merge branch 'master' into listeningpostadjustments

code/__DEFINES/dcs/signals/signals.dm

@@ -748,6 +748,8 @@
 ///sent when the access on an id is changed/updated, ensures wallets get updated once ids generate there access
 #define COSMIG_ACCESS_UPDATED "acces_updated"
 
+///sent by carbons to check if they can reflect a projectile
+#define COMSIG_CHECK_REFLECT "check_reflect"
 // Point of interest signals
 /// Sent from base of /datum/controller/subsystem/points_of_interest/proc/on_poi_element_added : (atom/new_poi)
 #define COMSIG_ADDED_POINT_OF_INTEREST "added_point_of_interest"

code/__DEFINES/mobs.dm

@@ -356,6 +356,13 @@
 #define ELZUOSE_CHARGE_FACTOR (0.05 * ELZUOSE_CHARGE_SCALING_MULTIPLIER) //factor at which ethereal's charge decreases
 #define REAGENTS_METABOLISM 0.4 //How many units of reagent are consumed per tick, by default.
 #define REAGENTS_EFFECT_MULTIPLIER (REAGENTS_METABOLISM / 0.4) // By defining the effect multiplier this way, it'll exactly adjust all effects according to how they originally were with the 0.4 metabolism
+///Greater numbers mean that less alcohol has greater intoxication potential
+#define ALCOHOL_THRESHOLD_MODIFIER 1
+///The rate at which alcohol affects you
+#define ALCOHOL_RATE 0.005
+///The exponent applied to boozepwr to make higher volume alcohol at least a little bit damaging to the liver
+#define ALCOHOL_EXPONENT 1.6
+#define ETHANOL_METABOLISM 0.5 * REAGENTS_METABOLISM
 
 // Eye protection
 #define FLASH_PROTECTION_SENSITIVE -1

code/__DEFINES/traits.dm

@@ -286,7 +286,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 //non-mob traits
 /// Used for limb-based paralysis, where replacing the limb will fix it.
 #define TRAIT_PARALYSIS "paralysis"
-
+/// Granted by prismwine, reflects lasers
+#define TRAIT_REFLECTIVE "reflective"
 #define TRAIT_HEARING_SENSITIVE "hearing_sensitive"
 
 /*
@@ -453,8 +454,6 @@ 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"
 /// Self-explainatory.
 #define BEAUTY_ELEMENT_TRAIT "beauty_element"
 #define MOOD_COMPONENT_TRAIT "mood_component"

code/game/objects/effects/effect_system/effects_foam.dm

@@ -353,6 +353,22 @@
 		for(var/obj/item/Item in O)
 			Item.extinguish()
 
+/obj/structure/foamedmetal/forcewine
+	name = "resin"
+	desc = "It's rapidly decaying!"
+	opacity = FALSE
+	icon_state = "atmos_resin"
+	alpha = 120
+	max_integrity = 10
+	var/timeleft = 50
+
+/obj/structure/foamedmetal/forcewine/Initialize(mapload, new_timeleft)
+	. = ..()
+	if(new_timeleft)
+		timeleft = new_timeleft
+	if(timeleft)
+		QDEL_IN(src, timeleft)
+
 #undef ALUMINIUM_FOAM
 #undef IRON_FOAM
 #undef RESIN_FOAM

code/game/objects/effects/forcefields.dm

@@ -37,4 +37,4 @@
 	name = "resin"
 	icon_state = "atmos_resin"
 	CanAtmosPass = ATMOS_PASS_NO
-	timeleft = 1
+	timeleft = 50

code/game/objects/items/manuals.dm

@@ -303,7 +303,6 @@
 
 			</body>
 			</html>"}
-
 // Wiki books that are linked to the configured wiki link.
 
 // A book that links to the wiki

code/modules/cargo/blackmarket/blackmarket_items/consumables.dm

@@ -69,17 +69,21 @@
 	desc = "The SRM keeps the recipes for their trickwines a closely guarded secret. The Hunters carrying those bottles? Less so."
 	item = /datum/reagent/consumable/ethanol/trickwine/ash_wine
 
-	price_min = 200
+	price_min = 300
 	price_max = 600
 	stock_min = 3
 	stock_max = 7
-	availability_prob = 40
+	availability_prob = 30
 
 /datum/blackmarket_item/consumable/trickwine/spawn_item(loc)
-	var/trickwine = pick(list(/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine,
-						/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine,
-						/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine,
-						/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine,))
+	var/trickwine = pick(list(
+		/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine,
+		/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine,
+		/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine,
+		/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine,
+		/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine,
+		/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine
+	))
 	return new trickwine(loc)
 
 /datum/blackmarket_item/consumable/stimpack

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

@@ -72,3 +72,13 @@
 	name = "Vintage Hearthflame"
 	list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/hearth_wine = 45, /datum/reagent/consumable/ethanol/hcider = 5)
 	desc = "Hearthflame 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 = "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 = "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/food_and_drinks/recipes/drinks_recipes.dm

@@ -637,6 +637,18 @@
 	required_container = /obj/structure/fermenting_barrel/distiller
 	mix_sound ='sound/items/welder.ogg'
 
+/datum/chemical_reaction/force_wine
+	results = list(/datum/reagent/consumable/ethanol/trickwine/force_wine = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 3, /datum/reagent/calcium = 1, /datum/reagent/consumable/comet_trail = 1)
+	required_container = /obj/structure/fermenting_barrel/distiller
+	mix_sound ='sound/magic/forcewall.ogg'
+
+/datum/chemical_reaction/prism_wine
+	results = list(/datum/reagent/consumable/ethanol/trickwine/prism_wine = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/gin = 3, /datum/reagent/toxin/plasma = 1, /datum/reagent/consumable/tinlux = 1)
+	required_container = /obj/structure/fermenting_barrel/distiller
+	mix_sound ='sound/weapons/laser.ogg'
+
 /datum/chemical_reaction/molten_bubbles
 	results = list(/datum/reagent/consumable/molten = 30)
 	required_reagents = list(/datum/reagent/clf3 = 10, /datum/reagent/consumable/space_cola = 20, /datum/reagent/medicine/leporazine = 1, /datum/reagent/medicine/lavaland_extract = 1)

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

@@ -97,8 +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))
+	if(SEND_SIGNAL(src, COMSIG_CHECK_REFLECT, def_zone))
+		return TRUE
+	if(HAS_TRAIT(src, TRAIT_REFLECTIVE))
 		return TRUE
 	return FALSE
 

code/modules/reagents/chemistry/reagents/alcohol_reagents/ethanol.dm

@@ -2,22 +2,13 @@
 // ALCOHOLS //
 //////////////
 
-
-///Greater numbers mean that less alcohol has greater intoxication potential
-#define ALCOHOL_THRESHOLD_MODIFIER 1
-///The rate at which alcohol affects you
-#define ALCOHOL_RATE 0.005
-///The exponent applied to boozepwr to make higher volume alcohol at least a little bit damaging to the liver
-#define ALCOHOL_EXPONENT 1.6
-
-
 /datum/reagent/consumable/ethanol
 	name = "Ethanol"
 	description = "A well-known alcohol with a variety of applications."
 	color = "#404030" // rgb: 64, 64, 48
 	nutriment_factor = 0
 	taste_description = "alcohol"
-	metabolization_rate = 0.5 * REAGENTS_METABOLISM
+	metabolization_rate = ETHANOL_METABOLISM
 	var/boozepwr = 65 //Higher numbers equal higher hardness, higher hardness equals more intense alcohol poisoning
 	accelerant_quality = 5