From 11b7cded319679bc9d2d0095af167ee13b974473 Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Fri, 8 Feb 2019 19:19:55 -0200
Subject: [PATCH] Removes combat cyborgs from the station's hands (#6028)

---
 .../mob/living/silicon/robot/presets.dm       |  2 +-
 .../security levels/keycard authentication.dm | 20 -------------------
 html/changelogs/alberyk-borg.yml              |  6 ++++++
 3 files changed, 7 insertions(+), 21 deletions(-)
 create mode 100644 html/changelogs/alberyk-borg.yml

diff --git a/code/modules/mob/living/silicon/robot/presets.dm b/code/modules/mob/living/silicon/robot/presets.dm
index 142114b2c28..c501bfb5357 100644
--- a/code/modules/mob/living/silicon/robot/presets.dm
+++ b/code/modules/mob/living/silicon/robot/presets.dm
@@ -17,7 +17,7 @@
 	if(!jetpack)
 		jetpack = new /obj/item/weapon/tank/jetpack/carbondioxide/synthetic(src)
 
-/mob/living/silicon/robot/combat/scrambled //should not stand linked to the station or the ai
+/mob/living/silicon/robot/scrambled //should not stand linked to the station or the ai
 	scrambledcodes = 1
 	lawupdate = 0
 
diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm
index 548f0a7e3d2..2334d82fa9a 100644
--- a/code/modules/security levels/keycard authentication.dm	
+++ b/code/modules/security levels/keycard authentication.dm	
@@ -70,8 +70,6 @@
 
 		dat += "<li><A href='?src=\ref[src];triggerevent=Grant Emergency Maintenance Access'>Grant Emergency Maintenance Access</A></li>"
 		dat += "<li><A href='?src=\ref[src];triggerevent=Revoke Emergency Maintenance Access'>Revoke Emergency Maintenance Access</A></li>"
-		dat += "<li><A href='?src=\ref[src];triggerevent=Cyborg Crisis Override'>Cyborg Crisis Override</A></li>"
-		dat += "<li><A href='?src=\ref[src];triggerevent=Disable Cyborg Crisis Override'>Disable Cyborg Crisis Override</A></li>"
 		dat += "</ul>"
 		user << browse(dat, "window=keycard_auth;size=500x250")
 	if(screen == 2)
@@ -151,12 +149,6 @@
 		if("Revoke Emergency Maintenance Access")
 			revoke_maint_all_access()
 			feedback_inc("alert_keycard_auth_maintRevoke",1)
-		if("Cyborg Crisis Override")
-			cyborg_crisis_override()
-			feedback_inc("alert_keycard_auth_borgCrisis",1)
-		if("Disable Cyborg Crisis Override")
-			disable_cyborg_crisis_override()
-			feedback_inc("alert_keycard_auth_borgDisable",1)
 		if("Emergency Response Team")
 			if(is_ert_blocked())
 				usr << "<span class='warning'>All emergency response teams are dispatched and can not be called at this time.</span>"
@@ -185,15 +177,3 @@ var/global/maint_all_access = 0
 	if(maint_all_access && src.check_access_list(list(access_maint_tunnels)))
 		return 1
 	return ..(M)
-
-/proc/cyborg_crisis_override()
-	for(var/mob/living/silicon/robot/M in silicon_mob_list)
-		M.crisis_override = 1
-	to_world("<font size=4 color='red'>Attention!</font>")
-	to_world("<font color='red'>Cyborg crisis override has been activated, station bound cyborgs are allowed to select the combat module during code red.</font>")
-
-/proc/disable_cyborg_crisis_override()
-	for(var/mob/living/silicon/robot/M in silicon_mob_list)
-		M.crisis_override = 0
-	to_world("<font size=4 color='red'>Attention!</font>")
-	to_world("<font color='red'>Cyborg crisis override has been deactivated, station bound cyborgs are no longer allowed to select the combat module.</font>")
diff --git a/html/changelogs/alberyk-borg.yml b/html/changelogs/alberyk-borg.yml
new file mode 100644
index 00000000000..a402a834c9f
--- /dev/null
+++ b/html/changelogs/alberyk-borg.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - rscdel: "The station is no longer able to deploy combat cyborgs."