Unorphans the blackbox

This commit is contained in:
CitadelStationBot
2017-04-26 17:05:23 -05:00
parent e7df2bc14a
commit bde5d6253a
116 changed files with 1980 additions and 322 deletions
+1 -1
View File
@@ -190,5 +190,5 @@
/obj/docking_port/mobile/arrivals/vv_edit_var(var_name, var_value)
switch(var_name)
if("perma_docked")
feedback_add_details("admin_secrets_fun_used","ShA[var_value ? "s" : "g"]")
SSblackbox.add_details("admin_secrets_fun_used","ShA[var_value ? "s" : "g"]")
return ..()
+1 -1
View File
@@ -290,7 +290,7 @@
setTimer(SSshuttle.emergencyDockTime)
send2irc("Server", "The Emergency Shuttle has docked with the station.")
priority_announce("The Emergency Shuttle has docked with the station. You have [timeLeft(600)] minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority")
feedback_add_details("emergency_shuttle", src.name)
SSblackbox.add_details("emergency_shuttle", src.name)
// Gangs only have one attempt left if the shuttle has
// docked with the station to prevent suffering from
+2 -2
View File
@@ -155,7 +155,7 @@
message_admins("[key_name_admin(usr)] fast travelled \
[M]")
log_admin("[key_name(usr)] fast travelled [M]")
feedback_add_details("shuttle_fasttravel", M.name)
SSblackbox.add_details("shuttle_fasttravel", M.name)
break
if("preview")
@@ -182,7 +182,7 @@
with the shuttle manipulator.")
log_admin("[key_name(usr)] loaded [mdp] with the \
shuttle manipulator.</span>")
feedback_add_details("shuttle_manipulator", mdp.name)
SSblackbox.add_details("shuttle_manipulator", mdp.name)
update_icon()
+2 -2
View File
@@ -583,9 +583,9 @@
"<span class='userdanger'>You feel an immense \
crushing pressure as the space around you ripples.</span>")
if(M.key || M.get_ghost(TRUE))
feedback_add_details("shuttle_gib", "[type]")
SSblackbox.add_details("shuttle_gib", "[type]")
else
feedback_add_details("shuttle_gib_unintelligent", "[type]")
SSblackbox.add_details("shuttle_gib_unintelligent", "[type]")
M.gib()
else //non-living mobs shouldn't be affected by shuttles, which is why this is an else
+1 -1
View File
@@ -90,7 +90,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
SSshuttle.orderhistory += SO
SO.generate(pick_n_take(empty_turfs))
feedback_add_details("cargo_imports",
SSblackbox.add_details("cargo_imports",
"[SO.pack.type]|[SO.pack.name]|[SO.pack.cost]")
investigate_log("Order #[SO.id] ([SO.pack.name], placed by [key_name(SO.orderer_ckey)]) has shipped.", "cargo")
if(SO.pack.dangerous)