Skip to content

Commit

Permalink
small tweaks to tgui
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Oct 15, 2024
1 parent 7b0b760 commit 4b72aaa
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 15 deletions.
2 changes: 0 additions & 2 deletions code/controllers/subsystem/missions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,3 @@ SUBSYSTEM_DEF(missions)
if(inactive_missions.len)
var/datum/mission/dynamic/mission_to_start = inactive_missions[inactive_missions.len]
mission_to_start.start_mission()


2 changes: 1 addition & 1 deletion code/modules/dynamic_missions/mission.dm
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
/datum/mission/proc/can_complete()
return !failed

/datum/mission/proc/get_tgui_info(list/items_on_pad)
/datum/mission/proc/get_tgui_info(list/items_on_pad = list())
var/time_remaining = max(dur_timer ? timeleft(dur_timer) : duration, 0)

var/act_str = ""
Expand Down
4 changes: 2 additions & 2 deletions code/modules/dynamic_missions/missions/dynamic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@
desc = "We are looking for a [mission_item::name]"

/obj/effect/landmark/mission_poi/main/blackbox
name = "blackbox recovery"
desc = "Recover some lost logs from this ruin's blackbox recorder."
icon_state = "main_blackbox"
already_spawned = TRUE

Expand All @@ -71,4 +69,6 @@
return recorder.stored

/datum/mission/dynamic/blackbox
name = "blackbox recovery"
desc = "Recover some lost logs from this ruin's blackbox recorder."
setpiece_item = /obj/machinery/blackbox_recorder
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
/datum/computer_file/program/mission
filename = "missionviewer"
filedesc = "Mission viewer"
program_icon_state = "generic"
extended_desc = "Mission viewer."
size = 12
program_icon_state = "bountyboard"
extended_desc = "A multi-platform network for placing requests across the sector, with payment across the network being possible.."
requires_ntnet = TRUE
usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP
size = 10
usage_flags = ALL
transfer_access = ACCESS_HEADS
available_on_ntnet = TRUE
tgui_id = "NtosMission"
/// Variable dictating if we are in the process of restoring the AI in the inserted intellicard
var/restoring = FALSE

/datum/computer_file/program/mission/ui_data(mob/user)
var/list/data = list()
Expand Down
5 changes: 2 additions & 3 deletions tgui/packages/tgui/interfaces/MissionBoard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const MissionBoard = (props, context) => {
);
};

const MissionsContent = (props, context) => {
export const MissionsContent = (props, context) => {
const { act, data } = useBackend<Data>(context);
const { missions, pad, id_inserted, sending } = data;
return (
Expand Down Expand Up @@ -97,9 +97,8 @@ const MissionsList = (props, context) => {
>
Turn in
</Button>
<LabeledList.Divider />
{duration ? missionTimer(mission) : ''}
<LabeledList.Divider />

{validItems.map((validItem: string) => (
<Box>{validItem}</Box>
))}
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/NtosMission.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { MissionsContent } from './MissionBoard';

export const NtosMission = () => {
return (
<NtosWindow width={370} height={400} resizable>
<NtosWindow width={750} height={600} resizable>
<NtosWindow.Content scrollable>
<MissionsContent />
</NtosWindow.Content>
Expand Down

0 comments on commit 4b72aaa

Please sign in to comment.