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

[MIRROR] Linter Introduction + Cleanup

Browse Source
This commit is contained in:
Chompstation Bot
2021-05-27 16:31:50 +00:00
parent bbafe17f3b
commit 20e3b0a2d3
244 changed files with 4808 additions and 1461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
code/modules/food/kitchen/cooking_machines/candy.dm
View File

@@ -1,3 +1,4 @@
<<<<<<< HEAD
/obj/machinery/appliance/mixer/candy
name = "candy machine"
desc = "Get yer candied cheese wheels here!"
@@ -42,3 +43,94 @@
/obj/machinery/appliance/mixer/candy/change_product_appearance(var/obj/item/weapon/reagent_containers/food/snacks/cooked/product)
food_color = get_random_colour(1)
. = ..()
||||||| parent of da4837903c... Merge pull request #10433 from VOREStation/upstream-merge-8085
/obj/machinery/appliance/mixer/candy
name = "candy machine"
desc = "Get yer candied cheese wheels here!"
icon_state = "mixer_off"
off_icon = "mixer_off"
on_icon = "mixer_on"
cook_type = "candied"
appliancetype = CANDYMAKER
var/datum/looping_sound/candymaker/candymaker_loop
circuit = /obj/item/weapon/circuitboard/candymachine
cooking_coeff = 1.0 // Original Value 0.6
output_options = list(
"Jawbreaker" = /obj/item/weapon/reagent_containers/food/snacks/variable/jawbreaker,
"Candy Bar" = /obj/item/weapon/reagent_containers/food/snacks/variable/candybar,
"Sucker" = /obj/item/weapon/reagent_containers/food/snacks/variable/sucker,
"Jelly" = /obj/item/weapon/reagent_containers/food/snacks/variable/jelly
)
/obj/machinery/appliance/mixer/candy/Initialize()
. = ..()
candymaker_loop = new(list(src), FALSE)
/obj/machinery/appliance/mixer/candy/Destroy()
. = ..()
QDEL_NULL(candymaker_loop)
/obj/machinery/appliance/mixer/candy/update_icon()
. = ..()
if(!stat)
icon_state = on_icon
if(candymaker_loop)
candymaker_loop.start(src)
else
icon_state = off_icon
if(candymaker_loop)
candymaker_loop.stop(src)
/obj/machinery/appliance/mixer/candy/change_product_appearance(var/obj/item/weapon/reagent_containers/food/snacks/cooked/product)
food_color = get_random_colour(1)
. = ..()
=======
/obj/machinery/appliance/mixer/candy
name = "candy machine"
desc = "Get yer candied cheese wheels here!"
icon_state = "mixer_off"
off_icon = "mixer_off"
on_icon = "mixer_on"
cook_type = "candied"
appliancetype = CANDYMAKER
var/datum/looping_sound/candymaker/candymaker_loop
circuit = /obj/item/weapon/circuitboard/candymachine
cooking_coeff = 1.0 // Original Value 0.6
output_options = list(
"Jawbreaker" = /obj/item/weapon/reagent_containers/food/snacks/variable/jawbreaker,
"Candy Bar" = /obj/item/weapon/reagent_containers/food/snacks/variable/candybar,
"Sucker" = /obj/item/weapon/reagent_containers/food/snacks/variable/sucker,
"Jelly" = /obj/item/weapon/reagent_containers/food/snacks/variable/jelly
)
/obj/machinery/appliance/mixer/candy/Initialize()
. = ..()
candymaker_loop = new(list(src), FALSE)
/obj/machinery/appliance/mixer/candy/Destroy()
. = ..()
QDEL_NULL(candymaker_loop)
/obj/machinery/appliance/mixer/candy/update_icon()
. = ..()
if(!stat)
icon_state = on_icon
if(candymaker_loop)
candymaker_loop.start(src)
else
icon_state = off_icon
if(candymaker_loop)
candymaker_loop.stop(src)
/obj/machinery/appliance/mixer/candy/change_product_appearance(var/obj/item/weapon/reagent_containers/food/snacks/product)
food_color = get_random_colour(1)
. = ..()
>>>>>>> da4837903c... Merge pull request #10433 from VOREStation/upstream-merge-8085