diff --git a/code/game/machinery/kitchen/deep_fryer.dm b/code/game/machinery/kitchen/deep_fryer.dm index 1671ebe8..afa5e86b 100644 --- a/code/game/machinery/kitchen/deep_fryer.dm +++ b/code/game/machinery/kitchen/deep_fryer.dm @@ -67,6 +67,12 @@ if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/deepfryholder)) user << "You cannot doublefry." return + if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/customizable/candy)) + user << "That would probably break [src]." + return + if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/cereal)) + user << "That isn't going to fit." + return else fry_food(I, user) diff --git a/code/modules/food/cooker.dm b/code/modules/food/cooker.dm index d71b779e..a386a7c0 100644 --- a/code/modules/food/cooker.dm +++ b/code/modules/food/cooker.dm @@ -49,9 +49,18 @@ obj/machinery/cooker/proc/checkValid(obj/item/check, mob/user) /* if(istype(check, /obj/item/flag)) user << "That isn't going to fit." return 0*/ - if(!istype(check, /obj/item/weapon/reagent_containers/food)) + if(!istype(check, /obj/item/weapon/reagent_containers/food/snacks)) user << "That isn't going to work." return 0 + if(istype(check, /obj/item/weapon/reagent_containers/food/snacks/customizable/candy)) + user << "That would probably break [src]." + return 0 + if(istype(check, /obj/item/weapon/reagent_containers/food/snacks/cereal)) + user << "That isn't going to fit." + return 0 + if(istype(check, /obj/item/weapon/reagent_containers/food/snacks/deepfryholder)) + user << "You cannot cook this twice." + return 0 return 1 obj/machinery/cooker/proc/setIcon(obj/item/copyme, obj/item/copyto) diff --git a/code/modules/food/oven.dm b/code/modules/food/oven.dm index f0f213f6..7d604191 100644 --- a/code/modules/food/oven.dm +++ b/code/modules/food/oven.dm @@ -16,13 +16,23 @@ updatefood() /obj/machinery/cooking/attackby(obj/item/I, mob/user) + if(on) user << "The machine is already running." return else - if(!istype(I, /obj/item/weapon/reagent_containers/food)) + if(!istype(I, /obj/item/weapon/reagent_containers/food/snacks)) user << "You think yourself better than to place [I] in there" return + if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/deepfryholder)) + user << "You cannot cook this twice." + return + if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/customizable/candy)) + user << "That would probably taste bad." + return + if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/cereal)) + user << "That isn't going to be nice." + return var/obj/item/F = I var/obj/item/weapon/reagent_containers/food/snacks/customizable/C diff --git a/html/changelog.html b/html/changelog.html index de5e7a3a..2f91f184 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -60,6 +60,7 @@ should be listed in the changelog upon commit though. Thanks. -->

12 December 2014

SoundScopes updated: