mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
Tweak to kitchen machinery:
This commit is contained in:
@@ -583,6 +583,7 @@
|
||||
var/obj/item/thing
|
||||
var/delete = 1
|
||||
var/status = CI.container.check_contents()
|
||||
|
||||
if (status == 1)//If theres only one object in a container then we extract that
|
||||
thing = locate(/obj/item) in CI.container
|
||||
delete = 0
|
||||
@@ -596,6 +597,7 @@
|
||||
qdel(CI)
|
||||
else
|
||||
CI.reset()//reset instead of deleting if the container is left inside
|
||||
user.visible_message("<span class='notice'>\The [user] remove \the [thing] from \the [src].</span>")
|
||||
|
||||
/obj/machinery/appliance/proc/cook_mob(var/mob/living/victim, var/mob/user)
|
||||
return
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
/obj/item/weapon/reagent_containers/cooking_container/oven
|
||||
name = "oven dish"
|
||||
shortname = "shelf"
|
||||
desc = "Put ingredients in this; designed for use with an oven. Warranty void if used incorrectly."
|
||||
desc = "Put ingredients in this; designed for use with an oven. Warranty void if used incorrectly. Alt click to remove contents."
|
||||
icon_state = "ovendish"
|
||||
max_space = 30
|
||||
max_reagents = 120
|
||||
@@ -162,11 +162,11 @@
|
||||
/obj/item/weapon/reagent_containers/cooking_container/fryer
|
||||
name = "fryer basket"
|
||||
shortname = "basket"
|
||||
desc = "Put ingredients in this; designed for use with a deep fryer. Warranty void if used incorrectly."
|
||||
desc = "Put ingredients in this; designed for use with a deep fryer. Warranty void if used incorrectly. Alt click to remove contents."
|
||||
icon_state = "basket"
|
||||
|
||||
/obj/item/weapon/reagent_containers/cooking_container/grill
|
||||
name = "grill rack"
|
||||
shortname = "rack"
|
||||
desc = "Put ingredients 'in'/on this; designed for use with a grill. Warranty void if used incorrectly."
|
||||
desc = "Put ingredients 'in'/on this; designed for use with a grill. Warranty void if used incorrectly. Alt click to remove contents."
|
||||
icon_state = "grillrack"
|
||||
@@ -86,6 +86,7 @@
|
||||
cooking = FALSE
|
||||
|
||||
playsound(src, 'sound/machines/hatch_open.ogg', 20, 1)
|
||||
to_chat(user, "<span class='notice'>You [open? "close":"open"] the oven door</span>")
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/appliance/cooker/oven/proc/manip(var/obj/item/I)
|
||||
|
||||
@@ -663,9 +663,20 @@
|
||||
return
|
||||
options["examine"] = radial_examine
|
||||
|
||||
<<<<<<< HEAD
|
||||
// if there is no power or it's broken, the procs will fail but the buttons will still show
|
||||
if(length(holdingitems))
|
||||
options["grind"] = radial_grind
|
||||
=======
|
||||
if (usr.stat != 0)
|
||||
return
|
||||
if (!beaker)
|
||||
return
|
||||
beaker.loc = src.loc
|
||||
beaker = null
|
||||
visible_message("<span class='notice'>\The [usr] remove the container from \the [src].</span>")
|
||||
update_icon()
|
||||
>>>>>>> 864135b... Merge pull request #7425 from lbnesquik/Kot-Cooking-tweak
|
||||
|
||||
var/choice
|
||||
|
||||
|
||||
Reference in New Issue
Block a user