diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index bc459fffbc..ecb5db1ea5 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -559,6 +559,7 @@ /obj/item/export/bottle name = "Report this please" desc = "A sealed bottle of alcohol, ready to be exported" + icon = 'icons/obj/drinks.dmi' force = 0 throwforce = 0 throw_speed = 0 @@ -568,86 +569,112 @@ attack_verb = list("boop", "thunked", "shown") /obj/item/export/bottle/gin + icon_state = "ginbottle" name = "Sealed Gin" /obj/item/export/bottle/wine + icon_state = "winebottle" name = "Sealed Wine" /obj/item/export/bottle/whiskey + icon_state = "whiskeybottle" name = "Sealed Whiskey" /obj/item/export/bottle/vodka + icon_state = "vodkabottle" name = "Sealed Vodka" /obj/item/export/bottle/tequila + icon_state = "tequilabottle" name = "Sealed Tequila" /obj/item/export/bottle/patron + icon_state = "patronbottle" name = "Sealed Patron" /obj/item/export/bottle/rum + icon_state = "rumbottle" name = "Sealed Rum" /obj/item/export/bottle/vermouth + icon_state = "vermouthbottle" name = "Sealed Vermouth" /obj/item/export/bottle/kahlua + icon_state = "kahluabottle" name = "Sealed Kahlua" /obj/item/export/bottle/goldschlager + icon_state = "goldschlagerbottle" name = "Sealed Goldschlager" /obj/item/export/bottle/hcider + icon_state = "hcider" name = "Sealed Cider" /obj/item/export/bottle/cognac + icon_state = "cognacbottle" name = "Sealed Cognac" /obj/item/export/bottle/absinthe + icon_state = "absinthebottle" name = "Sealed Unmarked Absinthe" /obj/item/export/bottle/grappa + icon_state = "grappabottle" name = "Sealed Grappa" /obj/item/export/bottle/sake + icon_state = "sakebottle" name = "Sealed Sake" /obj/item/export/bottle/fernet + icon_state = "fernetbottle" name = "Sealed Fernet" /obj/item/export/bottle/applejack + icon_state = "applejack_bottle" name = "Sealed Applejack" /obj/item/export/bottle/champagne + icon_state = "champagne_bottle" name = "Sealed Champagne" /obj/item/export/bottle/blazaam + icon_state = "blazaambottle" name = "Sealed Blazaam" /obj/item/export/bottle/trappist + icon_state = "trappistbottle" name = "Sealed Trappist" /obj/item/export/bottle/grenadine + icon_state = "grenadine" name = "Sealed Grenadine" /obj/item/export/bottle/minikeg name = "Mini-Beer Keg" + icon_state = "keggy" desc = "A small wooden barrle with metal rings, untapped beer inside." /obj/item/export/bottle/blooddrop + icon_state = "champagne_selling_bottle" name = "Blood Drop" desc = "Large red bottle filled with a mix of wine and other named brands." /obj/item/export/bottle/slim_gold name = "Slim Gold " + icon_state = "selling_bottle_alt" desc = "A gold looking yellow bottle that has a mix of different named brands." /obj/item/export/bottle/white_bloodmoon name = "White Bloodmoon" + icon_state = "selling_bottle_basic" desc = "Rather simple bottle for this kind of drink." /obj/item/export/bottle/greenroad name = "Green Road" + icon_state = "selling_bottle" desc = "Ironic name as the fruit used is from ashy plants." diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index dd51ce2bc7..9770e05d09 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -92,6 +92,7 @@ description = "The sweet juice of an apple, fit for all ages." color = "#ECFF56" // rgb: 236, 255, 86 taste_description = "apples" + pH = 3.2 // ~ 2.7 -> 3.7 /datum/reagent/consumable/poisonberryjuice name = "Poison Berry Juice" diff --git a/code/modules/research/designs/autobotter_designs.dm b/code/modules/research/designs/autobotter_designs.dm index 7909fa2f7a..01ba5c93d1 100644 --- a/code/modules/research/designs/autobotter_designs.dm +++ b/code/modules/research/designs/autobotter_designs.dm @@ -297,7 +297,7 @@ /datum/design/bottle/export/minikeg name = "Export Design (Minikeg)" desc = "Allows for the fabication, and bottling of Minikeg of craft beer." - id = "minikeg_export" + id = "minikeg" category = list("Beers") reagents_list = list("light_beer" = 100) build_path = /obj/item/export/bottle/minikeg @@ -305,7 +305,7 @@ /datum/design/bottle/export/blooddrop name = "Export Design (Blooddrop)" desc = "Allows for the blowing, and bottling of Blooddrop bottles." - id = "blooddrop_export" + id = "blooddrop" category = list("Wines") reagents_list = list("champagne" = 30, "co2" = 30, "wine" = 10, "grape_juice" = 30) build_path = /obj/item/export/bottle/blooddrop @@ -313,7 +313,7 @@ /datum/design/bottle/export/slim_gold name = "Export Design (Slim Gold)" desc = "Allows for the blowing, and bottling of Slim Gold bottles." - id = "slim_gold_export" + id = "slim_gold" category = list("Beers") reagents_list = list("gold" = 10, "co2" = 10, "rum" = 30, "beer" = 40) build_path = /obj/item/export/bottle/slim_gold @@ -321,7 +321,7 @@ /datum/design/bottle/export/white_bloodmoon name = "Export Design (White Bloodmoon)" desc = "Allows for the blowing, and bottling of White Bloodmoon bottles." - id = "white_bloodmoon_export" + id = "white_bloodmoon" category = list("Wines") reagents_list = list("synthflesh" = 50, "blood" = 50, "gib" = 10) build_path = /obj/item/export/bottle/white_bloodmoon @@ -329,7 +329,7 @@ /datum/design/bottle/export/greenroad name = "Export Design (Greenroad)" desc = "Allows for the blowing, and bottling of Greenroad bottles." - id = "greenroad_export" + id = "greenroad" reagents_list = list("vitfro" = 50, "rum" = 50, "ash" = 10) category = list("Beers") build_path = /obj/item/export/bottle/greenroad \ No newline at end of file