cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-21 03:58:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2023-06-03 19:53:45 +02:00
parent 5529e11292 067bf338a7
commit 9cedb2ec47
608 changed files with 17985 additions and 4722 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/tgui/external.dm
+4 -3
View File
@@ -1,7 +1,8 @@
/**
* tgui external
/*!
* External tgui definitions, such as src_object APIs.
*
* Contains all external tgui declarations.
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
code/modules/tgui/modules/trait_tutorial_tgui.dm
+48
View File
@@ -0,0 +1,48 @@
/*
Verb/Main definition path: code\modules\mob\living\carbon\human\species\station\traits_vr\traits_tutorial.dm
Frontend path: tgui\packages\tgui\interfaces\TraitTutorial.tsx
*/
/datum/tgui_module/trait_tutorial_tgui
name = "Explain Custom Traits"
tgui_id = "TraitTutorial"
var/trait_names = list()
var/trait_category = list() // name:category
var/trait_desc = list() // name:desc
var/trait_tutorial = list() //name:tutorial
var/trait_selected = ""
/datum/tgui_module/trait_tutorial_tgui/proc/set_vars(list/names, list/categories, list/descriptions, list/tutorials)
trait_names = names
trait_category = categories
trait_desc = descriptions
trait_tutorial = tutorials
/datum/tgui_module/trait_tutorial_tgui/tgui_interact(mob/living/carbon/human/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, tgui_id, name)
ui.open()
/datum/tgui_module/trait_tutorial_tgui/tgui_data(mob/user)
var/list/data = list()
data["names"] = trait_names //passes a list of strings
data["descriptions"] = trait_desc //passes an assoc list as obj
data["categories"] = trait_category //passes an assoc list as obj
data["tutorials"] = trait_tutorial //passes an assoc list as obj
data["selection"] = trait_selected //passes a string
return data
/datum/tgui_module/trait_tutorial_tgui/tgui_act(action, params)
. = ..()
if(.)
return
if(action == "select_trait")
var/selection = params["name"]
trait_selected = selection
. = TRUE
/datum/tgui_module/trait_tutorial_tgui/tgui_state(mob/user)
return GLOB.tgui_always_state
code/modules/tgui/states.dm
+4 -1
View File
@@ -1,6 +1,9 @@
/**
/*!
* Base state and helpers for states. Just does some sanity checks,
* implement a proper state for in-depth checks.
*
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
code/modules/tgui/states/admin.dm
+5
View File
@@ -1,3 +1,8 @@
/*!
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
* tgui state: admin_state
*
code/modules/tgui/states/always.dm
+4
View File
@@ -1,3 +1,7 @@
/*!
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
* tgui state: always_state
code/modules/tgui/states/conscious.dm
+5
View File
@@ -1,3 +1,8 @@
/*!
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
* tgui state: conscious_state
*
code/modules/tgui/states/contained.dm
+5
View File
@@ -1,3 +1,8 @@
/*!
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
* tgui state: contained_state
*
code/modules/tgui/states/deep_inventory.dm
+5
View File
@@ -1,3 +1,8 @@
/*!
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
* tgui state: deep_inventory_state
*
code/modules/tgui/states/default.dm
+5
View File
@@ -1,3 +1,8 @@
/*!
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
* tgui state: default_state
*
code/modules/tgui/states/hands.dm
+5
View File
@@ -1,3 +1,8 @@
/*!
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
* tgui state: hands_state
*
code/modules/tgui/states/human_adjacent.dm
+4
View File
@@ -1,3 +1,7 @@
/*!
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
* tgui state: human_adjacent_state
code/modules/tgui/states/inventory.dm
+5
View File
@@ -1,3 +1,8 @@
/*!
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
* tgui state: inventory_state
*
code/modules/tgui/states/not_incapacitated.dm
+5
View File
@@ -1,3 +1,8 @@
/*!
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
* tgui state: not_incapacitated_state
*
code/modules/tgui/states/notcontained.dm
+5
View File
@@ -1,3 +1,8 @@
/*!
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
* tgui state: notcontained_state
*
code/modules/tgui/states/observer.dm
+5 -1
View File
@@ -1,3 +1,8 @@
/*!
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
* tgui state: observer_state
*
@@ -12,4 +17,3 @@ GLOBAL_DATUM_INIT(tgui_observer_state, /datum/tgui_state/observer_state, new)
if(check_rights(R_ADMIN|R_EVENT, 0, src))
return STATUS_INTERACTIVE
return STATUS_CLOSE
code/modules/tgui/states/physical.dm
+6 -1
View File
@@ -1,3 +1,8 @@
/*!
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
* tgui state: physical_state
*
@@ -72,4 +77,4 @@ GLOBAL_DATUM_INIT(tgui_physical_state_bigscreen, /datum/tgui_state/physical_bigs
return max(STATUS_UPDATE, shared_living_tgui_distance_bigscreen(src_object)) // Silicons can always see.
/mob/living/silicon/ai/physical_can_use_tgui_topic(src_object)
return STATUS_UPDATE // AIs are not physical.
return STATUS_UPDATE // AIs are not physical.
code/modules/tgui/states/self.dm
+5
View File
@@ -1,3 +1,8 @@
/*!
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
* tgui state: self_state
*
code/modules/tgui/states/zlevel.dm
+5
View File
@@ -1,3 +1,8 @@
/*!
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
* tgui state: z_state
*
code/modules/tgui/tgui.dm
+19 -5
View File
@@ -1,7 +1,6 @@
/**
* tgui
*
* /tg/station user interface library
/*!
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
/**
@@ -38,6 +37,8 @@
var/datum/tgui_state/state = null
/// Rate limit client refreshes to prevent DoS.
COOLDOWN_DECLARE(refresh_cooldown)
/// Are byond mouse events beyond the window passed in to the ui
var/mouse_hooked = FALSE
/// The map z-level to display.
var/map_z_level = 1
/// The Parent UI
@@ -109,6 +110,8 @@
window.send_message("update", get_payload(
with_data = TRUE,
with_static_data = TRUE))
if(mouse_hooked)
window.set_mouse_macro()
SStgui.on_open(src)
/**
@@ -148,6 +151,17 @@
/datum/tgui/proc/set_autoupdate(autoupdate)
src.autoupdate = autoupdate
/**
* public
*
* Enable/disable passing through byond mouse events to the window
*
* required value bool Enable/disable hooking.
*/
/datum/tgui/proc/set_mouse_hook(value)
src.mouse_hooked = value
//Handle unhooking/hooking on already open windows ?
/**
* public
*
@@ -329,7 +343,7 @@
if(initialized)
send_full_update()
initialized = TRUE
if("pingReply")
if("ping/reply")
initialized = TRUE
if("suspend")
close(can_be_suspended = TRUE)
code/modules/tgui/tgui_window.dm
+45 -1
View File
@@ -24,6 +24,7 @@
var/initial_inline_html
var/initial_inline_js
var/initial_inline_css
var/mouse_event_macro_set = FALSE
/**
* public
@@ -215,6 +216,8 @@
/datum/tgui_window/proc/close(can_be_suspended = TRUE, logout = FALSE)
if(!client)
return
if(mouse_event_macro_set)
remove_mouse_macro()
if(can_be_suspended && can_be_suspended())
#ifdef TGUI_DEBUGGING
log_tgui(client, "[id]/close: suspending")
@@ -364,7 +367,7 @@
// If not locked, handle these message types
switch(type)
if("ping")
send_message("pingReply", payload)
send_message("ping/reply", payload)
if("suspend")
close(can_be_suspended = TRUE)
if("close")
@@ -377,3 +380,44 @@
// Resend the assets
for(var/asset in sent_assets)
send_asset(asset)
/datum/tgui_window/vv_edit_var(var_name, var_value)
return var_name != NAMEOF(src, id) && ..()
/datum/tgui_window/proc/set_mouse_macro()
if(mouse_event_macro_set)
return
var/list/byondToTguiEventMap = list(
"MouseDown" = "byond/mousedown",
"MouseUp" = "byond/mouseup"
)
for(var/mouseMacro in byondToTguiEventMap)
var/command_template = ".output CONTROL PAYLOAD"
var/event_message = TGUI_CREATE_MESSAGE(byondToTguiEventMap[mouseMacro], null)
var target_control = is_browser \
? "[id]:update" \
: "[id].browser:update"
var/with_id = replacetext(command_template, "CONTROL", target_control)
var/full_command = replacetext(with_id, "PAYLOAD", event_message)
var/list/params = list()
params["parent"] = "default" //Technically this is external to tgui but whatever
params["name"] = mouseMacro
params["command"] = full_command
winset(client, "[mouseMacro]Window[id]Macro", params)
mouse_event_macro_set = TRUE
/datum/tgui_window/proc/remove_mouse_macro()
if(!mouse_event_macro_set)
stack_trace("Unsetting mouse macro on tgui window that has none")
var/list/byondToTguiEventMap = list(
"MouseDown" = "byond/mousedown",
"MouseUp" = "byond/mouseup"
)
for(var/mouseMacro in byondToTguiEventMap)
winset(client, null, "[mouseMacro]Window[id]Macro.parent=null")
mouse_event_macro_set = FALSE