Merge pull request #144 from Mirag1993/Мердж-с-оффами

Trickwines! Part 2! (shiptest-ss13#2166)

_maps/shuttles/roumain/srm_glaive.dmm

@@ -208,9 +208,7 @@
 /obj/structure/flora/ausbushes/brflowers,
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/item/book/manual/trickwines_4_brewers,
-/turf/open/floor/grass{
-	icon_state = "junglegrass"
-	},
+/turf/open/floor/grass/ship/jungle,
 /area/ship/roumain)
 "cJ" = (
 /obj/structure/cable/orange{
@@ -255,6 +253,7 @@
 "ds" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/structure/flora/ausbushes/brflowers,
+/obj/item/reagent_containers/food/drinks/breakawayflask,
 /turf/open/floor/grass/ship/jungle,
 /area/ship/roumain)
 "dt" = (
@@ -726,15 +725,7 @@
 /area/ship/engineering/engine)
 "jG" = (
 /obj/structure/flora/ausbushes/ppflowers,
-/obj/structure/flora/tree/jungle{
-	icon_state = "churchtree";
-	icon = 'icons/obj/flora/chapeltree.dmi';
-	randomize_icon = 0;
-	pixel_x = -16;
-	pixel_y = 0;
-	desc = "A sturdy oak tree imported directly from the homeworld of the Montagne who runs the ship it resides on. It is planted in soil from the same place.";
-	name = "Montagne's Oak"
-	},
+/obj/structure/flora/tree/srm,
 /turf/open/floor/grass/ship/jungle,
 /area/ship/roumain)
 "ko" = (
@@ -753,6 +744,12 @@
 	},
 /turf/open/floor/wood/maple,
 /area/ship/construction)
