From 32a833fa47eefb103474e7f9d9a728f3e813fbbd Mon Sep 17 00:00:00 2001
From: Alberyk <vitor.e.rubbo@gmail.com>
Date: Sun, 24 Jul 2016 17:53:08 -0300
Subject: [PATCH] Adding combat modules cyborgs (#617)

This pull will allow cyborgs to select the combat module when it is code red or delta. They come with an energy carbine, flash, plasma cutter, a shield module and one that allows them to go fast.
---
 code/modules/mob/living/silicon/robot/robot.dm         | 2 +-
 code/modules/mob/living/silicon/robot/robot_items.dm   | 6 +++---
 code/modules/mob/living/silicon/robot/robot_modules.dm | 7 ++++---
 html/changelogs/alberyk-PR-617.yml                     | 6 ++++++
 4 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 html/changelogs/alberyk-PR-617.yml

diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 578498a3d9f..7e03a285a59 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -258,7 +258,7 @@
 		return
 	var/list/modules = list()
 	modules.Add(robot_module_types)
-	if((crisis && security_level == SEC_LEVEL_RED) || crisis_override) //Leaving this in until it's balanced appropriately.
+	if(security_level == (SEC_LEVEL_RED || SEC_LEVEL_DELTA)) //There are no brakes in the combat module train.
 		src << "\red Crisis mode active. Combat module available."
 		modules+="Combat"
 	modtype = input("Please, select a module!", "Robot", null, null) in modules
diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm
index fbfd6261893..a1a3e471149 100644
--- a/code/modules/mob/living/silicon/robot/robot_items.dm
+++ b/code/modules/mob/living/silicon/robot/robot_items.dm
@@ -250,8 +250,8 @@
 /obj/item/borg/combat/shield
 	name = "personal shielding"
 	desc = "A powerful experimental module that turns aside or absorbs incoming attacks at the cost of charge."
-	icon = 'icons/obj/decals.dmi'
-	icon_state = "shock"
+	icon = 'icons/obj/device.dmi'
+	icon_state = "shield1" //placeholder for now
 	var/shield_level = 0.5 //Percentage of damage absorbed by the shield.
 
 /obj/item/borg/combat/shield/verb/set_shield_level()
@@ -267,4 +267,4 @@
 	name = "mobility module"
 	desc = "By retracting limbs and tucking in its head, a combat android can roll at high speeds."
 	icon = 'icons/obj/decals.dmi'
-	icon_state = "shock"
\ No newline at end of file
+	icon_state = "shock"
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 7e8a6c6f67f..b6b58df4a77 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -7,7 +7,7 @@ var/global/list/robot_modules = list(
 	"Crisis" 		= /obj/item/weapon/robot_module/medical/crisis,
 	"Surgeon" 		= /obj/item/weapon/robot_module/medical/surgeon,
 	"Security" 		= /obj/item/weapon/robot_module/security/general,
-	"Combat" 		= /obj/item/weapon/robot_module/security/combat,
+	"Combat" 		= /obj/item/weapon/robot_module/combat,
 	"Engineering"	= /obj/item/weapon/robot_module/engineering/general,
 	"Construction"	= /obj/item/weapon/robot_module/engineering/construction,
 	"Janitor" 		= /obj/item/weapon/robot_module/janitor
@@ -658,7 +658,7 @@ var/global/list/robot_modules = list(
 
 	return
 
-/obj/item/weapon/robot_module/security/combat
+/obj/item/weapon/robot_module/combat
 	name = "combat robot module"
 	sprites = list("Combat Android" = "droid-combat")
 	supported_upgrades = list(/obj/item/robot_parts/robot_component/jetpack)
@@ -672,7 +672,8 @@ var/global/list/robot_modules = list(
 	src.modules += new /obj/item/borg/combat/shield(src)
 	src.modules += new /obj/item/borg/combat/mobility(src)
 	src.emag = new /obj/item/weapon/gun/energy/lasercannon/mounted(src)
-
+	return
+	
 /obj/item/weapon/robot_module/drone
 	name = "drone module"
 	no_slip = 1
diff --git a/html/changelogs/alberyk-PR-617.yml b/html/changelogs/alberyk-PR-617.yml
new file mode 100644
index 00000000000..a8252c71949
--- /dev/null
+++ b/html/changelogs/alberyk-PR-617.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - rscadd: "Cyborgs can now select the combat module when the security level is red or higher."