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

Merge pull request #838 from Fox-McCloud/donkpockets

Browse Source 
Donk Pocket Fix
This commit is contained in:
ZomgPonies
2015-04-21 08:06:54 -04:00
parent 3a5195ae91 b4bb5cccee
commit 1adc73a45c
2 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/recipes_microwave.dm
+4 -19
View File
@@ -218,29 +218,14 @@
/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
/datum/recipe/microwave/warmdonkpocket
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/warmdonkpocket
/*
/datum/recipe/microwave/meatbread
code/modules/reagents/reagent_containers/food/snacks.dm
+9 -8
View File
@@ -799,14 +799,15 @@
..()
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/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
name = "Donk-pocket"