Merge pull request #5213 from Citadel-Station-13/upstream-merge-35045

[MIRROR] Turrets now check borgs!
2018-01-31 04:12:11 -06:00
parent cfcef963ad 165ff6d534
commit 903a89e281
3 changed files with 22 additions and 0 deletions
@@ -552,6 +552,16 @@
 	can_be_pushed = FALSE
 	hat_offset = 3

+/obj/item/robot_module/syndicate/rebuild_modules()
+	..()
+	var/mob/living/silicon/robot/Syndi = loc
+	Syndi.faction  -= "silicon" //ai turrets
+
+/obj/item/robot_module/syndicate/remove_module(obj/item/I, delete_after)
+	..()
+	var/mob/living/silicon/robot/Syndi = loc
+	Syndi.faction += "silicon" //ai is your bff now!
+
 /obj/item/robot_module/syndicate_medical
 	name = "Syndicate Medical"
 	basic_modules = list(
@@ -41,6 +41,7 @@
 /mob/living/silicon/Initialize()
 	. = ..()
 	GLOB.silicon_mobs += src
+	faction += "silicon"
 	for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
 		diag_hud.add_to_hud(src)
 	diag_hud_set_status()