Skip to content

bugfixes (primarily bbq sauces, putting more than 1 sauce, and sauce … #384

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

Open
wewman222 wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −9
Open

bugfixes (primarily bbq sauces, putting more than 1 sauce, and sauce … #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions modular/Neu_Food/code/NeuFood.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,13 @@
else if(slice(W, user))
return 1
update_cooktime(user)
//CC EDIT Sauce application code
for(var/datum/reagent/R in W.reagents.reagent_list)
if(istype(W, /obj/item/reagent_containers))
var/datum/component/sauced_food/sauced = src.GetComponent(/datum/component/sauced_food)
if(sauced)
to_chat(user, "Already has sauce!")
return COMPONENT_INCOMPATIBLE
if(istype(R, /datum/reagent/consumable/sauce))
playsound(get_turf(user), 'sound/foley/dropsound/gen_drop.ogg', 30, TRUE, -1)
to_chat(user, "Applying sauce...")
Expand All @@ -89,7 +94,7 @@
src.AddComponent(/datum/component/sauced_food, new_sauce_level, new_sauce_type)
src.name = src.name + " with " + typecastedR.name
src.desc = src.desc + " " + typecastedR.description
W.reagents.remove_reagent(R, 5)
W.reagents.remove_reagent(R.type, 5)
return
..()

Expand Down Expand Up @@ -334,13 +339,13 @@
/datum/component/sauced_food/proc/on_food_eaten(datum/source, mob/living/eater, mob/living/feeder)
SIGNAL_HANDLER
if(sauce_effect == 1)
eater.apply_status_effect(/datum/status_effect/buff/spicy_sauce, sauce_power * 60 SECONDS)
eater.apply_status_effect(/datum/status_effect/buff/spicy_sauce, 5 MINUTES)
if(sauce_effect == 2)
eater.apply_status_effect(/datum/status_effect/buff/savory_sauce, sauce_power * 60 SECONDS)
eater.apply_status_effect(/datum/status_effect/buff/savory_sauce, 5 MINUTES)
if(sauce_effect == 3)
eater.apply_status_effect(/datum/status_effect/buff/sweet_sauce, sauce_power * 60 SECONDS)
eater.apply_status_effect(/datum/status_effect/buff/sweet_sauce, 5 MINUTES)
if(sauce_effect == 4)
eater.apply_status_effect(/datum/status_effect/buff/sour_sauce, sauce_power * 60 SECONDS)
eater.apply_status_effect(/datum/status_effect/buff/sour_sauce, 5 MINUTES)


/obj/item/reagent_containers/food/snacks/rogue/sauce // base sauce, TECHNICALLY SPICES due to their solid nature
Expand Down
8 changes: 4 additions & 4 deletions modular_causticcove/code/modules/chemistry/reagents/caustic_sauces_reactions.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@
bottle_name = "bronze bullion"
bottle_desc = "A container of an especially spicy 'barbeque' sauce."
reagent_to_brew = /datum/reagent/consumable/sauce/bronze_bullion
needed_reagents = list(/datum/brewing_recipe/molasses = 100)
needed_reagents = list(/datum/reagent/consumable/sugar/molasses = 100)
needed_items = list(/obj/item/reagent_containers/food/snacks/rogue/veg/garlick_clove = 3, /obj/item/alch/mentha = 1)
brewed_amount = 3
brew_time = 3 MINUTES
Expand All @@ -524,7 +524,7 @@
bottle_name = "dead horse sauce"
bottle_desc = "A container of an especially sweet 'barbeque' sauce."
reagent_to_brew = /datum/reagent/consumable/sauce/dead_horse_sauce
needed_reagents = list(/datum/brewing_recipe/molasses = 100)
needed_reagents = list(/datum/reagent/consumable/sugar/molasses = 100)
needed_items = list(/obj/item/reagent_containers/food/snacks/grown/fruit/tomato = 3, /obj/item/alch/mentha = 1)
brewed_amount = 3
brew_time = 3 MINUTES
Expand All @@ -536,7 +536,7 @@
bottle_name = "milk of quartz"
bottle_desc = "A container of an especially savory 'barbeque' sauce."
reagent_to_brew = /datum/reagent/consumable/sauce/milk_of_quartz
needed_reagents = list(/datum/brewing_recipe/molasses = 100, /datum/reagent/consumable/milk = 50)
needed_reagents = list(/datum/reagent/consumable/sugar/molasses = 100, /datum/reagent/consumable/milk = 50)
needed_items = list(/obj/item/alch/mentha = 1)
brewed_amount = 3
brew_time = 3 MINUTES
Expand All @@ -548,7 +548,7 @@
bottle_name = "milk of quartz"
bottle_desc = "A container of an especially sour 'dressing' sauce."
reagent_to_brew = /datum/reagent/consumable/sauce/native_lye
needed_reagents = list(/datum/brewing_recipe/molasses = 100)
needed_reagents = list(/datum/reagent/consumable/sugar/molasses = 100)
needed_items = list(/obj/item/reagent_containers/food/snacks/grown/fruit/lemon = 2, /obj/item/reagent_containers/food/snacks/rogue/veg/garlick_clove = 3, )
brewed_amount = 3
brew_time = 3 MINUTES
Expand Down
Loading