Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds some cooler looking bottles to the Glass Recycler #1

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Adds some cooler looking bottles to the Glass Recycler #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8c2b7e
Add files via upload
genessee596 Jul 10, 2020
fc32be6
Add files via upload
genessee596 Jul 10, 2020
15b9a22
Update alcohol.dm
genessee596 Jul 11, 2020
640755e
Update glass_recycler.dm
genessee596 Jul 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions code/modules/food_and_drink/alcohol.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "wide 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



20 changes: 20 additions & 0 deletions code/obj/machinery/glass_recycler.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@
<A href='?src=\ref[src];type=flute'>Champagne Flute</A><br>
<A href='?src=\ref[src];type=cocktail'>Cocktail Glass</A><br>
<A href='?src=\ref[src];type=drinkbottle'>Drink Bottle</A><br>
<A href='?src=\ref[src];type=tallbottle'>Tall Bottle</A><br>
<A href='?src=\ref[src];type=longbottle'>Long Bottle</A><br>
<A href='?src=\ref[src];type=rectangularbottle'>Rectangular Bottle</A><br>
<A href='?src=\ref[src];type=squarebottle'>Square Bottle</A><br>
<A href='?src=\ref[src];type=masculinebottle'>Wide Bottle</A><br>
<A href='?src=\ref[src];type=drinking'>Drinking Glass</A><br>
<A href='?src=\ref[src];type=oldf'>Old Fashioned Glass</A><br>
<A href='?src=\ref[src];type=pitcher'>Pitcher</A><br>
Expand Down Expand Up @@ -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
Expand Down