mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
Fish (ya know, from fishing) is now edible (#86110)
## About The Pull Request Fish (the item that you catch with a fishing rod) now has an edible component attached to it, making it possible to eat them if you really have to, at the cost of eventually killing and deleting the fish, however, you normally shouldn't. Along with the seafood and meat foodtypes flags, it possess the gore and raw foodtypes too, making them pretty awful to eat unless you're a (non-vegan) lizard, felinid, or wearing the strange bandana*, which can only be found in the cqc kit case. Furthermore, it carry diseases like the ones from food left on the floors for too long, so a strong stomach is required to safely eat it even if you actually like it, dummy... UNLESS you fry or grill it, thus killing the diseases (as well as the fish) and removing both the gore and raw food types, then it becomes an actually ok meal... UNLESS you're dumb enough to eat a pufferfish, a donkfish or a slimefish. That is more or less the general rule. A few fish stray for it. For example, lavaloops are never raw (still gorey). The skeleton fish are never edibles, and holodeck fish is, well, holographic and thus disappears if you try to eat it. *the strange bandana is a reference to MSG, and this is a reference to the MGS3 fish eating animation. This is WIP btw, I'll have to test it and add some then polish it. ## Why It's Good For The Game Whole unprocessed fish should be technically edible, even if not safe to eat nine times out of ten. Also I kinda need this if I want to add a tasty fishing spot to the kitchen deepfriers. ## Changelog 🆑 add: Whole, unprocessed fish is now edible. However it's pretty much reccomended to grill or fry it for over 30 spess seconds before attempting to eat it. fix: germ-covered, dirty food no longer tries to infect you through contact. /🆑
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
|
||||
/datum/element/consumable_mob/proc/on_consume(atom/movable/source, mob/living/consumer)
|
||||
SIGNAL_HANDLER
|
||||
if(!consumer.combat_mode || !consumer.reagents)
|
||||
if(!consumer.combat_mode || !consumer.reagents || HAS_TRAIT(consumer, TRAIT_PACIFISM))
|
||||
return
|
||||
for(var/reagent_type in reagents_list)
|
||||
if(isnull(reagents_list[reagent_type]))
|
||||
|
||||
@@ -17,28 +17,27 @@
|
||||
var/atom/this_food = target
|
||||
|
||||
switch(fry_time)
|
||||
if(0 to 15)
|
||||
if(0 to 15 SECONDS)
|
||||
this_food.add_atom_colour(fried_colors[1], FIXED_COLOUR_PRIORITY)
|
||||
this_food.name = "lightly-fried [this_food.name]"
|
||||
this_food.desc += " It's been lightly fried in a deep fryer."
|
||||
|
||||
if(15 to 50)
|
||||
if(15 SECONDS to 50 SECONDS)
|
||||
this_food.add_atom_colour(fried_colors[2], FIXED_COLOUR_PRIORITY)
|
||||
this_food.name = "fried [this_food.name]"
|
||||
this_food.desc += " It's been fried, increasing its tastiness value by [rand(1, 75)]%."
|
||||
|
||||
if(50 to 85)
|
||||
if(50 SECONDS to 85 SECONDS)
|
||||
this_food.add_atom_colour(fried_colors[3], FIXED_COLOUR_PRIORITY)
|
||||
this_food.name = "deep-fried [this_food.name]"
|
||||
this_food.desc += " Deep-fried to perfection."
|
||||
|
||||
if(85 to INFINITY)
|
||||
if(85 SECONDS to INFINITY)
|
||||
this_food.add_atom_colour(fried_colors[4], FIXED_COLOUR_PRIORITY)
|
||||
this_food.name = "\proper the physical manifestation of the very concept of fried foods"
|
||||
this_food.desc = "A heavily-fried... something. Who can tell anymore?"
|
||||
|
||||
ADD_TRAIT(this_food, TRAIT_FOOD_FRIED, ELEMENT_TRAIT(type))
|
||||
SEND_SIGNAL(this_food, COMSIG_ITEM_FRIED, fry_time)
|
||||
// Already edible items will inherent these parameters
|
||||
// Otherwise, we will become edible.
|
||||
this_food.AddComponent( \
|
||||
@@ -49,6 +48,7 @@
|
||||
foodtypes = FRIED, \
|
||||
volume = this_food.reagents?.maximum_volume, \
|
||||
)
|
||||
SEND_SIGNAL(this_food, COMSIG_ITEM_FRIED, fry_time)
|
||||
|
||||
/datum/element/fried_item/Detach(atom/source, ...)
|
||||
for(var/color in fried_colors)
|
||||
|
||||
@@ -28,10 +28,12 @@
|
||||
if(grill_time > 30 SECONDS && isnull(this_food.GetComponent(/datum/component/edible)))
|
||||
this_food.AddComponent(/datum/component/edible, foodtypes = FRIED)
|
||||
|
||||
SEND_SIGNAL(this_food, COMSIG_ITEM_BARBEQUE_GRILLED)
|
||||
SEND_SIGNAL(this_food, COMSIG_ITEM_BARBEQUE_GRILLED, grill_time)
|
||||
ADD_TRAIT(this_food, TRAIT_FOOD_BBQ_GRILLED, ELEMENT_TRAIT(type))
|
||||
|
||||
/datum/element/grilled_item/Detach(atom/source, ...)
|
||||
source.name = initial(source.name)
|
||||
source.desc = initial(source.desc)
|
||||
qdel(source.GetComponent(/datum/component/edible)) // Don't care if it was initially edible
|
||||
REMOVE_TRAIT(src, TRAIT_FOOD_BBQ_GRILLED, ELEMENT_TRAIT(type))
|
||||
return ..()
|
||||
|
||||
Reference in New Issue
Block a user