From 5b33a7248652a48d44a4455f382d98eff86c5c1f Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 23 Jan 2017 22:39:01 -0500 Subject: [PATCH] fixesssss --- code/modules/hydroponics/gene_modder.dm | 10 --- code/modules/hydroponics/trays/tray_soil.dm | 84 --------------------- 2 files changed, 94 deletions(-) delete mode 100644 code/modules/hydroponics/trays/tray_soil.dm diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm index 208d76fd2a2..09853bbc219 100644 --- a/code/modules/hydroponics/gene_modder.dm +++ b/code/modules/hydroponics/gene_modder.dm @@ -31,16 +31,6 @@ component_parts += new /obj/item/weapon/stock_parts/manipulator(src) RefreshParts() -/obj/item/weapon/circuitboard/plantgenes - name = "Plant DNA Manipulator (Machine Board)" - build_path = /obj/machinery/plantgenes - origin_tech = "programming=3;biotech=3" - req_components = list( - /obj/item/weapon/stock_parts/manipulator = 1, - /obj/item/weapon/stock_parts/micro_laser = 1, - /obj/item/weapon/stock_parts/console_screen = 1, - /obj/item/weapon/stock_parts/scanning_module = 1) - /obj/machinery/plantgenes/RefreshParts() rating = 0 for(var/I in component_parts) diff --git a/code/modules/hydroponics/trays/tray_soil.dm b/code/modules/hydroponics/trays/tray_soil.dm deleted file mode 100644 index efaaeee887c..00000000000 --- a/code/modules/hydroponics/trays/tray_soil.dm +++ /dev/null @@ -1,84 +0,0 @@ -/obj/machinery/portable_atmospherics/hydroponics/soil - name = "soil" - icon_state = "soil" - density = 0 - use_power = 0 - mechanical = 0 - tray_light = 0 - -/obj/machinery/portable_atmospherics/hydroponics/soil/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O,/obj/item/weapon/tank)) - return - else if(istype(O,/obj/item/weapon/crowbar)) - return - else if(istype(O, /obj/item/weapon/shovel)) - if(seed) - to_chat(user, "You dig up and dispose of \the [seed.display_name].") - seed = null - dead = 0 - sampled = 0 - age = 0 - lastproduce = 0 - yield_mod = 0 - mutation_mod = 0 - check_health() - else - to_chat(user, "You clear up [src]!") - qdel(src) - else - ..() - -/obj/machinery/portable_atmospherics/hydroponics/soil/New() - ..() - verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/close_lid_verb - verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/remove_label - verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/setlight - verbs -= /obj/machinery/portable_atmospherics/hydroponics/verb/eject_tank_verb - -/obj/machinery/portable_atmospherics/hydroponics/soil/CanPass() - return 1 - -// Holder for vine plants. -// Icons for plants are generated as overlays, so setting it to invisible wouldn't work. -// Hence using a blank icon. -/obj/machinery/portable_atmospherics/hydroponics/soil/invisible - name = "plant" - icon = 'icons/obj/seeds.dmi' - icon_state = "blank" - -/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/New(var/newloc,var/datum/seed/newseed) - ..() - seed = newseed - dead = 0 - age = 1 - health = seed.get_trait(TRAIT_ENDURANCE) - lastcycle = world.time - pixel_y = rand(-5,5) - check_health() - -/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/remove_dead() - ..() - qdel(src) - -/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/harvest() - ..() - if(!seed) // Repeat harvests are a thing. - qdel(src) - -/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/die() - qdel(src) - -/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/process() - if(!seed) - qdel(src) - return - else if(name=="plant") - name = seed.display_name - ..() - -/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/Destroy() - // Check if we're masking a decal that needs to be visible again. - for(var/obj/effect/plant/plant in get_turf(src)) - if(plant.invisibility == INVISIBILITY_MAXIMUM) - plant.invisibility = initial(plant.invisibility) - return ..()