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

Makes it clear that central command has called the shuttle when cance… (#24355)

Browse Source 
* makes it clear that central command has called the shuttle when cancel shuttle is used from the admin panel.

* DGamerL review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Furrior review

Co-authored-by: Mikhail G. <furiorg@gmail.com>

* Furrior review part 2

* changeed all mentions of cancel(null, TRUE) to cancel(byCC = TRUE)

* missed one

---------

Co-authored-by: Code-Lyoko0 <113879982+Code-Lyoko0@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Mikhail G. <furiorg@gmail.com>
This commit is contained in:
Code-Lyoko0
2024-03-11 13:28:57 -05:00
committed by GitHub
parent b1d14b0c99
commit 60de9f9b8f
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+1 -2
View File
@@ -343,13 +343,12 @@
if("2")
if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED)
return
SSshuttle.emergency.cancel(byCC = TRUE)
switch(SSshuttle.emergency.mode)
if(SHUTTLE_CALL)
SSshuttle.emergency.cancel()
log_admin("[key_name(usr)] sent the Emergency Shuttle back")
message_admins("<span class='adminnotice'>[key_name_admin(usr)] sent the Emergency Shuttle back</span>")
else
SSshuttle.emergency.cancel()
log_admin("[key_name(usr)] called the Emergency Shuttle")
message_admins("<span class='adminnotice'>[key_name_admin(usr)] called the Emergency Shuttle to the station</span>")
code/modules/admin/verbs/randomverbs.dm
+2 -2
View File
@@ -868,11 +868,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
else
var/keepStatus = alert("Maintain recall status on future shuttle calls?", "Maintain Status?", "Yes", "No") == "Yes" //Keeps or drops recallability
SSshuttle.emergency.canRecall = TRUE // must be true for cancel proc to work
SSshuttle.emergency.cancel()
SSshuttle.emergency.cancel(byCC = TRUE)
if(keepStatus)
SSshuttle.emergency.canRecall = FALSE // restores original status
else
SSshuttle.emergency.cancel()
SSshuttle.emergency.cancel(byCC = TRUE)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Cancel Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] admin-recalled the emergency shuttle.")