cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Adds nutriment factor to liquid gibs. [MDB IGNORE] (#19052)

Browse Source 
* Adds nutriment factor to liquid gibs. (#73033)

## About The Pull Request

Over the years I've heard quite a few lizard players scratch their heads
in confusion due to the lack of gibs filling you up. I gave it a fairly
low value of 2 so people don't end up trying to power game it.

## Why It's Good For The Game

Adding an alternative use to gibs is always nice, at the moment it's
mostly just used for soap and cytology (Which barely anyone does.)

## Changelog

🆑
balance: Gibs now provide a small amount of nutriment.
/🆑

* Fixes the modular uses of liquid gibs

* Fixes an error that somehow slipped through.

---------

Co-authored-by: carshalash <carshalash@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2023-02-03 16:59:09 -05:00
committed by GitHub
co-authored by carshalash GoldenAlpharex
parent 67567d1e23
commit ebe38543ff
15 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapfluff/ruins/spaceruin_code/oldstation.dm
+1 -1
View File
@@ -247,7 +247,7 @@
/datum/reagent/yuck = 5,
/datum/reagent/consumable/vitfro = 5,
// Supplementary for CELL_LINE_TABLE_GRAPE
/datum/reagent/liquidgibs = 5
/datum/reagent/consumable/liquidgibs = 5
)
/obj/machinery/computer/old
code/modules/mob/living/basic/vermin/mouse.dm
+2 -2
View File
@@ -293,7 +293,7 @@
eatverbs = list("devour")
food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
foodtypes = GORE | MEAT | RAW
grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5)
grind_results = list(/datum/reagent/blood = 20, /datum/reagent/consumable/liquidgibs = 5)
decomp_req_handle = TRUE
ant_attracting = FALSE
decomp_type = /obj/item/food/deadmouse/moldy
@@ -345,7 +345,7 @@
icon_state = "mouse_gray_dead"
food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/mold = 10)
foodtypes = GORE | MEAT | RAW | GROSS
grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5, /datum/reagent/consumable/mold = 10)
grind_results = list(/datum/reagent/blood = 20, /datum/reagent/consumable/liquidgibs = 5, /datum/reagent/consumable/mold = 10)
preserved_food = TRUE
/// The mouse AI controller
code/modules/reagents/chemistry/reagents/other_reagents.dm
+3 -2
View File
@@ -115,17 +115,18 @@
if(data["blood_DNA"])
bloodsplatter.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
/datum/reagent/liquidgibs
/datum/reagent/consumable/liquidgibs
name = "Liquid Gibs"
color = "#CC4633"
description = "You don't even want to think about what's in here."
taste_description = "gross iron"
nutriment_factor = 2 * REAGENTS_METABOLISM
material = /datum/material/meat
ph = 7.45
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/glass_style/shot_glass/liquidgibs
required_drink_type = /datum/reagent/liquidgibs
required_drink_type = /datum/reagent/consumable/liquidgibs
icon_state = "shotglassred"
/datum/reagent/bone_dust
code/modules/reagents/chemistry/recipes/others.dm
+5 -5
View File
@@ -84,7 +84,7 @@
reaction_tags = REACTION_TAG_EASY | REACTION_TAG_UNIQUE | REACTION_TAG_OTHER
/datum/chemical_reaction/soapification
required_reagents = list(/datum/reagent/liquidgibs = 10, /datum/reagent/lye = 10) // requires two scooped gib tiles
required_reagents = list(/datum/reagent/consumable/liquidgibs = 10, /datum/reagent/lye = 10) // requires two scooped gib tiles
required_temp = 374
mob_react = FALSE
reaction_flags = REACTION_INSTANT
@@ -110,7 +110,7 @@
new /obj/item/soap/omega(location)
/datum/chemical_reaction/candlefication
required_reagents = list(/datum/reagent/liquidgibs = 5, /datum/reagent/oxygen = 5) //
required_reagents = list(/datum/reagent/consumable/liquidgibs = 5, /datum/reagent/oxygen = 5) //
required_temp = 374
mob_react = FALSE
reaction_flags = REACTION_INSTANT
@@ -122,7 +122,7 @@
new /obj/item/flashlight/flare/candle(location)
/datum/chemical_reaction/meatification
required_reagents = list(/datum/reagent/liquidgibs = 10, /datum/reagent/consumable/nutriment = 10, /datum/reagent/carbon = 10)
required_reagents = list(/datum/reagent/consumable/liquidgibs = 10, /datum/reagent/consumable/nutriment = 10, /datum/reagent/carbon = 10)
mob_react = FALSE
reaction_flags = REACTION_INSTANT
reaction_tags = REACTION_TAG_EASY | REACTION_TAG_UNIQUE | REACTION_TAG_OTHER
@@ -453,7 +453,7 @@
/datum/chemical_reaction/carpet/red
results = list(/datum/reagent/carpet/red = 2)
required_reagents = list(/datum/reagent/carpet/ = 1, /datum/reagent/liquidgibs = 1)
required_reagents = list(/datum/reagent/carpet/ = 1, /datum/reagent/consumable/liquidgibs = 1)
/datum/chemical_reaction/carpet/royalblack
results = list(/datum/reagent/carpet/royal/black = 2)
@@ -568,7 +568,7 @@
//monkey powder heehoo
/datum/chemical_reaction/monkey_powder
results = list(/datum/reagent/monkey_powder = 5)
required_reagents = list(/datum/reagent/consumable/banana = 1, /datum/reagent/consumable/nutriment=2, /datum/reagent/liquidgibs = 1)
required_reagents = list(/datum/reagent/consumable/banana = 1, /datum/reagent/consumable/nutriment=2, /datum/reagent/consumable/liquidgibs = 1)
reaction_flags = REACTION_INSTANT
reaction_tags = REACTION_TAG_EASY | REACTION_TAG_UNIQUE
code/modules/reagents/reagent_containers/cups/drinks.dm
+1 -1
View File
@@ -143,7 +143,7 @@
/obj/item/reagent_containers/cup/glass/ice/prison
name = "dirty ice cup"
desc = "Either Nanotrasen's water supply is contaminated, or this machine actually vends lemon, chocolate, and cherry snow cones."
list_reagents = list(/datum/reagent/consumable/ice = 25, /datum/reagent/liquidgibs = 5)
list_reagents = list(/datum/reagent/consumable/ice = 25, /datum/reagent/consumable/liquidgibs = 5)
/obj/item/reagent_containers/cup/glass/mug // parent type is literally just so empty mug sprites are a thing
name = "mug"
code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm
+15 -15
View File
@@ -9,7 +9,7 @@
required_reagents = list(/datum/reagent/consumable/nutriment/protein)
supplementary_reagents = list(
/datum/reagent/growthserum = 2,
/datum/reagent/liquidgibs = 2,
/datum/reagent/consumable/liquidgibs = 2,
/datum/reagent/consumable/cornoil = 2,
/datum/reagent/consumable/nutriment = 1,
/datum/reagent/consumable/nutriment/vitamin = 1,
@@ -94,7 +94,7 @@
desc = "Feliform cells"
required_reagents = list(
/datum/reagent/consumable/nutriment/protein,
/datum/reagent/liquidgibs)
/datum/reagent/consumable/liquidgibs)
supplementary_reagents = list(
/datum/reagent/growthserum = 3,
@@ -115,7 +115,7 @@
desc = "Canid cells"
required_reagents = list(
/datum/reagent/consumable/nutriment/protein,
/datum/reagent/liquidgibs)
/datum/reagent/consumable/liquidgibs)
supplementary_reagents = list(
/datum/reagent/growthserum = 3,
@@ -134,7 +134,7 @@
desc = "Squat canid cells"
required_reagents = list(
/datum/reagent/consumable/nutriment/protein,
/datum/reagent/liquidgibs)
/datum/reagent/consumable/liquidgibs)
supplementary_reagents = list(
/datum/reagent/growthserum = 2,
@@ -152,7 +152,7 @@
desc = "Ursine cells"
required_reagents = list(
/datum/reagent/consumable/nutriment/protein,
/datum/reagent/liquidgibs,
/datum/reagent/consumable/liquidgibs,
/datum/reagent/medicine/c2/synthflesh) //Nuke this if the dispenser becomes xenobio meta.
supplementary_reagents = list(
@@ -214,7 +214,7 @@
desc = "Ophidic cells"
required_reagents = list(
/datum/reagent/consumable/nutriment/protein,
/datum/reagent/liquidgibs)
/datum/reagent/consumable/liquidgibs)
supplementary_reagents = list(
/datum/reagent/growthserum = 3,
@@ -239,7 +239,7 @@
supplementary_reagents = list(
/datum/reagent/toxin/slimejelly = 2,
/datum/reagent/liquidgibs = 2,
/datum/reagent/consumable/liquidgibs = 2,
/datum/reagent/consumable/enzyme = 1)
suppressive_reagents = list(
@@ -257,7 +257,7 @@
supplementary_reagents = list(
/datum/reagent/consumable/nutriment/vitamin = 3,
/datum/reagent/liquidgibs = 2,
/datum/reagent/consumable/liquidgibs = 2,
/datum/reagent/sulfur = 2)
suppressive_reagents = list(
@@ -277,7 +277,7 @@
supplementary_reagents = list(
/datum/reagent/growthserum = 3,
/datum/reagent/consumable/nutriment/vitamin = 2,
/datum/reagent/liquidgibs = 2,
/datum/reagent/consumable/liquidgibs = 2,
/datum/reagent/consumable/eggyolk = 2,
/datum/reagent/consumable/shamblers = 1)
@@ -300,7 +300,7 @@
/datum/reagent/gold = 2, //This is why they eat so many adventurers.
/datum/reagent/consumable/nutriment/peptides = 2,
/datum/reagent/consumable/potato_juice = 1,
/datum/reagent/liquidgibs = 1,
/datum/reagent/consumable/liquidgibs = 1,
/datum/reagent/consumable/nutriment/vitamin = 1)
suppressive_reagents = list(
@@ -326,7 +326,7 @@
/datum/reagent/consumable/ethanol/squirt_cider = 2,
/datum/reagent/consumable/doctor_delight = 1,
/datum/reagent/medicine/salglu_solution = 1,
/datum/reagent/liquidgibs = 1,
/datum/reagent/consumable/liquidgibs = 1,
/datum/reagent/consumable/nutriment/vitamin = 1)
suppressive_reagents = list(
@@ -437,7 +437,7 @@
/datum/reagent/consumable/red_queen = 2,
/datum/reagent/consumable/peachjuice = 2,
/datum/reagent/uranium = 1,
/datum/reagent/liquidgibs = 1)
/datum/reagent/consumable/liquidgibs = 1)
suppressive_reagents = list(
/datum/reagent/consumable/salt = -3,
@@ -468,7 +468,7 @@
/datum/reagent/consumable/nutriment/peptides = -6,
/datum/reagent/consumable/nutriment/protein = -4,
/datum/reagent/consumable/nutriment = -3,
/datum/reagent/liquidgibs = -2)
/datum/reagent/consumable/liquidgibs = -2)
virus_suspectibility = 0
resulting_atoms = list(/mob/living/simple_animal/hostile/netherworld = 1)
@@ -589,7 +589,7 @@
supplementary_reagents = list(
/datum/reagent/ants = 3,
/datum/reagent/liquidgibs = 2,
/datum/reagent/consumable/liquidgibs = 2,
/datum/reagent/consumable/salt = 1,
/datum/reagent/consumable/eggwhite= 1,
/datum/reagent/consumable/nutriment/vitamin = 1,)
@@ -704,7 +704,7 @@
/datum/reagent/consumable/nutriment/vitamin = 1,
/datum/reagent/toxin/plasma = 1,
/datum/reagent/consumable/nutriment/organ_tissue = 1,
/datum/reagent/liquidgibs = 1,
/datum/reagent/consumable/liquidgibs = 1,
/datum/reagent/consumable/enzyme = 1)
suppressive_reagents = list(
code/modules/surgery/bodyparts/_bodyparts.dm
+1 -1
View File
@@ -17,7 +17,7 @@
///The type of husk for building an iconstate
var/husk_type = "humanoid"
layer = BELOW_MOB_LAYER //so it isn't hidden behind objects when on the floor
grind_results = list(/datum/reagent/bone_dust = 10, /datum/reagent/liquidgibs = 5) // robotic bodyparts and chests/heads cannot be ground
grind_results = list(/datum/reagent/bone_dust = 10, /datum/reagent/consumable/liquidgibs = 5) // robotic bodyparts and chests/heads cannot be ground
/// The mob that "owns" this limb
/// DO NOT MODIFY DIRECTLY. Use set_owner()
var/mob/living/carbon/owner