cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-15 10:04:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-12

Browse Source
This commit is contained in:
Roxy
2025-11-12 16:42:38 -05:00
parent b4dbcc9db1 44b3075544
commit 71faa643bf
379 changed files with 37535 additions and 33147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/fun_balloon.dm
+5 -5
View File
@@ -135,11 +135,11 @@
var/effect_range = 5
/obj/effect/fun_balloon/scatter/effect()
for(var/mob/living/M in range(effect_range, get_turf(src)))
var/turf/T = find_safe_turf(zlevel = src.z)
new /obj/effect/temp_visual/gravpush(get_turf(M))
M.forceMove(T)
to_chat(M, span_notice("Pop!"), confidential = TRUE)
for(var/mob/living/dispersed_mob in range(effect_range, get_turf(src)))
var/turf/drop_off = find_safe_turf(z)
new /obj/effect/temp_visual/gravpush(get_turf(dispersed_mob))
dispersed_mob.forceMove(drop_off)
dispersed_mob.balloon_alert(dispersed_mob, "pop!")
// ----------- Station Crash
// Can't think of anywhere better to put it right now
code/modules/admin/smites/boneless.dm
+1 -1
View File
@@ -11,7 +11,7 @@
var/mob/living/carbon/carbon_target = target
for(var/obj/item/bodypart/limb as anything in carbon_target.bodyparts)
var/severity = pick_weight(list(
var/severity = pick_weight(alist(
WOUND_SEVERITY_MODERATE = 1,
WOUND_SEVERITY_SEVERE = 2,
WOUND_SEVERITY_CRITICAL = 2,
code/modules/admin/verbs/commandreport.dm
+3 -3
View File
@@ -100,13 +100,13 @@ ADMIN_VERB(create_command_report, R_ADMIN, "Create Command Report", "Create a co
if("set_report_sound")
if(params["picked_sound"] == CUSTOM_SOUND_PRESET)
played_sound = DEFAULT_ANNOUNCEMENT_SOUND // fallback by default
var/sound_file = input(ui_user, "Select sound file (OGG, WAV, MP3)", "Upload sound") as file|null
var/sound_file = input(ui_user, "Select sound file", "Upload sound") as sound|null
if(!sound_file)
tgui_alert(ui_user, "The custom sound could not be loaded. The standard sound will be played.", "Loading error", list("Ok"))
return
if(!(copytext("[sound_file]", -4) in list(".ogg", ".wav", ".mp3")))
tgui_alert(ui_user, "Invalid file type. Please select an OGG, WAV, or MP3 file.", "Loading error", list("Ok"))
if(!IS_SOUND_FILE(sound_file))
tgui_alert(ui_user, "Invalid file type. Please select a sound file.", "Loading error", list("Ok"))
return
played_sound = sound_file
code/modules/admin/verbs/debug.dm
+2 -2
View File
@@ -320,7 +320,7 @@ ADMIN_VERB(cmd_admin_areatest, R_DEBUG, "Test Areas", "Tests the areas for vario
areas_with_intercom.Add(A.type)
CHECK_TICK
for(var/obj/machinery/camera/C as anything in GLOB.cameranet.cameras)
for(var/obj/machinery/camera/C as anything in SScameras.cameras)
var/area/A = get_area(C)
if(!A)
dat += "Skipped over [C] in invalid location, [C.loc].<br>"
@@ -615,7 +615,7 @@ ADMIN_VERB(place_ruin, R_DEBUG, "Spawn Ruin", "Attempt to randomly place a speci
themed_names[name] = list(ruin, theme, list(ruin.default_area))
names += sort_list(themed_names)
var/ruinname = tgui_input_list(user, "Select ruin", "Spawn Ruin", sort_list(names))
var/ruinname = tgui_input_list(user, "Select ruin", "Spawn Ruin", names)
var/data = names[ruinname]
if (!data)
return
code/modules/admin/verbs/mapping.dm
+6 -6
View File
@@ -8,11 +8,11 @@ ADMIN_VERB(camera_view, R_DEBUG, "Camera Range Display", "Shows the range of cam
if(!on)
var/list/seen = list()
for(var/obj/machinery/camera/C as anything in GLOB.cameranet.cameras)
for(var/turf/T in C.can_see())
seen[T]++
for(var/turf/T in seen)
T.maptext = MAPTEXT(seen[T])
for(var/obj/machinery/camera/cam as anything in SScameras.cameras)
for(var/turf/cam_turf as anything in cam.can_see())
seen[cam]++
for(var/turf/seen_turf as anything in seen)
seen_turf.maptext = MAPTEXT(seen[seen_turf])
BLACKBOX_LOG_ADMIN_VERB("Show Camera Range")
#ifdef TESTING
@@ -34,7 +34,7 @@ ADMIN_VERB_VISIBILITY(sec_camera_report, ADMIN_VERB_VISIBLITY_FLAG_MAPPING_DEBUG
ADMIN_VERB(sec_camera_report, R_DEBUG, "Camera Report", "Get a printout of all camera issues.", ADMIN_CATEGORY_MAPPING)
var/list/obj/machinery/camera/CL = list()
for(var/obj/machinery/camera/C as anything in GLOB.cameranet.cameras)
for(var/obj/machinery/camera/C as anything in SScameras.cameras)
CL += C
var/output = {"<B>Camera Abnormalities Report</B><HR>