Last Push - Everything is working, just needs testing!

This commit is contained in:
Rykka
2020-07-16 19:52:20 -04:00
parent 9f935ff59d
commit 3974d7e87f
32 changed files with 221 additions and 183 deletions

View File

@@ -1,3 +1,4 @@
// More for our custom races // More for our custom races
#define IS_CHIMERA 12 #define IS_CHIMERA 12
#define IS_SHADEKIN 13 #define IS_SHADEKIN 13
#define IS_ALRAUNE 14

View File

@@ -118,7 +118,7 @@
if("spacespice") if("spacespice")
name = "bottle of space spice" name = "bottle of space spice"
desc = "An exotic blend of spices for cooking. Definitely not worms." 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" icon_state = "spacespicebottle"
center_of_mass = list("x"=16, "y"=6) center_of_mass = list("x"=16, "y"=6)
if("barbecue") if("barbecue")
@@ -441,6 +441,6 @@
/obj/item/weapon/reagent_containers/food/condiment/spacespice/on_reagent_change() /obj/item/weapon/reagent_containers/food/condiment/spacespice/on_reagent_change()
return return
/obj/item/weapon/reagent_containers/food/condiment/spacespice/initialize() /obj/item/weapon/reagent_containers/food/condiment/spacespice/Initialize()
..() . = ..()
reagents.add_reagent("spacespice", 40) reagents.add_reagent("spacespice", 40)

View File

