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

Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-2406a

Browse Source
This commit is contained in:
Waterpig
2024-06-02 10:40:19 +02:00
parent 2c429b0d12 74ad925b3c
commit 5da11912cb
611 changed files with 24702 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/sql_ban_system.dm
+7 -8
View File
@@ -426,15 +426,14 @@
ROLE_REV,
ROLE_REVENANT,
ROLE_REV_HEAD,
ROLE_SENTIENT_DISEASE,
ROLE_SPIDER,
ROLE_SPY,
ROLE_SYNDICATE,
ROLE_TRAITOR,
ROLE_WIZARD,
ROLE_BORER, //SKYRAT EDIT
ROLE_ASSAULT_OPERATIVE, //SKYRAT EDIT
ROLE_BLOODSUCKER,// BUBBER EDIT,
ROLE_BORER, // SKYRAT EDIT ADDITION
ROLE_ASSAULT_OPERATIVE, // SKYRAT EDIT ADDITION
ROLE_BLOODSUCKER,// BUBBER EDIT
ROLE_VASSAL, // BUBBER EDIT
),
"Skyrat Ban Options" = list(
@@ -447,8 +446,8 @@
BAN_EORG,
BAN_ANTAGONIST,
BAN_OPFOR,
BAN_LOOC, //SKYRAT ADDITION - LOOC muting again
),//SKYRAT EDIT ADDITION - EXTRA_BANS
BAN_LOOC, // SKYRAT EDIT ADDITION - LOOC muting again
), // SKYRAT EDIT ADDITION - EXTRA_BANS
)
for(var/department in long_job_lists)
output += "<div class='column'><label class='rolegroup long [ckey(department)]'>[tgui_fancy ? "<input type='checkbox' name='[department]' class='hidden' onClick='header_click_all_checkboxes(this)'>" : ""][department]</label><div class='content'>"
@@ -871,7 +870,7 @@
return
var/kn = key_name(usr)
var/kna = key_name_admin(usr)
var/change_message = "[usr.client.key] unbanned [target] from [role] on [SQLtime()] during round #[GLOB.round_id]<hr>"
var/change_message = "[usr.client.key] unbanned [target] from [role] on [ISOtime()] during round #[GLOB.round_id]<hr>"
var/datum/db_query/query_unban = SSdbcore.NewQuery({"
UPDATE [format_table_name("ban")] SET
unbanned_datetime = NOW(),
@@ -916,7 +915,7 @@
var/kn = key_name(usr)
var/kna = key_name_admin(usr)
var/change_message = "[usr.client.key] re-activated ban of [target] from [role] on [SQLtime()] during round #[GLOB.round_id]<hr>"
var/change_message = "[usr.client.key] re-activated ban of [target] from [role] on [ISOtime()] during round #[GLOB.round_id]<hr>"
var/datum/db_query/query_reban = SSdbcore.NewQuery({"
UPDATE [format_table_name("ban")] SET
unbanned_datetime = NULL,