From bd63d505a0cfcc600e1b883679a645184f1a956a Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 19 Apr 2015 15:19:26 -0400 Subject: [PATCH 1/2] Donk Pocket Fix --- code/modules/food/recipes_microwave.dm | 20 +++---------------- .../reagent_containers/food/snacks.dm | 13 +++++------- 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 10d74c98f0f..9723580e315 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -218,29 +218,15 @@ /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/meatball ) - result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL - proc/warm_up(var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked) - being_cooked.warm = 1 - being_cooked.reagents.add_reagent("omnizine", 15) - being_cooked.bitesize = 6 - being_cooked.name = "Warm " + being_cooked.name - being_cooked.cooltime() - make_food(var/obj/container as obj) - var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = ..(container) - warm_up(being_cooked) - return being_cooked + result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket /datum/recipe/microwave/donkpocket/warm reagents = list() //This is necessary since this is a child object of the above recipe and we don't want donk pockets to need flour items = list( /obj/item/weapon/reagent_containers/food/snacks/donkpocket ) - result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL - make_food(var/obj/container as obj) - var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = locate() in container - if(being_cooked && !being_cooked.warm) - warm_up(being_cooked) - return being_cooked + result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm + /* /datum/recipe/microwave/meatbread diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index ef9fc2d8088..6440579afd8 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -799,14 +799,11 @@ ..() reagents.add_reagent("nutriment", 4) - var/warm = 0 - proc/cooltime() //Not working, derp? - if (src.warm) - spawn( 4200 ) - src.warm = 0 - src.reagents.del_reagent("omnizine") - src.name = "donk-pocket" - return +/obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm + name = "Warm Donk-pocket" + New() + ..() + reagents.add_reagent("omnizine", 4) /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket name = "Donk-pocket" From b4bb5cccee4ac04d8002704192fc3f52b3b9063a Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 20 Apr 2015 16:46:30 -0400 Subject: [PATCH 2/2] DERP --- code/modules/food/recipes_microwave.dm | 5 ++--- code/modules/reagents/reagent_containers/food/snacks.dm | 6 +++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 9723580e315..71c04ed3851 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -220,12 +220,11 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket -/datum/recipe/microwave/donkpocket/warm - reagents = list() //This is necessary since this is a child object of the above recipe and we don't want donk pockets to need flour +/datum/recipe/microwave/warmdonkpocket items = list( /obj/item/weapon/reagent_containers/food/snacks/donkpocket ) - result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm + result = /obj/item/weapon/reagent_containers/food/snacks/warmdonkpocket /* diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 6440579afd8..3c33b2836cf 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -799,10 +799,14 @@ ..() reagents.add_reagent("nutriment", 4) -/obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm +/obj/item/weapon/reagent_containers/food/snacks/warmdonkpocket name = "Warm Donk-pocket" + desc = "The food of choice for the seasoned traitor." + icon_state = "donkpocket" + filling_color = "#DEDEAB" New() ..() + reagents.add_reagent("nutriment", 4) reagents.add_reagent("omnizine", 4) /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket