Turrets now check borgs! (#35045)

* epic

* epic2

* epic

* 150 hours

* 150^2 hours
This commit is contained in:
ExcessiveUseOfCobblestone
2018-01-30 11:04:19 -05:00
committed by CitadelStationBot
parent f4c44d004a
commit 31cf679ce9
3 changed files with 22 additions and 0 deletions

View File

@@ -372,6 +372,17 @@
if(SA.stat || in_faction(SA)) //don't target if dead or in faction
continue
targets += SA
if(issilicon(A))
var/mob/living/silicon/sillycone = A
if(sillycone.stat || in_faction(sillycone))
continue
if(iscyborg(sillycone))
var/mob/living/silicon/robot/sillyconerobot = A
if(faction == "syndicate" && sillyconerobot.emagged == 1)
continue
targets += sillycone
if(iscarbon(A))
var/mob/living/carbon/C = A

View File

@@ -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(

View File

@@ -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()