cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate

Browse Source
This commit is contained in:
izac112
2020-05-16 09:06:27 +02:00
parent 6a7192c93f c52f9090a4
commit bbb084a354
129 changed files with 4015 additions and 2873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,6 +44,12 @@
// Seed details/line data.
var/datum/seed/seed = null // The currently planted seed
var/image/ov_lowhealth
var/image/ov_lowwater
var/image/ov_lownutri
var/image/ov_harvest
var/image/ov_frozen
var/image/ov_alert3
// Reagent information for process(), consider moving this to a controller along
// with cycle information under 'mechanical concerns' at some point.
@@ -170,6 +176,8 @@
/obj/machinery/portable_atmospherics/hydroponics/Initialize()
. = ..()
if(!ov_lowhealth)
setup_overlays()
temp_chem_holder = new()
temp_chem_holder.create_reagents(10)
create_reagents(200)

36
code/modules/hydroponics/trays/tray_update_icons.dm
View File

@@ -1,3 +1,17 @@
/obj/machinery/portable_atmospherics/hydroponics/proc/setup_overlays()
ov_lowhealth = image(icon = icon, icon_state = "over_lowhealth3")
ov_lowhealth.plane = PLANE_LIGHTING_ABOVE
ov_lowwater = image(icon = icon, icon_state = "over_lowwater3")
ov_lowwater.plane = PLANE_LIGHTING_ABOVE
ov_lownutri = image(icon = icon, icon_state = "over_lownutri3")
ov_lownutri.plane = PLANE_LIGHTING_ABOVE
ov_harvest = image(icon = icon, icon_state = "over_alert3")
ov_harvest.plane = PLANE_LIGHTING_ABOVE
ov_frozen = image(icon = icon, icon_state = "over_harvest3")
ov_frozen.plane = PLANE_LIGHTING_ABOVE
ov_alert3 = image(icon = icon, icon_state = "over_frozen3")
ov_alert3.plane = PLANE_LIGHTING_ABOVE
//Refreshes the icon and sets the luminosity
/obj/machinery/portable_atmospherics/hydroponics/update_icon()
// Update name.
@@ -12,12 +26,12 @@
if(labelled)
name += " ([labelled])"
overlays.Cut()
cut_overlays()
// Updates the plant overlay.
if(!isnull(seed))
if(mechanical && health <= (seed.get_trait(TRAIT_ENDURANCE) / 2))
overlays += "over_lowhealth3"
add_overlay(ov_lowhealth)
if(dead)
var/ikey = "[seed.get_trait(TRAIT_PLANT_ICON)]-dead"
@@ -25,7 +39,7 @@
if(!dead_overlay)
dead_overlay = image('icons/obj/hydroponics_growing.dmi', "[ikey]")
dead_overlay.color = DEAD_PLANT_COLOUR
overlays |= dead_overlay
add_overlay(dead_overlay)
else
if(!seed.growth_stages)
seed.update_growth_stages()
@@ -49,7 +63,7 @@
plant_overlay = image('icons/obj/hydroponics_growing.dmi', "[ikey]")
plant_overlay.color = seed.get_trait(TRAIT_PLANT_COLOUR)
plant_controller.plant_icon_cache["[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"] = plant_overlay
overlays |= plant_overlay
add_overlay(plant_overlay)
if(harvest && overlay_stage == seed.growth_stages)
ikey = "[seed.get_trait(TRAIT_PRODUCT_ICON)]"
@@ -58,25 +72,25 @@
harvest_overlay = image('icons/obj/hydroponics_products.dmi', "[ikey]")
harvest_overlay.color = seed.get_trait(TRAIT_PRODUCT_COLOUR)
plant_controller.plant_icon_cache["product-[ikey]-[seed.get_trait(TRAIT_PRODUCT_COLOUR)]"] = harvest_overlay
overlays |= harvest_overlay
add_overlay(harvest_overlay)
//Draw the cover.
if(closed_system)
overlays += "hydrocover"
add_overlay("hydrocover")
//Updated the various alert icons.
if(mechanical)
if(waterlevel <= 10)
overlays += "over_lowwater3"
add_overlay(ov_lowwater)
if(nutrilevel <= 2)
overlays += "over_lownutri3"
add_overlay(ov_lownutri)
if(weedlevel >= 5 || pestlevel >= 5 || toxins >= 40)
overlays += "over_alert3"
add_overlay(ov_alert3)
if(harvest)
overlays += "over_harvest3"
add_overlay(ov_harvest)
if(frozen)
overlays += "over_frozen3"
add_overlay(ov_frozen)
// Update bioluminescence.
if(seed)