shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes mushroom bowls (#35740)

Browse Source 
* Fixes mushroom bowls

Made the mushroom bowl a subtype of the normal bowl, and deleted a
duplicate definition.

Also, adds custom soup and salad support for the mushroom bowls.

Fixes #32471

* Remove a dangling return
This commit is contained in:
fludd12
2018-02-19 15:58:38 -05:00
committed by CitadelStationBot
parent fef23bd7cc
commit 0d03e90e9f
3 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/food_and_drinks/drinks/drinks.dm
View File

@@ -372,18 +372,6 @@
volume = 30
spillable = TRUE
///Lavaland bowls and bottles///
/obj/item/reagent_containers/food/drinks/mushroom_bowl
name = "mushroom bowl"
desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point."
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "mushroom_bowl"
w_class = WEIGHT_CLASS_SMALL
resistance_flags = NONE
isGlass = FALSE
//////////////////////////soda_cans//
//These are in their own group to be used as IED's in /obj/item/grenade/ghettobomb.dm

46
code/modules/mining/lavaland/ash_flora.dm
View File

@@ -191,20 +191,54 @@
icon_state = "cactus_fruit"
seed = /obj/item/seeds/lavaland/cactus
/obj/item/mushroom_bowl
/obj/item/reagent_containers/glass/bowl/mushroom_bowl
name = "mushroom bowl"
desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point."
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "mushroom_bowl"
w_class = WEIGHT_CLASS_SMALL
resistance_flags = FLAMMABLE
max_integrity = 200
/obj/item/reagent_containers/glass/bowl/mushroom_bowl/update_icon()
cut_overlays()
if(reagents && reagents.total_volume)
var/mutable_appearance/filling = mutable_appearance('icons/obj/lavaland/ash_flora.dmi', "fullbowl")
filling.color = mix_color_from_reagents(reagents.reagent_list)
add_overlay(filling)
else
icon_state = "mushroom_bowl"
/obj/item/reagent_containers/glass/bowl/mushroom_bowl/attackby(obj/item/I,mob/user, params)
if(istype(I, /obj/item/reagent_containers/food/snacks))
var/obj/item/reagent_containers/food/snacks/S = I
if(I.w_class > WEIGHT_CLASS_SMALL)
to_chat(user, "<span class='warning'>The ingredient is too big for [src]!</span>")
else if(contents.len >= 20)
to_chat(user, "<span class='warning'>You can't add more ingredients to [src]!</span>")
else
if(reagents.has_reagent("water", 10)) //are we starting a soup or a salad?
var/obj/item/reagent_containers/food/snacks/customizable/A = new/obj/item/reagent_containers/food/snacks/customizable/soup/ashsoup(get_turf(src))
A.initialize_custom_food(src, S, user)
else
var/obj/item/reagent_containers/food/snacks/customizable/A = new/obj/item/reagent_containers/food/snacks/customizable/salad/ashsalad(get_turf(src))
A.initialize_custom_food(src, S, user)
else
. = ..()
//what you can craft with these things
/datum/crafting_recipe/mushroom_bowl
name = "Mushroom Bowl"
result = /obj/item/reagent_containers/food/drinks/mushroom_bowl
result = /obj/item/reagent_containers/glass/bowl/mushroom_bowl
reqs = list(/obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings = 5)
time = 30
category = CAT_PRIMAL
/obj/item/reagent_containers/food/snacks/customizable/salad/ashsalad
desc = "Very ashy."
trash = /obj/item/reagent_containers/glass/bowl/mushroom_bowl
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "mushroom_bowl"
/obj/item/reagent_containers/food/snacks/customizable/soup/ashsoup
desc = "A bowl with ash and... stuff in it."
trash = /obj/item/reagent_containers/glass/bowl/mushroom_bowl
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "mushroom_soup"