diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index c499177bffd..1835823f234 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -193,8 +193,8 @@ obj/machinery/hydroponics/proc/weedinvasion() // If a weed growth is sufficient, src.myseed = new /obj/item/seeds/amanitamycelium if(6 to 9) src.myseed = new /obj/item/seeds/chantermycelium - //if(6 to 7) implementation for tower caps still kinda missing - // src.myseed = new /obj/item/seeds/towermycelium + if(6 to 7) // implementation for tower caps still kinda missing ~ Not Anymore! -Cheridan + src.myseed = new /obj/item/seeds/towermycelium if(4 to 5) src.myseed = new /obj/item/seeds/plumpmycelium else @@ -671,13 +671,8 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) else if (istype(O, /obj/item/weapon/minihoe)) // The minihoe //var/deweeding if(src.weedlevel > 0) - user.visible_message("\red [user] starts uprooting the weeds.", "\red You start removing some weeds from the tray.") - sleep(10) - if(src.weedlevel > 1) - src.weedlevel -= rand(1,2) // Kill kill kill - else - src.weedlevel = 0 - user << "Success!" + user.visible_message("\red [user] starts uprooting the weeds.", "\red You remove the weeds from the tray.") + src.weedlevel = 0 else user << "\red This plot is completely devoid of weeds. It doesn't need uprooting." diff --git a/code/game/machinery/sink.dm b/code/game/machinery/sink.dm index 4944445dccf..68ea12bc830 100644 --- a/code/game/machinery/sink.dm +++ b/code/game/machinery/sink.dm @@ -58,6 +58,13 @@ user << "\red Someone's already washing something here." return + if (istype(O, /obj/item/weapon/reagent_containers/glass/bucket)) + O:reagents.add_reagent("water", 70) + user.visible_message( \ + "\blue [user] fills the [O] using the [src].", \ + "\blue You fill the [O] using the [src].") + return + if (istype(O, /obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/food/drinks)) O:reagents.add_reagent("water", 10) user.visible_message( \ diff --git a/icons/mob/critter.dmi b/icons/mob/critter.dmi index 139e1751d26..0febb340d1b 100644 Binary files a/icons/mob/critter.dmi and b/icons/mob/critter.dmi differ