cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2020-08-10 21:50:42 +02:00
parent 9a7169cc0d 9dfb1ccd48
commit 81871a960e
212 changed files with 6916 additions and 3606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/food/kitchen/cooking_machines/_appliance.dm
View File

@@ -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

6
code/modules/food/kitchen/cooking_machines/container.dm
View File

@@ -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"

4
code/modules/food/kitchen/cooking_machines/fryer.dm
View File

@@ -12,7 +12,7 @@
circuit = /obj/item/weapon/circuitboard/fryer
appliancetype = FRYER
active_power_usage = 12 KILOWATTS
heating_power = 12000
heating_power = 12 KILOWATTS
light_y = 15
@@ -24,7 +24,7 @@
// Power used to maintain temperature once it's heated.
// Going with 25% of the active power. This is a somewhat arbitrary value.
resistance = 60000 // Approx. 10 minutes to heat up.
resistance = 10 KILOWATTS // Approx. 10 minutes to heat up.
max_contents = 2
container_type = /obj/item/weapon/reagent_containers/cooking_container/fryer

5
code/modules/food/kitchen/cooking_machines/oven.dm
View File

@@ -9,10 +9,10 @@
can_burn_food = TRUE
circuit = /obj/item/weapon/circuitboard/oven
active_power_usage = 6 KILOWATTS
heating_power = 6000
heating_power = 6 KILOWATTS
//Based on a double deck electric convection oven
resistance = 30000 // Approx. 12 minutes to heat up.
resistance = 12 KILOWATTS // Approx. 12 minutes to heat up.
idle_power_usage = 2 KILOWATTS
//uses ~30% power to stay warm
optimal_power = 0.8 // Oven cooks .2 faster than the default speed.
@@ -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)