From 566234a83ef245043e85edfaa568ae6beb658a92 Mon Sep 17 00:00:00 2001 From: blah Date: Thu, 25 Aug 2016 12:48:24 +0100 Subject: [PATCH 1/5] Puts the code in to fix the consistency issue of food processors and slime processor. Someone else can edit the maps. --- .../kitchen_machinery/processor.dm | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 96d32d3902b..964bd207616 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -28,6 +28,23 @@ /obj/item/weapon/stock_parts/matter_bin = 1, /obj/item/weapon/stock_parts/manipulator = 1) +/obj/item/weapon/circuitboard/machine/processor + name = "circuit board (Food Processor)" + build_path = /obj/machinery/processor + +/obj/item/weapon/circuitboard/machine/processor/attackby(obj/item/I, mob/user, params) + if(istype(I,/obj/item/weapon/screwdriver)) + if(build_path == /obj/machinery/processor) + name = "circuit board (Slime Processor)" + build_path = /obj/machinery/processor/Slime + user << "Name protocols successfully updated." + else + name = "circuit board (Food Processor)" + build_path = /obj/machinery/processor + user << "Defaulting name protocols." + else + return ..() + /obj/machinery/processor/RefreshParts() for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts) rating_amount = B.rating @@ -249,3 +266,15 @@ M.loc = src.loc return +/obj/machinery/processor/Slime + 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/New() + ..() + var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/processor/Slime(null) + B.apply_default_parts(src) + +/obj/item/weapon/circuitboard/machine/processor/Slime + name = "circuit board (Slime Processor)" + build_path = /obj/machinery/processor/Slime \ No newline at end of file From d01bba7481da4e6e6ca3f96f073e87a654d9ac74 Mon Sep 17 00:00:00 2001 From: blah Date: Thu, 25 Aug 2016 15:10:46 +0100 Subject: [PATCH 2/5] Solves a issue I created and a needless comment --- .../kitchen_machinery/processor.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 964bd207616..b8a3c70d282 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -35,8 +35,8 @@ /obj/item/weapon/circuitboard/machine/processor/attackby(obj/item/I, mob/user, params) if(istype(I,/obj/item/weapon/screwdriver)) if(build_path == /obj/machinery/processor) - name = "circuit board (Slime Processor)" - build_path = /obj/machinery/processor/Slime + name = "circuit board (slime Processor)" + build_path = /obj/machinery/processor/slime user << "Name protocols successfully updated." else name = "circuit board (Food Processor)" @@ -232,7 +232,7 @@ for(var/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 // DEAR GOD THIS BURNS MY EYES HAVE YOU EVER LOOKED IN AN ENGLISH DICTONARY BEFORE IN YOUR LIFE AAAAAAAAAAAAAAAAAAAAA - Iamgoofball + log_admin("DEBUG: [O] in processor hasnt got a suitable recipe. How did it get in there? Please report it immediatly!!!") continue total_time += P.time var/offset = prob(50) ? -2 : 2 @@ -266,15 +266,15 @@ M.loc = src.loc return -/obj/machinery/processor/Slime +/obj/machinery/processor/slime 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/New() +/obj/machinery/processor/slime/New() ..() - var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/processor/Slime(null) + var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/processor/slime(null) B.apply_default_parts(src) -/obj/item/weapon/circuitboard/machine/processor/Slime +/obj/item/weapon/circuitboard/machine/processor/slime name = "circuit board (Slime Processor)" - build_path = /obj/machinery/processor/Slime \ No newline at end of file + build_path = /obj/machinery/processor/slime \ No newline at end of file From 4b1b1b1dbe3c29d159a6742367bc40120f02c13f Mon Sep 17 00:00:00 2001 From: blah Date: Thu, 25 Aug 2016 15:26:26 +0100 Subject: [PATCH 3/5] Fixes bucket of blood. --- .../food_and_drinks/kitchen_machinery/processor.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index b8a3c70d282..01de84afd12 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -148,9 +148,9 @@ "You jump out from the processor!", \ "You hear chimpering.") return - var/obj/item/weapon/reagent_containers/glass/bucket/bucket_of_blood = new(loc) + var/obj/item/weapon/reagent_containers/glass/bucket = new(loc) var/datum/reagent/blood/B = new() - B.holder = bucket_of_blood + B.holder = bucket B.volume = 70 //set reagent data B.data["donor"] = O @@ -163,9 +163,9 @@ if(O.resistances&&O.resistances.len) B.data["resistances"] = O.resistances.Copy() - bucket_of_blood.reagents.reagent_list += B - bucket_of_blood.reagents.update_total() - bucket_of_blood.on_reagent_change() + bucket.reagents.reagent_list += B + bucket.reagents.update_total() + bucket.on_reagent_change() //bucket_of_blood.reagents.handle_reactions() //blood doesn't react ..() From 308603ca61cc285b55c15a8953160388fe0624ad Mon Sep 17 00:00:00 2001 From: blah Date: Thu, 25 Aug 2016 16:23:47 +0100 Subject: [PATCH 4/5] Properly fixes the blood bucket and fixes being able to manually put in slimes and monkeys. --- .../food_and_drinks/kitchen_machinery/processor.dm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 01de84afd12..7310767ca79 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -148,7 +148,8 @@ "You jump out from the processor!", \ "You hear chimpering.") return - var/obj/item/weapon/reagent_containers/glass/bucket = new(loc) + var/obj/bucket = new /obj/item/weapon/reagent_containers/glass/bucket(loc) + var/datum/reagent/blood/B = new() B.holder = bucket B.volume = 70 @@ -219,6 +220,15 @@ if(src.processing) user << "The processor is in the process of processing!" return 1 + if(user.a_intent == "grab" && user.pulling && isliving(user.pulling) && isslime(user.pulling) || ismonkey(user.pulling)) + if(user.grab_state < GRAB_AGGRESSIVE) + user << "You need a better grip to do that!" + return + var/mob/living/pushed_mob = user.pulling + visible_message("[user] stuffs [pushed_mob] into [src]!") + pushed_mob.forceMove(src) + user.stop_pulling() + return if(src.contents.len == 0) user << "The processor is empty!" return 1 From 9471623237644a6b282d4c53a184acc769706f27 Mon Sep 17 00:00:00 2001 From: blah Date: Fri, 26 Aug 2016 15:11:14 +0100 Subject: [PATCH 5/5] Does the change that Joan requested --- code/modules/food_and_drinks/kitchen_machinery/processor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 7310767ca79..ebbe4b1e4d2 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -220,7 +220,7 @@ if(src.processing) user << "The processor is in the process of processing!" return 1 - if(user.a_intent == "grab" && user.pulling && isliving(user.pulling) && isslime(user.pulling) || ismonkey(user.pulling)) + if(user.a_intent == "grab" && user.pulling && (isslime(user.pulling) || ismonkey(user.pulling))) if(user.grab_state < GRAB_AGGRESSIVE) user << "You need a better grip to do that!" return