@@ -157,7 +157,7 @@
. = ..() . = ..()
if(Adjacent(user)) if(Adjacent(user))
if(coating) 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) if(bitecount==0)
return . return .
else if (bitecount==1) else if (bitecount==1)
@@ -282,7 +282,7 @@
// desc = "Smells caustic. Tastes like heresy." //Duh // desc = "Smells caustic. Tastes like heresy." //Duh
// icon_state = "xburger" //Refers to an icon in food.dmi // icon_state = "xburger" //Refers to an icon in food.dmi
// Initialize() //Don't mess with this. (We use Initialize now instead of New()) // 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("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. // reagents.add_reagent("nutriment", 2) // this line of code for all the contents.
// bitesize = 3 //This is the amount each bite consumes. // bitesize = 3 //This is the amount each bite consumes.
@@ -3445,7 +3445,7 @@
update_icon() update_icon()
return return
..() . = ..()
/obj/item/pizzabox/margherita/Initialize() /obj/item/pizzabox/margherita/Initialize()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita(src) pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita(src)
@@ -3584,7 +3584,7 @@
qdel(src) qdel(src)
return return
else else
..() . = ..()
// Human Burger + cheese wedge = cheeseburger // 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) /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) qdel(src)
return return
else else
..() . = ..()
/obj/item/weapon/reagent_containers/food/snacks/bunbun /obj/item/weapon/reagent_containers/food/snacks/bunbun
name = "\improper Bun Bun" 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>") to_chat(user, "<span class='notice'>You remove the seeds from the flower, slightly damaging them.</span>")
qdel(src) qdel(src)
else else
..() . = ..()
/obj/item/weapon/reagent_containers/food/snacks/rawsticks /obj/item/weapon/reagent_containers/food/snacks/rawsticks
name = "raw potato sticks" name = "raw potato sticks"
@@ -3775,7 +3775,7 @@
center_of_mass = list("x"=16, "y"=15) center_of_mass = list("x"=16, "y"=15)
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein/Initialize() /obj/item/weapon/reagent_containers/food/snacks/liquidprotein/Initialize()
..() . = ..()
reagents.add_reagent("protein", 30) reagents.add_reagent("protein", 30)
reagents.add_reagent("iron", 3) reagents.add_reagent("iron", 3)
bitesize = 4 bitesize = 4
@@ -3790,7 +3790,7 @@
center_of_mass = list("x"=16, "y"=15) center_of_mass = list("x"=16, "y"=15)
/obj/item/weapon/reagent_containers/food/snacks/liquidvitamin/Initialize() /obj/item/weapon/reagent_containers/food/snacks/liquidvitamin/Initialize()
..() . = ..()
reagents.add_reagent("flour", 20) reagents.add_reagent("flour", 20)
reagents.add_reagent("tricordrazine", 5) reagents.add_reagent("tricordrazine", 5)
reagents.add_reagent("paracetamol", 5) reagents.add_reagent("paracetamol", 5)
@@ -3846,10 +3846,10 @@
center_of_mass = list("x"=15, "y"=9) center_of_mass = list("x"=15, "y"=9)
/obj/item/weapon/reagent_containers/food/snacks/unajerky/Initialize() /obj/item/weapon/reagent_containers/food/snacks/unajerky/Initialize()
..() . =..()
reagents.add_reagent("protein", 8) reagents.add_reagent("protein", 8)
reagents.add_reagent("capsaicin", 2) reagents.add_reagent("capsaicin", 2)
bitesize = 2 bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/croissant /obj/item/weapon/reagent_containers/food/snacks/croissant
name = "croissant" name = "croissant"
@@ -4353,7 +4353,7 @@
/obj/item/weapon/reagent_containers/food/snacks/macncheese /obj/item/weapon/reagent_containers/food/snacks/macncheese
name = "macaroni and cheese" name = "macaroni and cheese"
desc = "The perfect combination of noodles and dairy." desc = "The perfect combination of noodles and dairy."
icon = 'modular_citadel/icons/obj/food_cit.dmi' icon = 'icons/obj/food.dmi'
icon_state = "macncheese" icon_state = "macncheese"
trash = /obj/item/trash/snack_bowl trash = /obj/item/trash/snack_bowl
center_of_mass = list("x"=16, "y"=16) 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 //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) /obj/item/weapon/reagent_containers/food/snacks/proc/apply_coating(var/datum/reagent/nutriment/coating/C, var/mob/user)
if (coating) if (coating)
user << "The [src] is already coated in [coating.name]!" to_chat(user, "The [src] is already coated in [coating.name]!")
return 0 return 0
//Calculate the reagents of the coating needed //Calculate the reagents of the coating needed
@@ -4398,7 +4398,7 @@
return 0 return 0
if (C.volume < req) 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 return 0
var/id = C.id var/id = C.id
@@ -4499,7 +4499,7 @@
var/composition_reagent var/composition_reagent
var/composition_reagent_quantity var/composition_reagent_quantity
/mob/living/simple_animal/adultslime /mob/living/simple_mob/adultslime
composition_reagent = "slimejelly" composition_reagent = "slimejelly"
/mob/living/carbon/slime /mob/living/carbon/slime
@@ -4508,13 +4508,13 @@
/mob/living/carbon/alien/diona /mob/living/carbon/alien/diona
composition_reagent = "nutriment"//Dionae are plants, so eating them doesn't give animal protein 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" composition_reagent = "slimejelly"
/mob/living/simple_animal /mob/living/simple_mob
var/kitchen_tag = "animal" //Used for cooking with animals var/kitchen_tag = "animal" //Used for cooking with animals
/mob/living/simple_animal/mouse /mob/living/simple_mob/mouse
kitchen_tag = "rodent" kitchen_tag = "rodent"
/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel
@@ -4548,7 +4548,7 @@
bitesize = 1 bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/jalapeno_poppers/Initialize() /obj/item/weapon/reagent_containers/food/snacks/jalapeno_poppers/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("batter", 2) reagents.add_reagent("batter", 2)
reagents.add_reagent("oil", 2) reagents.add_reagent("oil", 2)
@@ -4690,7 +4690,7 @@
nutriment_amt = 0 nutriment_amt = 0
/obj/item/weapon/reagent_containers/food/snacks/spreads/Initialize() /obj/item/weapon/reagent_containers/food/snacks/spreads/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("triglyceride", 20) reagents.add_reagent("triglyceride", 20)
reagents.add_reagent("sodiumchloride",1) reagents.add_reagent("sodiumchloride",1)
@@ -4712,7 +4712,7 @@
center_of_mass = list("x"=16, "y"=16) center_of_mass = list("x"=16, "y"=16)
/obj/item/weapon/reagent_containers/food/snacks/rawbacon/Initialize() /obj/item/weapon/reagent_containers/food/snacks/rawbacon/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 0.33) reagents.add_reagent("protein", 0.33)
/obj/item/weapon/reagent_containers/food/snacks/bacon /obj/item/weapon/reagent_containers/food/snacks/bacon
@@ -4740,7 +4740,7 @@
center_of_mass = list("x"=16, "y"=16) center_of_mass = list("x"=16, "y"=16)
/obj/item/weapon/reagent_containers/food/snacks/bacon/Initialize() /obj/item/weapon/reagent_containers/food/snacks/bacon/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 0.33) reagents.add_reagent("protein", 0.33)
reagents.add_reagent("triglyceride", 1) reagents.add_reagent("triglyceride", 1)
@@ -4751,7 +4751,7 @@
icon_state = "bacon_stick" icon_state = "bacon_stick"
/obj/item/weapon/reagent_containers/food/snacks/bacon_stick/Initialize() /obj/item/weapon/reagent_containers/food/snacks/bacon_stick/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 3) reagents.add_reagent("protein", 3)
reagents.add_reagent("egg", 1) reagents.add_reagent("egg", 1)
@@ -4762,7 +4762,7 @@
trash = /obj/item/trash/snack_bowl trash = /obj/item/trash/snack_bowl
/obj/item/weapon/reagent_containers/food/snacks/chilied_eggs/Initialize() /obj/item/weapon/reagent_containers/food/snacks/chilied_eggs/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("egg", 6) reagents.add_reagent("egg", 6)
reagents.add_reagent("protein", 2) reagents.add_reagent("protein", 2)
@@ -4783,7 +4783,7 @@
trash = /obj/item/trash/plate trash = /obj/item/trash/plate
/obj/item/weapon/reagent_containers/food/snacks/bacon_and_eggs/Initialize() /obj/item/weapon/reagent_containers/food/snacks/bacon_and_eggs/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 3) reagents.add_reagent("protein", 3)
reagents.add_reagent("egg", 1) reagents.add_reagent("egg", 1)
@@ -4797,7 +4797,7 @@
trash = /obj/item/trash/plate trash = /obj/item/trash/plate
/obj/item/weapon/reagent_containers/food/snacks/sweet_and_sour/Initialize() /obj/item/weapon/reagent_containers/food/snacks/sweet_and_sour/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 3) reagents.add_reagent("protein", 3)
/obj/item/weapon/reagent_containers/food/snacks/corn_dog /obj/item/weapon/reagent_containers/food/snacks/corn_dog
@@ -4809,7 +4809,7 @@
nutriment_amt = 4 nutriment_amt = 4
/obj/item/weapon/reagent_containers/food/snacks/corn_dog/Initialize() /obj/item/weapon/reagent_containers/food/snacks/corn_dog/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 3) reagents.add_reagent("protein", 3)
/obj/item/weapon/reagent_containers/food/snacks/truffle /obj/item/weapon/reagent_containers/food/snacks/truffle
@@ -4821,7 +4821,7 @@
bitesize = 4 bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/truffle/Initialize() /obj/item/weapon/reagent_containers/food/snacks/truffle/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("coco", 6) reagents.add_reagent("coco", 6)
/obj/item/weapon/reagent_containers/food/snacks/truffle/random /obj/item/weapon/reagent_containers/food/snacks/truffle/random
@@ -4829,7 +4829,7 @@
desc = "Rich bite-sized chocolate with a mystery filling!" desc = "Rich bite-sized chocolate with a mystery filling!"
/obj/item/weapon/reagent_containers/food/snacks/truffle/random/Initialize() /obj/item/weapon/reagent_containers/food/snacks/truffle/random/Initialize()
. = . = ..() . = ..()
var/reagent_string = pick(list("cream","cherryjelly","mint","frostoil","capsaicin","cream","coffee","milkshake")) var/reagent_string = pick(list("cream","cherryjelly","mint","frostoil","capsaicin","cream","coffee","milkshake"))
reagents.add_reagent(reagent_string, 4) reagents.add_reagent(reagent_string, 4)
@@ -4842,7 +4842,7 @@
nutriment_amt = 5 nutriment_amt = 5
/obj/item/weapon/reagent_containers/food/snacks/bacon_flatbread/Initialize() /obj/item/weapon/reagent_containers/food/snacks/bacon_flatbread/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 5) reagents.add_reagent("protein", 5)
/obj/item/weapon/reagent_containers/food/snacks/meat_pocket /obj/item/weapon/reagent_containers/food/snacks/meat_pocket
@@ -4854,7 +4854,7 @@
nutriment_amt = 3 nutriment_amt = 3
/obj/item/weapon/reagent_containers/food/snacks/meat_pocket/Initialize() /obj/item/weapon/reagent_containers/food/snacks/meat_pocket/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 3) reagents.add_reagent("protein", 3)
/obj/item/weapon/reagent_containers/food/snacks/fish_taco /obj/item/weapon/reagent_containers/food/snacks/fish_taco
@@ -4866,7 +4866,7 @@
nutriment_amt = 3 nutriment_amt = 3
/obj/item/weapon/reagent_containers/food/snacks/fish_taco/Initialize() /obj/item/weapon/reagent_containers/food/snacks/fish_taco/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("seafood",3) reagents.add_reagent("seafood",3)
/obj/item/weapon/reagent_containers/food/snacks/nt_muffin /obj/item/weapon/reagent_containers/food/snacks/nt_muffin
@@ -4878,7 +4878,7 @@
nutriment_amt = 3 nutriment_amt = 3
/obj/item/weapon/reagent_containers/food/snacks/nt_muffin/Initialize() /obj/item/weapon/reagent_containers/food/snacks/nt_muffin/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein",5) reagents.add_reagent("protein",5)
/obj/item/weapon/reagent_containers/food/snacks/pineapple_ring /obj/item/weapon/reagent_containers/food/snacks/pineapple_ring
@@ -4890,7 +4890,7 @@
nutriment_amt = 2 nutriment_amt = 2
/obj/item/weapon/reagent_containers/food/snacks/pineapple_ring/Initialize() /obj/item/weapon/reagent_containers/food/snacks/pineapple_ring/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("pineapplejuice",3) reagents.add_reagent("pineapplejuice",3)
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple
@@ -4906,7 +4906,7 @@
bitesize = 2 bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple/Initialize() /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 4) reagents.add_reagent("protein", 4)
reagents.add_reagent("cheese", 5) reagents.add_reagent("cheese", 5)
reagents.add_reagent("tomatojuice", 6) reagents.add_reagent("tomatojuice", 6)
@@ -4936,7 +4936,7 @@
bitesize = 2 bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/burger/bacon/Initialize() /obj/item/weapon/reagent_containers/food/snacks/burger/bacon/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 4) reagents.add_reagent("protein", 4)
/obj/item/weapon/reagent_containers/food/snacks/blt /obj/item/weapon/reagent_containers/food/snacks/blt
@@ -4951,7 +4951,7 @@
bitesize = 2 bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/blt/Initialize() /obj/item/weapon/reagent_containers/food/snacks/blt/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 4) reagents.add_reagent("protein", 4)
/obj/item/weapon/reagent_containers/food/snacks/onionrings /obj/item/weapon/reagent_containers/food/snacks/onionrings
@@ -5033,7 +5033,7 @@
bitesize = 1 bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/crabmeat/Initialize() /obj/item/weapon/reagent_containers/food/snacks/crabmeat/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("seafood", 2) reagents.add_reagent("seafood", 2)
/obj/item/weapon/reagent_containers/food/snacks/crab_legs /obj/item/weapon/reagent_containers/food/snacks/crab_legs
@@ -5047,7 +5047,7 @@
trash = /obj/item/trash/plate trash = /obj/item/trash/plate
/obj/item/weapon/reagent_containers/food/snacks/crab_legs/Initialize() /obj/item/weapon/reagent_containers/food/snacks/crab_legs/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("seafood", 6) reagents.add_reagent("seafood", 6)
reagents.add_reagent("sodiumchloride", 1) reagents.add_reagent("sodiumchloride", 1)
@@ -5069,7 +5069,7 @@
bitesize = 3 bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/nugget/Initialize() /obj/item/weapon/reagent_containers/food/snacks/nugget/Initialize()
. = . = ..() . = ..()
var/shape = pick("lump", "star", "lizard", "corgi") var/shape = pick("lump", "star", "lizard", "corgi")
desc = "A chicken nugget vaguely shaped like a [shape]." desc = "A chicken nugget vaguely shaped like a [shape]."
icon_state = "nugget_[shape]" icon_state = "nugget_[shape]"
@@ -5095,7 +5095,7 @@
bitesize = 3 bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/honeybun/Initialize() /obj/item/weapon/reagent_containers/food/snacks/honeybun/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("honey", 3) reagents.add_reagent("honey", 3)
// Moved /bun/attackby() from /code/modules/food/food/snacks.dm // 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) /obj/item/weapon/reagent_containers/food/snacks/chip/on_consume(mob/M as mob)
if(reagents && reagents.total_volume) if(reagents && reagents.total_volume)
icon_state = bitten_state icon_state = bitten_state
. = . = ..() . = ..()
/obj/item/weapon/reagent_containers/food/snacks/chip/salsa /obj/item/weapon/reagent_containers/food/snacks/chip/salsa
name = "salsa chip" name = "salsa chip"
@@ -5246,7 +5246,7 @@
user.put_in_active_hand(src) user.put_in_active_hand(src)
src.pickup(user) src.pickup(user)
return return
. = . = ..() . = ..()
/obj/item/weapon/reagent_containers/food/snacks/chipplate/nachos /obj/item/weapon/reagent_containers/food/snacks/chipplate/nachos
name = "plate of nachos" name = "plate of nachos"
@@ -5273,7 +5273,7 @@
nutriment_amt = 20 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) /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 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") if(istype(item,/obj/item/weapon/reagent_containers/food/snacks/chip/nacho) && item.icon_state == "chip_nacho")
returningitem = new nachotrans(src) returningitem = new nachotrans(src)
@@ -5285,24 +5285,24 @@
item.reagents.trans_to(returningitem, item.reagents.total_volume) //Old chip to new chip item.reagents.trans_to(returningitem, item.reagents.total_volume) //Old chip to new chip
if(item.icon_state == "chip_half") if(item.icon_state == "chip_half")
returningitem.icon_state = "[returningitem.icon_state]_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)) else if(prob(1))
memed = 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.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 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) qdel(item)
reagents.trans_to(returningitem, bitesize) //Dip to new chip reagents.trans_to(returningitem, bitesize) //Dip to new chip
user.put_in_hands(returningitem) user.put_in_hands(returningitem)
if (reagents && reagents.total_volume) if (reagents && reagents.total_volume)
if(!memed) if(!memed)
user << "You scoop up some dip with the chip." to_chat(user, "You scoop up some dip with the chip.")
else else
if(!memed) 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) var/obj/waste = new trash(loc)
if (loc == user) if (loc == user)
user.put_in_hands(waste) user.put_in_hands(waste)
@@ -5338,7 +5338,7 @@
nutriment_amt = 6 nutriment_amt = 6
/obj/item/weapon/reagent_containers/food/snacks/burrito/Initialize() /obj/item/weapon/reagent_containers/food/snacks/burrito/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 4) reagents.add_reagent("protein", 4)
@@ -5353,7 +5353,7 @@
nutriment_amt = 6 nutriment_amt = 6
/obj/item/weapon/reagent_containers/food/snacks/burrito_vegan/Initialize() /obj/item/weapon/reagent_containers/food/snacks/burrito_vegan/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("tofu", 6) reagents.add_reagent("tofu", 6)
/obj/item/weapon/reagent_containers/food/snacks/burrito_spicy /obj/item/weapon/reagent_containers/food/snacks/burrito_spicy
@@ -5367,7 +5367,7 @@
nutriment_amt = 6 nutriment_amt = 6
/obj/item/weapon/reagent_containers/food/snacks/burrito_spicy/Initialize() /obj/item/weapon/reagent_containers/food/snacks/burrito_spicy/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 6) reagents.add_reagent("protein", 6)
/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese /obj/item/weapon/reagent_containers/food/snacks/burrito_cheese
@@ -5381,7 +5381,7 @@
nutriment_amt = 6 nutriment_amt = 6
/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese/Initialize() /obj/item/weapon/reagent_containers/food/snacks/burrito_cheese/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 6) reagents.add_reagent("protein", 6)
/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese_spicy /obj/item/weapon/reagent_containers/food/snacks/burrito_cheese_spicy
@@ -5394,7 +5394,7 @@
nutriment_amt = 6 nutriment_amt = 6
/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese_spicy/Initialize() /obj/item/weapon/reagent_containers/food/snacks/burrito_cheese_spicy/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 6) reagents.add_reagent("protein", 6)
/obj/item/weapon/reagent_containers/food/snacks/burrito_hell /obj/item/weapon/reagent_containers/food/snacks/burrito_hell
@@ -5418,7 +5418,7 @@
nutriment_amt = 6 nutriment_amt = 6
/obj/item/weapon/reagent_containers/food/snacks/burrito_hell/Initialize() /obj/item/weapon/reagent_containers/food/snacks/burrito_hell/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 9) reagents.add_reagent("protein", 9)
reagents.add_reagent("condensedcapsaicin", 20) //what could possibly go wrong reagents.add_reagent("condensedcapsaicin", 20) //what could possibly go wrong
@@ -5440,7 +5440,7 @@
trash = /obj/item/trash/snack_bowl trash = /obj/item/trash/snack_bowl
/obj/item/weapon/reagent_containers/food/snacks/hatchling_suprise/Initialize() /obj/item/weapon/reagent_containers/food/snacks/hatchling_suprise/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("egg", 2) reagents.add_reagent("egg", 2)
reagents.add_reagent("protein", 4) reagents.add_reagent("protein", 4)
@@ -5452,7 +5452,7 @@
trash = /obj/item/trash/plate trash = /obj/item/trash/plate
/obj/item/weapon/reagent_containers/food/snacks/red_sun_special/Initialize() /obj/item/weapon/reagent_containers/food/snacks/red_sun_special/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 2) reagents.add_reagent("protein", 2)
/obj/item/weapon/reagent_containers/food/snacks/riztizkzi_sea /obj/item/weapon/reagent_containers/food/snacks/riztizkzi_sea
@@ -5463,7 +5463,7 @@
trash = /obj/item/trash/snack_bowl trash = /obj/item/trash/snack_bowl
/obj/item/weapon/reagent_containers/food/snacks/riztizkzi_sea/Initialize() /obj/item/weapon/reagent_containers/food/snacks/riztizkzi_sea/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("egg", 4) reagents.add_reagent("egg", 4)
/obj/item/weapon/reagent_containers/food/snacks/father_breakfast /obj/item/weapon/reagent_containers/food/snacks/father_breakfast
@@ -5474,7 +5474,7 @@
trash = /obj/item/trash/plate trash = /obj/item/trash/plate
/obj/item/weapon/reagent_containers/food/snacks/father_breakfast/Initialize() /obj/item/weapon/reagent_containers/food/snacks/father_breakfast/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("egg", 4) reagents.add_reagent("egg", 4)
reagents.add_reagent("protein", 6) reagents.add_reagent("protein", 6)
@@ -5485,7 +5485,7 @@
icon_state = "stuffed_meatball" icon_state = "stuffed_meatball"
/obj/item/weapon/reagent_containers/food/snacks/stuffed_meatball/Initialize() /obj/item/weapon/reagent_containers/food/snacks/stuffed_meatball/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 4) reagents.add_reagent("protein", 4)
/obj/item/weapon/reagent_containers/food/snacks/egg_pancake /obj/item/weapon/reagent_containers/food/snacks/egg_pancake
@@ -5496,7 +5496,7 @@
trash = /obj/item/trash/plate trash = /obj/item/trash/plate
/obj/item/weapon/reagent_containers/food/snacks/egg_pancake/Initialize() /obj/item/weapon/reagent_containers/food/snacks/egg_pancake/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("protein", 6) reagents.add_reagent("protein", 6)
reagents.add_reagent("egg", 2) reagents.add_reagent("egg", 2)
@@ -5510,7 +5510,7 @@
trash = /obj/item/trash/snacktray trash = /obj/item/trash/snacktray
/obj/item/weapon/reagent_containers/food/snacks/sliceable/grilled_carp/Initialize() /obj/item/weapon/reagent_containers/food/snacks/sliceable/grilled_carp/Initialize()
. = . = ..() . = ..()
reagents.add_reagent("seafood", 12) reagents.add_reagent("seafood", 12)
/obj/item/weapon/reagent_containers/food/snacks/grilled_carp_slice /obj/item/weapon/reagent_containers/food/snacks/grilled_carp_slice

