cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 20:47:10 +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 14:28:57 -04:00
committed by GitHub
co-authored by DGamerL Mikhail G. Code-Lyoko0
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/shuttle/emergency.dm
+2 -2
View File
@@ -274,7 +274,7 @@
new_sound = sound('sound/AI/cshuttle.ogg')
)
/obj/docking_port/mobile/emergency/cancel(area/signalOrigin)
/obj/docking_port/mobile/emergency/cancel(area/signalOrigin, byCC = FALSE)
if(!canRecall)
return
@@ -289,7 +289,7 @@
else
SSshuttle.emergencyLastCallLoc = null
GLOB.major_announcement.Announce(
"The emergency shuttle has been recalled.[SSshuttle.emergencyLastCallLoc ? " Recall signal traced. Results can be viewed on any communications console." : "" ]",
"The emergency shuttle has been recalled[byCC ? " by Central Command." : SSshuttle.emergencyLastCallLoc ? ". Recall signal traced. Results can be viewed on any communications console." : "." ]",
new_title = "Priority Announcement",
new_sound = sound('sound/AI/eshuttle_recall.ogg')
)