From 201a75254326aa40e1a2dbd090d45ecc89844714 Mon Sep 17 00:00:00 2001
From: klaasjared <86997650+GhostActual@users.noreply.github.com>
Date: Fri, 6 Aug 2021 14:45:14 -0400
Subject: [PATCH] Base Commit

---
 code/modules/reagents/reactions/instant/drinks.dm | 12 ++++++------
 .../reagents/reactions/instant/drinks_vr.dm       |  4 ++--
 maps/offmap_vr/talon/talon_v2.dmm                 | 15 ++++++++-------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm
index 8814bf518e7..bd56670ec5c 100644
--- a/code/modules/reagents/reactions/instant/drinks.dm
+++ b/code/modules/reagents/reactions/instant/drinks.dm
@@ -399,7 +399,7 @@
 	name = "Singulo"
 	id = "singulo"
 	result = "singulo"
-	required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5)
+	required_reagents = list("vodka" = 5, "radium" = 1, "redwine" = 5)
 	result_amount = 10
 
 /decl/chemical_reaction/instant/drinks/alliescocktail
@@ -505,14 +505,14 @@
 	name = "Acid Spit"
 	id = "acidspit"
 	result = "acidspit"
-	required_reagents = list("sacid" = 1, "wine" = 5)
+	required_reagents = list("sacid" = 1, "redwine" = 5)
 	result_amount = 6
 
 /decl/chemical_reaction/instant/drinks/amasec
 	name = "Amasec"
 	id = "amasec"
 	result = "amasec"
-	required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5)
+	required_reagents = list("iron" = 1, "redwine" = 5, "vodka" = 5)
 	result_amount = 10
 
 /decl/chemical_reaction/instant/drinks/changelingsting
@@ -661,7 +661,7 @@
 	name = "Melon Spritzer"
 	id = "melonspritzer"
 	result = "melonspritzer"
-	required_reagents = list("watermelonjuice" = 2, "wine" = 2, "applejuice" = 1, "limejuice" = 1)
+	required_reagents = list("watermelonjuice" = 2, "redwine" = 2, "applejuice" = 1, "limejuice" = 1)
 	result_amount = 6
 
 /decl/chemical_reaction/instant/drinks/fauxfizz
@@ -915,7 +915,7 @@
     name = "Wine brandy"
     id = "winebrandy"
     result = "winebrandy"
-    required_reagents = list("wine" = 10)
+    required_reagents = list("redwine" = 10)
     catalysts = list("enzyme" = 10) //10u enzyme so it requires more than is usually added. Stops overlap with wine recipe
     result_amount = 5
 
@@ -937,7 +937,7 @@
 	name = "Vesper"
 	id = "vesper"
 	result = "vesper"
-	required_reagents = list("gin" = 3, "vodka" = 1, "wine" = 1)
+	required_reagents = list("gin" = 3, "vodka" = 1, "redwine" = 1)
 	result_amount = 4
 
 /decl/chemical_reaction/instant/drinks/rotgut
diff --git a/code/modules/reagents/reactions/instant/drinks_vr.dm b/code/modules/reagents/reactions/instant/drinks_vr.dm
index f234184d863..5f32c7e5f8a 100644
--- a/code/modules/reagents/reactions/instant/drinks_vr.dm
+++ b/code/modules/reagents/reactions/instant/drinks_vr.dm
@@ -60,7 +60,7 @@
 	name = "Negroni Sbagliato"
 	id = "sbagliato"
 	result = "sbagliato"
-	required_reagents = list("wine" = 1, "vermouth" = 1, "sodawater" =1)
+	required_reagents = list("redwine" = 1, "vermouth" = 1, "sodawater" =1)
 	result_amount = 3
 
 /decl/chemical_reaction/instant/drinks/italiancrisis
@@ -187,7 +187,7 @@
 	name = "New York Sour"
 	id = "newyorksour"
 	result = "newyorksour"
-	required_reagents = list("whiskeysour" = 3, "wine" = 2, "egg" = 1)
+	required_reagents = list("whiskeysour" = 3, "redwine" = 2, "egg" = 1)
 	result_amount = 6
 
 /decl/chemical_reaction/instant/drinks/mudslide
diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm
index bdb401a6818..1c040f2c167 100644
--- a/maps/offmap_vr/talon/talon_v2.dmm
+++ b/maps/offmap_vr/talon/talon_v2.dmm
@@ -165,7 +165,6 @@
 /area/talon_v2/engineering/generators)
 "aq" = (
 /obj/machinery/recharge_station,
-/obj/structure/catwalk,
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering/generators)
 "ar" = (
@@ -5645,12 +5644,18 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/crew_quarters/cap_room)
 "so" = (
-/obj/item/weapon/storage/dicecup/loaded,
+/obj/item/weapon/storage/dicecup/loaded{
+	pixel_x = 7;
+	pixel_y = 11
+	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/table/marble,
+/obj/item/weapon/deck/cards{
+	pixel_x = 3
+	},
 /turf/simulated/floor/tiled/white,
 /area/talon_v2/crew_quarters/bar)
 "ss" = (
@@ -7128,7 +7133,6 @@
 /area/talon_v2/central_hallway/fore)
 "xq" = (
 /obj/effect/floor_decal/corner/black/diagonal,
-/obj/item/weapon/deck/cards,
 /obj/structure/table/marble,
 /turf/simulated/floor/tiled/white,
 /area/talon_v2/crew_quarters/bar)
@@ -8587,9 +8591,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/talon_v2/engineering)
-"Ct" = (
-/turf/simulated/floor/plating,
-/area/talon_v2/crew_quarters/bar)
 "Cw" = (
 /obj/structure/bed/chair/bay/chair{
 	dir = 1
@@ -26215,7 +26216,7 @@ JO
 JO
 qc
 qI
-Ct
+oh
 DU
 Hl
 Hl