cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 13:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes, Reworks, New Tabs and General Misery

Browse Source
This commit is contained in:
Aleksej Komarov
2020-04-19 05:42:00 +03:00
parent f73d00d2c4
commit 2979838c38
40 changed files with 1641 additions and 1548 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/traitor/equipment/module_picker.dm
+2 -2
View File
@@ -39,8 +39,8 @@
/datum/module_picker/ui_data(mob/user)
var/list/data = list()
data["processing_time"] = processing_time
data["compact_mode"] = compact_mode
data["processingTime"] = processing_time
data["compactMode"] = compact_mode
return data
/datum/module_picker/ui_static_data(mob/user)
code/modules/asset_cache/asset_list_items.dm
-4
View File
@@ -4,10 +4,6 @@
assets = list(
"tgui.bundle.js" = 'tgui/packages/tgui/public/tgui.bundle.js',
"tgui.bundle.css" = 'tgui/packages/tgui/public/tgui.bundle.css',
"shim-html5shiv.js" = 'tgui/packages/tgui/public/shim-html5shiv.js',
"shim-ie8.js" = 'tgui/packages/tgui/public/shim-ie8.js',
"shim-dom4.js" = 'tgui/packages/tgui/public/shim-dom4.js',
"shim-css-om.js" = 'tgui/packages/tgui/public/shim-css-om.js',
)
/datum/asset/group/tgui
code/modules/cargo/blackmarket/blackmarket_uplink.dm
+2 -2
View File
@@ -4,7 +4,7 @@
icon_state = "uplink"
// UI variables.
var/ui_x = 720
var/ui_x = 600
var/ui_y = 480
var/viewing_category
var/viewing_market
@@ -58,7 +58,7 @@
/obj/item/blackmarket_uplink/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "BlackmarketUplink", name, ui_x, ui_y, master_ui, state)
ui = new(user, src, ui_key, "BlackMarketUplink", name, ui_x, ui_y, master_ui, state)
ui.open()
/obj/item/blackmarket_uplink/ui_data(mob/user)