From 42ff7bf843fb5b2ce1d9910c01e734a7d4fa93b6 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Thu, 26 Sep 2024 08:57:08 +0200 Subject: [PATCH] [NO GBP] The Pun Pun job trait actually removes the premapped Pun Pun (#86877) ## About The Pull Request Yeah, I've got the `SSticker.HasRoundStarted` check wrong. ## Why It's Good For The Game Until proven otherwise, monkeys do not reproduce by mitosis. ## Changelog :cl: fix: The Pun Pun job trait doesn't leave behind a fake (or is it?) Pun Pun. /:cl: --- code/datums/station_traits/job_traits.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/station_traits/job_traits.dm b/code/datums/station_traits/job_traits.dm index b23a694cfde..3e8171d99c5 100644 --- a/code/datums/station_traits/job_traits.dm +++ b/code/datums/station_traits/job_traits.dm @@ -258,7 +258,8 @@ /datum/station_trait/job/pun_pun/New() . = ..() - if(!SSticker.HasRoundStarted() || !GLOB.the_one_and_only_punpun) //Make sure we don't have two Pun Puns if loaded before the start of the round. + //Make sure we don't have two Pun Puns if loaded before the start of the round. + if(SSticker.HasRoundStarted() || !GLOB.the_one_and_only_punpun) return new /obj/effect/landmark/start/pun_pun(GLOB.the_one_and_only_punpun.loc) qdel(GLOB.the_one_and_only_punpun)