From e600b5921739f646196236945de3da2769e335a8 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 11 Oct 2019 20:42:01 -0700
Subject: [PATCH 1/5] Update computer.dm

---
 code/modules/holodeck/computer.dm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm
index 6cc11afdf5..f42d1d8e06 100644
--- a/code/modules/holodeck/computer.dm
+++ b/code/modules/holodeck/computer.dm
@@ -111,6 +111,11 @@
 			if(A)
 				load_program(A)
 		if("safety")
+			if(!issilicon(usr) && !IsAdminGhost(usr))
+				var/msg = "[key_name(usr)] attempted to emag the holodeck using a href exploit!"
+				message_admins(msg)
+				log_admin(msg)
+				return
 			obj_flags ^= EMAGGED
 			if((obj_flags & EMAGGED) && program && emag_programs[program.name])
 				emergency_shutdown()

From f393c7fff25f7c70c4fe0e6ebb5aceddc060362e Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 11 Oct 2019 20:43:10 -0700
Subject: [PATCH 2/5] Update new_player.dm

---
 code/modules/mob/dead/new_player/new_player.dm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index f0b7c18b28..b9bb9fe249 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -145,7 +145,13 @@
 		ViewManifest()
 
 	if(href_list["SelectedJob"])
-
+		if(!SSticker || !SSticker.IsRoundInProgress())
+			var/msg = "[key_name(usr)] attempted to join the round using a href that shouldn't be available at this moment!"
+			log_admin(msg)
+			message_admins(msg)
+			to_chat(usr, "<span class='danger'>The round is either not ready, or has already finished...</span>")
+			return
+			
 		if(!GLOB.enter_allowed)
 			to_chat(usr, "<span class='notice'>There is an administrative lock on entering the game!</span>")
 			return

From 5cf627e889852a42ca260cc8779c230ae9ca6f1e Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 11 Oct 2019 20:43:36 -0700
Subject: [PATCH 3/5] Update computer.dm

---
 code/modules/holodeck/computer.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm
index f42d1d8e06..889706744a 100644
--- a/code/modules/holodeck/computer.dm
+++ b/code/modules/holodeck/computer.dm
@@ -112,7 +112,7 @@
 				load_program(A)
 		if("safety")
 			if(!issilicon(usr) && !IsAdminGhost(usr))
-				var/msg = "[key_name(usr)] attempted to emag the holodeck using a href exploit!"
+				var/msg = "[key_name(usr)] attempted to emag the holodeck using a href they shouldn't have!"
 				message_admins(msg)
 				log_admin(msg)
 				return

From 8c07a797000b32522737936e08accfb38a5cfed4 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 11 Oct 2019 20:45:42 -0700
Subject: [PATCH 4/5] Update bot.dm

---
 code/modules/mob/living/simple_animal/bot/bot.dm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index d99900187b..a5943aa0e6 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -808,11 +808,18 @@ Pass a positive integer as an argument to override a bot's default speed.
 
 	switch(href_list["operation"])
 		if("patrol")
+			if(!issilicon(usr) && !IsAdminGhost(usr) && !(bot_core.allowed(usr) || !locked))
+				return TRUE
 			auto_patrol = !auto_patrol
 			bot_reset()
 		if("remote")
 			remote_disabled = !remote_disabled
 		if("hack")
+			if(!issilicon(usr) && !IsAdminGhost(usr))
+				var/msg = "[key_name(usr)] attempted to hack a bot with a href that shouldn't be available!"
+				message_admins(msg)
+				log_admin(msg)
+				return TRUE
 			if(emagged != 2)
 				emagged = 2
 				hacked = TRUE

From 076b2d48fccd3b82bf827021c015eec087e6a352 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 11 Oct 2019 20:46:19 -0700
Subject: [PATCH 5/5] Update secbot.dm

---
 code/modules/mob/living/simple_animal/bot/secbot.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 9572b4dafc..f22139ac22 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -131,7 +131,8 @@ Auto Patrol: []"},
 /mob/living/simple_animal/bot/secbot/Topic(href, href_list)
 	if(..())
 		return 1
-
+	if(!issilicon(usr) && !IsAdminGhost(usr) && !(bot_core.allowed(usr) || !locked))
+		return TRUE
 	switch(href_list["operation"])
 		if("idcheck")
 			idcheck = !idcheck