Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
687297f
Ticket Panel (Adminhelps & Mentorhelps)
GeneriedJenelle Nov 7, 2025
914cb41
Lint Fix.
GeneriedJenelle Nov 7, 2025
a362e31
Merge remote-tracking branch 'upstream/master' into ticketpanel
GeneriedJenelle Nov 7, 2025
db51c58
Various Fixes
GeneriedJenelle Nov 7, 2025
a4dc4fb
Fixes ban bug
GeneriedJenelle Nov 23, 2025
3b681d3
Ticket Tab links linked to ticket panel
GeneriedJenelle Nov 26, 2025
1bc1d76
Defer added to ticket panel + bug fixes
GeneriedJenelle Nov 26, 2025
066ae43
Merge remote-tracking branch 'upstream/master' into ticketpanel
GeneriedJenelle Mar 4, 2026
bbe0424
Merge remote-tracking branch 'upstream/master' into ticketpanel
GeneriedJenelle Mar 5, 2026
4ad8d0c
Fixes Merge Conflicts + Adds IC Faction/Role Info
GeneriedJenelle Mar 5, 2026
bf53647
Merge remote-tracking branch 'upstream/master' into ticketpanel
Neocolony Jun 27, 2026
230869e
Requested Changes
GeneriedJenelle Jun 27, 2026
6e4fd2f
Update code/modules/admin/ticket_panel/ticket_panel.dm
GeneriedJenelle Jun 27, 2026
f6cdb10
Update code/modules/admin/ticket_panel/ticket_panel.dm
GeneriedJenelle Jun 27, 2026
47e9474
Update code/modules/admin/ticket_panel/ticket_panel.dm
GeneriedJenelle Jun 27, 2026
452eb08
Update code/modules/admin/ticket_panel/ticket_panel.dm
GeneriedJenelle Jun 27, 2026
7c695ee
Update code/modules/admin/ticket_panel/ticket_panel.dm
GeneriedJenelle Jun 27, 2026
295e812
Update code/modules/mentor/mentorhelp.dm
GeneriedJenelle Jun 27, 2026
d445cbf
Update code/modules/admin/ticket_panel/ticket_panel.dm
GeneriedJenelle Jun 27, 2026
c54d66b
Update code/modules/admin/ticket_panel/ticket_panel.dm
GeneriedJenelle Jun 27, 2026
b0de3b2
Update code/modules/admin/ticket_panel/ticket_panel.dm
GeneriedJenelle Jun 27, 2026
929a155
Update code/modules/admin/ticket_panel/ticket_panel.dm
GeneriedJenelle Jun 27, 2026
8dd5abb
More changes
GeneriedJenelle Jun 27, 2026
6b82f92
Adminhelp/pm with formatting and tgui message edits
GeneriedJenelle Jun 27, 2026
4160c09
Message Encoding Fix
GeneriedJenelle Jun 28, 2026
0f26131
Font Size Adjustment Settings
GeneriedJenelle Jun 28, 2026
01148ff
Mentorhelp ckey adjustments
GeneriedJenelle Jun 28, 2026
31fdab4
Safer input handling
GeneriedJenelle Jun 28, 2026
6075023
Fixes Layout issue
GeneriedJenelle Jun 29, 2026
d81ffea
Linter fixes
GeneriedJenelle Jun 29, 2026
be7d2b1
Requested Fixes
GeneriedJenelle Jul 2, 2026
794db5e
Update code/modules/mentor/mentorhelp.dm
GeneriedJenelle Jul 2, 2026
0846127
Update code/modules/mentor/mentorhelp.dm
GeneriedJenelle Jul 2, 2026
e130e5d
Update code/modules/mentor/mentorhelp.dm
GeneriedJenelle Jul 2, 2026
6f17b8e
Apply suggestions from code review
GeneriedJenelle Jul 4, 2026
4039c32
Changes usr.key to usr.username() consistently
GeneriedJenelle Jul 4, 2026
e72de17
Apply suggestions from code review
GeneriedJenelle Jul 6, 2026
dffb906
Switching from .key to .username()
GeneriedJenelle Jul 6, 2026
d6279cf
Merge branch 'ticketpanel' of https://github.com/GeneriedJenelle/cmss…
GeneriedJenelle Jul 6, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions code/controllers/mc/admin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick)
name = text
return src

/obj/effect/statclick/Topic(href, href_list)
if(usr.client && usr.client.admin_holder)
Action(href_list["action"])

/obj/effect/statclick/proc/Action(action)
return

/obj/effect/statclick/debug
var/class

Expand Down
3 changes: 2 additions & 1 deletion code/datums/bug_report.dm
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@
GLOB.admin_help_ui_handler.perform_adminhelp(initial_user, general_message, urgent = FALSE)

var/href_message = ADMIN_VIEW_BUG_REPORT(src)
initial_user.current_ticket.AddInteraction(href_message)
var/link_data = list("View Report", "byond://?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];view_bug_report=[REF(src)]")
initial_user.current_ticket.AddInteraction(href_message, link_data = link_data)

/datum/tgui_bug_report_form/ui_act(action, list/params, datum/tgui/ui)
. = ..()
Expand Down
4 changes: 3 additions & 1 deletion code/modules/admin/admin_verbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ GLOBAL_LIST_INIT(admin_verbs_default, list(
/client/proc/toggledebuglogs,
/client/proc/togglestatpanelsplit,
/client/proc/togglenichelogs,
/datum/admins/proc/ticket_panel,
/datum/admins/proc/display_tags,
/datum/admins/proc/player_notes_show,
/datum/admins/proc/check_ckey,
Expand Down Expand Up @@ -317,7 +318,8 @@ GLOBAL_LIST_INIT(mentor_verbs, list(
/client/proc/cmd_mentor_say,
/datum/admins/proc/imaginary_friend,
/client/proc/toggle_newplayer_ghost_hud,
/client/proc/toggle_newplayer_ic_hud
/client/proc/toggle_newplayer_ic_hud,
/datum/admins/proc/ticket_panel
))

/client/proc/add_admin_verbs()
Expand Down
9 changes: 6 additions & 3 deletions code/modules/admin/player_panel/actions/punish.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,24 @@
/datum/player_action/permanent_ban/act(client/user, mob/target, list/params)
var/reason = tgui_input_text(user, "What message should be given to the permabanned user?", "Permanent Ban", encode = FALSE)
if(!reason)
return
return FALSE

var/internal_reason = tgui_input_text(user, "What's the reason for the ban? This is shown internally, and not displayed in public notes and ban messages. Include as much detail as necessary.", "Permanent Ban", multiline = TRUE, encode = FALSE)
if(!internal_reason)
return
return FALSE

var/datum/entity/player/target_entity = target.client?.player_data
if(!target_entity)
target_entity = get_player_from_key(target.ckey || target.persistent_ckey)

if(!target_entity)
return
return FALSE

if(!target_entity.add_perma_ban(reason, internal_reason, user.player_data))
to_chat(user, SPAN_ADMIN("The user is already permabanned! If necessary, you can remove the permaban, and place a new one."))
return FALSE

return TRUE

/datum/player_action/sticky_ban
action_tag = "sticky_ban"
Expand Down
Loading