shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-32161

Browse Source
This commit is contained in:
LetterJay
2017-11-11 23:02:13 -06:00
committed by GitHub
parent 545ac04b78 1f7deabbfb
commit 6286f4d4c2
625 changed files with 27981 additions and 20284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/food/condiment.dm
+1 -1
View File
@@ -19,7 +19,7 @@
"capsaicin" = list("hotsauce", "hotsauce bottle", "You can almost TASTE the stomach ulcers now!"),
"enzyme" = list("enzyme", "universal enzyme bottle", "Used in cooking various dishes"),
"soysauce" = list("soysauce", "soy sauce bottle", "A salty soy-based flavoring"),
"frostoil" = list("coldsauce", "coldsauce bottle", "Leaves the tongue numb in it's passage"),
"frostoil" = list("coldsauce", "coldsauce bottle", "Leaves the tongue numb in its passage"),
"sodiumchloride" = list("saltshakersmall", "salt shaker", "Salt. From space oceans, presumably"),
"blackpepper" = list("peppermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"),
"cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"),
code/modules/food_and_drinks/kitchen_machinery/processor.dm
+49 -118
View File
@@ -24,8 +24,6 @@
/obj/machinery/processor/process()
..()
// The irony
// To be clear, if it's grinding, then it can't suck them up
if(processing)
return
var/mob/living/simple_animal/slime/picked_slime
@@ -43,125 +41,44 @@
return
src.visible_message("[picked_slime] is sucked into [src].")
picked_slime.loc = src
picked_slime.forceMove(src)
/datum/food_processor_process
var/input
var/output
var/time = 40
/datum/food_processor_process/proc/process_food(loc, what, obj/machinery/processor/processor)
if (src.output && loc && processor)
for(var/i = 0, i < processor.rating_amount, i++)
new src.output(loc)
if (what)
qdel(what) // Note to self: Make this safer
/* objs */
/datum/food_processor_process/meat
input = /obj/item/reagent_containers/food/snacks/meat/slab
output = /obj/item/reagent_containers/food/snacks/faggot
/datum/food_processor_process/bacon
input = /obj/item/reagent_containers/food/snacks/meat/rawcutlet
output = /obj/item/reagent_containers/food/snacks/meat/rawbacon
/datum/food_processor_process/potatowedges
input = /obj/item/reagent_containers/food/snacks/grown/potato/wedges
output = /obj/item/reagent_containers/food/snacks/fries
/datum/food_processor_process/sweetpotato
input = /obj/item/reagent_containers/food/snacks/grown/potato/sweet
output = /obj/item/reagent_containers/food/snacks/yakiimo
/datum/food_processor_process/potato
input = /obj/item/reagent_containers/food/snacks/grown/potato
output = /obj/item/reagent_containers/food/snacks/tatortot
/datum/food_processor_process/carrot
input = /obj/item/reagent_containers/food/snacks/grown/carrot
output = /obj/item/reagent_containers/food/snacks/carrotfries
/datum/food_processor_process/soybeans
input = /obj/item/reagent_containers/food/snacks/grown/soybeans
output = /obj/item/reagent_containers/food/snacks/soydope
/datum/food_processor_process/spaghetti
input = /obj/item/reagent_containers/food/snacks/doughslice
output = /obj/item/reagent_containers/food/snacks/spaghetti
/datum/food_processor_process/corn
input = /obj/item/reagent_containers/food/snacks/grown/corn
output = /obj/item/reagent_containers/food/snacks/tortilla
/datum/food_processor_process/parsnip
input = /obj/item/reagent_containers/food/snacks/grown/parsnip
output = /obj/item/reagent_containers/food/snacks/roastparsnip
/* mobs */
/datum/food_processor_process/mob/process_food(loc, what, processor)
..()
/obj/machinery/processor/proc/process_food(datum/food_processor_process/recipe, atom/movable/what)
if (recipe.output && loc && !QDELETED(src))
for(var/i = 0, i < rating_amount, i++)
new recipe.output(drop_location())
if (ismob(what))
var/mob/themob = what
themob.gib(TRUE,TRUE,TRUE)
else
qdel(what)
/datum/food_processor_process/mob/slime/process_food(loc, what, obj/machinery/processor/processor)
/obj/machinery/processor/slime/process_food(datum/food_processor_process/recipe, atom/movable/what)
var/mob/living/simple_animal/slime/S = what
var/C = S.cores
if(S.stat != DEAD)
S.loc = loc
S.visible_message("<span class='notice'>[C] crawls free of the processor!</span>")
return
for(var/i in 1 to (C+processor.rating_amount-1))
new S.coretype(loc)
SSblackbox.add_details("slime_core_harvested","[replacetext(S.colour," ","_")]")
if (istype(S))
var/C = S.cores
if(S.stat != DEAD)
S.forceMove(drop_location())
S.visible_message("<span class='notice'>[C] crawls free of the processor!</span>")
return
for(var/i in 1 to (C+rating_amount-1))
var/atom/movable/item = new S.coretype(drop_location())
adjust_item_drop_location(item)
SSblackbox.add_details("slime_core_harvested","[replacetext(S.colour," ","_")]")
..()
/datum/food_processor_process/mob/slime/input = /mob/living/simple_animal/slime
/datum/food_processor_process/mob/slime/output = null
/datum/food_processor_process/mob/monkey/process_food(loc, what, processor)
var/mob/living/carbon/monkey/O = what
if (O.client) //grief-proof
O.loc = loc
O.visible_message("<span class='notice'>Suddenly [O] jumps out from the processor!</span>", \
"<span class='notice'>You jump out from the processor!</span>", \
"<span class='italics'>You hear chimpering.</span>")
return
var/obj/bucket = new /obj/item/reagent_containers/glass/bucket(loc)
var/datum/reagent/blood/B = new()
B.holder = bucket
B.volume = 70
//set reagent data
B.data["donor"] = O
for(var/thing in O.viruses)
var/datum/disease/D = thing
if(!(D.spread_flags & VIRUS_SPREAD_SPECIAL))
B.data["viruses"] += D.Copy()
if(O.has_dna())
B.data["blood_DNA"] = O.dna.unique_enzymes
if(O.resistances&&O.resistances.len)
B.data["resistances"] = O.resistances.Copy()
bucket.reagents.reagent_list += B
bucket.reagents.update_total()
bucket.on_reagent_change()
//bucket_of_blood.reagents.handle_reactions() //blood doesn't react
..()
/datum/food_processor_process/mob/monkey/input = /mob/living/carbon/monkey
/datum/food_processor_process/mob/monkey/output = null
/obj/machinery/processor/proc/select_recipe(X)
for (var/Type in subtypesof(/datum/food_processor_process) - /datum/food_processor_process/mob)
var/datum/food_processor_process/P = new Type()
if (!istype(X, P.input))
for (var/type in subtypesof(/datum/food_processor_process) - /datum/food_processor_process/mob)
var/datum/food_processor_process/recipe = new type()
if (!istype(X, recipe.input) || !istype(src, recipe.required_machine))
continue
return P
return 0
return recipe
/obj/machinery/processor/attackby(obj/item/O, mob/user, params)
if(src.processing)
to_chat(user, "<span class='warning'>The processor is in the process of processing!</span>")
to_chat(user, "<span class='warning'>[src] is in the process of processing!</span>")
return 1
if(default_deconstruction_screwdriver(user, "processor", "processor1", O))
return
@@ -205,12 +122,12 @@
return ..()
/obj/machinery/processor/attack_hand(mob/user)
if (src.stat != 0) //NOPOWER etc
if(stat & (NOPOWER|BROKEN))
return
if(src.processing)
to_chat(user, "<span class='warning'>The processor is in the process of processing!</span>")
to_chat(user, "<span class='warning'>[src] is in the process of processing!</span>")
return 1
if(user.a_intent == INTENT_GRAB && user.pulling && (isslime(user.pulling) || ismonkey(user.pulling)))
if(user.a_intent == INTENT_GRAB && user.pulling && select_recipe(user.pulling))
if(user.grab_state < GRAB_AGGRESSIVE)
to_chat(user, "<span class='warning'>You need a better grip to do that!</span>")
return
@@ -220,7 +137,7 @@
user.stop_pulling()
return
if(src.contents.len == 0)
to_chat(user, "<span class='warning'>The processor is empty!</span>")
to_chat(user, "<span class='warning'>[src] is empty!</span>")
return 1
processing = TRUE
user.visible_message("[user] turns on [src].", \
@@ -238,12 +155,12 @@
var/offset = prob(50) ? -2 : 2
animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = (total_time / rating_speed)*5) //start shaking
sleep(total_time / rating_speed)
for(var/O in src.contents)
for(var/atom/movable/O in src.contents)
var/datum/food_processor_process/P = select_recipe(O)
if (!P)
log_admin("DEBUG: [O] in processor havent suitable recipe. How do you put it in?") //-rastaf0
log_admin("DEBUG: [O] in processor havent suitable recipe. How do you put it in?")
continue
P.process_food(src.loc, O, src)
process_food(P, O)
pixel_x = initial(pixel_x) //return to its spot after shaking
processing = FALSE
src.visible_message("\The [src] finishes processing.")
@@ -267,10 +184,24 @@
return
/obj/machinery/processor/slime
name = "Slime processor"
name = "slime processor"
desc = "An industrial grinder with a sticker saying appropriated for science department. Keep hands clear of intake area while operating."
/obj/machinery/processor/slime/Initialize()
. = ..()
var/obj/item/circuitboard/machine/B = new /obj/item/circuitboard/machine/processor/slime(null)
B.apply_default_parts(src)
B.apply_default_parts(src)
/obj/machinery/processor/slime/adjust_item_drop_location(atom/movable/AM)
var/static/list/slimecores = subtypesof(/obj/item/slime_extract)
var/i = 0
if(!(i = slimecores.Find(AM.type))) // If the item is not found
return
if (i <= 16) // If in the first 12 slots
AM.pixel_x = -12 + ((i%4)*8)
AM.pixel_y = -12 + (round(i/4)*8)
return i
var/ii = i - 16
AM.pixel_x = -8 + ((ii%3)*8)
AM.pixel_y = -8 + (round(ii/3)*8)
return i
code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+1
View File
@@ -194,6 +194,7 @@
break
if(O.name == params["name"])
O.forceMove(drop_location())
adjust_item_drop_location(O)
desired--
return TRUE
return FALSE
code/modules/food_and_drinks/recipes/processor_recipes.dm
+50
View File
@@ -0,0 +1,50 @@
/datum/food_processor_process
var/input
var/output
var/time = 40
var/required_machine = /obj/machinery/processor
/datum/food_processor_process/meat
input = /obj/item/reagent_containers/food/snacks/meat/slab
output = /obj/item/reagent_containers/food/snacks/faggot
/datum/food_processor_process/bacon
input = /obj/item/reagent_containers/food/snacks/meat/rawcutlet
output = /obj/item/reagent_containers/food/snacks/meat/rawbacon
/datum/food_processor_process/potatowedges
input = /obj/item/reagent_containers/food/snacks/grown/potato/wedges
output = /obj/item/reagent_containers/food/snacks/fries
/datum/food_processor_process/sweetpotato
input = /obj/item/reagent_containers/food/snacks/grown/potato/sweet
output = /obj/item/reagent_containers/food/snacks/yakiimo
/datum/food_processor_process/potato
input = /obj/item/reagent_containers/food/snacks/grown/potato
output = /obj/item/reagent_containers/food/snacks/tatortot
/datum/food_processor_process/carrot
input = /obj/item/reagent_containers/food/snacks/grown/carrot
output = /obj/item/reagent_containers/food/snacks/carrotfries
/datum/food_processor_process/soybeans
input = /obj/item/reagent_containers/food/snacks/grown/soybeans
output = /obj/item/reagent_containers/food/snacks/soydope
/datum/food_processor_process/spaghetti
input = /obj/item/reagent_containers/food/snacks/doughslice
output = /obj/item/reagent_containers/food/snacks/spaghetti
/datum/food_processor_process/corn
input = /obj/item/reagent_containers/food/snacks/grown/corn
output = /obj/item/reagent_containers/food/snacks/tortilla
/datum/food_processor_process/parsnip
input = /obj/item/reagent_containers/food/snacks/grown/parsnip
output = /obj/item/reagent_containers/food/snacks/roastparsnip
/datum/food_processor_process/mob/slime
input = /mob/living/simple_animal/slime
output = null
required_machine = /obj/machinery/processor/slime