cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 09:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Botany Tweaks (#389)

Browse Source 
Watering hydroponics trays with a bucket of water will no longer waste
the excess water.
Fertilizer bottles now contain 60u. Amounts in vendors and biogenerator
cost adjusted appropriately
This commit is contained in:
NanakoAC
2016-06-20 15:34:30 +01:00
committed by skull132
parent ea0e6114c8
commit e70157ebfc
6 changed files with 77 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/modules/hydroponics/trays/tray.dm
View File

@@ -16,6 +16,11 @@
var/pestlevel = 0 // Pests (max 10)
var/weedlevel = 0 // Weeds (max 10)
var/maxWaterLevel = 100
var/maxNutriLevel = 10
var/maxPestLevel = 10
var/maxWeedLevel = 10
// Tray state vars.
var/dead = 0 // Is it dead?
var/harvest = 0 // Is it ready to harvest?
@@ -407,6 +412,20 @@
/obj/machinery/portable_atmospherics/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
//A special case for if the container has only water, for manual watering with buckets
if (istype(O,/obj/item/weapon/reagent_containers))
var/obj/item/weapon/reagent_containers/RC = O
if (RC.reagents.reagent_list.len == 1)
if (RC.reagents.has_reagent("water", 1))
if (waterlevel < maxWaterLevel)
var/amountToRemove = min((maxWaterLevel - waterlevel), RC.reagents.total_volume)
RC.reagents.remove_reagent("water", amountToRemove, 1)
waterlevel += amountToRemove
user.visible_message("[user] transfers [amountToRemove]u of water to the tray."," You transfer [amountToRemove]u of water to the tray.")
else
user << "This tray is full of water already."
return 1
if (O.is_open_container())
return 0

6
code/modules/hydroponics/trays/tray_reagents.dm
View File

@@ -100,7 +100,7 @@
/obj/item/weapon/reagent_containers/glass/fertilizer
name = "fertilizer bottle"
desc = "A small glass bottle. Can hold up to 10 units."
desc = "A small glass bottle. Can hold up to 60 units."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
flags = OPENCONTAINER
@@ -111,7 +111,7 @@
//Like a shot glass!
amount_per_transfer_from_this = 10
volume = 10
volume = 60
/obj/item/weapon/reagent_containers/glass/fertilizer/New()
..()
@@ -120,7 +120,7 @@
src.pixel_y = rand(-5.0, 5)
if(fertilizer)
reagents.add_reagent(fertilizer,10)
reagents.add_reagent(fertilizer,60)
/obj/item/weapon/reagent_containers/glass/fertilizer/ez
name = "bottle of E-Z-Nutrient"

14
code/modules/hydroponics/trays/tray_soil.dm
View File

@@ -7,6 +7,20 @@
tray_light = 0
/obj/machinery/portable_atmospherics/hydroponics/soil/attackby(var/obj/item/O as obj, var/mob/user as mob)
//A special case for if the container has only water, for manual watering with buckets
if (istype(O,/obj/item/weapon/reagent_containers))
var/obj/item/weapon/reagent_containers/RC = O
if (RC.reagents.reagent_list.len == 1)
if (RC.reagents.has_reagent("water", 1))
if (waterlevel < maxWaterLevel)
var/amountToRemove = min((maxWaterLevel - waterlevel), RC.reagents.total_volume)
RC.reagents.remove_reagent("water", amountToRemove, 1)
waterlevel += amountToRemove
user.visible_message("[user] pours [amountToRemove]u of water into the soil."," You pour [amountToRemove]u of water into the soil.")
else
user << "The soil is saturated with water already."
return 1
if(istype(O,/obj/item/weapon/tank))
return
else