cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some issues with the ERT manager (#22306)

Browse Source 
* fixes some keycard and ert manager stuff

* Update code/modules/admin/verbs/pray.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
Contrabang
2023-09-17 20:35:10 -04:00
committed by GitHub
parent 4990604711
commit 62e8c46f21
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/pray.dm
+2 -2
View File
@@ -64,12 +64,12 @@
SEND_SOUND(X, sound('sound/effects/adminhelp.ogg'))
/proc/ERT_Announce(text, mob/Sender, repeat_warning)
var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
var/msg = sanitizeSafe(text)
var/insert_this = list(list(
"time" = station_time_timestamp(),
"sender_real_name" = "[Sender.real_name ? Sender.real_name : Sender.name]",
"sender_uid" = Sender.UID(),
"message" = msg))
"message" = html_decode(msg)))
GLOB.ert_request_messages.Insert(1, insert_this) // insert it to the top of the list
msg = "<span class='adminnotice'><b><font color=orange>ERT REQUEST: </font>[key_name(Sender, 1)] ([ADMIN_PP(Sender,"PP")]) ([ADMIN_VV(Sender,"VV")]) ([ADMIN_TP(Sender,"TP")]) ([ADMIN_SM(Sender,"SM")]) ([admin_jump_link(Sender)]) ([ADMIN_BSA(Sender,"BSA")]) (<A HREF='?_src_=holder;ErtReply=[Sender.UID()]'>RESPOND</A>):</b> [msg]</span>"
if(repeat_warning)
code/modules/security_levels/keycard_authentication.dm
+1 -1
View File
@@ -117,7 +117,7 @@
. = TRUE
switch(action)
if("ert")
ert_reason = stripped_input(usr, "Reason for ERT Call:", "", "")
ert_reason = input(usr, "Reason for ERT Call:", "", "") // we strip this later in ERT_Announce
if("reset")
reset()
if("triggerevent")
code/modules/tgui/modules/ert_manager.dm
+6 -4
View File
@@ -104,13 +104,15 @@
slots_list += "paranormal: [paranormal_slots]"
if(cyborg_slots > 0)
slots_list += "cyborg: [cyborg_slots]"
D.silent = params["silent"]
var/silenced = text2bool(params["silent"])
D.silent = silenced
var/slot_text = english_list(slots_list)
notify_ghosts("An ERT is being dispatched. Type: [ert_type]. Open positions: [slot_text]")
message_admins("[key_name_admin(usr)] dispatched a [params["silent"] ? "silent " : ""][ert_type] ERT. Slots: [slot_text]", 1)
log_admin("[key_name(usr)] dispatched a [params["silent"] ? "silent " : ""][ert_type] ERT. Slots: [slot_text]")
if(!params["silent"])
message_admins("[key_name_admin(usr)] dispatched a [silenced ? "silent " : ""][ert_type] ERT. Slots: [slot_text]", 1)
log_admin("[key_name(usr)] dispatched a [silenced ? "silent " : ""][ert_type] ERT. Slots: [slot_text]")
if(!silenced)
GLOB.major_announcement.Announce("Attention, [station_name()]. We are attempting to assemble an ERT. Standby.", "ERT Protocol Activated")
trigger_armed_response_team(D, commander_slots, security_slots, medical_slots, engineering_slots, janitor_slots, paranormal_slots, cyborg_slots, cyborg_security)