Merge branch 'master' into mapsyncs43293845982

This commit is contained in:
deathride58
2018-01-05 02:03:51 +00:00
committed by GitHub
10 changed files with 58 additions and 14 deletions
+2
View File
@@ -249,6 +249,7 @@ SUBSYSTEM_DEF(shuttle)
emergency.request(null, signal_origin, html_decode(emergency_reason), 0)
log_game("[key_name(user)] has called the shuttle.")
deadchat_broadcast("<span class='deadsay bold'>[user.name] has called the shuttle.</span>", user)
if(call_reason)
SSblackbox.record_feedback("text", "shuttle_reason", 1, "[call_reason]")
log_game("Shuttle call reason: [call_reason]")
@@ -286,6 +287,7 @@ SUBSYSTEM_DEF(shuttle)
emergency.cancel(get_area(user))
log_game("[key_name(user)] has recalled the shuttle.")
message_admins("[key_name_admin(user)] has recalled the shuttle.")
deadchat_broadcast("<span class='deadsay bold'>[user.name] has recalled the shuttle.</span>", user)
return 1
/datum/controller/subsystem/shuttle/proc/canRecall()