From a8248c68f47de7337b82fd122711e57a05f6cb63 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Sun, 3 Nov 2019 12:53:02 -0500 Subject: [PATCH] perhaps --- code/modules/cargo/exports/food_wine.dm | 31 +++++++++++++++++++ .../food_and_drinks/drinks/drinks/bottle.dm | 1 - code/modules/hydroponics/fermenting_barrel.dm | 7 ----- .../research/designs/autobotter_designs.dm | 4 +-- code/modules/research/techweb/all_nodes.dm | 2 +- 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/code/modules/cargo/exports/food_wine.dm b/code/modules/cargo/exports/food_wine.dm index 3f403eaad1..c3615d5005 100644 --- a/code/modules/cargo/exports/food_wine.dm +++ b/code/modules/cargo/exports/food_wine.dm @@ -4,6 +4,7 @@ /datum/export/booze //Like the kind you bottle! k_elasticity = 0 + unit_name = "brand unit of booze" include_subtypes = TRUE /datum/export/food/meat @@ -171,3 +172,33 @@ unit_name = "snowcone" export_types = list(/obj/item/reagent_containers/food/snacks/snowcones) +/datum/export/booze/loose + cost = 1.5 //PER unit + unit_name = "station brew" + export_types = list(/datum/reagent/consumable/ethanol/fruit_wine) + +/datum/export/booze/loose/brands + cost = 0.1 //Most bottes are worth like 15 credits + unit_name = "brand booze" + export_types = list(/datum/reagent/consumable/ethanol/beer, /datum/reagent/consumable/ethanol/kahlua, /datum/reagent/consumable/ethanol/whiskey, /datum/reagent/consumable/ethanol/thirteenloko, /datum/reagent/consumable/ethanol/vodka, /datum/reagent/consumable/ethanol/gin, \ + /datum/reagent/consumable/ethanol/rum, /datum/reagent/consumable/ethanol/tequila, /datum/reagent/consumable/ethanol/vermouth, /datum/reagent/consumable/ethanol/wine, /datum/reagent/consumable/ethanol/grappa, /datum/reagent/consumable/ethanol/cognac, \ + /datum/reagent/consumable/ethanol/absinthe, /datum/reagent/consumable/ethanol/goldschlager, /datum/reagent/consumable/ethanol/patron, /datum/reagent/consumable/ethanol/sake, /datum/reagent/consumable/ethanol/hcider, /datum/reagent/consumable/ethanol/champagne, \ + /datum/reagent/consumable/ethanol/applejack, /datum/reagent/consumable/ethanol/trappist, /datum/reagent/consumable/ethanol/blazaam) + +/datum/export/booze/brands + cost = 100 + unit_name = "export bottle" + export_types = list(/obj/item/export/bottle/kahlua, /obj/item/export/bottle/whiskey, /obj/item/export/bottle/vodka, /obj/item/export/bottle/gin, \ + /obj/item/export/bottle/rum, /obj/item/export/bottle/tequila, /obj/item/export/bottle/vermouth, /obj/item/export/bottle/wine, /obj/item/export/bottle/grappa, /obj/item/export/bottle/cognac, \ + /obj/item/export/bottle/absinthe, /obj/item/export/bottle/goldschlager, /obj/item/export/bottle/patron, /obj/item/export/bottle/sake, /obj/item/export/bottle/hcider, /obj/item/export/bottle/champagne, \ + /obj/item/export/bottle/applejack, /obj/item/export/bottle/trappist, /obj/item/export/bottle/blazaam) + +/datum/export/booze/bottled + cost = 400 + unit_name = "exotic brews" + export_types = list(/obj/item/export/bottle/blooddrop, /obj/item/export/bottle/slim_gold, /obj/item/export/bottle/white_bloodmoon, /obj/item/export/bottle/greenroad) + +/datum/export/booze/bottledkeg + cost = 120 + unit_name = "exotic brews" + export_types = list(/obj/item/export/bottle/minikeg) //Its just beer diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 1cb7700faf..bc459fffbc 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -565,7 +565,6 @@ throw_range = 0 w_class = WEIGHT_CLASS_TINY item_state = "beer" - hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("boop", "thunked", "shown") /obj/item/export/bottle/gin diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm index 83fc18dcb9..313d998685 100644 --- a/code/modules/hydroponics/fermenting_barrel.dm +++ b/code/modules/hydroponics/fermenting_barrel.dm @@ -69,10 +69,3 @@ icon_state = "barrel_open" else icon_state = "barrel" - -/datum/crafting_recipe/fermenting_barrel - name = "Wooden Barrel" - result = /obj/structure/fermenting_barrel - reqs = list(/obj/item/stack/sheet/mineral/wood = 30) - time = 50 - category = CAT_PRIMAL diff --git a/code/modules/research/designs/autobotter_designs.dm b/code/modules/research/designs/autobotter_designs.dm index 6555c8221f..7909fa2f7a 100644 --- a/code/modules/research/designs/autobotter_designs.dm +++ b/code/modules/research/designs/autobotter_designs.dm @@ -295,11 +295,11 @@ build_path = /obj/item/export/bottle/grenadine /datum/design/bottle/export/minikeg - name = "Export Design (minikeg)" + name = "Export Design (Minikeg)" desc = "Allows for the fabication, and bottling of Minikeg of craft beer." id = "minikeg_export" category = list("Beers") - reagents_list = list("beer" = 100) + reagents_list = list("light_beer" = 100) build_path = /obj/item/export/bottle/minikeg /datum/design/bottle/export/blooddrop diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index ba52489472..ec76740506 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -56,7 +56,7 @@ display_name = "License Bottling" description = "Some Branded bottles to print and export." starting_node = TRUE - design_ids = list("gin", "wine", "whiskey", "vodka", "tequila", "patron", "rum", "kahlua", "vermouth", "goldschlager", "hcider", "cognac", "absinthe", "grappa", "sake", "fernet", "applejack", "champagne", "blazaam", "trappist", "grenadine") + design_ids = list("gin", "wine", "whiskey", "vodka", "tequila", "patron", "rum", "kahlua", "vermouth", "goldschlager", "hcider", "cognac", "absinthe", "grappa", "sake", "fernet", "applejack", "champagne", "blazaam", "trappist", "grenadine", "autobottler") /datum/techweb_node/blueprinted_exports id = "blueprinted_exports"