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

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-09-24 10:13:01 -04:00
parent ae8d35f963 5fdb6d3618
commit b308ee9d78
313 changed files with 6548 additions and 4624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/admingame.dm
+7
View File
@@ -444,3 +444,10 @@ ADMIN_VERB(lag_switch_panel, R_ADMIN, "Show Lag Switches", "Display the controls
dat += "Disable character creator: <a href='byond://?_src_=holder;[HrefToken()];change_lag_switch=[DISABLE_CREATOR]'><b>[SSlag_switch.measures[DISABLE_CREATOR] ? "On" : "Off"]</b></a> - <span style='font-size:80%'>trait applies to all</span><br />" // SKYRAT EDIT ADDITION
dat += "</body></html>"
user << browse(dat.Join(), "window=lag_switch_panel;size=420x480")
ADMIN_VERB(spawn_panel, R_SPAWN, "Spawn Panel", "Spawn Panel (TGUI).", ADMIN_CATEGORY_GAME)
var/datum/spawnpanel/panel = get_spawnpanel_for_admin(user.mob)
if(panel)
panel.ui_interact(user.mob)
BLACKBOX_LOG_ADMIN_VERB("Spawn Panel")
code/modules/admin/verbs/lua/lua_state.dm
+1 -1
View File
@@ -115,7 +115,7 @@ GLOBAL_PROTECT(lua_state_stack)
if(timer_enabled)
var/result = call_function("__Timer_timer_process", seconds_per_tick)
log_result(result, verbose = FALSE)
for(var/function as anything in functions_to_execute)
for(var/function in functions_to_execute)
result = call_function(list("__Timer_callbacks", function))
log_result(result, verbose = FALSE)
functions_to_execute.Cut()
code/modules/admin/verbs/plane_debugger.dm
+1 -1
View File
@@ -126,7 +126,7 @@
var/list/plane_info = list()
var/list/our_planes = our_hud?.get_planes_from(current_group)
for (var/plane_string as anything in our_planes)
for (var/plane_string in our_planes)
var/list/this_plane = list()
var/atom/movable/screen/plane_master/plane = our_planes[plane_string]
this_plane["name"] = plane.name
code/modules/admin/verbs/selectequipment.dm
+1 -1
View File
@@ -88,7 +88,7 @@ ADMIN_VERB_ONLY_CONTEXT_MENU(select_equipment, R_FUN, "Select Equipment", mob/ta
/datum/select_equipment/proc/make_outfit_entries(category="General", list/outfit_list)
var/list/entries = list()
for(var/path as anything in outfit_list)
for(var/path in outfit_list)
var/datum/outfit/outfit = path
entries += list(outfit_entry(category, path, initial(outfit.name)))
return entries