From 73b1aefe3f4cd5722cbb29112a47d1b341533b45 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu, 31 Dec 2020 02:39:03 +0100
Subject: [PATCH] [MIRROR] Admins cancelling a vote now leaves a log and
 message (#2388)

* Merge pull request #55810 from NotRanged/democracy

Admins cancelling a vote now leaves a log and message

* Admins cancelling a vote now leaves a log and message

Co-authored-by: 81Denton <32391752+81Denton@users.noreply.github.com>
---
 code/controllers/subsystem/vote.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index f438a8bee2d..a60fbf3359a 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -333,6 +333,8 @@ SUBSYSTEM_DEF(vote)
 			return
 		if("cancel")
 			if(usr.client.holder)
+				usr.log_message("[key_name_admin(usr)] cancelled a vote.", LOG_ADMIN)
+				message_admins("[key_name_admin(usr)] has cancelled the current vote.")
 				reset()
 		if("toggle_restart")
 			if(usr.client.holder && trialmin)