From 48df6a949465338eb666de6477bfba11db67313c Mon Sep 17 00:00:00 2001 From: The0bserver Date: Thu, 1 Oct 2020 04:07:16 -0400 Subject: [PATCH 1/4] I shot the tray, I made an accurate tip. --- code/modules/plumbing/plumbers/autohydro.dm | 64 ------------------- .../machine_designs_service.dm | 8 --- .../research/techweb/nodes/medical_nodes.dm | 2 +- strings/tips.txt | 2 +- tgstation.dme | 1 - 5 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 code/modules/plumbing/plumbers/autohydro.dm diff --git a/code/modules/plumbing/plumbers/autohydro.dm b/code/modules/plumbing/plumbers/autohydro.dm deleted file mode 100644 index 37590bb4f3..0000000000 --- a/code/modules/plumbing/plumbers/autohydro.dm +++ /dev/null @@ -1,64 +0,0 @@ -/obj/machinery/hydroponics/constructable/automagic - name = "automated hydroponics system" - desc = "The bane of botanists everywhere. Accepts chemical reagents via plumbing, automatically harvests and removes dead plants." - obj_flags = CAN_BE_HIT | UNIQUE_RENAME - circuit = /obj/item/circuitboard/machine/hydroponics/automagic - self_sufficiency_req = 400 //automating hydroponics makes gaia sad so she needs more drugs to turn they tray godly. - - -/obj/machinery/hydroponics/constructable/automagic/attackby(obj/item/O, mob/user, params) - if(istype(O, /obj/item/reagent_containers)) - return FALSE //avoid fucky wuckies - ..() - -/obj/machinery/hydroponics/constructable/automagic/default_unfasten_wrench(mob/user, obj/item/I, time = 20) - . = ..() - if(. == SUCCESSFUL_UNFASTEN) - user.visible_message("[user.name] [anchored ? "fasten" : "unfasten"] [src]", \ - "You [anchored ? "fasten" : "unfasten"] [src]") - var/datum/component/plumbing/CP = GetComponent(/datum/component/plumbing) - if(anchored) - CP.enable() - else - CP.disable() - -/obj/machinery/hydroponics/constructable/automagic/Destroy() - . = ..() - STOP_PROCESSING(SSobj, src) - -/obj/machinery/hydroponics/constructable/automagic/Initialize(mapload) - . = ..() - START_PROCESSING(SSobj, src) - create_reagents(100 , AMOUNT_VISIBLE) - -/obj/machinery/hydroponics/constructable/automagic/ComponentInitialize() - . = ..() - AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, .proc/can_be_rotated)) - AddComponent(/datum/component/plumbing/simple_demand) - -/obj/machinery/hydroponics/constructable/proc/can_be_rotated(mob/user, rotation_type) - return !anchored - -/obj/machinery/hydroponics/constructable/automagic/process() - if(reagents) - reagents.add_reagent(reagents) - reagents.clear_reagents() - if(dead) - dead = 0 - qdel(myseed) - myseed = null - update_icon() - name = initial(name) - desc = initial(desc) - if(harvest) - myseed.harvest_userless() - harvest = 0 - lastproduce = age - if(!myseed.get_gene(/datum/plant_gene/trait/repeated_harvest)) - qdel(myseed) - myseed = null - dead = 0 - name = initial(name) - desc = initial(desc) - update_icon() - ..() diff --git a/code/modules/research/designs/machine_desings/machine_designs_service.dm b/code/modules/research/designs/machine_desings/machine_designs_service.dm index af4f650793..5cbff1c66a 100644 --- a/code/modules/research/designs/machine_desings/machine_designs_service.dm +++ b/code/modules/research/designs/machine_desings/machine_designs_service.dm @@ -81,14 +81,6 @@ category = list ("Hydroponics Machinery") departmental_flags = DEPARTMENTAL_FLAG_SERVICE -/datum/design/board/hydroponics/auto - name = "Machine Design (Automatic Hydroponics Tray Board)" - desc = "The circuit board for an automatic hydroponics tray. GIVE ME THE PLANT, CAPTAIN." - id = "autohydrotray" - build_path = /obj/machinery/hydroponics/constructable/automagic - category = list ("Hydroponics Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE | DEPARTMENTAL_FLAG_MEDICAL - /datum/design/board/monkey_recycler name = "Machine Design (Monkey Recycler Board)" desc = "The circuit board for a monkey recycler." diff --git a/code/modules/research/techweb/nodes/medical_nodes.dm b/code/modules/research/techweb/nodes/medical_nodes.dm index 150e420c09..afab12990b 100644 --- a/code/modules/research/techweb/nodes/medical_nodes.dm +++ b/code/modules/research/techweb/nodes/medical_nodes.dm @@ -38,7 +38,7 @@ display_name = "Advanced Plumbing Technology" description = "Plumbing RCD." prereq_ids = list("plumbing", "adv_engi") - design_ids = list("plumb_rcd", "autohydrotray") + design_ids = list("plumb_rcd") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) //////////////////////Cybernetics///////////////////// diff --git a/strings/tips.txt b/strings/tips.txt index 5dc4e1b985..2039b30359 100644 --- a/strings/tips.txt +++ b/strings/tips.txt @@ -163,7 +163,7 @@ As a Botanist, you can mutate the plants growing in your hydroponics trays with As a Botanist, you should look into increasing the potency of your plants. This is shown by the size of the plant's sprite, and can increase the amount of chemicals, points gained from grinding them in the biogenerator, and lets people know you are a proficient botanist. As a Botanist, you can combine production trait chemicals and mix your own complex chemicals inside of the plants themselves using precursors. Chlorine (blumpkin) + radium and phosphorus (glowshrooms) equals unstable mutagen! As a Botanist, earthsblood is an incredibly powerful chemical found in Ambrosia Gaia, it heals all types of damages very rapidly but causes lingering brain damage and has a nasty overdose. You can combine the chemicals from watermelons (water), grass (hydrogen), and cherries (sugar) to mix mannitol in with your earthsblood to completely counteract its main drawback! -As a Botanist, Ambrosia Gaia is a plant mutated from Ambrosia Deus, which is a plant mutated from Ambrosia Vulgaris. The reagent contained within this plant known as earthsblood can make your trays and soil plots completely self sufficient when a plant containing such reagent is composted into them, meaning they won't need nutrients or water, and they'll automatically kill their own weeds and pests. +As a Botanist, Ambrosia Gaia is a plant mutated from Ambrosia Deus, which is a plant mutated from Ambrosia Vulgaris. The reagent contained within this plant known as earthsblood makes for a vastly superior fertilizer than most, giving decent stat boosts to most stats, and automatically killing weeds and pests! As a Cook, you can load your food into snack vending machines. As a Cook, you can rename your custom made food with a pen. As a Cook, any food you make will be much healthier than the junk food found in vendors. Having the crew routinely eating from you will provide minor buffs. diff --git a/tgstation.dme b/tgstation.dme index d71d8db2bf..84ba5e24f7 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2873,7 +2873,6 @@ #include "code\modules\plumbing\ducts.dm" #include "code\modules\plumbing\plumbers\_plumb_machinery.dm" #include "code\modules\plumbing\plumbers\acclimator.dm" -#include "code\modules\plumbing\plumbers\autohydro.dm" #include "code\modules\plumbing\plumbers\bottler.dm" #include "code\modules\plumbing\plumbers\destroyer.dm" #include "code\modules\plumbing\plumbers\fermenter.dm" From 5a03688bdb1a9a5cef99a6bf9e22035905a9d750 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Thu, 1 Oct 2020 04:43:02 -0400 Subject: [PATCH 2/4] Dirt not powered, var cleanup, plumbing enable --- code/modules/hydroponics/hydroponics.dm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 6226f97b9f..6299d8ec41 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -28,8 +28,6 @@ var/unwrenchable = TRUE var/recent_bee_visit = FALSE //Have we been visited by a bee recently, so bees dont overpollinate one plant var/mob/lastuser //Last user to add reagents to a tray. Mostly for logging. - var/self_sufficiency_req = 20 //Required total dose to make a self-sufficient hydro tray. 1:1 with earthsblood. - var/self_sufficiency_progress = 0 var/self_sustaining = FALSE //If the tray generates nutrients and water on its own // Here lies irrigation. You won't be missed, because you were never used. @@ -44,6 +42,14 @@ icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "hydrotray3" +/obj/machinery/hydroponics/constructable/ComponentInitialize() + . = ..() + AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, .proc/can_be_rotated)) + AddComponent(/datum/component/plumbing/simple_demand) + +/obj/machinery/hydroponics/constructable/proc/can_be_rotated(mob/user, rotation_type) + return !anchored + /obj/machinery/hydroponics/constructable/RefreshParts() var/tmp_capacity = 0 for (var/obj/item/stock_parts/matter_bin/M in component_parts) @@ -634,7 +640,7 @@ if(!anchored) return self_sustaining = !self_sustaining - idle_power_usage = self_sustaining ? 4000 : 0 + idle_power_usage = self_sustaining ? 2500 : 0 to_chat(user, "You [self_sustaining ? "activate" : "deactivated"] [src]'s autogrow function[self_sustaining ? ", maintaining the tray's health while using high amounts of power" : ""].") update_icon() @@ -716,4 +722,6 @@ qdel(src) else return ..() - \ No newline at end of file + +/obj/machinery/hydroponics/soil/CtrlClick(mob/user) + return //Dirt doesn't have electricity, last I checked. From a9e727954ec9b6b2f04af73ea422d523823c0dd2 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Thu, 1 Oct 2020 04:49:07 -0400 Subject: [PATCH 3/4] No more automagic --- .../game/objects/items/circuitboards/machine_circuitboards.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 37d19783b5..3cd899fcf4 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -519,10 +519,6 @@ /obj/item/stack/sheet/glass = 1) needs_anchored = FALSE -/obj/item/circuitboard/machine/hydroponics/automagic - name = "Automatic Hydroponics Tray (Machine Board)" - build_path = /obj/machinery/hydroponics/constructable/automagic - /obj/item/circuitboard/machine/seed_extractor name = "Seed Extractor (Machine Board)" build_path = /obj/machinery/seed_extractor From fc3feae4c5ca7c65e93eb16b871284e350f0dc6b Mon Sep 17 00:00:00 2001 From: The0bserver Date: Thu, 1 Oct 2020 05:43:09 -0400 Subject: [PATCH 4/4] Plumbing component removed, for now. --- code/modules/hydroponics/hydroponics.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 6299d8ec41..bee131b000 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -42,14 +42,6 @@ icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "hydrotray3" -/obj/machinery/hydroponics/constructable/ComponentInitialize() - . = ..() - AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, .proc/can_be_rotated)) - AddComponent(/datum/component/plumbing/simple_demand) - -/obj/machinery/hydroponics/constructable/proc/can_be_rotated(mob/user, rotation_type) - return !anchored - /obj/machinery/hydroponics/constructable/RefreshParts() var/tmp_capacity = 0 for (var/obj/item/stock_parts/matter_bin/M in component_parts)