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

Keeps old fortune cookie behaviour if a non-blank paper is used in the recipe

Browse Source
This commit is contained in:
Citinited
2018-04-14 14:17:06 +01:00
parent 1c8740ca93
commit e352741f2b
2 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/food/snacks.dm
+1 -9
View File
@@ -1054,15 +1054,7 @@
icon_state = "fortune_cookie"
filling_color = "#E8E79E"
list_reagents = list("nutriment" = 3)
var/obj/item/weapon/paper/fortune/F
/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/New()
..()
F = new /obj/item/weapon/paper/fortune(src)
/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/Post_Consume(mob/living/carbon/human/user)
to_chat(user, "<span class='notice'>[F] falls out of [src]!</span>")
user.put_in_hands(F)
trash = /obj/item/weapon/paper
/obj/item/weapon/reagent_containers/food/snacks/badrecipe
name = "Burned mess"
code/modules/food_and_drinks/recipes/recipes_oven.dm
+6 -12
View File
@@ -180,21 +180,15 @@
result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie
/datum/recipe/oven/fortunecookie/make_food(obj/container)
var/obj/item/weapon/paper/paper = locate() in container
paper.loc = null //prevent deletion
var/obj/item/weapon/paper/P = locate() in container
var/obj/item/weapon/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)
P.loc = 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/fortunecookie/check_items(obj/container)
. = ..()
if(.)
var/obj/item/weapon/paper/paper = locate() in container
if(!paper || !paper.info)
return -1
return .
/datum/recipe/oven/pizzamargherita
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,