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

Rewrite examine() to pass a list around

Browse Source
This commit is contained in:
Aronai Sieyes
2020-04-29 16:42:50 -04:00
committed by VirgoBot
parent 8c5c0a7cfb
commit 6ebd249748
214 changed files with 2021 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/beekeeping/beehive.dm
+2 -2
View File
@@ -31,9 +31,9 @@
overlays += "bees3"
/obj/machinery/beehive/examine(var/mob/user)
..()
. = ..()
if(!closed)
to_chat(user, "The lid is open.")
. += "The lid is open."
/obj/machinery/beehive/attackby(var/obj/item/I, var/mob/user)
if(I.is_crowbar())
code/modules/hydroponics/seed_packets.dm
+2 -2
View File
@@ -60,9 +60,9 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds)
src.desc = "It's labelled as coming from [seed.display_name]."
/obj/item/seeds/examine(mob/user)
..(user)
. = ..()
if(seed && !seed.roundstart)
to_chat(user, "It's tagged as variety #[seed.uid].")
. += "It's tagged as variety #[seed.uid]."
/obj/item/seeds/cutting
name = "cuttings"
code/modules/hydroponics/trays/tray.dm
+19 -15
View File
@@ -1,6 +1,11 @@
/obj/machinery/portable_atmospherics/hydroponics
name = "hydroponics tray"
<<<<<<< HEAD
icon = 'icons/obj/hydroponics_machines_vr.dmi' //VOREStation Edit
=======
desc = "A tray usually full of fluid for growing plants."
icon = 'icons/obj/hydroponics_machines.dmi'
>>>>>>> 6c6644f... Rewrite examine() to pass a list around (#7038)
icon_state = "hydrotray3"
density = 1
anchored = 1
@@ -607,32 +612,31 @@
else if(dead)
remove_dead(user)
/obj/machinery/portable_atmospherics/hydroponics/examine()
..()
/obj/machinery/portable_atmospherics/hydroponics/examine(mob/user)
. = ..()
if(seed)
to_chat(usr, "<span class='notice'>[seed.display_name] are growing here.</span>")
. += "<span class='notice'>[seed.display_name] are growing here.</span>"
else
to_chat(usr, "[src] is empty.")
. += "It is empty."
if(!Adjacent(usr))
return
if(!Adjacent(user))
return .
to_chat(usr, "Water: [round(waterlevel,0.1)]/100")
to_chat(usr, "Nutrient: [round(nutrilevel,0.1)]/10")
. += "Water: [round(waterlevel,0.1)]/100"
. += "Nutrient: [round(nutrilevel,0.1)]/10"
if(seed)
if(weedlevel >= 5)
to_chat(usr, "\The [src] is <span class='danger'>infested with weeds</span>!")
. += "It is <span class='danger'>infested with weeds</span>!"
if(pestlevel >= 5)
to_chat(usr, "\The [src] is <span class='danger'>infested with tiny worms</span>!")
. += "It is <span class='danger'>infested with tiny worms</span>!"
if(dead)
to_chat(usr, "<span class='danger'>The plant is dead.</span>")
. += "It has <span class='danger'>a dead plant</span>!"
else if(health <= (seed.get_trait(TRAIT_ENDURANCE)/ 2))
to_chat(usr, "The plant looks <span class='danger'>unhealthy</span>.")
. += "It has <span class='danger'>an unhealthy plant</span>!"
if(frozen == 1)
to_chat(usr, "<span class='notice'>It is cryogenically frozen.</span>")
. += "<span class='notice'>It is cryogenically frozen.</span>"
if(mechanical)
var/turf/T = loc
var/datum/gas_mixture/environment
@@ -655,7 +659,7 @@
var/light_available = T.get_lumcount() * 5
light_string = "a light level of [light_available] lumens"
to_chat(usr, "The tray's sensor suite is reporting [light_string] and a temperature of [environment.temperature]K at [environment.return_pressure()] kPa in the [environment_type] environment")
. += "The tray's sensor suite is reporting [light_string] and a temperature of [environment.temperature]K at [environment.return_pressure()] kPa in the [environment_type] environment."
/obj/machinery/portable_atmospherics/hydroponics/verb/close_lid_verb()
set name = "Toggle Tray Lid"