cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

TG Upstream Part 1

Browse Source 
3591 individual conflicts

Update build.js

Update install_node.sh

Update byond.js

oh my fucking god

hat

slow

huh

holy shit

we all fall down

2 more I missed

2900 individual conflicts

2700 Individual conflicts

replaces yarn file with tg version, bumping us down to 2200-ish

Down to 2000 individual conflicts

140 down

mmm

aaaaaaaaaaaaaaaaaaa

not yt

575

soon

900 individual conflicts

600 individual conflicts, 121 file conflicts

im not okay

160 across 19 files

29 in 4 files

0 conflicts, compiletime fix time

some minor incap stuff

missed ticks

weird dupe definition stuff

missed ticks 2

incap fixes

undefs and pie fix

Radio update and some extra minor stuff

returns a single override

no more dupe definitions, 175 compiletime errors

Unticked file fix

sound and emote stuff

honk and more radio stuff
This commit is contained in:
Waterpig
2024-10-19 08:04:33 -07:00
committed by Majkl-J
parent 67e8dba34a
commit bb70889f6e
1578 changed files with 384 additions and 52713 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/tgui_input/alert.dm
-4
View File
@@ -120,11 +120,7 @@
data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS))
return data
<<<<<<< HEAD
/datum/tgui_alert/ui_act(action, list/params)
=======
/datum/tgui_alert/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
. = ..()
if (.)
return
code/modules/tgui_input/checkboxes.dm
-4
View File
@@ -115,11 +115,7 @@
return data
<<<<<<< HEAD
/datum/tgui_checkbox_input/ui_act(action, list/params)
=======
/datum/tgui_checkbox_input/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
. = ..()
if (.)
return
code/modules/tgui_input/keycombo.dm
-8
View File
@@ -8,11 +8,7 @@
* * user - The user to show the number input to.
* * message - The content of the number input, shown in the body of the TGUI window.
* * title - The title of the number input modal, shown on the top of the TGUI window.
<<<<<<< HEAD
* * default - The default (or current) key, shown as a placeholder.
=======
* * default - The default (or current) key, shown as a placeholder.
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
*/
/proc/tgui_input_keycombo(mob/user = usr, message, title = "Key Input", default = 0, timeout = 0, ui_state = GLOB.always_state)
if (!istype(user))
@@ -111,11 +107,7 @@
data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS))
return data
<<<<<<< HEAD
/datum/tgui_input_keycombo/ui_act(action, list/params)
=======
/datum/tgui_input_keycombo/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
. = ..()
if (.)
return
code/modules/tgui_input/list.dm
-4
View File
@@ -137,11 +137,7 @@
data["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1)
return data
<<<<<<< HEAD
/datum/tgui_list_input/ui_act(action, list/params)
=======
/datum/tgui_list_input/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
. = ..()
if (.)
return
code/modules/tgui_input/number.dm
-4
View File
@@ -136,11 +136,7 @@
data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS))
return data
<<<<<<< HEAD
/datum/tgui_input_number/ui_act(action, list/params)
=======
/datum/tgui_input_number/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
. = ..()
if (.)
return
code/modules/tgui_input/say_modal/modal.dm
-4
View File
@@ -86,11 +86,7 @@
if(!payload?["channel"])
CRASH("No channel provided to an open TGUI-Say")
window_open = TRUE
<<<<<<< HEAD
if(payload["channel"] != OOC_CHANNEL && payload["channel"] != ADMIN_CHANNEL && payload["channel"] != LOOC_CHANNEL) // SKYRAT EDIT CHANGE (Add LOOC_CHANNEL)
=======
if(payload["channel"] != OOC_CHANNEL && payload["channel"] != ADMIN_CHANNEL)
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
start_thinking()
if(!client.typing_indicators)
log_speech_indicators("[key_name(client)] started typing at [loc_name(client.mob)], indicators DISABLED.")
code/modules/tgui_input/say_modal/speech.dm
-7
View File
@@ -10,11 +10,7 @@
/datum/tgui_say/proc/alter_entry(payload)
var/entry = payload["entry"]
/// No OOC leaks
<<<<<<< HEAD
if(!entry || payload["channel"] == OOC_CHANNEL || payload["channel"] == ME_CHANNEL || payload["channel"] == LOOC_CHANNEL) // SKYRAT EDIT CHANGE - CUSTOMIZATION
=======
if(!entry || payload["channel"] == OOC_CHANNEL || payload["channel"] == ME_CHANNEL)
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
return pick(hurt_phrases)
/// Random trimming for larger sentences
if(length(entry) > 50)
@@ -51,7 +47,6 @@
if(ADMIN_CHANNEL)
SSadmin_verbs.dynamic_invoke_verb(client, /datum/admin_verb/cmd_admin_say, entry)
return TRUE
<<<<<<< HEAD
// SKYRAT EDIT ADDITION START - CUSTOMIZATION
if(LOOC_CHANNEL)
client.looc(entry)
@@ -60,8 +55,6 @@
client.mob.whisper_verb(entry)
return TRUE
// SKYRAT EDIT ADDITION END
=======
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
return FALSE
/**
code/modules/tgui_input/text.dm
-4
View File
@@ -133,11 +133,7 @@
data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS))
return data
<<<<<<< HEAD
/datum/tgui_input_text/ui_act(action, list/params)
=======
/datum/tgui_input_text/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
. = ..()
if (.)
return