+"lb" = (
+/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/sparsegrass,
+/obj/structure/fermenting_barrel,
+/turf/open/floor/grass/ship/jungle,
+/area/ship/roumain)
 "lf" = (
 /obj/structure/cable/orange{
 	icon_state = "2-8"
@@ -1680,7 +1677,7 @@
 /area/ship/medical)
 "At" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/reagent_containers/food/drinks/drinkingglass/breakawayflask/vintageash,
+/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine,
 /turf/open/floor/plating{
 	icon_state = "greenerdirt"
 	},
@@ -1776,7 +1773,7 @@
 /obj/structure/railing{
 	dir = 1
 	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/breakawayflask/vintageash,
+/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine,
 /turf/open/floor/ship/dirt/dark,
 /area/ship/roumain)
 "BB" = (
@@ -2106,6 +2103,7 @@
 	name = "Body Holofield Switch";
 	id = "glaive_body_holo"
 	},
+/obj/structure/fermenting_barrel,
 /turf/open/floor/grass/ship/jungle,
 /area/ship/roumain)
 "FA" = (
@@ -2889,8 +2887,10 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Sl" = (
-/obj/structure/fermenting_barrel,
-/turf/open/floor/ship/dirt/dark,
+/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/flora/ausbushes/sparsegrass,
+/obj/structure/fermenting_barrel/distiller,
+/turf/open/floor/grass/ship/jungle,
 /area/ship/roumain)
 "Sx" = (
 /obj/structure/window/reinforced/spawner{
@@ -3951,8 +3951,8 @@ Lk
 cz
 YP
 ds
-aM
-aM
+lb
+Sl
 Fu
 wp
 wp
@@ -4177,7 +4177,7 @@ ZE
 MZ
 qN
 NL
-Sl
+NL
 NL
 NL
 NL

code/__DEFINES/reagents.dm

@@ -22,7 +22,7 @@
 #define VAPOR 3	// foam, spray, blob attack
 #define PATCH 4	// patches
 #define INJECT 5	// injection
-
+#define SMOKE 6 //smoking
 
 //defines passed through to the on_reagent_change proc
 #define DEL_REAGENT 1	// reagent deleted (fully cleared)

code/datums/components/crafting/recipes.dm

@@ -1164,9 +1164,23 @@
 
 /datum/crafting_recipe/breakawayflask
 	name = "Breakaway Flask"
-	result = /obj/item/reagent_containers/food/drinks/drinkingglass/breakawayflask
+	result = /obj/item/reagent_containers/food/drinks/breakawayflask
 	time = 5 SECONDS
 	reqs = list(/obj/item/stack/sheet/glass = 5,
 				/obj/item/stack/sheet/mineral/plasma = 1)
 	tools = list(TOOL_WELDER)
 	category = CAT_MISC
+
+/datum/crafting_recipe/fermenting_barrel
+	name = "Wooden Barrel"
+	result = /obj/structure/fermenting_barrel
+	reqs = list(/obj/item/stack/sheet/mineral/wood = 8)
+	time = 50
+	category = CAT_PRIMAL
+
+/datum/crafting_recipe/distiller
+	name = "Distiller"
+	result = /obj/structure/fermenting_barrel/distiller
+	reqs = list(/obj/item/stack/sheet/mineral/wood = 8, /obj/item/stack/sheet/metal = 5, /datum/reagent/srm_bacteria = 30)
+	time = 50
+	category = CAT_PRIMAL

code/game/MapData/shuttles/srm_glaive.dm

@@ -91,10 +91,6 @@
 	)
 	generate_items_inside(items_inside, src)
 
-/obj/structure/flora/tree/chapel/srm
-	name = "Montagne's Oak"
-	desc = "A sturdy oak tree imported directly from the homeworld of the Montagne who runs the ship it resides on. It is planted in soil from the same place."
-
 /obj/item/book/manual/srmlore
 	name = "Notes on the SRM"
 	icon_state = "book5"

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

@@ -223,9 +223,9 @@
 		for(var/atom/movable/AM in T)
 			if(AM.type == src.type)
 				continue
-			reagents.expose(AM, TOUCH, fraction)
+			reagents.expose(AM, SMOKE, fraction)
 
-		reagents.expose(T, TOUCH, fraction)
+		reagents.expose(T, SMOKE, fraction)
 		return 1
 
 /obj/effect/particle_effect/smoke/chem/smoke_mob(mob/living/carbon/M)

code/game/objects/effects/forcefields.dm

@@ -8,8 +8,11 @@
 	CanAtmosPass = ATMOS_PASS_DENSITY
 	var/timeleft = 300 //Set to 0 for permanent forcefields (ugh)
 
-/obj/effect/forcefield/Initialize()
+/obj/effect/forcefield/Initialize(mapload, new_timeleft)
 	. = ..()
+	//used to change the time for forcewine
+	if(new_timeleft)
+		timeleft = new_timeleft
 	if(timeleft)
 		QDEL_IN(src, timeleft)
 
@@ -36,3 +39,10 @@
 	name = "invisible blockade"
 	desc = "You're gonna be here awhile."
 	timeleft = 600
+
+/obj/effect/forcefield/resin
+	desc = "It's rapidly decaying!"
+	name = "resin"
+	icon_state = "atmos_resin"
+	CanAtmosPass = ATMOS_PASS_NO
+	timeleft = 1

code/game/objects/items/manuals.dm

@@ -242,7 +242,7 @@
 /obj/item/book/manual/trickwines_4_brewers
 	name = "Trickwines for brewers"
 	icon_state = "book2"
-	author = "Baxter Baxter"
+	author = "Bridget Saint-Baskett"
 	title = "Trickwines for brewers"
 	dat = {"<html>
 			<head>
@@ -262,7 +262,16 @@
 			<h2> Breakaway flasks</h2>
 			Honestly, I love these things. I'm not a scientist so I cant exactly explain how it works but somehow when you fuse plasma into glass it makes it ultra sharp and makes it really good for cracking over fauna heads.<br>
 			The simplest way I have found of making them is crafting them with a chunk of glass, plasma, and a welder.<br>
-			I should note: trickwines don't seem to form without flasks. I think it's something to do with the plasma reacting with the mixture.<br>
+
+			<h2> Bacteria </h2>
+			A speical speices of bacteria native to Illestren is what allows Trickwines form.<br>
+			Now we use a special distiller that keeps just enough bacertia alive to ferment without turning the batch sour.<br>
+			Now you should still have one on board but if you dont its fine.<br>
+			It just so happens we have trees on board our ships host to the Bacteria.<br>
+			To get enough Bacteria your going to need to feed it anything that would help a plant.<br>
+			Water, Fertilizer, Ashwine are all good options.<br>
+			Soon it will drops some apples and you can grind them for the bacteria.<br>
+			Once you have enough you can fabricate it the same way you would a normal barrel.<br>
 
 			<h2> Ashwine </h2>
 			It's kind of our trademark, and it's one of the simplest trickwines to make. The Montagnes love using this stuff in ceremonies as well so it should get you some good boy points.<br>
@@ -285,11 +294,30 @@
 			It's a nice upper. Great if you're trying to run away.<br>
 			This one's really flashy. Expect some severe burns on your target<br>
 
-				<br>Baxter Baxter, Senior Brewer<br>
-				P.S.: please stop asking how the uranium got into those flasks.
+			<h2> Hearthwine </h2>
+			I once threw back a flask of this stuff in the heat of a really bad battle and it sealed my wounds within seconds its honestly increadible.<br>
+			It also acts like the inverse of Icewine heating you up more then a fever.<br>
+			Last time I threw it at someone though i almost burnt down the forest I was in.<br>
+			Its made out of ground up fireblossems with some nice hard cider and a bit of welding fuel with of course a ratio of 3:1:1.<br>
 
-				</body>
-				</html>"}
+			<h2> Forcewine </h2>
+			I once had a duel with a wizard and and I was able to completly ignore a few of his spells! Its like they just fizzled out when they hit me.<br>
+			Would recomend for any esoteric senarios even though I have only been in a few of those.<br>
+			You can also use it to entrap Fauna inside of a forcefield like bubble, Gives you time to breath and laugh at them.<br>
+			3:1:1 Tequila, Space Montain Wind, and I know its strange but hollow water, Its that stuff you can extract from geysers<br>
+
+			<h2> Prismwine </h2>
+			Gives you a nice shiny layer of armour, fire seems to have alot harder time sticking to me when i tested it.<br>
+			Throwing it seeems to do the reverse acting like a magnifying glass to burns and lasers<br>
+			Made 3:1:1 with good ol Gin, then add plasma and tinea luxor which is found from mushroom stems<br>
+
+			Some of these can be a bit situatinal but its always nice to have a few in your bag for emergecys.<br>
+			As a bonus, most of the other factions have no clue how to make these so you can sell them for a fair chunk of cash.<br>
+
+			<br>Bridget Saint-Baskett, Senior Brewer<br>
+
+			</body>
+			</html>"}
 
 // Wiki books that are linked to the configured wiki link.