From b8c2b7e3e43928a1d71cf5b82adc886eb311dd74 Mon Sep 17 00:00:00 2001
From: genessee596 <46986487+genessee596@users.noreply.github.com>
Date: Fri, 10 Jul 2020 02:33:57 -0400
Subject: [PATCH 1/4] Add files via upload
---
code/obj/machinery/glass_recycler.dm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/code/obj/machinery/glass_recycler.dm b/code/obj/machinery/glass_recycler.dm
index 34a2b9d1d7094..8a6ef234cd914 100644
--- a/code/obj/machinery/glass_recycler.dm
+++ b/code/obj/machinery/glass_recycler.dm
@@ -74,6 +74,11 @@
Champagne Flute
Cocktail Glass
Drink Bottle
+ Tall Bottle
+ Long Bottle
+ Rectangular Bottle
+ Square Bottle
+ Masculine Bottle
Drinking Glass
Old Fashioned Glass
Pitcher
@@ -133,6 +138,21 @@
if("drinkbottle")
G = new /obj/item/reagent_containers/food/drinks/bottle(get_turf(src))
src.glass_amt -= 1
+ if("longbottle")
+ G = new /obj/item/reagent_containers/food/drinks/bottle/empty/long(get_turf(src))
+ src.glass_amt -= 1
+ if("tallbottle")
+ G = new /obj/item/reagent_containers/food/drinks/bottle/empty/tall(get_turf(src))
+ src.glass_amt -= 1
+ if("rectangularbottle")
+ G = new /obj/item/reagent_containers/food/drinks/bottle/empty/rectangular(get_turf(src))
+ src.glass_amt -= 1
+ if("squarebottle")
+ G = new /obj/item/reagent_containers/food/drinks/bottle/empty/square(get_turf(src))
+ src.glass_amt -= 1
+ if("masculinebottle")
+ G = new /obj/item/reagent_containers/food/drinks/bottle/empty/masculine(get_turf(src))
+ src.glass_amt -= 1
if("plate")
G = new /obj/item/plate(get_turf(src))
src.glass_amt -= 2
From fc32be6b45749f98cfec573fab178e7d03d99d75 Mon Sep 17 00:00:00 2001
From: genessee596 <46986487+genessee596@users.noreply.github.com>
Date: Fri, 10 Jul 2020 02:46:36 -0400
Subject: [PATCH 2/4] Add files via upload
---
code/modules/food_and_drink/alcohol.dm | 65 ++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
diff --git a/code/modules/food_and_drink/alcohol.dm b/code/modules/food_and_drink/alcohol.dm
index 614c00fef44af..42a10abe26294 100644
--- a/code/modules/food_and_drink/alcohol.dm
+++ b/code/modules/food_and_drink/alcohol.dm
@@ -404,3 +404,68 @@
desc = "A stick of celery. Does not feature ants. Unless you leave it on the floor, but those would probably not be very tasty. I dunno, though, I've never eaten an ant. They might be delicious."
icon_state = "celery"
edible = 1
+
+// empty bottles
+
+/obj/item/reagent_containers/food/drinks/bottle/empty/long
+ name = "long bottle"
+ desc = "A bottle shaped like the ones used to hold beer or vermouth."
+ icon_state = "bottle-vermouthC"
+ item_state = "vermouth"
+ alt_filled_state = 1
+ heal_amt = 1
+ g_amt = 40
+ bottle_style = "vermouthC"
+ label = "label-none"
+ initial_volume = 50
+
+/obj/item/reagent_containers/food/drinks/bottle/empty/tall
+ name = "tall bottle"
+ desc = "A bottle shaped like the ones used to hold vodka."
+ icon_state = "bottle-tvodka"
+ bottle_style = "tvodka"
+ fluid_style = "tvodka"
+ label = "label-none"
+ alt_filled_state = 1
+ heal_amt = 1
+ g_amt = 60
+ initial_volume = 50
+
+/obj/item/reagent_containers/food/drinks/bottle/empty/rectangular
+ name = "rectangular bottle"
+ desc = "A bottle shaped like the ones used to hold gin."
+ icon_state = "bottle-gin"
+ bottle_style = "gin"
+ fluid_style = "gin"
+ label = "label-none"
+ alt_filled_state = 1
+ heal_amt = 1
+ g_amt = 60
+ initial_volume = 50
+
+/obj/item/reagent_containers/food/drinks/bottle/empty/square
+ name = "square bottle"
+ desc = "A bottle shaped like the ones used to hold rum."
+ icon_state = "bottle-spicedrum"
+ bottle_style = "spicedrum"
+ fluid_style = "spicedrum"
+ label = "label-none"
+ alt_filled_state = 1
+ heal_amt = 1
+ g_amt = 60
+ initial_volume = 50
+
+/obj/item/reagent_containers/food/drinks/bottle/empty/masculine
+ name = "masculine bottle"
+ desc = "A bottle shaped like the ones used to hold tequila."
+ icon_state = "bottle-tequila"
+ bottle_style = "tequila"
+ fluid_style = "tequila"
+ label = "label-none"
+ alt_filled_state = 1
+ heal_amt = 1
+ g_amt = 60
+ initial_volume = 50
+
+
+
From 15b9a22a989adfb6a6e34c0749b41fa70d0ed8b7 Mon Sep 17 00:00:00 2001
From: genessee596 <46986487+genessee596@users.noreply.github.com>
Date: Sat, 11 Jul 2020 00:08:14 -0400
Subject: [PATCH 3/4] Update alcohol.dm
---
code/modules/food_and_drink/alcohol.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/food_and_drink/alcohol.dm b/code/modules/food_and_drink/alcohol.dm
index 42a10abe26294..bd35ba6770135 100644
--- a/code/modules/food_and_drink/alcohol.dm
+++ b/code/modules/food_and_drink/alcohol.dm
@@ -456,7 +456,7 @@
initial_volume = 50
/obj/item/reagent_containers/food/drinks/bottle/empty/masculine
- name = "masculine bottle"
+ name = "wide bottle"
desc = "A bottle shaped like the ones used to hold tequila."
icon_state = "bottle-tequila"
bottle_style = "tequila"
From 640755e3c8a997318cc58915f112f91b17e77251 Mon Sep 17 00:00:00 2001
From: genessee596 <46986487+genessee596@users.noreply.github.com>
Date: Sat, 11 Jul 2020 00:08:59 -0400
Subject: [PATCH 4/4] Update glass_recycler.dm
---
code/obj/machinery/glass_recycler.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/obj/machinery/glass_recycler.dm b/code/obj/machinery/glass_recycler.dm
index 8a6ef234cd914..49853c5ff7719 100644
--- a/code/obj/machinery/glass_recycler.dm
+++ b/code/obj/machinery/glass_recycler.dm
@@ -78,7 +78,7 @@
Long Bottle
Rectangular Bottle
Square Bottle
- Masculine Bottle
+ Wide Bottle
Drinking Glass
Old Fashioned Glass
Pitcher