mirror of
https://github.com/Aurorastation/Aurora-Old.git
synced 2026-08-31 08:36:32 +01:00
Cooking Fixes
This commit is contained in:
@@ -67,6 +67,12 @@
|
||||
if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/deepfryholder))
|
||||
user << "<span class='userdanger'>You cannot doublefry.</span>"
|
||||
return
|
||||
if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/customizable/candy))
|
||||
user << "<span class='warning'>That would probably break [src].</span>"
|
||||
return
|
||||
if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/cereal))
|
||||
user << "<span class='warning'>That isn't going to fit.</span>"
|
||||
return
|
||||
else
|
||||
fry_food(I, user)
|
||||
|
||||
|
||||
@@ -49,9 +49,18 @@ obj/machinery/cooker/proc/checkValid(obj/item/check, mob/user)
|
||||
/* if(istype(check, /obj/item/flag))
|
||||
user << "<span class='warning'>That isn't going to fit.</span>"
|
||||
return 0*/
|
||||
if(!istype(check, /obj/item/weapon/reagent_containers/food))
|
||||
if(!istype(check, /obj/item/weapon/reagent_containers/food/snacks))
|
||||
user << "<span class='warning'>That isn't going to work.</span>"
|
||||
return 0
|
||||
if(istype(check, /obj/item/weapon/reagent_containers/food/snacks/customizable/candy))
|
||||
user << "<span class='warning'>That would probably break [src].</span>"
|
||||
return 0
|
||||
if(istype(check, /obj/item/weapon/reagent_containers/food/snacks/cereal))
|
||||
user << "<span class='warning'>That isn't going to fit.</span>"
|
||||
return 0
|
||||
if(istype(check, /obj/item/weapon/reagent_containers/food/snacks/deepfryholder))
|
||||
user << "<span class='userdanger'>You cannot cook this twice.</span>"
|
||||
return 0
|
||||
return 1
|
||||
|
||||
obj/machinery/cooker/proc/setIcon(obj/item/copyme, obj/item/copyto)
|
||||
|
||||
@@ -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 << "<span class='userdanger'>You cannot cook this twice.</span>"
|
||||
return
|
||||
if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/customizable/candy))
|
||||
user << "<span class='warning'>That would probably taste bad.</span>"
|
||||
return
|
||||
if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/cereal))
|
||||
user << "<span class='warning'>That isn't going to be nice.</span>"
|
||||
return
|
||||
|
||||
var/obj/item/F = I
|
||||
var/obj/item/weapon/reagent_containers/food/snacks/customizable/C
|
||||
|
||||
@@ -60,6 +60,7 @@ should be listed in the changelog upon commit though. Thanks. -->
|
||||
<h2 class='date'>12 December 2014</h2>
|
||||
<h3 class='author'>SoundScopes updated:</h3>
|
||||
<ul class='changes bgimages16'>
|
||||
<li class='bugfix'>Cookinig fixes</li>
|
||||
<li class='bugfix'>Missing slime sprites</li>
|
||||
<li class='bugfix'>PA turns off properly when broken or loss of power</li>
|
||||
<li class='bugfix'>Pipe Painters now paint pipes rather than making invisible pipes</li>
|
||||
|
||||
Reference in New Issue
Block a user