View File

@@ -54,7 +54,7 @@
cooked_icon = "chickenbreast_cooked" cooked_icon = "chickenbreast_cooked"
filling_color = "#BBBBAA" 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) reagents.remove_reagent("triglyceride", INFINITY)
//Chicken is low fat. Less total calories than other meats //Chicken is low fat. Less total calories than other meats

View File

@@ -23,7 +23,7 @@
var/max_contents = 1 // Maximum number of things this appliance can simultaneously cook var/max_contents = 1 // Maximum number of things this appliance can simultaneously cook
var/on_icon // Icon state used when cooking. var/on_icon // Icon state used when cooking.
var/off_icon // Icon state used when not 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/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/can_cook_mobs // Whether or not this machine accepts grabbed mobs.
var/mobdamagetype = BRUTE // Burn damage for cooking appliances, brute for cereal/candy var/mobdamagetype = BRUTE // Burn damage for cooking appliances, brute for cereal/candy
@@ -74,10 +74,9 @@
return ..() return ..()
/obj/machinery/appliance/examine(var/mob/user) /obj/machinery/appliance/examine(var/mob/user)
..() . = ..()
if(Adjacent(usr)) if(Adjacent(user))
list_contents(user) . += list_contents(user)
return 1
/obj/machinery/appliance/proc/list_contents(var/mob/user) /obj/machinery/appliance/proc/list_contents(var/mob/user)
if (cooking_objs.len) if (cooking_objs.len)
@@ -85,9 +84,9 @@
for (var/a in cooking_objs) for (var/a in cooking_objs)
var/datum/cooking_item/CI = a var/datum/cooking_item/CI = a
string += "-\a [CI.container.label(null, CI.combine_target)], [report_progress(CI)]</br>" string += "-\a [CI.container.label(null, CI.combine_target)], [report_progress(CI)]</br>"
usr << string to_chat(user, string)
else 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) /obj/machinery/appliance/proc/report_progress(var/datum/cooking_item/CI)
if (!CI || !CI.max_cookwork) if (!CI || !CI.max_cookwork)
@@ -100,17 +99,17 @@
if (progress < 0.25) if (progress < 0.25)
return "It's barely started cooking." return "It's barely started cooking."
if (progress < 0.75) 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) 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 var/half_overcook = (CI.overcook_mult - 1)*0.5
if (progress < 1+half_overcook) 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) 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 else
return span("danger","It is burning!!") return "<span class='danger'>It is burning!</span>"
/obj/machinery/appliance/update_icon() /obj/machinery/appliance/update_icon()
if (!stat && cooking_objs.len) if (!stat && cooking_objs.len)
@@ -131,14 +130,14 @@
return return
if (!user.IsAdvancedToolUser()) if (!user.IsAdvancedToolUser())
user << "You lack the dexterity to do that!" to_chat(user, "You lack the dexterity to do that!")
return return
if (user.stat || user.restrained() || user.incapacitated()) if (user.stat || user.restrained() || user.incapacitated())
return return
if (!Adjacent(user) && !issilicon(user)) if (!Adjacent(user) && !issilicon(user))
user << "You can't reach [src] from here." to_chat(user, "You can't reach [src] from here.")
return return
if (stat & POWEROFF)//Its turned off if (stat & POWEROFF)//Its turned off
@@ -150,6 +149,7 @@
stat |= POWEROFF stat |= POWEROFF
use_power = 0 use_power = 0
user.visible_message("[user] turns [src] off.", "You turn off [src].") 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) playsound(src, 'sound/machines/click.ogg', 40, 1)
update_icon() update_icon()
@@ -166,14 +166,14 @@
return return
if (!usr.IsAdvancedToolUser()) if (!usr.IsAdvancedToolUser())
usr << "You lack the dexterity to do that!" to_chat(usr, "You lack the dexterity to do that!")
return return
if (usr.stat || usr.restrained() || usr.incapacitated()) if (usr.stat || usr.restrained() || usr.incapacitated())
return return
if (!Adjacent(usr) && !issilicon(usr)) 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 return
if(output_options.len) if(output_options.len)
@@ -182,10 +182,10 @@
return return
if(choice == "Default") if(choice == "Default")
selected_option = null 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 else
selected_option = choice 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 //Handles all validity checking and error messages for inserting things
/obj/machinery/appliance/proc/can_insert(var/obj/item/I, var/mob/user) /obj/machinery/appliance/proc/can_insert(var/obj/item/I, var/mob/user)
@@ -199,18 +199,18 @@
if(istype(G)) if(istype(G))
if(!can_cook_mobs) 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 return 0
if(!isliving(G.affecting)) 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 0
return 2 return 2
if (!has_space(I)) 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 return 0
@@ -220,16 +220,18 @@
// We're trying to cook something else. Check if it's valid. // We're trying to cook something else. Check if it's valid.
var/obj/item/weapon/reagent_containers/food/snacks/check = I var/obj/item/weapon/reagent_containers/food/snacks/check = I
if(istype(check) && islist(check.cooked) && (cook_type in check.cooked)) 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 return 0
else if(istype(check, /obj/item/weapon/reagent_containers/glass)) 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 return 0
else if(istype(check, /obj/item/weapon/disk/nuclear)) 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 return 0
else if(!istype(check) && !istype(check, /obj/item/weapon/holder)) 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 0
return 1 return 1
@@ -238,13 +240,13 @@
//This function is overridden by cookers that do stuff with containers //This function is overridden by cookers that do stuff with containers
/obj/machinery/appliance/proc/has_space(var/obj/item/I) /obj/machinery/appliance/proc/has_space(var/obj/item/I)
if (cooking_objs.len >= max_contents) 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) /obj/machinery/appliance/attackby(var/obj/item/I, var/mob/user)
if(!cook_type || (stat & (BROKEN))) 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 return
var/result = can_insert(I, user) 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>") user.visible_message("<span class='notice'>\The [user] puts \the [I] into \the [src].</span>")
get_cooking_work(CI) get_cooking_work(CI)
cooking = 1 cooking = TRUE
return CI return CI
/obj/machinery/appliance/proc/get_cooking_work(var/datum/cooking_item/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 //Called every tick while we're cooking something
/obj/machinery/appliance/proc/do_cooking_tick(var/datum/cooking_item/CI) /obj/machinery/appliance/proc/do_cooking_tick(var/datum/cooking_item/CI)
if (!istype(CI) || !CI.max_cookwork) if (!istype(CI) || !CI.max_cookwork)
return 0 return FALSE
var/was_done = 0 var/was_done = FALSE
if (CI.cookwork >= CI.max_cookwork) if (CI.cookwork >= CI.max_cookwork)
was_done = 1 was_done = TRUE
CI.cookwork += cooking_power CI.cookwork += cooking_power
@@ -375,7 +377,7 @@
if (M) if (M)
M.apply_damage(rand(1,3), mobdamagetype, "chest") M.apply_damage(rand(1,3), mobdamagetype, "chest")
return 1 return TRUE
/obj/machinery/appliance/process() /obj/machinery/appliance/process()
if (cooking_power > 0 && cooking) if (cooking_power > 0 && cooking)
@@ -436,7 +438,7 @@
//Final step. Cook function just cooks batter for now. //Final step. Cook function just cooks batter for now.
for (var/obj/item/weapon/reagent_containers/food/snacks/S in CI.container) for (var/obj/item/weapon/reagent_containers/food/snacks/S in CI.container)
S.cook() S.cook()
//Combination cooking involves combining the names and reagents of ingredients into a predefined output object //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 //The ingredients represent flavours or fillings. EG: donut pizza, cheese bread
@@ -620,10 +622,10 @@
if(istype(H.species, /datum/species/diona)) if(istype(H.species, /datum/species/diona))
src.composition_reagent = "nutriment" src.composition_reagent = "nutriment"
//if the mob is a simple animal with a defined meat quantity //if the mob is a simple animal - MOB NOT ANIMAL - with a defined meat quantity
if (istype(src, /mob/living/simple_animal)) if (istype(src, /mob/living/simple_mob))
var/mob/living/simple_animal/SA = src var/mob/living/simple_mob/SA = src
if (SA.meat_amount) if(SA.meat_amount)
src.composition_reagent_quantity = SA.meat_amount*2*9 src.composition_reagent_quantity = SA.meat_amount*2*9
//The quantity of protein is based on the meat_amount, but multiplied by 2 //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) victim.reagents.trans_to_holder(result.reagents, victim.reagents.total_volume)
if (isanimal(victim)) if (isanimal(victim))
var/mob/living/simple_animal/SA = victim var/mob/living/simple_mob/SA = victim
result.kitchen_tag = SA.kitchen_tag result.kitchen_tag = SA.kitchen_tag
result.appearance = victim result.appearance = victim

View File

@@ -40,21 +40,23 @@
//RefreshParts() //RefreshParts()
return (cooking_power / optimal_power) * 100 return (cooking_power / optimal_power) * 100
/obj/machinery/appliance/cooker/New() /obj/machinery/appliance/cooker/Initialize()
. = ..() . = ..()
loss = (active_power_usage / resistance)*0.5 loss = (active_power_usage / resistance)*0.5
cooking_objs = list() cooking_objs = list()
for (var/i = 0, i < max_contents, i++) for (var/i = 0, i < max_contents, i++)
cooking_objs.Add(new /datum/cooking_item/(new container_type(src))) 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 update_icon() // this probably won't cause issues, but Aurora used SSIcons and queue_icon_update() instead
/obj/machinery/appliance/cooker/update_icon() /obj/machinery/appliance/cooker/update_icon()
cut_overlays() cut_overlays()
var/image/light var/image/light
if (use_power == 2 && !stat) if(use_power == 1 && !stat)
light = image(icon, "light_on") light = image(icon, "light_idle")
else if(use_power == 2 && !stat)
light = image(icon, "light_preheating")
else else
light = image(icon, "light_off") light = image(icon, "light_off")
light.pixel_x = light_x light.pixel_x = light_x

View File

@@ -14,7 +14,7 @@
w_class = 2 w_class = 2
var/prefix var/prefix
/obj/item/weapon/reagent_containers/food/snacks/variable/initialize() /obj/item/weapon/reagent_containers/food/snacks/variable/Initialize()
. = ..() . = ..()
if (reagents) if (reagents)
reagents.maximum_volume = size*8 + 10 reagents.maximum_volume = size*8 + 10
@@ -26,7 +26,7 @@
var/ratio = reagents.total_volume / size var/ratio = reagents.total_volume / size
scale = ratio**(1/3) //Scaling factor is square root of desired area 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 else
scale = min_scale scale = min_scale
@@ -149,7 +149,7 @@
size = 30 size = 30
w_class = 3 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")) name = pick(list("flakes", "krispies", "crunch", "pops", "O's", "crisp", "loops", "jacks", "clusters"))

View File

@@ -15,13 +15,14 @@ fundamental differences
idle_power_usage = 50 idle_power_usage = 50
/obj/machinery/appliance/mixer/examine(var/mob/user) /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_objs += new /datum/cooking_item(new /obj/item/weapon/reagent_containers/cooking_container(src))
cooking = 0 cooking = FALSE
selected_option = pick(output_options) 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 //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 return
if (!usr.IsAdvancedToolUser()) 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 return
if(output_options.len) if(output_options.len)
@@ -43,7 +44,7 @@ fundamental differences
return return
else else
selected_option = choice 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] var/datum/cooking_item/CI = cooking_objs[1]
CI.combine_target = selected_option CI.combine_target = selected_option

