Merge branch 'BackroomsImplementation' of https://github.com/Moltijoe…

…/Yogstation into BackroomsImplementation
yogstation13 · Apr 10, 2024 · ed0f7a6 · ed0f7a6
2 parents 9f5e717 + ffe4c1b
commit ed0f7a6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
@@ -353,7 +353,7 @@ SUBSYSTEM_DEF(ticker)
 		place.power_change()
 
 
-	rock_paper_scissors_puzzle()
+	INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(rock_paper_scissors_puzzle))
 	return TRUE
 
 /datum/controller/subsystem/ticker/proc/PostSetup()

diff --git a/html/changelog.html b/html/changelog.html
@@ -57,6 +57,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">09 April 2024</h2>
+			<h3 class="author">Moltijoe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">fixes the server not restarting at the end of a round</li>
+			</ul>
+
 			<h2 class="date">08 April 2024</h2>
 			<h3 class="author">AMyriad updated:</h3>
 			<ul class="changes bgimages16">

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
@@ -43821,3 +43821,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: clown throwing pie at sec officer title screen is no longer offset incorrectly
   - bugfix: candle boxes won't turn invisible anymore when used inhand as they cannot
       be closed
+2024-04-09:
+  Moltijoe:
+  - bugfix: fixes the server not restarting at the end of a round