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

Merge branch 'master' of https://github.com/tgstation/tgstation into pupstream-2025-09-07

Browse Source 
# Conflicts:
#	README.md
#	code/__DEFINES/admin.dm
#	code/__DEFINES/melee.dm
#	code/_globalvars/traits/_traits.dm
#	code/controllers/subsystem/economy.dm
#	code/datums/components/crafting/crafting.dm
#	code/datums/elements/crusher_loot.dm
#	code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
#	code/modules/clothing/suits/_suits.dm
#	code/modules/escape_menu/leave_body.dm
#	code/modules/jobs/job_types/_job.dm
#	code/modules/mining/equipment/mineral_scanner.dm
#	code/modules/mob/living/living.dm
#	code/modules/plumbing/plumbers/pill_press.dm
#	tgui/packages/tgui/interfaces/Vending.tsx
This commit is contained in:
nevimer
2025-09-07 00:37:52 -04:00
parent f5bbea9cc9 f4360e2da5
commit b348b617a3
362 changed files with 82084 additions and 106117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/debug.dm
+18
View File
@@ -1031,3 +1031,21 @@ ADMIN_VERB(count_instances, R_DEBUG, "Count Atoms/Datums", "Count how many atom
. = list()
CRASH("count_datums not supported on OpenDream")
#endif
ADMIN_VERB_VISIBILITY(export_save_to_dev_preference, ADMIN_VERB_VISIBLITY_FLAG_LOCALHOST)
ADMIN_VERB(export_save_to_dev_preference, R_DEBUG, "Export Save as Dev Preferences", "Exports your savefile to be used by any guests that connect to your localost.", ADMIN_CATEGORY_SERVER)
if(!user.is_localhost())
tgui_alert(user, "You shouldn't be using this right now!", "Export Failed", list("OK"))
log_admin("[key_name(user)] attempted to export preferences to [DEV_PREFS_PATH] - this is normally locked to localhost only!")
stack_trace("Export Save as Dev Preferences was called by a non-localhost user!")
return
if(is_guest_key(user.key))
tgui_alert(user, "Guests don't have preferences to export.", "Export Failed", list("OK"))
return
var/datum/preferences/user_prefs = user.prefs
var/datum/json_savefile/dev_save = new(DEV_PREFS_PATH)
user_prefs.save_preferences()
user_prefs.savefile.copy_to_savefile(dev_save)
dev_save.save()
tgui_alert(user, "Exported preferences to [DEV_PREFS_PATH]. \
Next time you localhost as a guest it will use this savefile as-is.", "Export Complete", list("OK thanks"))
code/modules/admin/verbs/secrets.dm
+2 -2
View File
@@ -94,12 +94,12 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w
//Buttons for helpful stuff. This is where people land in the tgui
if("clear_virus")
var/choice = tgui_alert(usr, "Are you sure you want to cure all disease?",, list("Yes", "Cancel"))
var/choice = tgui_alert(usr, "Are you sure you want to cure all disease? This will also grant immunity for that disease",, list("Yes", "Cancel"))
if(choice == "Yes")
message_admins("[key_name_admin(holder)] has cured all diseases.")
for(var/thing in SSdisease.active_diseases)
var/datum/disease/D = thing
D.cure(0)
D.cure()
if("list_bombers")
holder.holder.list_bombers()