View File

@@ -34,7 +34,7 @@
var/list/images = list() var/list/images = list()
var/num = 0 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)) if (istype(I, /obj/item/weapon/reagent_containers/food/snacks/variable/cereal))
//Images of cereal boxes on cereal boxes is dumb //Images of cereal boxes on cereal boxes is dumb
continue continue

View File

@@ -3,7 +3,7 @@
//which can be checked against recipe requirements in order to cook recipes that require several things //which can be checked against recipe requirements in order to cook recipes that require several things
/obj/item/weapon/reagent_containers/cooking_container /obj/item/weapon/reagent_containers/cooking_container
icon = 'modular_citadel/icons/obj/cooking_machines.dmi' icon = 'icons/obj/cooking_machines.dmi'
var/shortname var/shortname
var/max_space = 20//Maximum sum of w-classes of foods in this container at once var/max_space = 20//Maximum sum of w-classes of foods in this container at once
var/max_reagents = 80//Maximum units of reagents var/max_reagents = 80//Maximum units of reagents
@@ -14,21 +14,21 @@
/obj/item/weapon/paper /obj/item/weapon/paper
) )
/obj/item/weapon/reagent_containers/cooking_container/initialize() /obj/item/weapon/reagent_containers/cooking_container/Initialize()
. = ..() . = ..()
create_reagents(max_reagents) create_reagents(max_reagents)
flags |= OPENCONTAINER | NOREACT flags |= OPENCONTAINER | NOREACT
/obj/item/weapon/reagent_containers/cooking_container/examine(var/mob/user) /obj/item/weapon/reagent_containers/cooking_container/examine(var/mob/user)
..() . = ..()
if (contents.len) if (contents.len)
var/string = "It contains....</br>" var/string = "It contains....</br>"
for (var/atom/movable/A in contents) for (var/atom/movable/A in contents)
string += "[A.name] </br>" string += "[A.name] </br>"
user << span("notice", string) . += "<span class='notice'>string</span>"
if (reagents.total_volume) 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) /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 /obj/item/weapon/reagent_containers/cooking_container/oven
name = "oven dish" name = "oven dish"
shortname = "shelf" 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" icon_state = "ovendish"
max_space = 30 max_space = 30
max_reagents = 120 max_reagents = 120
@@ -153,5 +153,11 @@
/obj/item/weapon/reagent_containers/cooking_container/fryer /obj/item/weapon/reagent_containers/cooking_container/fryer
name = "fryer basket" name = "fryer basket"
shortname = "basket" shortname = "basket"
desc = "Put ingredients in this; designed for use with a deep fryer. Warranty void if used." desc = "Put ingredients in this; designed for use with a deep fryer. Warranty void if used incorrectly."
icon_state = "basket" 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"

