cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 03:26:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Donuts found in sec vendors and boxes can now be used to make glazed donuts [MDB IGNORE] (#9559)

Browse Source 
* Donuts found in sec vendors and boxes can now be used to make glazed donuts (#62910)

* Donuts found in sec vendors and boxes can now be used to make glazed donuts

* Hopefully fixes CI

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2021-11-23 17:02:47 +00:00
committed by GitHub
parent f7d751e115
commit d3692922ef
11 changed files with 550 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/food/pastries.dm
+3 -3
View File
@@ -8,7 +8,6 @@
name = "donut"
desc = "Goes great with robust coffee."
icon = 'icons/obj/food/donuts.dmi'
icon_state = "donut"
bite_consumption = 5
food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 3)
tastes = list("donut" = 1)
@@ -61,6 +60,7 @@
//Use this donut ingame
/obj/item/food/donut/plain
icon_state = "donut"
/obj/item/food/donut/chaos
name = "chaos donut"
@@ -161,7 +161,6 @@
name = "jelly donut"
desc = "You jelly?"
icon_state = "jelly"
decorated_icon = "jelly_homer"
food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
extra_reagent = /datum/reagent/consumable/berryjuice
tastes = list("jelly" = 1, "donut" = 3)
@@ -177,6 +176,7 @@
reagents.add_reagent(extra_reagent, 3)
/obj/item/food/donut/jelly/plain //use this ingame to avoid inheritance related crafting issues.
decorated_icon = "jelly_homer"
/obj/item/food/donut/jelly/berry
name = "pink jelly donut"
@@ -254,11 +254,11 @@
/obj/item/food/donut/jelly/slimejelly
name = "jelly donut"
desc = "You jelly?"
icon_state = "jelly"
extra_reagent = /datum/reagent/toxin/slimejelly
foodtypes = JUNKFOOD | GRAIN | FRIED | TOXIC | SUGAR | BREAKFAST
/obj/item/food/donut/jelly/slimejelly/plain
icon_state = "jelly"
/obj/item/food/donut/jelly/slimejelly/berry
name = "pink jelly donut"
code/game/objects/items/storage/fancy.dm
+1 -1
View File
@@ -79,7 +79,7 @@
icon = 'icons/obj/food/donuts.dmi'
icon_state = "donutbox_inner"
base_icon_state = "donutbox"
spawn_type = /obj/item/food/donut
spawn_type = /obj/item/food/donut/plain
is_open = TRUE
appearance_flags = KEEP_TOGETHER
custom_premium_price = PAYCHECK_HARD * 1.75