diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm index 48389d6eb4..9485c90eb5 100644 --- a/code/WorkInProgress/Chemistry-Reagents.dm +++ b/code/WorkInProgress/Chemistry-Reagents.dm @@ -723,9 +723,9 @@ datum return */ reaction_obj(var/obj/O, var/volume) - if(istype(O,/obj/plant/vine/)) - O:life -= rand(15,35) // Kills vines nicely // Not tested as vines don't work in R41 - else if(istype(O,/obj/alien/weeds/)) + // if(istype(O,/obj/plant/vine/)) + // O:life -= rand(15,35) // Kills vines nicely // Not tested as vines don't work in R41 + if(istype(O,/obj/alien/weeds/)) O:health -= rand(15,35) // Kills alien weeds pretty fast O:healthcheck() // Damage that is done to growing plants is separately diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index 497c4b3b27..b8bd4ea7bb 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -730,7 +730,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) // BROKEN!!!!!! - +/* /datum/vinetracker var/list/vines = list() @@ -790,13 +790,13 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) spawn(3000) del(V) sleep(600) - +*/ obj/plant anchored = 1 var/stage = 1 var/health = 10 - +/* obj/plant/vine name = "space vine" icon = 'hydroponics.dmi' @@ -837,4 +837,4 @@ obj/plant/vine if(exposed_temperature > 350) health -= 15 if(health <= 0) - del(src) \ No newline at end of file + del(src) */ \ No newline at end of file