Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765

code/modules/mob/living/silicon/robot/robot.dm

@@ -14,7 +14,7 @@
 	spark_system.attach(src)
 
 	wires = new /datum/wires/robot(src)
-	AddComponent(/datum/component/empprotection, EMP_PROTECT_WIRES)
+	AddElement(/datum/element/empprotection, EMP_PROTECT_WIRES)
 
 	robot_modules_background = new()
 	robot_modules_background.icon_state = "block"

code/modules/mob/living/silicon/robot/robot_defines.dm

@@ -9,6 +9,8 @@
 	maxHealth = 100
 	health = 100
 
+	combat_flags = COMBAT_FLAGS_DEFAULT
+
 	var/custom_name = ""
 	var/braintype = "Cyborg"
 	var/obj/item/robot_suit/robot_suit = null //Used for deconstruction to remember what the borg was constructed out of..

code/modules/mob/living/silicon/silicon.dm

@@ -15,8 +15,6 @@
 	speech_span = SPAN_ROBOT
 	flags_1 = PREVENT_CONTENTS_EXPLOSION_1 | HEAR_1
 	vore_flags = NO_VORE
-	/// Enable sprint system but not stamina
-	combat_flags = COMBAT_FLAGS_STAMEXEMPT_YESSPRINT
 
 	var/datum/ai_laws/laws = null//Now... THEY ALL CAN ALL HAVE LAWS
 	var/last_lawchange_announce = 0