Skip to content

Commit

Permalink
Merge pull request #9310 from Spookerton/spkrtn/fix/reaping-what-was-…
Browse files Browse the repository at this point in the history
…sown

harvesting cooldown correctly displays minutes
  • Loading branch information
Atermonera authored Jan 31, 2024
2 parents 79b9f24 + 318113a commit 8841edb
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion code/modules/mob/living/simple_mob/harvesting.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
return

if(harvest_tool)
. += SPAN_NOTICE("\The [src] can be [harvest_verb] with a [initial(harvest_tool.name)] every [round(harvest_cooldown, 0.1)] minutes.")
var/cooldown_display = round(harvest_cooldown / (1 MINUTE), 0.1)
. += SPAN_NOTICE("\The [src] can be [harvest_verb] with a [initial(harvest_tool.name)] every [cooldown_display] minutes.")
var/time_to_harvest = (harvest_recent + harvest_cooldown) - world.time
if(time_to_harvest > 0)
. += SPAN_NOTICE("It can be [harvest_verb] in [time_to_harvest / (1 MINUTE)] second(s).")
Expand Down

0 comments on commit 8841edb

Please sign in to comment.