Skip to content

Commit

Permalink
Should fix pumpkins, PUMPKINS EVERYWHERE (#4881)
Browse files Browse the repository at this point in the history
# About the pull request

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

Commit from
cmss13-devs/cmss13-pve@0aa95b1

Turns out i'm a monkey and didn't think about This One Small Thing when
refactoring, so the decorator keeps applying even without being active.
Neat huh.

# Explain why it's good for the game
Pumpkins overstepping their bounds. It's not much of a holiday if it's
on all the time...


# Changelog
:cl: MorrowWolf
fix: Fixed Pumpkins appearing past season.
/:cl:

Co-authored-by: Morrow <[email protected]>
  • Loading branch information
fira and morrowwolf committed Nov 9, 2023
1 parent 7d01d79 commit 653208a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/controllers/subsystem/game_decorator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ SUBSYSTEM_DEF(game_decorator)
var/defer_decoration = TRUE //! So map decoration is done post-setup after nightmare and spawners

/datum/game_decorator/New()
if(defer_decoration)
if(defer_decoration && is_active_decor())
RegisterSignal(SSdcs, COMSIG_GLOB_MODE_POSTSETUP, PROC_REF(defered_decoration))

/datum/game_decorator/proc/is_active_decor()
Expand Down

0 comments on commit 653208a

Please sign in to comment.