mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 22:17:32 +01:00
Adds Tapioca and Cassava plants (#30937)
* dat * Fixes a few issues and makes the pudding look good * fixes all sprites with hope * actually should fix the sprites * fixes cassava sprites and dough recipe oversight * fixes tabbing issues and prevents botany gaming * makes the linter happier + deletes duplicate file * changes many things about the order * generalizes the food reagentcontainer + linter gud * fixes the merge conflict * removes the settings on my vs code from my pr Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com> * Adds suggested changes Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com> * adds an abstract description * fixes an accidental deletion of vscodesettings * Update code/modules/reagents/reagent_containers/food.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com> * adds a missing typepath * Apply suggestions from code review Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com> * Propose 2 tapioca pudding sprites. * removes unused tapioca pudding sprite * fixes my paradise.dme file * Add new teas to the bar manual. * adds alfalfa scout's recommended mix message * attempts a fix for the .dme file * removes a deconflicter mistake * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com> --------- Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Co-authored-by: Alfalfa Scout <alfalfascout@proton.me>
This commit is contained in:
co-authored by
DGamerL
PollardTheDragon
Alfalfa Scout
parent
a1fc8db55f
commit
6a6f81131e
@@ -0,0 +1,53 @@
|
||||
// This is a base used for food ingredients that is to be turned into a reagent, it's mainly pill code, with no swallowing function.
|
||||
/obj/item/reagent_containers/food
|
||||
name = "food item"
|
||||
desc = ABSTRACT_TYPE_DESC
|
||||
inhand_icon_state = "tapioca_drypearls" // placeholder
|
||||
possible_transfer_amounts = null
|
||||
visible_transfer_rate = FALSE
|
||||
volume = 10
|
||||
|
||||
/obj/item/reagent_containers/food/activate_self(mob/user)
|
||||
if(..())
|
||||
return FINISH_ATTACK
|
||||
|
||||
apply(user, user)
|
||||
|
||||
/obj/item/reagent_containers/food/proc/apply(mob/living/carbon/C, mob/user)
|
||||
if(!istype(C))
|
||||
return FALSE
|
||||
|
||||
if(!reagents.total_volume)
|
||||
qdel(src)
|
||||
return TRUE
|
||||
|
||||
/obj/item/reagent_containers/food/interact_with_atom(atom/target, mob/living/user, list/modifiers)
|
||||
if(isnull(target.reagents))
|
||||
return
|
||||
|
||||
return ..()
|
||||
|
||||
/obj/item/reagent_containers/food/mob_act(mob/target, mob/living/user)
|
||||
apply(target, user)
|
||||
return TRUE
|
||||
|
||||
/obj/item/reagent_containers/food/normal_act(atom/target, mob/living/user)
|
||||
. = TRUE
|
||||
if(!target.is_refillable())
|
||||
return
|
||||
if(target.reagents.holder_full())
|
||||
to_chat(user, "<span class='warning'>[target] is full.</span>")
|
||||
return
|
||||
|
||||
to_chat(user, "<span class='notice'>You [!target.reagents.total_volume ? "pour" : "dump"] [src] in [target].</span>")
|
||||
for(var/mob/O as anything in oviewers(2, user))
|
||||
O.show_message("<span class='warning'>[user] puts something in [target].</span>", 1)
|
||||
reagents.trans_to(target, reagents.total_volume)
|
||||
qdel(src)
|
||||
|
||||
/obj/item/reagent_containers/food/drytapioca_pearls
|
||||
name = "dry tapioca pearls"
|
||||
desc = "Small, hard balls of dried tapioca powder."
|
||||
icon = 'icons/obj/food/food_ingredients.dmi'
|
||||
icon_state = "tapioca_drypearls"
|
||||
list_reagents = list("drytapioca" = 10)
|
||||
Reference in New Issue
Block a user