View File

@@ -12,6 +12,8 @@
appliancetype = FRYER appliancetype = FRYER
active_power_usage = 12 KILOWATTS 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 optimal_power = 0.35
idle_power_usage = 3.6 KILOWATTS idle_power_usage = 3.6 KILOWATTS
@@ -43,10 +45,12 @@
/obj/machinery/appliance/cooker/fryer/Destroy() /obj/machinery/appliance/cooker/fryer/Destroy()
QDEL_NULL(fry_loop) QDEL_NULL(fry_loop)
QDEL_NULL(oil)
return ..() return ..()
/obj/machinery/appliance/cooker/fryer/examine(var/mob/user) /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]") to_chat(user, "Oil Level: [oil.total_volume]/[optimal_oil]")
/obj/machinery/appliance/cooker/fryer/heat_up() /obj/machinery/appliance/cooker/fryer/heat_up()
@@ -83,12 +87,20 @@
cooking_power *= oil_efficiency cooking_power *= oil_efficiency
/obj/machinery/appliance/cooker/fryer/update_icon() /obj/machinery/appliance/cooker/fryer/update_icon()
if(cooking) if(!stat)
icon_state = on_icon ..()
fry_loop.start() 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 else
icon_state = off_icon 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 //Fryer gradually infuses any cooked food with oil. Moar calories
@@ -155,19 +167,19 @@
//Cooldown ensures it can't be spammed to instakill someone //Cooldown ensures it can't be spammed to instakill someone
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN*3) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN*3)
fry_loop.start() fry_loop.start(src)
if(!do_mob(user, victim, 20)) if(!do_mob(user, victim, 20))
cooking = 0 cooking = FALSE
icon_state = off_icon icon_state = off_icon
fry_loop.stop() fry_loop.stop(src)
return return
if(!victim || !victim.Adjacent(user)) if(!victim || !victim.Adjacent(user))
to_chat(user, "<span class='danger'>Your victim slipped free!</span>") to_chat(user, "<span class='danger'>Your victim slipped free!</span>")
cooking = 0 cooking = FALSE
icon_state = off_icon icon_state = off_icon
fry_loop.stop() fry_loop.stop(src)
return 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 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) victim.apply_damage(damage, BURN, user.zone_sel.selecting)
if(!nopain) 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") victim.emote("scream")
else 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>") 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>") victim.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [cook_type] in \a [src] by [user.name] ([user.ckey])</font>")

