mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Merge pull request #14759 from KillianKirilenko/kk-canteven
Botany/Hydroponics minifix
This commit is contained in:
committed by
CHOMPStation2
parent
63a59c18c7
commit
c1ac01b62c
@@ -390,9 +390,12 @@
|
||||
|
||||
// If a weed growth is sufficient, this proc is called.
|
||||
/obj/machinery/portable_atmospherics/hydroponics/proc/weed_invasion()
|
||||
var/previous_plant
|
||||
|
||||
//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"))]
|
||||
if(!seed) return //Weed does not exist, someone fucked up.
|
||||
|
||||
@@ -406,7 +409,7 @@
|
||||
pestlevel = 0
|
||||
sampled = 0
|
||||
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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user