diff --git a/code/modules/food/drinkingglass/metaglass_vr.dm b/code/modules/food/drinkingglass/metaglass_vr.dm index 55e4e80a378..5381153dd70 100644 --- a/code/modules/food/drinkingglass/metaglass_vr.dm +++ b/code/modules/food/drinkingglass/metaglass_vr.dm @@ -1,258 +1,206 @@ /datum/reagent/ethanol/ginzamary glass_icon_state = "ginzamaryglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/deathbell glass_icon_state = "deathbellglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/brownstar glass_icon_state = "brownstarglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/spacersbrew glass_icon_state = "spacersbrewglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/galacticpanic glass_icon_state = "galacticpanicglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/bulldog glass_icon_state = "bulldogglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/sbagliato glass_icon_state = "sbagliatoglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/italiancrisis glass_icon_state = "italiancrisisglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/bigbeer glass_icon_state = "bigbeerglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/sugarrush glass_icon_state = "sugarrushglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/lotus glass_icon_state = "lotusglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/shroomjuice glass_icon_state = "shroomjuiceglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/russianroulette glass_icon_state = "russianrouletteglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/lovepotion glass_icon_state = "lovepotionglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/honeyshot glass_icon_state = "honeyshotglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/appletini glass_icon_state = "appletiniglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/glowingappletini glass_icon_state = "glowingappletiniglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/scsatw glass_icon_state = "slowcomfortablescrewagainstthewallglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/choccymilk glass_icon_state = "choccymilkglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/sweettea glass_icon_state = "sweetteaglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/redspaceflush glass_icon_state = "redspaceflushglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/graveyard glass_icon_state = "graveyardglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/unsweettea glass_icon_state = "unsweetteaglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/hairoftherat glass_icon_state = "hairoftheratglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/soda/kiraspecial - glass_icon_state = "kiraspecial" - glass_center_of_mass = list("x"=16, "y"=12) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/soda/brownstar - glass_icon_state = "brownstar" - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/doctor_delight - glass_icon_state = "doctorsdelightglass" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/acid_spit - glass_icon_state = "acidspitglass" - glass_center_of_mass = list("x"=16, "y"=7) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/antifreeze - glass_icon_state = "antifreeze" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/coffee/b52 - glass_icon_state = "b52glass" - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/bananahonk - glass_icon_state = "bananahonkglass" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/bloody_mary - glass_icon_state = "bloodymaryglass" - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/booger - glass_icon_state = "booger" - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/devilskiss - glass_icon_state = "devilskiss" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/driestmartini - glass_icon_state = "driestmartiniglass" - glass_center_of_mass = list("x"=17, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/ginfizz - glass_icon_state = "ginfizzglass" - glass_center_of_mass = list("x"=16, "y"=7) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/gargle_blaster - glass_icon_state = "gargleblasterglass" - glass_center_of_mass = list("x"=17, "y"=6) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/goldschlager - glass_icon_state = "goldschlagerglass" - glass_center_of_mass = list("x"=16, "y"=12) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/hippies_delight - glass_icon_state = "hippiesdelightglass" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/irishcarbomb - glass_icon_state = "irishcarbomb" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/irish_cream - glass_icon_state = "irishcreamglass" - glass_center_of_mass = list("x"=16, "y"=9) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/longislandicedtea - glass_icon_state = "longislandicedteaglass" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/manhattan_proj - glass_icon_state = "proj_manhattanglass" - glass_center_of_mass = list("x"=17, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/neurotoxin - glass_icon_state = "neurotoxinglass" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/screwdrivercocktail - glass_icon_state = "screwdriverglass" - glass_center_of_mass = list("x"=15, "y"=10) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/silencer - glass_icon_state = "silencerglass" - glass_center_of_mass = list("x"=16, "y"=9) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/snowwhite - glass_icon_state = "snowwhite" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/tequilla_sunrise - glass_icon_state = "tequillasunriseglass" - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/white_russian - glass_icon_state = "whiterussianglass" - glass_center_of_mass = list("x"=16, "y"=9) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/whiskey_cola - glass_icon_state = "whiskeycolaglass" - glass_center_of_mass = list("x"=16, "y"=9) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/holywine - glass_icon_state = "holywineglass" - glass_center_of_mass = list("x"=15, "y"=7) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/holy_mary - glass_icon_state = "holymaryglass" - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/angelskiss - glass_icon_state = "angelskiss" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 2275221b2fd..b2591d992f7 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1861,7 +1861,7 @@ name = "Snow White" id = "snowwhite" result = "snowwhite" -required_reagents = list("pineapplejuice" = 1, "rum" = 1, "lemon_lime" = 1, "egg" = 1, "kahlua" = 1, "sugar" = 1) //VoreStation Edit + required_reagents = list("pineapplejuice" = 1, "rum" = 1, "lemon_lime" = 1, "egg" = 1, "kahlua" = 1, "sugar" = 1) //VoreStation Edit result_amount = 2 /datum/chemical_reaction/drinks/irishcarbomb diff --git a/icons/obj/drinks_vr.dmi b/icons/obj/drinks_vr.dmi index 68ebab9b000..a7eaa3bdd57 100644 Binary files a/icons/obj/drinks_vr.dmi and b/icons/obj/drinks_vr.dmi differ