cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 00:53:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

tigercat & falseincarnate code suggestions

Browse Source
This commit is contained in:
Citinited
2018-04-14 16:40:25 +01:00
parent e352741f2b
commit b66c700a63
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_globalvars/lists/fortunes.dm
+2 -2
View File
@@ -1,4 +1,4 @@
var/global/list/fortune_cookie_messages = list("A woman named [pick(first_names_female)] may have an opportunity for you.",
GLOBAL_LIST_INIT(fortune_cookie_messages, list("A woman named [pick(first_names_female)] may have an opportunity for you.",
"A man named [pick(first_names_male)] may have an opportunity for you.",
"If you feel you are right, stand firmly by your convictions.",
"A stranger is a friend you have not spoken to yet.",
@@ -18,4 +18,4 @@ var/global/list/fortune_cookie_messages = list("A woman named [pick(first_names_
"A chance meeting opens new doors to success and friendship.",
"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!")
"Help! I'm being held prisoner in a Nanotrasen bakery!"))
code/modules/food_and_drinks/food/snacks.dm
+1 -1
View File
@@ -1054,7 +1054,7 @@
icon_state = "fortune_cookie"
filling_color = "#E8E79E"
list_reagents = list("nutriment" = 3)
trash = /obj/item/weapon/paper
trash = /obj/item/weapon/paper/fortune
/obj/item/weapon/reagent_containers/food/snacks/badrecipe
name = "Burned mess"
code/modules/food_and_drinks/recipes/recipes_oven.dm
+3 -4
View File
@@ -181,12 +181,11 @@
/datum/recipe/oven/fortunecookie/make_food(obj/container)
var/obj/item/weapon/paper/P = locate() in container
P.loc = null //So we don't delete the paper while cooking the cookie
var/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/being_cooked = ..()
if(P.info)
P.loc = being_cooked //Prevents the oven deleting our paper
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
being_cooked.trash = new /obj/item/weapon/paper/fortune(being_cooked)
return being_cooked
/datum/recipe/oven/pizzamargherita
code/modules/paperwork/paper.dm
+1 -1
View File
@@ -486,7 +486,7 @@
/obj/item/weapon/paper/fortune/New()
..()
var/fortunemessage = pick(fortune_cookie_messages)
var/fortunemessage = pick(GLOB.fortune_cookie_messages)
info = "<p style='text-align:center;font-family:[deffont];font-size:120%;font-weight:bold;'>[fortunemessage]</p>"
info += "<span style='text-align:center;'><strong>Lucky numbers</strong>: [rand(1,49)], [rand(1,49)], [rand(1,49)], [rand(1,49)], [rand(1,49)]</span>"