mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
Last Push - Everything is working, just needs testing!
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
// More for our custom races
|
||||
#define IS_CHIMERA 12
|
||||
#define IS_SHADEKIN 13
|
||||
#define IS_SHADEKIN 13
|
||||
#define IS_ALRAUNE 14
|
||||
@@ -118,7 +118,7 @@
|
||||
if("spacespice")
|
||||
name = "bottle of space spice"
|
||||
desc = "An exotic blend of spices for cooking. Definitely not worms."
|
||||
icon = 'modular_citadel/icons/obj/food_syn.dmi'
|
||||
icon = 'icons/obj/food_syn.dmi'
|
||||
icon_state = "spacespicebottle"
|
||||
center_of_mass = list("x"=16, "y"=6)
|
||||
if("barbecue")
|
||||
@@ -441,6 +441,6 @@
|
||||
/obj/item/weapon/reagent_containers/food/condiment/spacespice/on_reagent_change()
|
||||
return
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/condiment/spacespice/initialize()
|
||||
..()
|
||||
/obj/item/weapon/reagent_containers/food/condiment/spacespice/Initialize()
|
||||
. = ..()
|
||||
reagents.add_reagent("spacespice", 40)
|
||||
@@ -157,7 +157,7 @@
|
||||
. = ..()
|
||||
if(Adjacent(user))
|
||||
if(coating)
|
||||
to_chat(user, "<span class='notice'>It's coated in [coating.name]!</span>")
|
||||
to_chat(user, "<span class='notice'>It's coated in [coating.name]!</span>")
|
||||
if(bitecount==0)
|
||||
return .
|
||||
else if (bitecount==1)
|
||||
@@ -282,7 +282,7 @@
|
||||
// desc = "Smells caustic. Tastes like heresy." //Duh
|
||||
// icon_state = "xburger" //Refers to an icon in food.dmi
|
||||
// Initialize() //Don't mess with this. (We use Initialize now instead of New())
|
||||
// ..() //Same here.
|
||||
// . = ..() //Same here.
|
||||
// reagents.add_reagent("xenomicrobes", 10) //This is what is in the food item. you may copy/paste
|
||||
// reagents.add_reagent("nutriment", 2) // this line of code for all the contents.
|
||||
// bitesize = 3 //This is the amount each bite consumes.
|
||||
@@ -3445,7 +3445,7 @@
|
||||
|
||||
update_icon()
|
||||
return
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/pizzabox/margherita/Initialize()
|
||||
pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita(src)
|
||||
@@ -3584,7 +3584,7 @@
|
||||
qdel(src)
|
||||
return
|
||||
else
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
// Human Burger + cheese wedge = cheeseburger
|
||||
/obj/item/weapon/reagent_containers/food/snacks/human/burger/attackby(obj/item/weapon/reagent_containers/food/snacks/cheesewedge/W as obj, mob/user as mob)
|
||||
@@ -3595,7 +3595,7 @@
|
||||
qdel(src)
|
||||
return
|
||||
else
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/bunbun
|
||||
name = "\improper Bun Bun"
|
||||
@@ -3701,7 +3701,7 @@
|
||||
to_chat(user, "<span class='notice'>You remove the seeds from the flower, slightly damaging them.</span>")
|
||||
qdel(src)
|
||||
else
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/rawsticks
|
||||
name = "raw potato sticks"
|
||||
@@ -3775,7 +3775,7 @@
|
||||
center_of_mass = list("x"=16, "y"=15)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 30)
|
||||
reagents.add_reagent("iron", 3)
|
||||
bitesize = 4
|
||||
@@ -3790,7 +3790,7 @@
|
||||
center_of_mass = list("x"=16, "y"=15)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/liquidvitamin/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
reagents.add_reagent("flour", 20)
|
||||
reagents.add_reagent("tricordrazine", 5)
|
||||
reagents.add_reagent("paracetamol", 5)
|
||||
@@ -3846,10 +3846,10 @@
|
||||
center_of_mass = list("x"=15, "y"=9)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/unajerky/Initialize()
|
||||
..()
|
||||
reagents.add_reagent("protein", 8)
|
||||
reagents.add_reagent("capsaicin", 2)
|
||||
bitesize = 2
|
||||
. =..()
|
||||
reagents.add_reagent("protein", 8)
|
||||
reagents.add_reagent("capsaicin", 2)
|
||||
bitesize = 2
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/croissant
|
||||
name = "croissant"
|
||||
@@ -4353,7 +4353,7 @@
|
||||
/obj/item/weapon/reagent_containers/food/snacks/macncheese
|
||||
name = "macaroni and cheese"
|
||||
desc = "The perfect combination of noodles and dairy."
|
||||
icon = 'modular_citadel/icons/obj/food_cit.dmi'
|
||||
icon = 'icons/obj/food.dmi'
|
||||
icon_state = "macncheese"
|
||||
trash = /obj/item/trash/snack_bowl
|
||||
center_of_mass = list("x"=16, "y"=16)
|
||||
@@ -4379,7 +4379,7 @@
|
||||
//This proc handles drawing coatings out of a container when this food is dipped into it
|
||||
/obj/item/weapon/reagent_containers/food/snacks/proc/apply_coating(var/datum/reagent/nutriment/coating/C, var/mob/user)
|
||||
if (coating)
|
||||
user << "The [src] is already coated in [coating.name]!"
|
||||
to_chat(user, "The [src] is already coated in [coating.name]!")
|
||||
return 0
|
||||
|
||||
//Calculate the reagents of the coating needed
|
||||
@@ -4398,7 +4398,7 @@
|
||||
return 0
|
||||
|
||||
if (C.volume < req)
|
||||
user << span("warning", "There's not enough [C.name] to coat the [src]!")
|
||||
to_chat("<span class='warning'>There's not enough [C.name] to coat the [src]!</span>")
|
||||
return 0
|
||||
|
||||
var/id = C.id
|
||||
@@ -4499,7 +4499,7 @@
|
||||
var/composition_reagent
|
||||
var/composition_reagent_quantity
|
||||
|
||||
/mob/living/simple_animal/adultslime
|
||||
/mob/living/simple_mob/adultslime
|
||||
composition_reagent = "slimejelly"
|
||||
|
||||
/mob/living/carbon/slime
|
||||
@@ -4508,13 +4508,13 @@
|
||||
/mob/living/carbon/alien/diona
|
||||
composition_reagent = "nutriment"//Dionae are plants, so eating them doesn't give animal protein
|
||||
|
||||
/mob/living/simple_animal/slime
|
||||
/mob/living/simple_mob/slime
|
||||
composition_reagent = "slimejelly"
|
||||
|
||||
/mob/living/simple_animal
|
||||
/mob/living/simple_mob
|
||||
var/kitchen_tag = "animal" //Used for cooking with animals
|
||||
|
||||
/mob/living/simple_animal/mouse
|
||||
/mob/living/simple_mob/mouse
|
||||
kitchen_tag = "rodent"
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel
|
||||
@@ -4548,7 +4548,7 @@
|
||||
bitesize = 1
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/jalapeno_poppers/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("batter", 2)
|
||||
reagents.add_reagent("oil", 2)
|
||||
|
||||
@@ -4690,7 +4690,7 @@
|
||||
nutriment_amt = 0
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/spreads/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("triglyceride", 20)
|
||||
reagents.add_reagent("sodiumchloride",1)
|
||||
|
||||
@@ -4712,7 +4712,7 @@
|
||||
center_of_mass = list("x"=16, "y"=16)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/rawbacon/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 0.33)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/bacon
|
||||
@@ -4740,7 +4740,7 @@
|
||||
center_of_mass = list("x"=16, "y"=16)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/bacon/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 0.33)
|
||||
reagents.add_reagent("triglyceride", 1)
|
||||
|
||||
@@ -4751,7 +4751,7 @@
|
||||
icon_state = "bacon_stick"
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/bacon_stick/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 3)
|
||||
reagents.add_reagent("egg", 1)
|
||||
|
||||
@@ -4762,7 +4762,7 @@
|
||||
trash = /obj/item/trash/snack_bowl
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/chilied_eggs/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("egg", 6)
|
||||
reagents.add_reagent("protein", 2)
|
||||
|
||||
@@ -4783,7 +4783,7 @@
|
||||
trash = /obj/item/trash/plate
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/bacon_and_eggs/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 3)
|
||||
reagents.add_reagent("egg", 1)
|
||||
|
||||
@@ -4797,7 +4797,7 @@
|
||||
trash = /obj/item/trash/plate
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/sweet_and_sour/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 3)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/corn_dog
|
||||
@@ -4809,7 +4809,7 @@
|
||||
nutriment_amt = 4
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/corn_dog/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 3)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/truffle
|
||||
@@ -4821,7 +4821,7 @@
|
||||
bitesize = 4
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/truffle/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("coco", 6)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/truffle/random
|
||||
@@ -4829,7 +4829,7 @@
|
||||
desc = "Rich bite-sized chocolate with a mystery filling!"
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/truffle/random/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
var/reagent_string = pick(list("cream","cherryjelly","mint","frostoil","capsaicin","cream","coffee","milkshake"))
|
||||
reagents.add_reagent(reagent_string, 4)
|
||||
|
||||
@@ -4842,7 +4842,7 @@
|
||||
nutriment_amt = 5
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/bacon_flatbread/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 5)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat_pocket
|
||||
@@ -4854,7 +4854,7 @@
|
||||
nutriment_amt = 3
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat_pocket/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 3)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/fish_taco
|
||||
@@ -4866,7 +4866,7 @@
|
||||
nutriment_amt = 3
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/fish_taco/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("seafood",3)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/nt_muffin
|
||||
@@ -4878,7 +4878,7 @@
|
||||
nutriment_amt = 3
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/nt_muffin/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein",5)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/pineapple_ring
|
||||
@@ -4890,7 +4890,7 @@
|
||||
nutriment_amt = 2
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/pineapple_ring/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("pineapplejuice",3)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple
|
||||
@@ -4906,7 +4906,7 @@
|
||||
bitesize = 2
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 4)
|
||||
reagents.add_reagent("cheese", 5)
|
||||
reagents.add_reagent("tomatojuice", 6)
|
||||
@@ -4936,7 +4936,7 @@
|
||||
bitesize = 2
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/burger/bacon/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 4)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/blt
|
||||
@@ -4951,7 +4951,7 @@
|
||||
bitesize = 2
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/blt/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 4)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/onionrings
|
||||
@@ -5033,7 +5033,7 @@
|
||||
bitesize = 1
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/crabmeat/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("seafood", 2)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/crab_legs
|
||||
@@ -5047,7 +5047,7 @@
|
||||
trash = /obj/item/trash/plate
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/crab_legs/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("seafood", 6)
|
||||
reagents.add_reagent("sodiumchloride", 1)
|
||||
|
||||
@@ -5069,7 +5069,7 @@
|
||||
bitesize = 3
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/nugget/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
var/shape = pick("lump", "star", "lizard", "corgi")
|
||||
desc = "A chicken nugget vaguely shaped like a [shape]."
|
||||
icon_state = "nugget_[shape]"
|
||||
@@ -5095,7 +5095,7 @@
|
||||
bitesize = 3
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/honeybun/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("honey", 3)
|
||||
|
||||
// Moved /bun/attackby() from /code/modules/food/food/snacks.dm
|
||||
@@ -5170,7 +5170,7 @@
|
||||
/obj/item/weapon/reagent_containers/food/snacks/chip/on_consume(mob/M as mob)
|
||||
if(reagents && reagents.total_volume)
|
||||
icon_state = bitten_state
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/chip/salsa
|
||||
name = "salsa chip"
|
||||
@@ -5246,7 +5246,7 @@
|
||||
user.put_in_active_hand(src)
|
||||
src.pickup(user)
|
||||
return
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/chipplate/nachos
|
||||
name = "plate of nachos"
|
||||
@@ -5273,7 +5273,7 @@
|
||||
nutriment_amt = 20
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/dip/attackby(obj/item/weapon/reagent_containers/food/snacks/item as obj, mob/user as mob)
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
var/obj/item/weapon/reagent_containers/food/snacks/returningitem
|
||||
if(istype(item,/obj/item/weapon/reagent_containers/food/snacks/chip/nacho) && item.icon_state == "chip_nacho")
|
||||
returningitem = new nachotrans(src)
|
||||
@@ -5285,24 +5285,24 @@
|
||||
item.reagents.trans_to(returningitem, item.reagents.total_volume) //Old chip to new chip
|
||||
if(item.icon_state == "chip_half")
|
||||
returningitem.icon_state = "[returningitem.icon_state]_half"
|
||||
returningitem.bitesize = Clamp(returningitem.reagents.total_volume,1,10)
|
||||
returningitem.bitesize = clamp(returningitem.reagents.total_volume,1,10)
|
||||
else if(prob(1))
|
||||
memed = 1
|
||||
user << "You scoop up some dip with the chip, but mid-scop, the chip breaks off into the dreadful abyss of dip, never to be seen again..."
|
||||
to_chat(user, "You scoop up some dip with the chip, but mid-scop, the chip breaks off into the dreadful abyss of dip, never to be seen again...")
|
||||
returningitem.icon_state = "[returningitem.icon_state]_half"
|
||||
returningitem.bitesize = Clamp(returningitem.reagents.total_volume,1,10)
|
||||
returningitem.bitesize = clamp(returningitem.reagents.total_volume,1,10)
|
||||
else
|
||||
returningitem.bitesize = Clamp(returningitem.reagents.total_volume*0.5,1,10)
|
||||
returningitem.bitesize = clamp(returningitem.reagents.total_volume*0.5,1,10)
|
||||
qdel(item)
|
||||
reagents.trans_to(returningitem, bitesize) //Dip to new chip
|
||||
user.put_in_hands(returningitem)
|
||||
|
||||
if (reagents && reagents.total_volume)
|
||||
if(!memed)
|
||||
user << "You scoop up some dip with the chip."
|
||||
to_chat(user, "You scoop up some dip with the chip.")
|
||||
else
|
||||
if(!memed)
|
||||
user << "You scoop up the remaining dip with the chip."
|
||||
to_chat(user, "You scoop up the remaining dip with the chip.")
|
||||
var/obj/waste = new trash(loc)
|
||||
if (loc == user)
|
||||
user.put_in_hands(waste)
|
||||
@@ -5338,7 +5338,7 @@
|
||||
nutriment_amt = 6
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/burrito/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 4)
|
||||
|
||||
|
||||
@@ -5353,7 +5353,7 @@
|
||||
nutriment_amt = 6
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/burrito_vegan/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("tofu", 6)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/burrito_spicy
|
||||
@@ -5367,7 +5367,7 @@
|
||||
nutriment_amt = 6
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/burrito_spicy/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 6)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese
|
||||
@@ -5381,7 +5381,7 @@
|
||||
nutriment_amt = 6
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 6)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese_spicy
|
||||
@@ -5394,7 +5394,7 @@
|
||||
nutriment_amt = 6
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese_spicy/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 6)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/burrito_hell
|
||||
@@ -5418,7 +5418,7 @@
|
||||
nutriment_amt = 6
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/burrito_hell/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 9)
|
||||
reagents.add_reagent("condensedcapsaicin", 20) //what could possibly go wrong
|
||||
|
||||
@@ -5440,7 +5440,7 @@
|
||||
trash = /obj/item/trash/snack_bowl
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/hatchling_suprise/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("egg", 2)
|
||||
reagents.add_reagent("protein", 4)
|
||||
|
||||
@@ -5452,7 +5452,7 @@
|
||||
trash = /obj/item/trash/plate
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/red_sun_special/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 2)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/riztizkzi_sea
|
||||
@@ -5463,7 +5463,7 @@
|
||||
trash = /obj/item/trash/snack_bowl
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/riztizkzi_sea/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("egg", 4)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/father_breakfast
|
||||
@@ -5474,7 +5474,7 @@
|
||||
trash = /obj/item/trash/plate
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/father_breakfast/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("egg", 4)
|
||||
reagents.add_reagent("protein", 6)
|
||||
|
||||
@@ -5485,7 +5485,7 @@
|
||||
icon_state = "stuffed_meatball"
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/stuffed_meatball/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 4)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/egg_pancake
|
||||
@@ -5496,7 +5496,7 @@
|
||||
trash = /obj/item/trash/plate
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/egg_pancake/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("protein", 6)
|
||||
reagents.add_reagent("egg", 2)
|
||||
|
||||
@@ -5510,7 +5510,7 @@
|
||||
trash = /obj/item/trash/snacktray
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/sliceable/grilled_carp/Initialize()
|
||||
. = . = ..()
|
||||
. = ..()
|
||||
reagents.add_reagent("seafood", 12)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grilled_carp_slice
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
cooked_icon = "chickenbreast_cooked"
|
||||
filling_color = "#BBBBAA"
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken/initialize()
|
||||
..()
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken/Initialize()
|
||||
. = ..()
|
||||
reagents.remove_reagent("triglyceride", INFINITY)
|
||||
//Chicken is low fat. Less total calories than other meats
|
||||
@@ -23,7 +23,7 @@
|
||||
var/max_contents = 1 // Maximum number of things this appliance can simultaneously cook
|
||||
var/on_icon // Icon state used when cooking.
|
||||
var/off_icon // Icon state used when not cooking.
|
||||
var/cooking // Whether or not the machine is currently operating.
|
||||
var/cooking = FALSE // Whether or not the machine is currently operating.
|
||||
var/cook_type // A string value used to track what kind of food this machine makes.
|
||||
var/can_cook_mobs // Whether or not this machine accepts grabbed mobs.
|
||||
var/mobdamagetype = BRUTE // Burn damage for cooking appliances, brute for cereal/candy
|
||||
@@ -74,10 +74,9 @@
|
||||
return ..()
|
||||
|
||||
/obj/machinery/appliance/examine(var/mob/user)
|
||||
..()
|
||||
if(Adjacent(usr))
|
||||
list_contents(user)
|
||||
return 1
|
||||
. = ..()
|
||||
if(Adjacent(user))
|
||||
. += list_contents(user)
|
||||
|
||||
/obj/machinery/appliance/proc/list_contents(var/mob/user)
|
||||
if (cooking_objs.len)
|
||||
@@ -85,9 +84,9 @@
|
||||
for (var/a in cooking_objs)
|
||||
var/datum/cooking_item/CI = a
|
||||
string += "-\a [CI.container.label(null, CI.combine_target)], [report_progress(CI)]</br>"
|
||||
usr << string
|
||||
to_chat(user, string)
|
||||
else
|
||||
usr << span("notice","It is empty.")
|
||||
to_chat(user, "<span class='notice>'It is empty.</span>")
|
||||
|
||||
/obj/machinery/appliance/proc/report_progress(var/datum/cooking_item/CI)
|
||||
if (!CI || !CI.max_cookwork)
|
||||
@@ -100,17 +99,17 @@
|
||||
if (progress < 0.25)
|
||||
return "It's barely started cooking."
|
||||
if (progress < 0.75)
|
||||
return span("notice","It's cooking away nicely.")
|
||||
return "<span class='notice'>It's cooking away nicely.</span>"
|
||||
if (progress < 1)
|
||||
return span("notice", "<b>It's almost ready!</b>")
|
||||
return "<span class='notice'><b>It's almost ready!</b></span>"
|
||||
|
||||
var/half_overcook = (CI.overcook_mult - 1)*0.5
|
||||
if (progress < 1+half_overcook)
|
||||
return span("soghun","<b>It is done !</b>")
|
||||
return "<span class='soghun'><b>It is done !</b></span>"
|
||||
if (progress < CI.overcook_mult)
|
||||
return span("warning","It looks overcooked, get it out!")
|
||||
return "<span class='warning'>It looks overcooked, get it out!</span>"
|
||||
else
|
||||
return span("danger","It is burning!!")
|
||||
return "<span class='danger'>It is burning!</span>"
|
||||
|
||||
/obj/machinery/appliance/update_icon()
|
||||
if (!stat && cooking_objs.len)
|
||||
@@ -131,14 +130,14 @@
|
||||
return
|
||||
|
||||
if (!user.IsAdvancedToolUser())
|
||||
user << "You lack the dexterity to do that!"
|
||||
to_chat(user, "You lack the dexterity to do that!")
|
||||
return
|
||||
|
||||
if (user.stat || user.restrained() || user.incapacitated())
|
||||
return
|
||||
|
||||
if (!Adjacent(user) && !issilicon(user))
|
||||
user << "You can't reach [src] from here."
|
||||
to_chat(user, "You can't reach [src] from here.")
|
||||
return
|
||||
|
||||
if (stat & POWEROFF)//Its turned off
|
||||
@@ -150,6 +149,7 @@
|
||||
stat |= POWEROFF
|
||||
use_power = 0
|
||||
user.visible_message("[user] turns [src] off.", "You turn off [src].")
|
||||
cooking = FALSE // Stop cooking here, too, just in case.
|
||||
|
||||
playsound(src, 'sound/machines/click.ogg', 40, 1)
|
||||
update_icon()
|
||||
@@ -166,14 +166,14 @@
|
||||
return
|
||||
|
||||
if (!usr.IsAdvancedToolUser())
|
||||
usr << "You lack the dexterity to do that!"
|
||||
to_chat(usr, "You lack the dexterity to do that!")
|
||||
return
|
||||
|
||||
if (usr.stat || usr.restrained() || usr.incapacitated())
|
||||
return
|
||||
|
||||
if (!Adjacent(usr) && !issilicon(usr))
|
||||
usr << "You can't adjust the [src] from this distance, get closer!"
|
||||
to_chat(usr, "You can't adjust the [src] from this distance, get closer!")
|
||||
return
|
||||
|
||||
if(output_options.len)
|
||||
@@ -182,10 +182,10 @@
|
||||
return
|
||||
if(choice == "Default")
|
||||
selected_option = null
|
||||
usr << "<span class='notice'>You decide not to make anything specific with \the [src].</span>"
|
||||
to_chat(usr, "<span class='notice'>You decide not to make anything specific with \the [src].</span>")
|
||||
else
|
||||
selected_option = choice
|
||||
usr << "<span class='notice'>You prepare \the [src] to make \a [selected_option] with the next thing you put in. Try putting several ingredients in a container!</span>"
|
||||
to_chat(usr, "<span class='notice'>You prepare \the [src] to make \a [selected_option] with the next thing you put in. Try putting several ingredients in a container!</span>")
|
||||
|
||||
//Handles all validity checking and error messages for inserting things
|
||||
/obj/machinery/appliance/proc/can_insert(var/obj/item/I, var/mob/user)
|
||||
@@ -199,18 +199,18 @@
|
||||
if(istype(G))
|
||||
|
||||
if(!can_cook_mobs)
|
||||
user << "<span class='warning'>That's not going to fit.</span>"
|
||||
to_chat(user, "<span class='warning'>That's not going to fit.</span>")
|
||||
return 0
|
||||
|
||||
if(!isliving(G.affecting))
|
||||
user << "<span class='warning'>You can't cook that.</span>"
|
||||
to_chat(user, "<span class='warning'>You can't cook that.</span>")
|
||||
return 0
|
||||
|
||||
return 2
|
||||
|
||||
|
||||
if (!has_space(I))
|
||||
user << "<span class='warning'>There's no room in [src] for that!</span>"
|
||||
to_chat(user, "<span class='warning'>There's no room in [src] for that!</span>")
|
||||
return 0
|
||||
|
||||
|
||||
@@ -220,16 +220,18 @@
|
||||
// We're trying to cook something else. Check if it's valid.
|
||||
var/obj/item/weapon/reagent_containers/food/snacks/check = I
|
||||
if(istype(check) && islist(check.cooked) && (cook_type in check.cooked))
|
||||
user << "<span class='warning'>\The [check] has already been [cook_type].</span>"
|
||||
to_chat(user, "<span class='warning'>\The [check] has already been [cook_type].</span>")
|
||||
return 0
|
||||
else if(istype(check, /obj/item/weapon/reagent_containers/glass))
|
||||
user << "<span class='warning'>That would probably break [src].</span>"
|
||||
to_chat(user, "<span class='warning'>That would probably break [src].</span>")
|
||||
return 0
|
||||
else if(istype(check, /obj/item/weapon/disk/nuclear))
|
||||
user << "<span class='warning'>You can't cook that.</span>"
|
||||
to_chat(user, "<span class='warning'>You can't cook that.</span>")
|
||||
return 0
|
||||
else if(I.is_crowbar() || I.is_screwdriver()) // You can't cook tools, dummy.
|
||||
return 0
|
||||
else if(!istype(check) && !istype(check, /obj/item/weapon/holder))
|
||||
user << "<span class='warning'>That's not edible.</span>"
|
||||
to_chat(user, "<span class='warning'>That's not edible.</span>")
|
||||
return 0
|
||||
|
||||
return 1
|
||||
@@ -238,13 +240,13 @@
|
||||
//This function is overridden by cookers that do stuff with containers
|
||||
/obj/machinery/appliance/proc/has_space(var/obj/item/I)
|
||||
if (cooking_objs.len >= max_contents)
|
||||
return 0
|
||||
return FALSE
|
||||
|
||||
else return 1
|
||||
else return TRUE
|
||||
|
||||
/obj/machinery/appliance/attackby(var/obj/item/I, var/mob/user)
|
||||
if(!cook_type || (stat & (BROKEN)))
|
||||
user << "<span class='warning'>\The [src] is not working.</span>"
|
||||
to_chat(user, "<span class='warning'>\The [src] is not working.</span>")
|
||||
return
|
||||
|
||||
var/result = can_insert(I, user)
|
||||
@@ -294,7 +296,7 @@
|
||||
user.visible_message("<span class='notice'>\The [user] puts \the [I] into \the [src].</span>")
|
||||
|
||||
get_cooking_work(CI)
|
||||
cooking = 1
|
||||
cooking = TRUE
|
||||
return CI
|
||||
|
||||
/obj/machinery/appliance/proc/get_cooking_work(var/datum/cooking_item/CI)
|
||||
@@ -354,11 +356,11 @@
|
||||
//Called every tick while we're cooking something
|
||||
/obj/machinery/appliance/proc/do_cooking_tick(var/datum/cooking_item/CI)
|
||||
if (!istype(CI) || !CI.max_cookwork)
|
||||
return 0
|
||||
return FALSE
|
||||
|
||||
var/was_done = 0
|
||||
var/was_done = FALSE
|
||||
if (CI.cookwork >= CI.max_cookwork)
|
||||
was_done = 1
|
||||
was_done = TRUE
|
||||
|
||||
CI.cookwork += cooking_power
|
||||
|
||||
@@ -375,7 +377,7 @@
|
||||
if (M)
|
||||
M.apply_damage(rand(1,3), mobdamagetype, "chest")
|
||||
|
||||
return 1
|
||||
return TRUE
|
||||
|
||||
/obj/machinery/appliance/process()
|
||||
if (cooking_power > 0 && cooking)
|
||||
@@ -436,7 +438,7 @@
|
||||
//Final step. Cook function just cooks batter for now.
|
||||
for (var/obj/item/weapon/reagent_containers/food/snacks/S in CI.container)
|
||||
S.cook()
|
||||
|
||||
|
||||
|
||||
//Combination cooking involves combining the names and reagents of ingredients into a predefined output object
|
||||
//The ingredients represent flavours or fillings. EG: donut pizza, cheese bread
|
||||
@@ -620,10 +622,10 @@
|
||||
if(istype(H.species, /datum/species/diona))
|
||||
src.composition_reagent = "nutriment"
|
||||
|
||||
//if the mob is a simple animal with a defined meat quantity
|
||||
if (istype(src, /mob/living/simple_animal))
|
||||
var/mob/living/simple_animal/SA = src
|
||||
if (SA.meat_amount)
|
||||
//if the mob is a simple animal - MOB NOT ANIMAL - with a defined meat quantity
|
||||
if (istype(src, /mob/living/simple_mob))
|
||||
var/mob/living/simple_mob/SA = src
|
||||
if(SA.meat_amount)
|
||||
src.composition_reagent_quantity = SA.meat_amount*2*9
|
||||
|
||||
//The quantity of protein is based on the meat_amount, but multiplied by 2
|
||||
@@ -651,7 +653,7 @@
|
||||
victim.reagents.trans_to_holder(result.reagents, victim.reagents.total_volume)
|
||||
|
||||
if (isanimal(victim))
|
||||
var/mob/living/simple_animal/SA = victim
|
||||
var/mob/living/simple_mob/SA = victim
|
||||
result.kitchen_tag = SA.kitchen_tag
|
||||
|
||||
result.appearance = victim
|
||||
|
||||
@@ -40,21 +40,23 @@
|
||||
//RefreshParts()
|
||||
return (cooking_power / optimal_power) * 100
|
||||
|
||||
/obj/machinery/appliance/cooker/New()
|
||||
/obj/machinery/appliance/cooker/Initialize()
|
||||
. = ..()
|
||||
loss = (active_power_usage / resistance)*0.5
|
||||
cooking_objs = list()
|
||||
for (var/i = 0, i < max_contents, i++)
|
||||
cooking_objs.Add(new /datum/cooking_item/(new container_type(src)))
|
||||
cooking = 0
|
||||
cooking = FALSE
|
||||
|
||||
update_icon() // this probably won't cause issues, but Aurora used SSIcons and queue_icon_update() instead
|
||||
|
||||
/obj/machinery/appliance/cooker/update_icon()
|
||||
cut_overlays()
|
||||
var/image/light
|
||||
if (use_power == 2 && !stat)
|
||||
light = image(icon, "light_on")
|
||||
if(use_power == 1 && !stat)
|
||||
light = image(icon, "light_idle")
|
||||
else if(use_power == 2 && !stat)
|
||||
light = image(icon, "light_preheating")
|
||||
else
|
||||
light = image(icon, "light_off")
|
||||
light.pixel_x = light_x
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
w_class = 2
|
||||
var/prefix
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/variable/initialize()
|
||||
/obj/item/weapon/reagent_containers/food/snacks/variable/Initialize()
|
||||
. = ..()
|
||||
if (reagents)
|
||||
reagents.maximum_volume = size*8 + 10
|
||||
@@ -26,7 +26,7 @@
|
||||
var/ratio = reagents.total_volume / size
|
||||
|
||||
scale = ratio**(1/3) //Scaling factor is square root of desired area
|
||||
scale = Clamp(scale, min_scale, max_scale)
|
||||
scale = clamp(scale, min_scale, max_scale)
|
||||
else
|
||||
scale = min_scale
|
||||
|
||||
@@ -149,7 +149,7 @@
|
||||
size = 30
|
||||
w_class = 3
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/variable/cereal/initialize()
|
||||
/obj/item/weapon/reagent_containers/food/snacks/variable/cereal/Initialize()
|
||||
. =..()
|
||||
name = pick(list("flakes", "krispies", "crunch", "pops", "O's", "crisp", "loops", "jacks", "clusters"))
|
||||
|
||||
|
||||
@@ -15,13 +15,14 @@ fundamental differences
|
||||
idle_power_usage = 50
|
||||
|
||||
/obj/machinery/appliance/mixer/examine(var/mob/user)
|
||||
..()
|
||||
to_chat(user, "<span class='notice'>It is currently set to make a [selected_option]</span>")
|
||||
. = ..()
|
||||
if(Adjacent(user))
|
||||
to_chat(user, "<span class='notice'>It is currently set to make a [selected_option]</span>")
|
||||
|
||||
/obj/machinery/appliance/mixer/New()
|
||||
/obj/machinery/appliance/mixer/Initialize()
|
||||
. = ..()
|
||||
cooking_objs += new /datum/cooking_item(new /obj/item/weapon/reagent_containers/cooking_container(src))
|
||||
cooking = 0
|
||||
cooking = FALSE
|
||||
selected_option = pick(output_options)
|
||||
|
||||
//Mixers cannot-not do combining mode. So the default option is removed from this. A combine target must be chosen
|
||||
@@ -34,7 +35,7 @@ fundamental differences
|
||||
return
|
||||
|
||||
if (!usr.IsAdvancedToolUser())
|
||||
to_chat(user, "<span class='notice'>You can't operate [src].</span>")
|
||||
to_chat(usr, "<span class='notice'>You can't operate [src].</span>")
|
||||
return
|
||||
|
||||
if(output_options.len)
|
||||
@@ -43,7 +44,7 @@ fundamental differences
|
||||
return
|
||||
else
|
||||
selected_option = choice
|
||||
to_chat(user, "<span class='notice'>You prepare \the [src] to make \a [selected_option].</span>")
|
||||
to_chat(usr, "<span class='notice'>You prepare \the [src] to make \a [selected_option].</span>")
|
||||
var/datum/cooking_item/CI = cooking_objs[1]
|
||||
CI.combine_target = selected_option
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
var/list/images = list()
|
||||
var/num = 0
|
||||
for (var/obj/item/I in CI.container).
|
||||
for(var/obj/item/I in CI.container)
|
||||
if (istype(I, /obj/item/weapon/reagent_containers/food/snacks/variable/cereal))
|
||||
//Images of cereal boxes on cereal boxes is dumb
|
||||
continue
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
//which can be checked against recipe requirements in order to cook recipes that require several things
|
||||
|
||||
/obj/item/weapon/reagent_containers/cooking_container
|
||||
icon = 'modular_citadel/icons/obj/cooking_machines.dmi'
|
||||
icon = 'icons/obj/cooking_machines.dmi'
|
||||
var/shortname
|
||||
var/max_space = 20//Maximum sum of w-classes of foods in this container at once
|
||||
var/max_reagents = 80//Maximum units of reagents
|
||||
@@ -14,21 +14,21 @@
|
||||
/obj/item/weapon/paper
|
||||
)
|
||||
|
||||
/obj/item/weapon/reagent_containers/cooking_container/initialize()
|
||||
/obj/item/weapon/reagent_containers/cooking_container/Initialize()
|
||||
. = ..()
|
||||
create_reagents(max_reagents)
|
||||
flags |= OPENCONTAINER | NOREACT
|
||||
|
||||
|
||||
/obj/item/weapon/reagent_containers/cooking_container/examine(var/mob/user)
|
||||
..()
|
||||
. = ..()
|
||||
if (contents.len)
|
||||
var/string = "It contains....</br>"
|
||||
for (var/atom/movable/A in contents)
|
||||
string += "[A.name] </br>"
|
||||
user << span("notice", string)
|
||||
. += "<span class='notice'>string</span>"
|
||||
if (reagents.total_volume)
|
||||
user << span("notice", "It contains [reagents.total_volume]u of reagents.")
|
||||
. += "<span class='notice'>It contains [reagents.total_volume]u of reagents.</span>"
|
||||
|
||||
|
||||
/obj/item/weapon/reagent_containers/cooking_container/attackby(var/obj/item/I as obj, var/mob/user as mob)
|
||||
@@ -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."
|
||||
desc = "Put ingredients in this; designed for use with an oven. Warranty void if used incorrectly."
|
||||
icon_state = "ovendish"
|
||||
max_space = 30
|
||||
max_reagents = 120
|
||||
@@ -153,5 +153,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."
|
||||
icon_state = "basket"
|
||||
desc = "Put ingredients in this; designed for use with a deep fryer. Warranty void if used incorrectly."
|
||||
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."
|
||||
icon_state = "grillrack"
|
||||
@@ -12,6 +12,8 @@
|
||||
appliancetype = FRYER
|
||||
active_power_usage = 12 KILOWATTS
|
||||
|
||||
min_temp = 140 + T0C // Same as above, increasing this to just under 2x to make the % increase on efficiency not quite so painful as it would be at 80.
|
||||
optimal_temp = 400 + T0C // Increasing this to be 2x Oven to allow for a much higher/realistic frying temperatures. Doesn't really do anything but make heating the fryer take a bit longer.
|
||||
optimal_power = 0.35
|
||||
|
||||
idle_power_usage = 3.6 KILOWATTS
|
||||
@@ -43,10 +45,12 @@
|
||||
|
||||
/obj/machinery/appliance/cooker/fryer/Destroy()
|
||||
QDEL_NULL(fry_loop)
|
||||
QDEL_NULL(oil)
|
||||
return ..()
|
||||
|
||||
/obj/machinery/appliance/cooker/fryer/examine(var/mob/user)
|
||||
if (..())//no need to duplicate adjacency check
|
||||
. = ..()
|
||||
if(Adjacent(user))
|
||||
to_chat(user, "Oil Level: [oil.total_volume]/[optimal_oil]")
|
||||
|
||||
/obj/machinery/appliance/cooker/fryer/heat_up()
|
||||
@@ -83,12 +87,20 @@
|
||||
cooking_power *= oil_efficiency
|
||||
|
||||
/obj/machinery/appliance/cooker/fryer/update_icon()
|
||||
if(cooking)
|
||||
icon_state = on_icon
|
||||
fry_loop.start()
|
||||
if(!stat)
|
||||
..()
|
||||
if(cooking == TRUE)
|
||||
icon_state = on_icon
|
||||
if(fry_loop)
|
||||
fry_loop.start(src)
|
||||
else
|
||||
icon_state = off_icon
|
||||
if(fry_loop)
|
||||
fry_loop.stop(src)
|
||||
else
|
||||
icon_state = off_icon
|
||||
fry_loop.stop(src)
|
||||
if(fry_loop)
|
||||
fry_loop.stop(src)
|
||||
..()
|
||||
|
||||
//Fryer gradually infuses any cooked food with oil. Moar calories
|
||||
@@ -155,19 +167,19 @@
|
||||
//Cooldown ensures it can't be spammed to instakill someone
|
||||
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN*3)
|
||||
|
||||
fry_loop.start()
|
||||
fry_loop.start(src)
|
||||
|
||||
if(!do_mob(user, victim, 20))
|
||||
cooking = 0
|
||||
cooking = FALSE
|
||||
icon_state = off_icon
|
||||
fry_loop.stop()
|
||||
fry_loop.stop(src)
|
||||
return
|
||||
|
||||
if(!victim || !victim.Adjacent(user))
|
||||
to_chat(user, "<span class='danger'>Your victim slipped free!</span>")
|
||||
cooking = 0
|
||||
cooking = FALSE
|
||||
icon_state = off_icon
|
||||
fry_loop.stop()
|
||||
fry_loop.stop(src)
|
||||
return
|
||||
|
||||
var/damage = rand(7,13) // Though this damage seems reduced, some hot oil is transferred to the victim and will burn them for a while after
|
||||
@@ -199,10 +211,10 @@
|
||||
victim.apply_damage(damage, BURN, user.zone_sel.selecting)
|
||||
|
||||
if(!nopain)
|
||||
victim << "<span class='danger'>Agony consumes you as searing hot oil scorches your [E ? E.name : "flesh"] horribly!</span>"
|
||||
to_chat(victim, "<span class='danger'>Agony consumes you as searing hot oil scorches your [E ? E.name : "flesh"] horribly!</span>")
|
||||
victim.emote("scream")
|
||||
else
|
||||
victim << "<span class='danger'>Searing hot oil scorches your [E ? E.name : "flesh"]!</span>"
|
||||
to_chat(victim, "<span class='danger'>Searing hot oil scorches your [E ? E.name : "flesh"]!</span>")
|
||||
|
||||
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Has [cook_type] \the [victim] ([victim.ckey]) in \a [src]</font>")
|
||||
victim.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [cook_type] in \a [src] by [user.name] ([user.ckey])</font>")
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
off_icon = "grill_off"
|
||||
can_burn_food = 1
|
||||
stat = POWEROFF
|
||||
|
||||
container_type = /obj/item/weapon/reagent_containers/cooking_container/grill
|
||||
|
||||
/obj/machinery/appliance/grill/toggle_power()
|
||||
set src in view()
|
||||
@@ -30,10 +32,10 @@
|
||||
playsound(src, 'sound/machines/click.ogg', 40, 1)
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/appliance/grill/initialize()
|
||||
/obj/machinery/appliance/grill/Initialize()
|
||||
. = ..()
|
||||
cooking_objs += new /datum/cooking_item(new /obj/item/weapon/reagent_containers/cooking_container(src))
|
||||
cooking = 0
|
||||
// cooking_objs += new /datum/cooking_item(new /obj/item/weapon/reagent_containers/cooking_container(src))
|
||||
cooking = FALSE
|
||||
|
||||
/obj/machinery/appliance/grill/has_space(var/obj/item/I)
|
||||
var/datum/cooking_item/CI = cooking_objs[1]
|
||||
@@ -69,7 +71,7 @@
|
||||
return 0
|
||||
|
||||
/obj/machinery/appliance/grill/update_icon()
|
||||
if (!stat)
|
||||
if(!stat)
|
||||
icon_state = on_icon
|
||||
else
|
||||
icon_state = off_icon
|
||||
|
||||
@@ -71,10 +71,12 @@
|
||||
if(open)
|
||||
open = FALSE
|
||||
loss = (active_power_usage / resistance)*0.5
|
||||
cooking = TRUE
|
||||
else
|
||||
open = TRUE
|
||||
loss = (active_power_usage / resistance)*4
|
||||
//When the oven door is opened, heat is lost MUCH faster
|
||||
//When the oven door is opened, heat is lost MUCH faster and you stop cooking (because the door is open)
|
||||
cooking = FALSE
|
||||
|
||||
playsound(src, 'sound/machines/hatch_open.ogg', 20, 1)
|
||||
update_icon()
|
||||
|
||||
@@ -260,7 +260,7 @@
|
||||
return
|
||||
start()
|
||||
if(reagents.total_volume==0 && !(locate(/obj) in ((contents - component_parts) - circuit))) //dry run
|
||||
if(!wzhzhzh(5)) //VOREStation Edit - Quicker Microwaves
|
||||
if(!wzhzhzh(16)) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 5)
|
||||
abort()
|
||||
return
|
||||
abort()
|
||||
@@ -271,17 +271,17 @@
|
||||
if(!recipe)
|
||||
dirty += 1
|
||||
if(prob(max(10,dirty*5)))
|
||||
if(!wzhzhzh(2)) //VOREStation Edit - Quicker Microwaves
|
||||
if(!wzhzhzh(16)) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 2)
|
||||
abort()
|
||||
return
|
||||
muck_start()
|
||||
wzhzhzh(2) //VOREStation Edit - Quicker Microwaves
|
||||
wzhzhzh(2) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 2)
|
||||
muck_finish()
|
||||
cooked = fail()
|
||||
cooked.forceMove(src.loc)
|
||||
return
|
||||
else if(has_extra_item())
|
||||
if(!wzhzhzh(2)) //VOREStation Edit - Quicker Microwaves
|
||||
if(!wzhzhzh(16)) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 2)
|
||||
abort()
|
||||
return
|
||||
broke()
|
||||
@@ -289,15 +289,15 @@
|
||||
cooked.forceMove(src.loc)
|
||||
return
|
||||
else
|
||||
if(!wzhzhzh(5)) //VOREStation Edit - Quicker Microwaves
|
||||
if(!wzhzhzh(40)) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was 5)
|
||||
abort()
|
||||
return
|
||||
abort()
|
||||
stop()
|
||||
cooked = fail()
|
||||
cooked.forceMove(src.loc)
|
||||
return
|
||||
else
|
||||
var/halftime = round(recipe.time/20/2) //VOREStation Edit - Quicker Microwaves
|
||||
var/halftime = round(recipe.time*4/10/2) //VOREStation Edit - Quicker Microwaves (Undone during Auroraport, left note in case of reversion, was round(recipe.time/20/2))
|
||||
if(!wzhzhzh(halftime))
|
||||
abort()
|
||||
return
|
||||
@@ -391,6 +391,13 @@
|
||||
icon_state = "mw"
|
||||
updateUsrDialog()
|
||||
soundloop.stop()
|
||||
|
||||
/obj/machinery/microwave/proc/stop()
|
||||
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
|
||||
operating = FALSE // Turn it off again aferwards
|
||||
icon_state = "mw"
|
||||
updateUsrDialog()
|
||||
soundloop.stop()
|
||||
|
||||
/obj/machinery/microwave/proc/dispose(var/message = 1)
|
||||
for (var/atom/movable/A in ((contents-component_parts)-circuit))
|
||||
|
||||
@@ -199,7 +199,7 @@
|
||||
// to decide what to do. They may be used again to make another recipe or discarded, or merged into the results,
|
||||
// thats no longer the concern of this proc
|
||||
var/obj/temp = new /obj(src)
|
||||
temp.create_reagents(9999999999)
|
||||
temp.create_reagents(999999999)
|
||||
|
||||
// Find items we need
|
||||
if(items && items.len)
|
||||
@@ -244,7 +244,7 @@
|
||||
the single-result's reagents
|
||||
*/
|
||||
var/obj/tempholder = new(src)
|
||||
tempholder.create_reagents(9999999999)
|
||||
tempholder.create_reagents(999999999)
|
||||
var/list/results = list()
|
||||
while (tally < result_quantity)
|
||||
var/obj/result_obj = new result(container)
|
||||
@@ -252,14 +252,14 @@
|
||||
|
||||
if(!result_obj.reagents)//This shouldn't happen
|
||||
//If the result somehow has no reagents defined, then create a new holder
|
||||
world << "[result_obj] had no reagents!"
|
||||
to_chat(world, "<span class='danger'>[result_obj] had no reagents!</span>")
|
||||
result_obj.create_reagents(temp.reagents.total_volume*1.5)
|
||||
|
||||
if(result_quantity == 1)
|
||||
qdel(tempholder.reagents)
|
||||
tempholder.reagents = result_obj.reagents
|
||||
else
|
||||
world << result_obj
|
||||
to_chat(world, result_obj)
|
||||
result_obj.reagents.trans_to(tempholder.reagents, result_obj.reagents.total_volume)
|
||||
tally++
|
||||
|
||||
|
||||
@@ -898,7 +898,7 @@ I said no!
|
||||
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/sausage
|
||||
resut_quantity = 2
|
||||
result_quantity = 2
|
||||
|
||||
/datum/recipe/fishfingers
|
||||
reagents = list("flour" = 10, "egg" = 3)
|
||||
|
||||
@@ -58,6 +58,8 @@
|
||||
flesh_color = "#9ee02c"
|
||||
blood_color = "#edf4d0" //sap!
|
||||
base_color = "#1a5600"
|
||||
|
||||
reagent_tag = IS_ALRAUNE
|
||||
|
||||
blurb = "Alraunes are a rare sight in space. Their bodies are reminiscent of that of plants, and yet they share many\
|
||||
traits with other humanoid beings.\
|
||||
|
||||
@@ -144,7 +144,7 @@
|
||||
playsound(src, 'sound/voice/bark2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises)
|
||||
m_type = 2
|
||||
else
|
||||
src << "You're not a dog!"
|
||||
to_chat(src, "You're not a dog!")
|
||||
//Vorestation addition end
|
||||
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
//We'll assume that the batter isnt going to be regurgitated and eaten by someone else. Only show this once
|
||||
if (data["cooked"] != 1)
|
||||
if (!messaged)
|
||||
M << "Ugh, this raw [name] tastes disgusting."
|
||||
to_chat(M, "Ugh, this raw [name] tastes disgusting.")
|
||||
nutriment_factor *= 0.5
|
||||
messaged = 1
|
||||
|
||||
@@ -677,8 +677,7 @@
|
||||
return
|
||||
if(alien == IS_ALRAUNE) // VOREStation Edit: It wouldn't affect plants that much.
|
||||
if(prob(5))
|
||||
M << "<span class='rose'>You feel a pleasant sensation in your mouth.</span>"
|
||||
to_chat(M, span("rose","You feel a pleasant sensation in your mouth."))
|
||||
to_chat(M, "<span class='rose'>You feel a pleasant sensation in your mouth.</span>")
|
||||
M.bodytemperature += rand(10, 25)
|
||||
return
|
||||
if(ishuman(M))
|
||||
|
||||
Reference in New Issue
Block a user