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

[MIRROR] Mint can gib obese people again [MDB IGNORE] (#18987)

Browse Source 
Mint can gib obese people again (#72970)

## About The Pull Request

Changes minttoxin(a toxin) to mintextract(a food).

## Why It's Good For The Game

Fixes https://github.com/tgstation/tgstation/issues/72969

The chef's mint is intended to gib fat people. Due to
https://github.com/tgstation/tgstation/pull/70764, liver functionality
was reworked so that instead of being purged rapidly, toxin's in a mobs
system with 3 units or less have no effect. Since the chef's mint only
has 2 units of mint toxin, it's intended functionality is impossible
under normal circumstances.

By changing the reagent type from toxin to consumable, it restores the
ability to gib.

## Changelog

🆑
fix: Mint Toxin(a toxin) has been changed to Mint Extract(a food). The
chef's mint can once again gib, fatties beware.
/🆑

Co-authored-by: the-orange-cow <76538214+the-orange-cow@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-01-28 20:17:09 +00:00
committed by GitHub
co-authored by the-orange-cow
parent c6397baa50
commit 69bd792a4c
6 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/food/sweets.dm
+1 -1
View File
@@ -40,7 +40,7 @@
desc = "It is only wafer thin."
icon_state = "mint"
bite_consumption = 1
food_reagents = list(/datum/reagent/toxin/minttoxin = 2)
food_reagents = list(/datum/reagent/consumable/mintextract = 2)
foodtypes = TOXIC | SUGAR
food_flags = FOOD_FINGER_FOOD
w_class = WEIGHT_CLASS_TINY
code/modules/mining/lavaland/ash_flora.dm
+1 -1
View File
@@ -310,7 +310,7 @@
product = /obj/item/food/grown/ash_flora/shavings
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list(/datum/reagent/consumable/sugar = 0.06, /datum/reagent/consumable/ethanol = 0.04, /datum/reagent/stabilizing_agent = 0.06, /datum/reagent/toxin/minttoxin = 0.02)
reagents_add = list(/datum/reagent/consumable/sugar = 0.06, /datum/reagent/consumable/ethanol = 0.04, /datum/reagent/stabilizing_agent = 0.06, /datum/reagent/consumable/mintextract = 0.02)
/obj/item/seeds/lavaland/porcini
name = "pack of porcini mycelium"
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+1 -1
View File
@@ -681,7 +681,7 @@
emagged_reagents = list(
/datum/reagent/consumable/ethanol,
/datum/reagent/iron,
/datum/reagent/toxin/minttoxin,
/datum/reagent/consumable/mintextract,
/datum/reagent/consumable/ethanol/atomicbomb,
/datum/reagent/consumable/ethanol/fernet
)
code/modules/reagents/chemistry/reagents/food_reagents.dm
+13
View File
@@ -1095,3 +1095,16 @@
nutriment_factor = 1.5 * REAGENTS_METABOLISM
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
default_container = /obj/item/reagent_containers/condiment/creamer
/datum/reagent/consumable/mintextract
name = "Mint Extract"
description = "Useful for dealing with undesirable customers."
color = "#CF3600" // rgb: 207, 54, 0
taste_description = "mint"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/mintextract/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired)
if(HAS_TRAIT(affected_mob, TRAIT_FAT))
affected_mob.investigate_log("has been gibbed by consuming [src] while fat.", INVESTIGATE_DEATHS)
affected_mob.inflate_gib()
return ..()
code/modules/reagents/chemistry/reagents/toxin_reagents.dm
-15
View File
@@ -207,21 +207,6 @@
. = TRUE
..()
/datum/reagent/toxin/minttoxin
name = "Mint Toxin"
description = "Useful for dealing with undesirable customers."
color = "#CF3600" // rgb: 207, 54, 0
toxpwr = 0
taste_description = "mint"
ph = 8
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/toxin/minttoxin/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired)
if(HAS_TRAIT(affected_mob, TRAIT_FAT))
affected_mob.investigate_log("has been gibbed by consuming [src] while fat.", INVESTIGATE_DEATHS)
affected_mob.inflate_gib()
return ..()
/datum/reagent/toxin/carpotoxin
name = "Carpotoxin"
description = "A deadly neurotoxin produced by the dreaded spess carp."
code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm
+2 -2
View File
@@ -304,7 +304,7 @@
/datum/reagent/consumable/nutriment/vitamin = 1)
suppressive_reagents = list(
/datum/reagent/toxin/minttoxin = -3,
/datum/reagent/consumable/mintextract = -3,
/datum/reagent/consumable/frostoil = -2,
/datum/reagent/consumable/ice = -1)
@@ -530,7 +530,7 @@
suppressive_reagents = list(
/datum/reagent/consumable/clownstears = -8,
/datum/reagent/toxin/minttoxin = -6,
/datum/reagent/consumable/mintextract = -6,
/datum/reagent/consumable/ethanol/silencer = -3,
/datum/reagent/consumable/ethanol/fernet = -3,
/datum/reagent/toxin/lipolicide = -3,