Merge pull request #9445 from VOREStation/upstream-merge-7369

[MIRROR] Department and Round Goals
This commit is contained in:
Novacat
2021-02-21 17:14:47 -05:00
committed by GitHub
15 changed files with 185 additions and 4 deletions
+3 -2
View File
@@ -17,10 +17,10 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/Initialize(var/mapload, var/planttype)
. = ..()
if(!dried_type)
dried_type = type
pixel_x = rand(-5.0, 5)
pixel_y = rand(-5.0, 5)
@@ -292,6 +292,7 @@
if(seed.get_trait(TRAIT_SPREAD) > 0)
to_chat(user, "<span class='notice'>You plant the [src.name].</span>")
new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(get_turf(user),src.seed)
GLOB.seed_planted_shift_roundstat++
qdel(src)
return
+2
View File
@@ -204,6 +204,8 @@
qdel(S)
GLOB.seed_planted_shift_roundstat++
check_health()
update_icon()