From c29c78eb691176712a4ab54cba2db6d0682ff7bd Mon Sep 17 00:00:00 2001 From: SpaceCat404 Date: Mon, 9 Dec 2024 08:22:21 -0600 Subject: [PATCH] carbonated cum fixes --- code/modules/vending/cola.dm | 14 +++++++++++--- .../food_and_drinks/drinks/drinks/drinks.dm | 2 +- modular_splurt/code/modules/vending/cola.dm | 3 ++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index a2503fff0f..e767d6a3ca 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -12,7 +12,14 @@ /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10, - /obj/item/reagent_containers/glass/beaker/waterbottle = 10) + /obj/item/reagent_containers/glass/beaker/waterbottle = 10, + //SPLURT ADDITIONS - MODULARIZATION IMPOSSIBLE? + /obj/item/reagent_containers/glass/beaker/waterbottle/large = 5, + /obj/item/reagent_containers/food/drinks/soda_cans/carbonatedcum = 5, + /obj/item/reagent_containers/food/drinks/soda_cans/carbonatedfemcum = 5, + /obj/item/reagent_containers/food/drinks/soda_cans/blood = 5, + /obj/item/reagent_containers/food/drinks/soda_cans/blooddiscrete = 5 + ) contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6, /obj/item/reagent_containers/glass/beaker/waterbottle/wataur = 2) @@ -87,7 +94,7 @@ light_mask = "pwr_game-light-mask" light_color = COLOR_STRONG_VIOLET -// /obj/machinery/vending/cola/shamblers +/obj/machinery/vending/cola/shamblers name = "\improper Shambler's Vendor" desc = "~Shake me up some of that Shambler's Juice!~" icon_state = "shamblers_juice" @@ -104,7 +111,8 @@ product_ads = "Refreshing!;Jyrbv dv lg jfdv fw kyrk Jyrdscvi'j Alztv!;Over 1 trillion souls drank!;Thirsty? Nyp efk uizeb kyv uribevjj?;Kyv Jyrdscvi uizebj kyv ezxyk!;Drink up!;Krjkp." light_mask = "shamblers-light-mask" light_color = COLOR_MOSTLY_PURE_PINK -// /obj/machinery/vending/cola/buzz_fuzz + +/obj/machinery/vending/cola/buzz_fuzz name = "\improper Buzz Fuzz Vendor" desc = "~A hive of Flavour!~" icon_state = "honey_vender" diff --git a/modular_splurt/code/modules/food_and_drinks/drinks/drinks/drinks.dm b/modular_splurt/code/modules/food_and_drinks/drinks/drinks/drinks.dm index 83bc8f95e0..8dbd2e68af 100644 --- a/modular_splurt/code/modules/food_and_drinks/drinks/drinks/drinks.dm +++ b/modular_splurt/code/modules/food_and_drinks/drinks/drinks/drinks.dm @@ -16,7 +16,7 @@ /obj/item/reagent_containers/food/drinks/soda_cans/blood name = "Stoker's Reserve" - desc = "A cola bottle made to look like a night out on the town, bears a large V" + desc = "A cola bottle made to look like a night out on the town, bears a large V." icon = 'modular_splurt/icons/obj/drinks.dmi' icon_state = "blood" list_reagents = list(/datum/reagent/blood = 30) diff --git a/modular_splurt/code/modules/vending/cola.dm b/modular_splurt/code/modules/vending/cola.dm index 43c53e5a40..15414ea9d0 100644 --- a/modular_splurt/code/modules/vending/cola.dm +++ b/modular_splurt/code/modules/vending/cola.dm @@ -1,4 +1,4 @@ -/obj/machinery/vending/cola/Initialize(mapload) +/* /obj/machinery/vending/cola/Initialize(mapload) var/list/extra_products = list( /obj/item/reagent_containers/glass/beaker/waterbottle/large = 5, /obj/item/reagent_containers/food/drinks/soda_cans/carbonatedcum = 5, @@ -8,3 +8,4 @@ ) LAZYADD(products, extra_products) . = ..() +Doesn't work, why bother?