diff --git a/code/modules/admin/admin.dm.rej b/code/modules/admin/admin.dm.rej deleted file mode 100644 index 39e86b0f03..0000000000 --- a/code/modules/admin/admin.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm (rejected hunks) -@@ -434,7 +434,7 @@ - if("Hard Restart (No Delay, No Feeback Reason)") - world.Reboot() - if("Hardest Restart (No actions, just reboot)") -- world.Reboot(fast_track = TRUE) -+ world.Reboot(fast_track = TRUE) - if("Service Restart (Force restart DD)") - GLOB.reboot_mode = REBOOT_MODE_HARD - world.ServiceReboot() diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 97bbfc0792..21e3961c64 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2239,7 +2239,7 @@ error_viewer.show_to(owner, null, href_list["viewruntime_linear"]) else if(href_list["showrelatedacc"]) var/client/C = locate(href_list["client"]) in GLOB.clients - var/list/thing_to_check + var/thing_to_check if(href_list["showrelatedacc"] == "cid") thing_to_check = C.related_accounts_cid else @@ -2247,8 +2247,8 @@ thing_to_check = splittext(thing_to_check, ", ") - var/list/dat = list("Related accounts by [uppertext(href_list["showrelatedacc"])]:") - dat += thing_to_check + var/list/dat = list("Related accounts by [uppertext(href_list["showrelatedacc"])]:") + dat += thing_to_check - usr << browse(dat.Join("
"), "window=related_[C];size=420x300") + usr << browse(dat.Join("
"), "window=related_[C];size=420x300") diff --git a/code/modules/admin/topic.dm.rej b/code/modules/admin/topic.dm.rej deleted file mode 100644 index 333acee487..0000000000 --- a/code/modules/admin/topic.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm (rejected hunks) -@@ -2240,7 +2240,7 @@ - - else if(href_list["showrelatedacc"]) - var/client/C = locate(href_list["client"]) in GLOB.clients -- var/list/thing_to_check -+ var/thing_to_check - if(href_list["showrelatedacc"] == "cid") - thing_to_check = C.related_accounts_cid - else