mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 05:30:05 +01:00
FalloutFalconandGitHub
d2f34e33be
## About The Pull Request moves all implementations (im aware of) for "Im a parent type dont spawn me please" to the datum layer to standardized behavior adds a standerized proc for filtering out "bad" items that we dont want spawning. applies to it the subtype vendor, gifts, and a new spawner and mystery box for a random gun (neither playerfacing) "port" of https://github.com/shiptest-ss13/Shiptest/pull/4621 https://github.com/user-attachments/assets/22f6f0b2-b44e-411a-b3dc-6b97dc0287aa small warning: I dont have EVERY abstract type defined right now but, ive done a good enough job for now. Im tired of data entry rn ## Why It's Good For The Game standardizing behavior. Might be a micro hit to performance however having this lets us not rely on icon state to determine whether something is a parent type and makes it much easier to tell something is a parent type (could be applied further to things like admin spawning menus and things like that). need feedback on if this is actually good for the game. ## Changelog 🆑 add: Soda cans show up in the silver slime drink table. add: Examine tag for items that are not mean to show up ingame. refactor: Standardizes how gifts rule out abstract types. fix: gifts no longer check if something has an inhand, massively expanding the list of potential items. /🆑
73 lines
2.2 KiB
Plaintext
73 lines
2.2 KiB
Plaintext
/obj/item/food/bowled
|
|
w_class = WEIGHT_CLASS_NORMAL
|
|
icon = 'icons/obj/food/soupsalad.dmi'
|
|
abstract_type = /obj/item/food/bowled
|
|
bite_consumption = 5
|
|
max_volume = 80
|
|
foodtypes = NONE
|
|
eatverbs = list("slurp", "sip", "inhale", "drink")
|
|
venue_value = FOOD_PRICE_CHEAP
|
|
|
|
/obj/item/food/bowled/make_germ_sensitive(mapload)
|
|
return // It's in a bowl
|
|
|
|
/obj/item/food/bowled/wish
|
|
name = "wish soup"
|
|
desc = "I wish this was soup."
|
|
icon_state = "wishsoup"
|
|
food_reagents = list(/datum/reagent/water = 10)
|
|
tastes = list("wishes" = 1)
|
|
trash_type = /obj/item/reagent_containers/cup/bowl
|
|
|
|
/obj/item/food/bowled/wish/Initialize(mapload)
|
|
. = ..()
|
|
if(prob(25))
|
|
desc = "A wish come true!"
|
|
reagents.add_reagent(/datum/reagent/consumable/nutriment, 9)
|
|
reagents.add_reagent(/datum/reagent/consumable/nutriment/vitamin, 1)
|
|
|
|
/obj/item/food/bowled/mammi
|
|
name = "Mammi"
|
|
desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement."
|
|
icon_state = "mammi"
|
|
food_reagents = list(
|
|
/datum/reagent/consumable/nutriment = 11,
|
|
/datum/reagent/consumable/nutriment/vitamin = 2,
|
|
)
|
|
foodtypes = SUGAR | DAIRY | JUNKFOOD | GRAIN
|
|
crafting_complexity = FOOD_COMPLEXITY_2
|
|
|
|
/obj/item/food/bowled/spacylibertyduff
|
|
name = "spacy liberty duff"
|
|
desc = "Jello gelatin, from Alfred Hubbard's cookbook."
|
|
icon_state = "spacylibertyduff"
|
|
bite_consumption = 3
|
|
food_reagents = list(
|
|
/datum/reagent/consumable/nutriment = 6,
|
|
/datum/reagent/drug/mushroomhallucinogen = 6,
|
|
/datum/reagent/consumable/nutriment/vitamin = 5,
|
|
)
|
|
trash_type = /obj/item/reagent_containers/cup/bowl
|
|
|
|
tastes = list("jelly" = 1, "mushroom" = 1)
|
|
foodtypes = VEGETABLES
|
|
crafting_complexity = FOOD_COMPLEXITY_2
|
|
|
|
/obj/item/food/bowled/amanitajelly
|
|
name = "amanita jelly"
|
|
desc = "Looks curiously toxic."
|
|
icon_state = "amanitajelly"
|
|
bite_consumption = 3
|
|
food_reagents = list(
|
|
/datum/reagent/consumable/nutriment = 7,
|
|
/datum/reagent/drug/mushroomhallucinogen = 3,
|
|
/datum/reagent/toxin/amatoxin = 6,
|
|
/datum/reagent/consumable/nutriment/vitamin = 5,
|
|
)
|
|
trash_type = /obj/item/reagent_containers/cup/bowl
|
|
|
|
|
|
tastes = list("jelly" = 1, "mushroom" = 1)
|
|
foodtypes = VEGETABLES | TOXIC
|
|
crafting_complexity = FOOD_COMPLEXITY_2
|