July 5th TG sync (#1883)

July 5th TG sync
2017-07-05 22:14:19 -05:00
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
@@ -321,7 +321,7 @@
 	return 0


-/mob/living/silicon/assess_threat() //Secbots won't hunt silicon units
+/mob/living/silicon/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null) //Secbots won't hunt silicon units
 	return -10

 /mob/living/silicon/proc/remove_med_sec_hud()