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

2020-01-18 01:23:08 +01:00
parent 1d948907f6 eb3597ecc3
commit 9c0b78bc09
240 changed files with 3333 additions and 2300 deletions
@@ -42,9 +42,8 @@


 /mob/living/silicon/ai/bullet_act(obj/item/projectile/Proj)
-	..(Proj)
+	. = ..()
 	updatehealth()
-	return 2

 /mob/living/silicon/ai/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0)
 	return // no eyes, no flashing