From 7c640eba2c3fe00cedf1052f12cbeac085a7eb1c Mon Sep 17 00:00:00 2001 From: christiankabbalahexpert <83491949+christiankabbalahexpert@users.noreply.github.com> Date: Wed, 20 Dec 2023 12:53:57 +1100 Subject: [PATCH] Organizing our \code\modules, minor fixes, changes, and additions. Moved the Gato burrito to under food_and_drinks. Added a recipe for Flatulose under fatchem.dm. Fixed some emote visibility and formatting (need to figure out how to remove the space in the *gurgle emote still). Buffed the fizulphite and extilphite production in it's recipe to be in-line with the volume of it's ingredients, rather than producing less than the sum of it's parts. --- .../food_and_drinks/{drinks => }/drinks.dm | 4 ++-- .../GBBurrito.dm => food_and_drinks/food.dm} | 20 +++++++++---------- .../code/modules/mob/living/emote.dm | 3 ++- .../reagents/chemistry/recipes/fatchem.dm | 15 ++++++++------ 4 files changed, 23 insertions(+), 19 deletions(-) rename GainStation13/code/modules/food_and_drinks/{drinks => }/drinks.dm (80%) rename GainStation13/code/modules/{vending/GBBurrito.dm => food_and_drinks/food.dm} (98%) diff --git a/GainStation13/code/modules/food_and_drinks/drinks/drinks.dm b/GainStation13/code/modules/food_and_drinks/drinks.dm similarity index 80% rename from GainStation13/code/modules/food_and_drinks/drinks/drinks.dm rename to GainStation13/code/modules/food_and_drinks/drinks.dm index 626e64fb..a4f22f7a 100644 --- a/GainStation13/code/modules/food_and_drinks/drinks/drinks.dm +++ b/GainStation13/code/modules/food_and_drinks/drinks.dm @@ -9,7 +9,7 @@ lefthand_file = 'GainStation13/icons/obj/food_lefthand.dmi' righthand_file = 'GainStation13/icons/obj/food_righthand.dmi' icon_state = "fizzwiz" - list_reagents = list(/datum/reagent/consumable/space_cola = 25, /datum/reagent/consumable/fizulphite = 15) + list_reagents = list(/datum/reagent/consumable/space_cola = 5, /datum/reagent/consumable/fizulphite = 3) foodtype = SUGAR price = 3 @@ -21,6 +21,6 @@ lefthand_file = 'GainStation13/icons/obj/food_lefthand.dmi' righthand_file = 'GainStation13/icons/obj/food_righthand.dmi' icon_state = "soothseltz" - list_reagents = list(/datum/reagent/consumable/space_cola = 25, /datum/reagent/consumable/extilphite = 15) + list_reagents = list(/datum/reagent/consumable/space_cola = 5, /datum/reagent/consumable/extilphite = 3) foodtype = SUGAR price = 3 diff --git a/GainStation13/code/modules/vending/GBBurrito.dm b/GainStation13/code/modules/food_and_drinks/food.dm similarity index 98% rename from GainStation13/code/modules/vending/GBBurrito.dm rename to GainStation13/code/modules/food_and_drinks/food.dm index 83fe6658..07d828dd 100644 --- a/GainStation13/code/modules/vending/GBBurrito.dm +++ b/GainStation13/code/modules/food_and_drinks/food.dm @@ -1,10 +1,10 @@ -/obj/item/reagent_containers/food/snacks/gbburrito - name = "\improper GATO Gas Giant Burrito" - icon_state = "gbburrito" - desc = "More than three pounds of beans, meat, and cheese wrapped in a greasy tortilla. It's piping hot." - trash = null - list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/flatulose = 4, /datum/reagent/consumable/sodiumchloride = 0.5) - filling_color = "#74291b" - tastes = list("refried beans","grease" = 1) - foodtype = MEAT - price = 3 +/obj/item/reagent_containers/food/snacks/gbburrito + name = "\improper GATO Gas Giant Burrito" + icon_state = "gbburrito" + desc = "More than three pounds of beans, meat, and cheese wrapped in a greasy tortilla. It's piping hot." + trash = null + list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/flatulose = 4, /datum/reagent/consumable/sodiumchloride = 0.5) + filling_color = "#74291b" + tastes = list("refried beans","grease" = 1) + foodtype = MEAT + price = 3 diff --git a/GainStation13/code/modules/mob/living/emote.dm b/GainStation13/code/modules/mob/living/emote.dm index 899d964a..3e76abbd 100644 --- a/GainStation13/code/modules/mob/living/emote.dm +++ b/GainStation13/code/modules/mob/living/emote.dm @@ -57,7 +57,7 @@ /datum/emote/living/burp key = "burp" key_third_person = "burps" - message = "burps." + message = "burps" emote_type = EMOTE_AUDIBLE /datum/emote/living/burp/run_emote(mob/living/user, params) @@ -118,6 +118,7 @@ key = "bellyrub" key_third_person = "bellyrubs" message = "rubs their belly" + emote_type = EMOTE_VISIBLE /datum/emote/living/bellyrub/run_emote(mob/living/user, params) if(!ishuman(user)) diff --git a/GainStation13/code/modules/reagents/chemistry/recipes/fatchem.dm b/GainStation13/code/modules/reagents/chemistry/recipes/fatchem.dm index 7d1c83fd..8523b974 100644 --- a/GainStation13/code/modules/reagents/chemistry/recipes/fatchem.dm +++ b/GainStation13/code/modules/reagents/chemistry/recipes/fatchem.dm @@ -1,6 +1,5 @@ //GS13 - fat chems - //WG chem /datum/chemical_reaction/lipoifier name = "lipoifier" @@ -8,19 +7,23 @@ results = list(/datum/reagent/consumable/lipoifier = 3) required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/cornoil = 1, /datum/reagent/medicine/synthflesh = 1) - //BURP CHEM - /datum/chemical_reaction/fizulphite name = "fizulphite" id = /datum/reagent/consumable/fizulphite - results = list(/datum/reagent/consumable/fizulphite = 3) + results = list(/datum/reagent/consumable/fizulphite = 5) required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/nitrogen = 1, /datum/reagent/oxygen = 3) //ANTI-BURP / ANTI-FULLNESS CHEM - /datum/chemical_reaction/extilphite name = "extilphite" id = /datum/reagent/consumable/extilphite - results = list(/datum/reagent/consumable/extilphite = 3) + results = list(/datum/reagent/consumable/extilphite = 5) required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/hydrogen = 2, /datum/reagent/carbon = 2) + +// brap chem +/datum/chemical_reaction/flatulose + name = "flatulose" + id = /datum/reagent/consumable/flatulose + results = list(/datum/reagent/consumable/flatulose = 3) + required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/toxin/bad_food = 1, /datum/reagent/consumable/cream = 1)