diff --git a/code/_globalvars/lists/fortunes.dm b/code/_globalvars/lists/fortunes.dm new file mode 100644 index 00000000000..546e33f913f --- /dev/null +++ b/code/_globalvars/lists/fortunes.dm @@ -0,0 +1,57 @@ +GLOBAL_LIST_INIT(fortune_cookie_messages, list("If you feel you are right, stand firmly by your convictions.", +"A stranger is a friend you have not spoken to yet.", +"Yesterday, you said tomorrow. Just do it!", +"Do, or do not. There is no try.", +"Fear leads to anger. Anger leads to hate. Hate leads to suffering.", +"Luck always favours the prepared mind.", +"A smile is your passport into the hearts of others.", +"Hard work pays off in the future, laziness pays off now.", +"Change can hurt, but it leads a path to something better.", +"If winter comes soon, can spring be far behind?", +"Love with your heart; use your head for everything else.", +"The man on the top of the mountain did not fall there.", +"The greatest risk is not taking one.", +"Strategy without tactics is the slowest route to victory.
Tactics without strategy is the noise before defeat.", +"If you are far from the enemy, make him believe you are near.", +"He who knows when he can fight and when he cannot, will be victorious.", +"A clever person solves a problem. A wise person avoids it.", +"When fighting for freedom, never wear new pants.", +"If you want the rainbow, you must put up with the rain.", +"Get ready! Good fortune comes in bunches.", +"An exciting opportunity lies ahead of you.", +"A journey of a thousand miles begins with a single step.", +"Expect the unexpected.", +"Live this day as if it were your last.", +"Remember the compliments you receive; forget the insults.", +"A chance meeting opens new doors to success and friendship.", +"Failure is the mother of success.", +"A rolling stone gathers no moss.", +"When life gives you lemons, make lemonade.", +"You will inherit some money or a small piece of land.", +"Happy news is on its way to you.", +"A pleasant surprise is in store for you.", +"You will be invited to an exciting event.", +"Keep your plans secret for now.", +"You will live a long, happy life.", +"When one door closes, another opens.", +"Life is a canvas, and you are its painter.", +"Failure to prepare is to prepare to fail.", +"Beware the robot that thinks for itself.", +"The early bird gets the worm, but the second mouse gets the cheese.", +"Don't pursue happiness - create it.", +"Courage is not the absence of fear; it is the conquest of it.", +"All things are difficult before they are easy.", +"A ship in harbour is safe, but that's not why ships are built.", +"Hardly anyone knows how much is gained by ignoring the future.", +"The wise man is the one that makes you think that he is dumb.", +"Hatred outlives the hateful.", +"The fatal flaw in every plan is the assumption that you know more than the enemy", +"A journey of a thousand miles begins with a single step.", +"Dig the well before you are thirsty.", +"Be not afraid of growing slowly, be afraid only of standing still.", +"Do not remove a fly from your friend's forehead with a hatchet.", +"A foolish man listens to his heart.
A wise man listens to cookies.", +"Thank you! But your fortune is in another cookie!", +"The greatest danger could be your stupidity.", +"He who laughs at himself never runs out of things to laugh at.", +"Help! I'm being held prisoner in a Nanotrasen bakery!")) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index f690e5f4231..3a730c3868d 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -1070,6 +1070,7 @@ icon_state = "fortune_cookie" filling_color = "#E8E79E" list_reagents = list("nutriment" = 3) + trash = /obj/item/paper/fortune /obj/item/reagent_containers/food/snacks/badrecipe name = "Burned mess" diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm index 025670aa817..7dcfe199ded 100644 --- a/code/modules/food_and_drinks/recipes/recipes_oven.dm +++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm @@ -180,21 +180,16 @@ result = /obj/item/reagent_containers/food/snacks/fortunecookie /datum/recipe/oven/fortunecookie/make_food(obj/container) - var/obj/item/paper/paper = locate() in container - paper.loc = null //prevent deletion + var/obj/item/paper/P = locate() in container + P.loc = null //So we don't delete the paper while cooking the cookie var/obj/item/reagent_containers/food/snacks/fortunecookie/being_cooked = ..() - paper.loc = being_cooked - being_cooked.trash = paper //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn + if(P.info) //If there's anything written on the paper, just move it into the fortune cookie + P.forceMove(being_cooked) //Prevents the oven deleting our paper + being_cooked.trash = P //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn + else + qdel(P) return being_cooked -/datum/recipe/oven/fortunecookie/check_items(obj/container) - . = ..() - if(.) - var/obj/item/paper/paper = locate() in container - if(!paper || !paper.info) - return -1 - return . - /datum/recipe/oven/pizzamargherita items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index d37506b3d82..e8858a4dd31 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -34,6 +34,8 @@ var/contact_poison // Reagent ID to transfer on contact var/contact_poison_volume = 0 var/contact_poison_poisoner = null + var/paper_width = 400//Width of the window that opens + var/paper_height = 400//Height of the window that opens var/const/deffont = "Verdana" var/const/signfont = "Times New Roman" @@ -72,12 +74,12 @@ if((!user.say_understands(null, all_languages["Galactic Common"]) && !forceshow) || forcestars) //assuming all paper is written in common is better than hardcoded type checks data = "[name][stars(info)][stamps]" if(view) - usr << browse(data, "window=[name]") + usr << browse(data, "window=[name];size=[paper_width]x[paper_height]") onclose(usr, "[name]") else data = "[name][infolinks ? info_links : info][stamps]" if(view) - usr << browse(data, "window=[name]") + usr << browse(data, "window=[name];size=[paper_width]x[paper_height]") onclose(usr, "[name]") return data @@ -476,6 +478,20 @@ /obj/item/paper/crumpled/bloody icon_state = "scrap_bloodied" +/obj/item/paper/fortune + name = "fortune" + icon_state = "slip" + paper_height = 150 + +/obj/item/paper/fortune/New() + ..() + var/fortunemessage = pick(GLOB.fortune_cookie_messages) + info = "

[fortunemessage]

" + info += "

Lucky numbers: [rand(1,49)], [rand(1,49)], [rand(1,49)], [rand(1,49)], [rand(1,49)]

" + +/obj/item/paper/fortune/update_icon() + ..() + icon_state = initial(icon_state) /* * Premade paper */ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 720fafd8847..8593012e528 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/paradise.dme b/paradise.dme index 7daead01233..8fee7485f98 100644 --- a/paradise.dme +++ b/paradise.dme @@ -101,6 +101,7 @@ #include "code\_globalvars\station.dm" #include "code\_globalvars\unused.dm" #include "code\_globalvars\lists\flavor_misc.dm" +#include "code\_globalvars\lists\fortunes.dm" #include "code\_globalvars\lists\misc.dm" #include "code\_globalvars\lists\mobs.dm" #include "code\_globalvars\lists\names.dm"