diff --git a/code/modules/admin/game_master/game_master.dm b/code/modules/admin/game_master/game_master.dm index d61a7b6921..170fdc12ea 100644 --- a/code/modules/admin/game_master/game_master.dm +++ b/code/modules/admin/game_master/game_master.dm @@ -73,6 +73,11 @@ GLOBAL_LIST_EMPTY(game_master_objectives) /// End Objective Stuff + /// Communication stuff + + + /// End Communication stuff + /// Holds what type of click intercept we are using var/current_click_intercept_action @@ -91,6 +96,9 @@ GLOBAL_LIST_EMPTY(game_master_objectives) submenu_types = null current_submenus = null + if(user_client?.click_intercept == src) + user_client.click_intercept = null + /datum/game_master/ui_data(mob/user) . = ..() @@ -105,7 +113,6 @@ GLOBAL_LIST_EMPTY(game_master_objectives) // Objective stuff data["objective_click_intercept"] = objective_click_intercept - return data /datum/game_master/ui_static_data(mob/user) @@ -161,6 +168,8 @@ GLOBAL_LIST_EMPTY(game_master_objectives) current_click_intercept_action = OBJECTIVE_CLICK_INTERCEPT_ACTION return + //Communication Section + if("set_communication_clarity") /datum/game_master/ui_close(mob/user) . = ..() diff --git a/tgui/packages/tgui/interfaces/GameMaster.js b/tgui/packages/tgui/interfaces/GameMaster.js index 8e641b1884..1e8a0bf3e4 100644 --- a/tgui/packages/tgui/interfaces/GameMaster.js +++ b/tgui/packages/tgui/interfaces/GameMaster.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Flex, Dropdown, Button, Section } from '../components'; +import { Flex, Dropdown, Button, Section, Slider } from '../components'; import { Window } from '../layouts'; export const GameMaster = (props, context) => { @@ -25,7 +25,7 @@ export const GameMaster = (props, context) => { }} /> - + { + + +
+ + +
+
+