cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 06:28:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Using a minihoe on a Hydroponics tray removes all the weeds in the tray at once.

Browse Source 
Using a bucket on a sink now fills it entirely with water, instead of 10 units at a time.
This should only save botanists a few hundred clicks per game.

Uncommented tower caps from the weed overgrowth options (they were commented out previously because they weren't done, but they're fully implemented now).

Sprite addition: Added new killer tomato sprites to critter.dmi (where the game actually draws them from, instead of livestock.dmi. Oops.)

Note: This is my first actual code commit! I'M A CODER NOW LOOKIT ME!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3360 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
d_h2005@yahoo.com
2012-03-26 01:27:56 +00:00
parent 587dfb813c
commit dbe7829f7b
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/hydroponics.dm
+4 -9
View File
@@ -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."
code/game/machinery/sink.dm
+7
View File
@@ -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( \