cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-13 08:56:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	maps/aurora/aurora-1_centcomm.dmm
This commit is contained in:
skull132
2017-10-29 16:15:53 +02:00
parent 0d50eed14e 2d52377ad8
commit c0f22a1cdd
47 changed files with 3560 additions and 90287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/DB ban/ban_mirroring.dm
+8 -1
View File
@@ -235,7 +235,14 @@
update_connection_data(C)
return
var/list/data_object = json_decode(data)
var/list/data_object
try
data_object = json_decode(data)
catch(var/exception/E)
data_object = list()
log_debug("CONN DATA: [E] encountered when loading data for [C.ckey].")
if (!data_object || !data_object.len)
log_debug("CONN DATA: [C.ckey] has no connection data to showcase.")
code/modules/admin/admin_verbs.dm
+1 -1
View File
@@ -1046,7 +1046,7 @@ var/list/admin_verbs_cciaa = list(
var/mob/living/silicon/ai/target = input("Choose the AI to force-wipe:", "AI Termination") as null|anything in ai_list
if (alert("Are you sure you want to wipe [target.name]? They will be ghosted and their job slot freed.", "Confirm AI Termination", "No", "No", "Yes") != "Yes")
if (!target || alert("Are you sure you want to wipe [target.name]? They will be ghosted and their job slot freed.", "Confirm AI Termination", "No", "No", "Yes") != "Yes")
return
log_and_message_admins("admin-wiped [key_name_admin(target)]'s core.")