View File

@@ -8,6 +8,8 @@
off_icon = "grill_off" off_icon = "grill_off"
can_burn_food = 1 can_burn_food = 1
stat = POWEROFF stat = POWEROFF
container_type = /obj/item/weapon/reagent_containers/cooking_container/grill
/obj/machinery/appliance/grill/toggle_power() /obj/machinery/appliance/grill/toggle_power()
set src in view() set src in view()
@@ -30,10 +32,10 @@
playsound(src, 'sound/machines/click.ogg', 40, 1) playsound(src, 'sound/machines/click.ogg', 40, 1)
update_icon() 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_objs += new /datum/cooking_item(new /obj/item/weapon/reagent_containers/cooking_container(src))
cooking = 0 cooking = FALSE
/obj/machinery/appliance/grill/has_space(var/obj/item/I) /obj/machinery/appliance/grill/has_space(var/obj/item/I)
var/datum/cooking_item/CI = cooking_objs[1] var/datum/cooking_item/CI = cooking_objs[1]
@@ -69,7 +71,7 @@
return 0 return 0
/obj/machinery/appliance/grill/update_icon() /obj/machinery/appliance/grill/update_icon()
if (!stat) if(!stat)
icon_state = on_icon icon_state = on_icon
else else
icon_state = off_icon icon_state = off_icon

View File

@@ -71,10 +71,12 @@
if(open) if(open)
open = FALSE open = FALSE
loss = (active_power_usage / resistance)*0.5 loss = (active_power_usage / resistance)*0.5
cooking = TRUE
else else
open = TRUE open = TRUE
loss = (active_power_usage / resistance)*4 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) playsound(src, 'sound/machines/hatch_open.ogg', 20, 1)
update_icon() update_icon()

View File

@@ -260,7 +260,7 @@
return return
start() start()
if(reagents.total_volume==0 && !(locate(/obj) in ((contents - component_parts) - circuit))) //dry run 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() abort()
return return
abort() abort()
@@ -271,17 +271,17 @@
if(!recipe) if(!recipe)
dirty += 1 dirty += 1
if(prob(max(10,dirty*5))) 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() abort()
return return
muck_start() 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() muck_finish()
cooked = fail() cooked = fail()
cooked.forceMove(src.loc) cooked.forceMove(src.loc)
return return
else if(has_extra_item()) 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() abort()
return return
broke() broke()
@@ -289,15 +289,15 @@
cooked.forceMove(src.loc) cooked.forceMove(src.loc)
return return
else 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() abort()
return return
abort() stop()
cooked = fail() cooked = fail()
cooked.forceMove(src.loc) cooked.forceMove(src.loc)
return return
else 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)) if(!wzhzhzh(halftime))
abort() abort()
return return
@@ -391,6 +391,13 @@
icon_state = "mw" icon_state = "mw"
updateUsrDialog() updateUsrDialog()
soundloop.stop() 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) /obj/machinery/microwave/proc/dispose(var/message = 1)
for (var/atom/movable/A in ((contents-component_parts)-circuit)) for (var/atom/movable/A in ((contents-component_parts)-circuit))

View File

@@ -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, // 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 // thats no longer the concern of this proc
var/obj/temp = new /obj(src) var/obj/temp = new /obj(src)
temp.create_reagents(9999999999) temp.create_reagents(999999999)
// Find items we need // Find items we need
if(items && items.len) if(items && items.len)
@@ -244,7 +244,7 @@
the single-result's reagents the single-result's reagents
*/ */
var/obj/tempholder = new(src) var/obj/tempholder = new(src)
tempholder.create_reagents(9999999999) tempholder.create_reagents(999999999)
var/list/results = list() var/list/results = list()
while (tally < result_quantity) while (tally < result_quantity)
var/obj/result_obj = new result(container) var/obj/result_obj = new result(container)
@@ -252,14 +252,14 @@
if(!result_obj.reagents)//This shouldn't happen if(!result_obj.reagents)//This shouldn't happen
//If the result somehow has no reagents defined, then create a new holder //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) result_obj.create_reagents(temp.reagents.total_volume*1.5)
if(result_quantity == 1) if(result_quantity == 1)
qdel(tempholder.reagents) qdel(tempholder.reagents)
tempholder.reagents = result_obj.reagents tempholder.reagents = result_obj.reagents
else else
world << result_obj to_chat(world, result_obj)
result_obj.reagents.trans_to(tempholder.reagents, result_obj.reagents.total_volume) result_obj.reagents.trans_to(tempholder.reagents, result_obj.reagents.total_volume)
tally++ tally++

View File

@@ -898,7 +898,7 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/cutlet, /obj/item/weapon/reagent_containers/food/snacks/cutlet,
) )
result = /obj/item/weapon/reagent_containers/food/snacks/sausage result = /obj/item/weapon/reagent_containers/food/snacks/sausage
resut_quantity = 2 result_quantity = 2
/datum/recipe/fishfingers /datum/recipe/fishfingers
reagents = list("flour" = 10, "egg" = 3) reagents = list("flour" = 10, "egg" = 3)

