Skip to content

Commit

Permalink
Initial completely non-functional
Browse files Browse the repository at this point in the history
  • Loading branch information
morrowwolf committed Oct 22, 2023
1 parent 12bf259 commit 2d9a77e
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 3 deletions.
11 changes: 10 additions & 1 deletion code/modules/admin/game_master/game_master.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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)
. = ..()

Expand All @@ -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)
Expand Down Expand Up @@ -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)
. = ..()
Expand Down
31 changes: 29 additions & 2 deletions tgui/packages/tgui/interfaces/GameMaster.js
Original file line number Diff line number Diff line change
@@ -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) => {
Expand All @@ -25,7 +25,7 @@ export const GameMaster = (props, context) => {
}}
/>
</Flex.Item>
<Flex.Item grow>
<Flex.Item>
<Dropdown
options={data.spawnable_xenos}
selected={data.selected_xeno}
Expand Down Expand Up @@ -76,6 +76,33 @@ export const GameMaster = (props, context) => {
</Flex>
</Section>
</Flex.Item>
<Flex.Item>
<Flex grow>
<Section title="Communication">
<Flex grow direction="column">
<Flex.Item>
<Button
content="Game Master Phone"
onClick={() => {
act('use_game_master_phone');
}}
/>
</Flex.Item>
<Flex.Item>Communication Clarity</Flex.Item>
<Flex.Item>
<Slider
maxValue={100}
minValue={0}
value={data.communication_clarity}
onChange={(e, clarity) => {
act('set_communication_clarity', { clarity });
}}
/>
</Flex.Item>
</Flex>
</Section>
</Flex>
</Flex.Item>
</Flex>
</Window.Content>
</Window>
Expand Down

0 comments on commit 2d9a77e

Please sign in to comment.