cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-13 08:57:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Organizing our \code\modules, minor fixes, changes, and additions.

Browse Source 
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.
This commit is contained in:
christiankabbalahexpert
2023-12-20 12:53:57 +11:00
parent 94c03ebb8a
commit 7c640eba2c
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/modules/food_and_drinks/drinks/drinks.dm → GainStation13/code/modules/food_and_drinks/drinks.dm
+2 -2
View File
@@ -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
GainStation13/code/modules/vending/GBBurrito.dm → GainStation13/code/modules/food_and_drinks/food.dm
+10 -10
View File
@@ -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
GainStation13/code/modules/mob/living/emote.dm
+2 -1
View File
@@ -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))
GainStation13/code/modules/reagents/chemistry/recipes/fatchem.dm
+9 -6
View File
@@ -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)