cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14759 from KillianKirilenko/kk-canteven

Browse Source 
Botany/Hydroponics minifix
This commit is contained in:
Heroman3003
2023-04-06 17:30:59 +10:00
committed by CHOMPStation2
parent 63a59c18c7
commit c1ac01b62c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,9 +390,12 @@
// If a weed growth is sufficient, this proc is called. // If a weed growth is sufficient, this proc is called.
/obj/machinery/portable_atmospherics/hydroponics/proc/weed_invasion() /obj/machinery/portable_atmospherics/hydroponics/proc/weed_invasion()
var/previous_plant
//Remove the seed if something is already planted. //Remove the seed if something is already planted.
if(seed) seed = null if(seed)
previous_plant = seed.display_name
seed = null
seed = SSplants.seeds[pick(list("reishi","nettle","amanita","mushrooms","plumphelmet","towercap","harebells","weeds"))] seed = SSplants.seeds[pick(list("reishi","nettle","amanita","mushrooms","plumphelmet","towercap","harebells","weeds"))]
if(!seed) return //Weed does not exist, someone fucked up. if(!seed) return //Weed does not exist, someone fucked up.
@@ -406,7 +409,7 @@
pestlevel = 0 pestlevel = 0
sampled = 0 sampled = 0
update_icon() update_icon()
visible_message("<span class='notice'>[src] has been overtaken by [seed.display_name].</span>") visible_message("<span class='notice'>\The [previous_plant ? previous_plant : initial(name)] has been overtaken by [seed.display_name].</span>")
return return