feeexes

BeeStation · Oct 19, 2023 · f1722f0 · f1722f0
1 parent bc20ad5
commit f1722f0
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 15 deletions.
diff --git a/beestation.dme b/beestation.dme
@@ -2152,7 +2152,6 @@
 #include "code\modules\atmospherics\machinery\portable\scrubber.dm"
 #include "code\modules\awaymissions\away_props.dm"
 #include "code\modules\awaymissions\bluespaceartillery.dm"
-#include "code\modules\awaymissions\capture_the_flag.dm"
 #include "code\modules\awaymissions\corpse.dm"
 #include "code\modules\awaymissions\exile.dm"
 #include "code\modules\awaymissions\gateway.dm"
@@ -2195,6 +2194,7 @@
 #include "code\modules\buildmode\submodes\throwing.dm"
 #include "code\modules\buildmode\submodes\variable_edit.dm"
 #include "code\modules\capture_the_flag\_defines.dm"
+#include "code\modules\capture_the_flag\ctf_game.dm"
 #include "code\modules\capture_the_flag\ctf_panel.dm"
 #include "code\modules\cargo\bounty.dm"
 #include "code\modules\cargo\bounty_console.dm"

diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm
@@ -80,13 +80,13 @@ GLOBAL_VAR_INIT(ghost_role_flags, (~0))
 //ie fugitives, space dragon, etc. also includes dynamic midrounds as it's the same deal
 #define GHOSTROLE_MIDROUND_EVENT	(1<<0)
 //ie ashwalkers, free golems, beach bums
-#define GHOSTROLE_SPAWNER			(1<<1)
+#define GHOSTROLE_SPAWNER (1<<1)
 //ie mind monkeys, sentience potion
 #define GHOSTROLE_STATION_SENTIENCE	(1<<2)
 //ie pais, posibrains
-#define GHOSTROLE_SILICONS			(1<<3)
+#define GHOSTROLE_SILICONS (1<<3)
 //ie mafia, ctf
-#define GHOSTROLE_MINIGAME			(1<<4)
+#define GHOSTROLE_MINIGAME (1<<4)
 
 // Job deadmin flags
 #define DEADMIN_POSITION_HEAD		(1<<0)

diff --git a/...ules/capture_the_flag/capture_the_flag.dm → code/modules/capture_the_flag/ctf_game.dm b/...ules/capture_the_flag/capture_the_flag.dm → code/modules/capture_the_flag/ctf_game.dm
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
@@ -942,7 +942,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(!client)
 		return
 	if(!isobserver(src))
-		to_chat(usr, span_warning("You must be a ghost to play minigames!"))
+		to_chat(usr, "<span class='warning'>You must be a ghost to play minigames!</span>")
 		return
 	if(!minigames_menu)
 		minigames_menu = new(src)

diff --git a/icons/mob/screen_ghost.dmi b/icons/mob/screen_ghost.dmi
diff --git a/tgui/packages/tgui/interfaces/MinigamesMenu.js b/tgui/packages/tgui/interfaces/MinigamesMenu.js
@@ -22,16 +22,6 @@ export const MinigamesMenu = (props, context) => {
                 onClick={() => act('ctf')}
               />
             </Stack.Item>
-            <Stack.Item grow>
-              <Button
-                content="Mafia"
-                fluid={1}
-                fontSize={3}
-                textAlign="center"
-                lineHeight="3"
-                onClick={() => act('mafia')}
-              />
-            </Stack.Item>
           </Stack>
         </Section>
       </Window.Content>