From 3fe84d2df100b3906440acf60fdde114a2d905af Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 12 Jul 2023 00:08:26 +0200 Subject: [PATCH] [MIRROR] the fortunate cookie drop the future [MDB IGNORE] (#22370) * the fortunate cookie drop the future (#76725) ## About The Pull Request ## Why It's Good For The Game the fortunate cookie was dropped a blank paper but now he will drop the future and he will dont drop a empty paper anymore. ## Changelog the fortunate cookie was dont working because he was dropped a empty paper but he will now dropped the future letter to tell the eater his future. :cl: fix: the fortunate cookie dont dropped a empty paper anymore. /:cl: * the fortunate cookie drop the future --------- Co-authored-by: Ben10Omintrix <138636438+Ben10Omintrix@users.noreply.github.com> --- code/game/objects/items/food/pastries.dm | 7 ++----- code/modules/paperwork/paper_cutter.dm | 7 +++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm index cd7d4f5d71c..4dc69af48d3 100644 --- a/code/game/objects/items/food/pastries.dm +++ b/code/game/objects/items/food/pastries.dm @@ -135,7 +135,7 @@ name = "fortune cookie" desc = "A true prophecy in each cookie!" icon_state = "fortune_cookie" - trash_type = /obj/item/paper/paperslip + trash_type = /obj/item/paper/paperslip/fortune food_reagents = list(/datum/reagent/consumable/nutriment = 5) tastes = list("cookie" = 1) foodtypes = GRAIN | SUGAR @@ -152,11 +152,8 @@ return fortune // Otherwise, use a generic one - var/obj/item/paper/paperslip/fortune_slip = new trash_type(drop_location) - fortune_slip.name = "fortune slip" + var/obj/item/paper/paperslip/fortune/fortune_slip = new trash_type(drop_location) // if someone adds lottery tickets in the future, be sure to add random numbers to this - fortune_slip.default_raw_text = pick(GLOB.wisdoms) - return fortune_slip /obj/item/food/fortunecookie/make_leave_trash() diff --git a/code/modules/paperwork/paper_cutter.dm b/code/modules/paperwork/paper_cutter.dm index ab7c4b2b537..128abc48177 100644 --- a/code/modules/paperwork/paper_cutter.dm +++ b/code/modules/paperwork/paper_cutter.dm @@ -202,6 +202,13 @@ righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi' grind_results = list(/datum/reagent/cellulose = 1.5) //It's a normal paper sheet divided in 2. 3 divided by 2 equals 1.5, this way you can't magically dupe cellulose +/obj/item/paper/paperslip/fortune + name = "fortune slip" + +/obj/item/paper/paperslip/fortune/Initialize(mapload) + default_raw_text = pick(GLOB.wisdoms) + return ..() + /obj/item/paper/paperslip/corporate //More fancy and sturdy paper slip which is a "plastic card", used for things like spare ID safe code name = "corporate plastic card" desc = "A plastic card for confidential corporate matters. Can be written on with pen somehow."