View File

@@ -58,6 +58,8 @@
flesh_color = "#9ee02c" flesh_color = "#9ee02c"
blood_color = "#edf4d0" //sap! blood_color = "#edf4d0" //sap!
base_color = "#1a5600" 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\ 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.\ traits with other humanoid beings.\

View File

@@ -144,7 +144,7 @@
playsound(src, 'sound/voice/bark2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises) playsound(src, 'sound/voice/bark2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises)
m_type = 2 m_type = 2
else else
src << "You're not a dog!" to_chat(src, "You're not a dog!")
//Vorestation addition end //Vorestation addition end

View File

@@ -71,7 +71,7 @@
//We'll assume that the batter isnt going to be regurgitated and eaten by someone else. Only show this once //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 (data["cooked"] != 1)
if (!messaged) if (!messaged)
M << "Ugh, this raw [name] tastes disgusting." to_chat(M, "Ugh, this raw [name] tastes disgusting.")
nutriment_factor *= 0.5 nutriment_factor *= 0.5
messaged = 1 messaged = 1
@@ -677,8 +677,7 @@
return return
if(alien == IS_ALRAUNE) // VOREStation Edit: It wouldn't affect plants that much. if(alien == IS_ALRAUNE) // VOREStation Edit: It wouldn't affect plants that much.
if(prob(5)) if(prob(5))
M << "<span class='rose'>You feel a pleasant sensation in your mouth.</span>" to_chat(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."))
M.bodytemperature += rand(10, 25) M.bodytemperature += rand(10, 25)
return return
if(ishuman(M)) if(ishuman(M))

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 130 KiB

After

Width:  |  Height:  |  Size: 130 KiB

View File

@@ -4716,7 +4716,7 @@
"bMJ" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/landmark/start{name = "Chef"},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bMJ" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/landmark/start{name = "Chef"},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bMK" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bMK" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bML" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bML" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bMM" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/appliance/cooker/candy,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bMM" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/appliance/mixer/candy,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bMN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/kitchen) "bMN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/kitchen)
"bMO" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "bMO" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/turf/simulated/floor/tiled,/area/hallway/primary/central_two)
"bMP" = (/obj/structure/extinguisher_cabinet{pixel_x = 25},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "bMP" = (/obj/structure/extinguisher_cabinet{pixel_x = 25},/turf/simulated/floor/tiled,/area/hallway/primary/central_two)
@@ -4817,7 +4817,7 @@
"bOG" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_soft/full,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bOG" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_soft/full,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bOH" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bOH" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bOI" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/material/knife/butch,/obj/item/weapon/material/kitchen/rollingpin,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bOI" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/material/knife/butch,/obj/item/weapon/material/kitchen/rollingpin,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bOJ" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/appliance/cooker/cereal,/obj/machinery/camera/network/civilian{c_tag = "CIV - Kitchen Starboard"; dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bOJ" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/appliance/mixer/cereal,/obj/machinery/camera/network/civilian{c_tag = "CIV - Kitchen Starboard"; dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bOK" = (/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/structure/table/reinforced,/obj/machinery/button/remote/blast_door{id = "chemcounter"; name = "Pharmacy Counter Lockdown Control"; pixel_y = 14},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/effect/floor_decal/corner/beige{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bOK" = (/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/item/stack/material/phoron,/obj/structure/table/reinforced,/obj/machinery/button/remote/blast_door{id = "chemcounter"; name = "Pharmacy Counter Lockdown Control"; pixel_y = 14},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/effect/floor_decal/corner/beige{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
"bOL" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bOL" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/chemistry)
"bOM" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bOM" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/medical/chemistry)

View File

@@ -8130,7 +8130,7 @@
"dar" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{req_access = null; req_one_access = list(5,12,25,27,28,35)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/locker) "dar" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{req_access = null; req_one_access = list(5,12,25,27,28,35)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/locker)
"das" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plating,/area/maintenance/locker) "das" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plating,/area/maintenance/locker)
"dat" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/locker) "dat" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/locker)
"dau" = (/obj/machinery/appliance/cooker/candy,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "dau" = (/obj/machinery/appliance/mixer/candy,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"dav" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "dav" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"daw" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/closet,/obj/random/maintenance,/obj/random/maintenance,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/bar) "daw" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/closet,/obj/random/maintenance,/obj/random/maintenance,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/bar)
"dax" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/wall,/area/crew_quarters/kitchen) "dax" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/wall,/area/crew_quarters/kitchen)
@@ -8186,7 +8186,7 @@
"dbv" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/green/border,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/green/bordercorner2{dir = 9},/turf/simulated/floor/tiled,/area/crew_quarters/locker) "dbv" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/green/border,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/green/bordercorner2{dir = 9},/turf/simulated/floor/tiled,/area/crew_quarters/locker)
"dbw" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/bar) "dbw" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/bar)
"dbx" = (/obj/machinery/atmospherics/pipe/simple/visible/universal{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/bar) "dbx" = (/obj/machinery/atmospherics/pipe/simple/visible/universal{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/bar)
"dby" = (/obj/machinery/appliance/cooker/cereal,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/ai_status_display{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "dby" = (/obj/machinery/appliance/mixer/cereal,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/ai_status_display{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"dbz" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 10; icon_state = "intact"},/obj/machinery/floodlight,/turf/simulated/floor/plating,/area/maintenance/bar) "dbz" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 10; icon_state = "intact"},/obj/machinery/floodlight,/turf/simulated/floor/plating,/area/maintenance/bar)
"dbA" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/effect/landmark/start{name = "Chef"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "dbA" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/effect/landmark/start{name = "Chef"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"dbB" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 5},/obj/item/weapon/reagent_containers/food/condiment/enzyme,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "dbB" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 5},/obj/item/weapon/reagent_containers/food/condiment/enzyme,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)

View File

@@ -704,7 +704,7 @@
"nB" = (/obj/machinery/flasher{id = "flash"; name = "Thunderdome Flash"},/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) "nB" = (/obj/machinery/flasher{id = "flash"; name = "Thunderdome Flash"},/turf/unsimulated/floor{icon_state = "dark"},/area/tdome)
"nC" = (/obj/machinery/seed_extractor,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "nC" = (/obj/machinery/seed_extractor,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"nD" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "nD" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"nE" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/appliance/cooker/candy,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "nE" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/appliance/mixer/candy,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"nF" = (/obj/machinery/door/blast/regular{id = "CentComPort"; name = "Security Doors"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "nF" = (/obj/machinery/door/blast/regular{id = "CentComPort"; name = "Security Doors"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall)
"nG" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access = list(101)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "nG" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access = list(101)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall)
"nH" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command) "nH" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/command)
@@ -730,7 +730,7 @@
"ob" = (/obj/structure/table/marble,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/weapon/material/kitchen/rollingpin,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "ob" = (/obj/structure/table/marble,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/weapon/material/kitchen/rollingpin,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"oc" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_soft/full,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "oc" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_soft/full,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"od" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "od" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"oe" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/appliance/cooker/cereal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar) "oe" = (/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/appliance/mixer/cereal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bar)
"of" = (/obj/structure/table/reinforced,/obj/item/weapon/card/id/gold/captain/spare,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/command) "of" = (/obj/structure/table/reinforced,/obj/item/weapon/card/id/gold/captain/spare,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/command)
"og" = (/obj/structure/table/reinforced,/obj/item/device/pda/captain,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/command) "og" = (/obj/structure/table/reinforced,/obj/item/device/pda/captain,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/command)
"oh" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "admin_shuttle_bay_door"; locked = 1},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/command) "oh" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "admin_shuttle_bay_door"; locked = 1},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/command)

