From 6f36aaa56f9a51285e976ec4f532e3d34ef7f675 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Sat, 10 Jan 2015 19:36:18 -0800 Subject: [PATCH 1/4] Re-adds Warm Donk-Pockets --- code/modules/food&drinks/food/snacks_pastry.dm | 8 ++++++++ .../food&drinks/recipes/microwave/recipes_pastry.dm | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/code/modules/food&drinks/food/snacks_pastry.dm b/code/modules/food&drinks/food/snacks_pastry.dm index 4860f4fd103..a37ac83f717 100644 --- a/code/modules/food&drinks/food/snacks_pastry.dm +++ b/code/modules/food&drinks/food/snacks_pastry.dm @@ -216,6 +216,14 @@ ..() reagents.add_reagent("nutriment", 4) +/obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm + name = "\improper Warm Donk-pocket" + desc = "The heated food of choice for the seasoned traitor." + +/obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm/New() + ..() + reagents.add_reagent("tricordrazine", 4) + /obj/item/weapon/reagent_containers/food/snacks/fortunecookie name = "fortune cookie" desc = "A true prophecy in each cookie!" diff --git a/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm b/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm index 96a202c12ac..e4fa2e27ae7 100644 --- a/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm +++ b/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm @@ -75,6 +75,13 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket +/datum/recipe/donkpocket/warm + reagents = list() + items = list( + /obj/item/weapon/reagent_containers/food/snacks/donkpocket + ) + result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm + ////////////////////////////////////////////////MUFFINS//////////////////////////////////////////////// From f47555af09bfd33ec0d633ae266dcec4fe80df15 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Sun, 11 Jan 2015 07:37:12 -0800 Subject: [PATCH 2/4] Changing heated pocket path: Part 1 --- code/modules/food&drinks/food/snacks_pastry.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/food&drinks/food/snacks_pastry.dm b/code/modules/food&drinks/food/snacks_pastry.dm index a37ac83f717..e30a6c76672 100644 --- a/code/modules/food&drinks/food/snacks_pastry.dm +++ b/code/modules/food&drinks/food/snacks_pastry.dm @@ -216,13 +216,15 @@ ..() reagents.add_reagent("nutriment", 4) -/obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm +/obj/item/weapon/reagent_containers/food/snacks/donkpocketwarm name = "\improper Warm Donk-pocket" desc = "The heated food of choice for the seasoned traitor." + icon_state = "donkpocket" -/obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm/New() +/obj/item/weapon/reagent_containers/food/snacks/donkpocketwarm/New() ..() reagents.add_reagent("tricordrazine", 4) + reagents.add_reagent("nutriment", 4) /obj/item/weapon/reagent_containers/food/snacks/fortunecookie name = "fortune cookie" @@ -327,4 +329,4 @@ ..() reagents.add_reagent("nutriment", 6) reagents.add_reagent("sodiumchloride", 1) - reagents.add_reagent("vitamin", 1) \ No newline at end of file + reagents.add_reagent("vitamin", 1) From 005b78658d9ce1b0d10b4b6157b3db36c5c0e294 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Sun, 11 Jan 2015 07:37:48 -0800 Subject: [PATCH 3/4] Changing heated pocket path: Part 2 --- code/modules/food&drinks/recipes/microwave/recipes_pastry.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm b/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm index e4fa2e27ae7..9c5029e56de 100644 --- a/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm +++ b/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm @@ -75,12 +75,12 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket -/datum/recipe/donkpocket/warm +/datum/recipe/donkpocketwarm reagents = list() 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/donkpocketwarm/ ////////////////////////////////////////////////MUFFINS//////////////////////////////////////////////// From f6387f1d8dd4ec12b53dd16466a4c1182499dc2a Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Mon, 19 Jan 2015 10:24:49 -0800 Subject: [PATCH 4/4] Adds Changelog --- html/changelogs/iamgoofball.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/iamgoofball.yml diff --git a/html/changelogs/iamgoofball.yml b/html/changelogs/iamgoofball.yml new file mode 100644 index 00000000000..384e62d46c5 --- /dev/null +++ b/html/changelogs/iamgoofball.yml @@ -0,0 +1,4 @@ +author: Iamgoofball +delete-after: True +changes: + - rscadd: "You can now heat donk pockets once more. Rejoice." \ No newline at end of file