mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-10 01:34:01 +00:00
1f3894e793
My original plan was to just implement materials into crafting so that items would inherit the materials of their components, allowing for some interesting stuff if the material flags of the item allow it. However to my dismay crafting is a pile of old tech debt, starting from the old `del_reqs` and `CheckParts` which still contain lines about old janky bandaids that are no longer in use nor reachable, up to the `customizable_reagent_holder` component which has some harddel issues when your custom food is sliced, and items used in food recipes not being deleted and instead stored inside the result with no purpose as well as other inconsistencies like stack recipes that transfer materials having counterparts in the UI that don't do that. EDIT: Several things have come up while working on this, so I apologise that it ended up changing over 100+ files. I managed to atomize some of the changes, but it's a bit tedious. EDIT: TLDR because I was told this section is too vague and there's too much going on. This PR: - Improves the dated crafting code (not the UI). - replaced `atom/CheckParts` and `crafting_recipe/on_craft_completion` with `atom/on_craft_completion`. - Reqs used in food recipes are now deleted by default and not stored inside the result (they did nothing). - Renames the customizable_reagent_holder comp and improves it (No harddels/ref issues). - Adds a unit test that tries to craft all recipes to see what's wrong (it skips some of the much more specific reqs for now). - In the unit test is also the code to make sure materials of the crafted item and a non-crafted item of the same type are roughly the same, so far only applied to food. - Some mild material/food refactoring around the fact that food item code has been changed to support materials. Improving the backbone of the crafting system. Also materials and food code. 🆑 refactor: Refactored crafting backend. Report possible pesky bugs. balance: the MEAT backpack (from the MEAT cargo pack) may be a smidge different because of code standardization. /🆑
207 lines
6.5 KiB
Plaintext
207 lines
6.5 KiB
Plaintext
/datum/round_event_control/easter
|
|
name = "Easter Eggselence"
|
|
holidayID = EASTER
|
|
typepath = /datum/round_event/easter
|
|
weight = -1
|
|
max_occurrences = 1
|
|
earliest_start = 0 MINUTES
|
|
category = EVENT_CATEGORY_HOLIDAY
|
|
description = "Hides surprise filled easter eggs in maintenance."
|
|
|
|
/datum/round_event/easter/announce(fake)
|
|
priority_announce(pick("Hip-hop into Easter!","Find some Bunny's stash!","Today is National 'Hunt a Wabbit' Day.","Be kind, give Chocolate Eggs!"))
|
|
|
|
|
|
/datum/round_event_control/rabbitrelease
|
|
name = "Release the Rabbits!"
|
|
holidayID = EASTER
|
|
typepath = /datum/round_event/rabbitrelease
|
|
weight = 5
|
|
max_occurrences = 10
|
|
category = EVENT_CATEGORY_HOLIDAY
|
|
description = "Summons a wave of cute rabbits."
|
|
|
|
/datum/round_event/rabbitrelease/announce(fake)
|
|
priority_announce("Unidentified furry objects detected coming aboard [station_name()]. Beware of Adorable-ness.", "Fluffy Alert", ANNOUNCER_ALIENS)
|
|
|
|
|
|
/datum/round_event/rabbitrelease/start()
|
|
|
|
for(var/obj/effect/landmark/event_spawn/spawn_point as anything in GLOB.generic_event_spawns) //Common public bunnies
|
|
if(prob(35))
|
|
new /mob/living/basic/rabbit/easter(spawn_point.loc)
|
|
CHECK_TICK
|
|
|
|
for(var/obj/effect/landmark/event_spawn/spawn_point as anything in GLOB.generic_maintenance_landmarks) // The rare maint bunnies
|
|
if(prob(15))
|
|
new /mob/living/basic/rabbit/easter(spawn_point.loc)
|
|
CHECK_TICK
|
|
|
|
for(var/obj/effect/landmark/carpspawn/spawn_point in GLOB.landmarks_list) // The rare space bunnies
|
|
if(prob(15))
|
|
new /mob/living/basic/rabbit/easter/space(spawn_point.loc)
|
|
CHECK_TICK
|
|
|
|
|
|
//Easter Baskets
|
|
/obj/item/storage/basket/easter
|
|
name = "Easter Basket"
|
|
storage_type = /datum/storage/basket/easter
|
|
|
|
//Bunny Suit
|
|
/obj/item/clothing/head/costume/bunnyhead
|
|
name = "Easter Bunny head"
|
|
icon_state = "bunnyhead"
|
|
inhand_icon_state = null
|
|
desc = "Considerably more cute than 'Frank'."
|
|
slowdown = -0.3
|
|
clothing_flags = THICKMATERIAL | SNUG_FIT
|
|
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
|
|
|
|
/obj/item/clothing/suit/costume/bunnysuit
|
|
name = "easter bunny suit"
|
|
desc = "Hop Hop Hop!"
|
|
icon_state = "bunnysuit"
|
|
icon = 'icons/obj/clothing/suits/costume.dmi'
|
|
worn_icon = 'icons/mob/clothing/suits/costume.dmi'
|
|
inhand_icon_state = null
|
|
slowdown = -0.3
|
|
clothing_flags = THICKMATERIAL
|
|
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
|
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
|
|
|
|
//Bunny bag!
|
|
/obj/item/storage/backpack/satchel/bunnysatchel
|
|
name = "easter bunny satchel"
|
|
desc = "Good for your eyes."
|
|
icon_state = "satchel_carrot"
|
|
inhand_icon_state = null
|
|
|
|
//Egg prizes and egg spawns!
|
|
/obj/item/surprise_egg
|
|
name = "wrapped egg"
|
|
desc = "A chocolate egg containing a little something special. Unwrap and enjoy!"
|
|
icon_state = "egg"
|
|
resistance_flags = FLAMMABLE
|
|
w_class = WEIGHT_CLASS_TINY
|
|
icon = 'icons/obj/food/egg.dmi'
|
|
lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/items/food_righthand.dmi'
|
|
obj_flags = UNIQUE_RENAME
|
|
|
|
/obj/item/surprise_egg/Initialize(mapload)
|
|
. = ..()
|
|
var/eggcolor = pick("blue","green","mime","orange","purple","rainbow","red","yellow")
|
|
icon_state = "egg-[eggcolor]"
|
|
|
|
/obj/item/surprise_egg/proc/dispensePrize(turf/where)
|
|
var/static/list/prize_list = list(/obj/item/clothing/head/costume/bunnyhead,
|
|
/obj/item/clothing/suit/costume/bunnysuit,
|
|
/obj/item/storage/backpack/satchel/bunnysatchel,
|
|
/obj/item/food/grown/carrot,
|
|
/obj/item/toy/balloon,
|
|
/obj/item/toy/gun,
|
|
/obj/item/toy/sword,
|
|
/obj/item/toy/talking/ai,
|
|
/obj/item/toy/talking/owl,
|
|
/obj/item/toy/talking/griffin,
|
|
/obj/item/toy/minimeteor,
|
|
/obj/item/toy/clockwork_watch,
|
|
/obj/item/toy/toy_xeno,
|
|
/obj/item/toy/foamblade,
|
|
/obj/item/toy/plush/carpplushie,
|
|
/obj/item/toy/redbutton,
|
|
/obj/item/toy/windup_toolbox,
|
|
/obj/item/clothing/head/collectable/rabbitears
|
|
) + subtypesof(/obj/item/toy/mecha)
|
|
var/won = pick(prize_list)
|
|
new won(where)
|
|
new/obj/item/food/chocolateegg(where)
|
|
|
|
/obj/item/surprise_egg/attack_self(mob/user)
|
|
..()
|
|
to_chat(user, span_notice("You unwrap [src] and find a prize inside!"))
|
|
dispensePrize(get_turf(src))
|
|
qdel(src)
|
|
|
|
//Easter Recipes + food
|
|
/obj/item/food/hotcrossbun
|
|
name = "hot cross bun"
|
|
desc = "The cross represents the Assistants that died for your sins."
|
|
icon_state = "hotcrossbun"
|
|
food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/sugar = 1)
|
|
foodtypes = SUGAR | GRAIN | BREAKFAST
|
|
tastes = list("pastry" = 1, "easter" = 1)
|
|
bite_consumption = 2
|
|
crafting_complexity = FOOD_COMPLEXITY_1
|
|
|
|
/datum/crafting_recipe/food/hotcrossbun
|
|
name = "Hot Cross Bun"
|
|
reqs = list(
|
|
/obj/item/food/breadslice/plain = 1,
|
|
/datum/reagent/consumable/sugar = 1
|
|
)
|
|
result = /obj/item/food/hotcrossbun
|
|
added_foodtypes = SUGAR | BREAKFAST
|
|
category = CAT_BREAD
|
|
|
|
/datum/crafting_recipe/food/briochecake
|
|
name = "Brioche cake"
|
|
reqs = list(
|
|
/obj/item/food/cake/plain = 1,
|
|
/datum/reagent/consumable/sugar = 2
|
|
)
|
|
result = /obj/item/food/cake/brioche
|
|
category = CAT_MISCFOOD
|
|
|
|
/obj/item/food/scotchegg
|
|
name = "scotch egg"
|
|
desc = "A boiled egg wrapped in a delicious, seasoned meatball."
|
|
icon = 'icons/obj/food/egg.dmi'
|
|
icon_state = "scotchegg"
|
|
bite_consumption = 3
|
|
custom_materials = list(/datum/material/meat = MEATDISH_MATERIAL_AMOUNT)
|
|
food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
|
|
crafting_complexity = FOOD_COMPLEXITY_2
|
|
foodtypes = MEAT
|
|
|
|
/datum/crafting_recipe/food/scotchegg
|
|
name = "Scotch egg"
|
|
reqs = list(
|
|
/datum/reagent/consumable/salt = 1,
|
|
/datum/reagent/consumable/blackpepper = 1,
|
|
/obj/item/food/boiledegg = 1,
|
|
/obj/item/food/meatball = 1
|
|
)
|
|
result = /obj/item/food/scotchegg
|
|
removed_foodtypes = BREAKFAST
|
|
category = CAT_EGG
|
|
|
|
/datum/crafting_recipe/food/mammi
|
|
name = "Mammi"
|
|
reqs = list(
|
|
/obj/item/food/bread/plain = 1,
|
|
/obj/item/food/chocolatebar = 1,
|
|
/datum/reagent/consumable/milk = 5
|
|
)
|
|
result = /obj/item/food/bowled/mammi
|
|
added_foodtypes = DAIRY
|
|
category = CAT_MISCFOOD
|
|
|
|
/obj/item/food/chocolatebunny
|
|
name = "chocolate bunny"
|
|
desc = "Contains less than 10% real rabbit!"
|
|
icon_state = "chocolatebunny"
|
|
food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
|
|
crafting_complexity = FOOD_COMPLEXITY_1
|
|
foodtypes = JUNKFOOD | SUGAR
|
|
|
|
/datum/crafting_recipe/food/chocolatebunny
|
|
name = "Chocolate bunny"
|
|
reqs = list(
|
|
/datum/reagent/consumable/sugar = 2,
|
|
/obj/item/food/chocolatebar = 1
|
|
)
|
|
result = /obj/item/food/chocolatebunny
|
|
category = CAT_MISCFOOD
|