View File

@@ -111,7 +111,7 @@
/turf/simulated/floor/tiled/white, /turf/simulated/floor/tiled/white,
/area/submap/Diner) /area/submap/Diner)
"aw" = ( "aw" = (
/obj/machinery/appliance/cooker/cereal, /obj/machinery/appliance/mixer/cereal,
/obj/machinery/light{ /obj/machinery/light{
icon_state = "tube1"; icon_state = "tube1";
dir = 4 dir = 4

View File

@@ -109,7 +109,7 @@
/turf/simulated/floor/tiled/white, /turf/simulated/floor/tiled/white,
/area/submap/Diner) /area/submap/Diner)
"aw" = ( "aw" = (
/obj/machinery/appliance/cooker/cereal, /obj/machinery/appliance/mixer/cereal,
/obj/machinery/light{ /obj/machinery/light{
icon_state = "tube1"; icon_state = "tube1";
dir = 4 dir = 4

View File

@@ -3607,7 +3607,7 @@
/obj/effect/floor_decal/corner/grey/diagonal{ /obj/effect/floor_decal/corner/grey/diagonal{
dir = 4 dir = 4
}, },
/obj/machinery/appliance/cooker/cereal, /obj/machinery/appliance/mixer/cereal,
/turf/unsimulated/floor/steel{ /turf/unsimulated/floor/steel{
icon_state = "white" icon_state = "white"
}, },
@@ -14562,7 +14562,7 @@
/obj/effect/floor_decal/corner/grey/diagonal{ /obj/effect/floor_decal/corner/grey/diagonal{
dir = 4 dir = 4
}, },
/obj/machinery/appliance/cooker/cereal, /obj/machinery/appliance/mixer/cereal,
/turf/unsimulated/floor/steel{ /turf/unsimulated/floor/steel{
icon_state = "white" icon_state = "white"
}, },

View File

@@ -1017,7 +1017,7 @@
/turf/simulated/floor/tiled/white, /turf/simulated/floor/tiled/white,
/area/mothership/kitchen) /area/mothership/kitchen)
"cl" = ( "cl" = (
/obj/machinery/appliance/cooker/cereal, /obj/machinery/appliance/mixer/cereal,
/obj/effect/floor_decal/industrial/warning/dust{ /obj/effect/floor_decal/industrial/warning/dust{
dir = 9 dir = 9
}, },
@@ -1049,7 +1049,7 @@
/turf/simulated/floor/tiled/white, /turf/simulated/floor/tiled/white,
/area/mothership/kitchen) /area/mothership/kitchen)
"cp" = ( "cp" = (
/obj/machinery/appliance/cooker/candy, /obj/machinery/appliance/mixer/candy,
/obj/effect/floor_decal/industrial/warning/dust{ /obj/effect/floor_decal/industrial/warning/dust{
dir = 1 dir = 1
}, },

View File

@@ -10236,7 +10236,7 @@
/turf/simulated/floor/tiled/white, /turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen) /area/crew_quarters/kitchen)
"atc" = ( "atc" = (
/obj/machinery/appliance/cooker/candy, /obj/machinery/appliance/mixer/candy,
/obj/effect/floor_decal/industrial/warning/dust{ /obj/effect/floor_decal/industrial/warning/dust{
dir = 8 dir = 8
}, },
@@ -10328,7 +10328,7 @@
/turf/simulated/floor/tiled/white, /turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen) /area/crew_quarters/kitchen)
"ato" = ( "ato" = (
/obj/machinery/appliance/cooker/cereal, /obj/machinery/appliance/mixer/cereal,
/obj/effect/floor_decal/industrial/warning/dust{ /obj/effect/floor_decal/industrial/warning/dust{
dir = 8 dir = 8
}, },

View File

@@ -4886,9 +4886,9 @@
"bPX" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bPX" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bPY" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_soft/full,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bPY" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_soft/full,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bPZ" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/reagent_containers/food/snacks/mint,/obj/item/weapon/reagent_containers/food/condiment/enzyme{layer = 5},/obj/item/weapon/packageWrap,/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bPZ" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/reagent_containers/food/snacks/mint,/obj/item/weapon/reagent_containers/food/condiment/enzyme{layer = 5},/obj/item/weapon/packageWrap,/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bQa" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/appliance/cooker/candy,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bQa" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/appliance/mixer/candy,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bQb" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bQb" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bQc" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/appliance/cooker/cereal,/obj/machinery/camera/network/civilian{c_tag = "CIV - Kitchen Starboard"; dir = 8},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bQc" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/appliance/mixer/cereal,/obj/machinery/camera/network/civilian{c_tag = "CIV - Kitchen Starboard"; dir = 8},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen)
"bQd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/crew_quarters/kitchen) "bQd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/crew_quarters/kitchen)
"bQe" = (/obj/structure/flora/ausbushes/brflowers,/obj/structure/flora/ausbushes/ppflowers,/turf/simulated/floor/grass,/area/crew_quarters/kitchen) "bQe" = (/obj/structure/flora/ausbushes/brflowers,/obj/structure/flora/ausbushes/ppflowers,/turf/simulated/floor/grass,/area/crew_quarters/kitchen)
"bQf" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "bQf" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/primary/central_two)

View File

@@ -137,17 +137,17 @@ stringbuilder-based UIs, and this needs little explanation.
if(location.internal == src) if(location.internal == src)
location.internal = null location.internal = null
location.internals.icon_state = "internal0" location.internals.icon_state = "internal0"
usr << "<span class='notice'>You close the tank release valve.</span>" to_chat(usr, "<span class='notice'>You close the tank release valve.</span>")
if(location.internals) if(location.internals)
location.internals.icon_state = "internal0" location.internals.icon_state = "internal0"
else else
if(location.wear_mask && (location.wear_mask.flags & MASKINTERNALS)) if(location.wear_mask && (location.wear_mask.flags & MASKINTERNALS))
location.internal = src location.internal = src
usr << "<span class='notice'>You open \the [src] valve.</span>" to_chat(usr, "<span class='notice'>You open \the [src] valve.</span>")
if(location.internals) if(location.internals)
location.internals.icon_state = "internal1" location.internals.icon_state = "internal1"
else else
usr << "<span class='warning'>You need something to connect to \the [src]!</span>" to_chat(usr, "<span class='warning'>You need something to connect to \the [src]!</span>")
``` ```
### Template (doT) ### Template (doT)

View File

@@ -2103,8 +2103,10 @@
#include "code\modules\food\kitchen\cooking_machines\_appliance.dm" #include "code\modules\food\kitchen\cooking_machines\_appliance.dm"
#include "code\modules\food\kitchen\cooking_machines\_cooker.dm" #include "code\modules\food\kitchen\cooking_machines\_cooker.dm"
#include "code\modules\food\kitchen\cooking_machines\_cooker_output.dm" #include "code\modules\food\kitchen\cooking_machines\_cooker_output.dm"
#include "code\modules\food\kitchen\cooking_machines\_mixer.dm"
#include "code\modules\food\kitchen\cooking_machines\candy.dm" #include "code\modules\food\kitchen\cooking_machines\candy.dm"
#include "code\modules\food\kitchen\cooking_machines\cereal.dm" #include "code\modules\food\kitchen\cooking_machines\cereal.dm"
#include "code\modules\food\kitchen\cooking_machines\container.dm"
#include "code\modules\food\kitchen\cooking_machines\fryer.dm" #include "code\modules\food\kitchen\cooking_machines\fryer.dm"
#include "code\modules\food\kitchen\cooking_machines\grill.dm" #include "code\modules\food\kitchen\cooking_machines\grill.dm"
#include "code\modules\food\kitchen\cooking_machines\oven.dm" #include "code\modules\food\kitchen\cooking_machines\oven.dm"