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
@@ -19,7 +19,7 @@
 	return TRUE

 /obj/machinery/turnstile/bullet_act(obj/item/projectile/P, def_zone)
-	return -1 //Pass through!
+	return BULLET_ACT_FORCE_PIERCE //Pass through!

 /obj/machinery/turnstile/proc/allowed_access(var/mob/B)
 	if(B.pulledby && ismob(B.pulledby))