cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

rej cleanup/commit

Browse Source
This commit is contained in:
LetterJay
2017-05-22 16:59:39 -05:00
parent aad357bd74
commit cbae09b538
8 changed files with 56 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/controllers/subsystem/shuttle.dm
View File

@@ -217,7 +217,27 @@ SUBSYSTEM_DEF(shuttle)
emergency.request(null, signal_origin, html_decode(emergency_reason), 0)
log_game("[key_name(user)] has called the shuttle.")
message_admins("[key_name_admin(user)] has called the shuttle.")
message_admins("[key_name_admin(user)] has called the shuttle. (<A HREF='?_src_=holder;trigger_centcom_recall=1'>TRIGGER CENTCOM RECALL</A>)")
/datum/controller/subsystem/shuttle/proc/centcom_recall(old_timer, admiral_message)
if(emergency.mode != SHUTTLE_CALL || emergency.timer != old_timer)
return
emergency.cancel(/area/centcom)
if(!admiral_message)
admiral_message = pick(GLOB.admiral_messages)
var/intercepttext = "<font size = 3><b>NanoTrasen Update</b>: Request For Shuttle.</font><hr>\
To whom it may concern:<br><br>\
We have taken note of the situation upon [station_name()] and have come to the \
conclusion that it does not warrant the abandonment of the station.<br>\
If you do not agree with our opinion we suggest that you open a direct \
line with us and explain the nature of your crisis.<br><br>\
<i>This message has been automatically generated based upon readings from long \
range diagnostic tools. To assure the quality of your request every finalized report \
is reviewed by an on-call rear admiral.<br>\
<b>Rear Admiral's Notes:</b> \
[admiral_message]"
print_command_report(intercepttext, announce = TRUE)
// Called when an emergency shuttle mobile docking port is
// destroyed, which will only happen with admin intervention
@@ -523,4 +543,3 @@ SUBSYSTEM_DEF(shuttle)
for(var/obj/docking_port/mobile/M in mobile)
if(M.is_in_shuttle_bounds(A))
return TRUE

42
code/controllers/subsystem/shuttle.dm.rej
View File

@@ -1,42 +0,0 @@
diff a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm (rejected hunks)
@@ -217,30 +217,25 @@ SUBSYSTEM_DEF(shuttle)
log_game("[key_name(user)] has called the shuttle.")
message_admins("[key_name_admin(user)] has called the shuttle. (<A HREF='?_src_=holder;trigger_centcom_recall=1'>TRIGGER CENTCOM RECALL</A>)")
-/datum/controller/subsystem/shuttle/proc/centcom_recall(old_timer, annoyed_admiral_message)
+/datum/controller/subsystem/shuttle/proc/centcom_recall(old_timer, admiral_message)
if(emergency.mode != SHUTTLE_CALL || emergency.timer != old_timer)
return
-
emergency.cancel(/area/centcom)
- msglog_admins("Shuttle has been recalled from Centcom.")
-
- addtimer(CALLBACK(src, .proc/centcom_recall2, annoyed_admiral_message), 50)
-/datum/controller/subsystem/shuttle/proc/centcom_recall2(annoyed_admiral_message)
- if(!annoyed_admiral_message)
- annoyed_admiral_message = pick(GLOB.annoyed_admiral_messages)
- var/intercepttext = "<FONT size = 3><b>NanoTrasen Update</b>: Request For Shuttle.</FONT><HR>\
- To whom it may concern:<BR><BR>\
+ if(!admiral_message)
+ admiral_message = pick(GLOB.admiral_messages)
+ var/intercepttext = "<font size = 3><b>NanoTrasen Update</b>: Request For Shuttle.</font><hr>\
+ To whom it may concern:<br><br>\
We have taken note of the situation upon [station_name()] and have come to the \
- conclusion that it does not warrant the abandonment of the station.<BR>\
+ conclusion that it does not warrant the abandonment of the station.<br>\
If you do not agree with our opinion we suggest that you open a direct \
- line with us and explain the nature of your crisis.<BR><BR>\
+ line with us and explain the nature of your crisis.<br><br>\
<i>This message has been automatically generated based upon readings from long \
range diagnostic tools. To assure the quality of your request every finalized report \
- is reviewed by an on-call rear admiral.<BR>\
+ is reviewed by an on-call rear admiral.<br>\
<b>Rear Admiral's Notes:</b> \
- [annoyed_admiral_message]"
- print_command_report(intercepttext, announce=TRUE)
+ [admiral_message]"
+ print_command_report(intercepttext, announce = TRUE)
// Called when an emergency shuttle mobile docking port is
// destroyed, which will only happen with admin intervention