cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-15-10-2025

Browse Source
This commit is contained in:
Roxy
2025-10-15 19:34:41 -04:00
parent 00716094d8 7007a304d3
commit d14e538393
656 changed files with 24772 additions and 15866 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/trooper/syndicate.dm
+2 -2
View File
@@ -37,9 +37,9 @@
r_hand = /obj/item/knife/combat/survival
var/projectile_deflect_chance = 0
/mob/living/basic/trooper/syndicate/melee/bullet_act(obj/projectile/projectile)
/mob/living/basic/trooper/syndicate/melee/projectile_hit(obj/projectile/hitting_projectile, def_zone, piercing_hit, blocked)
if(prob(projectile_deflect_chance))
visible_message(span_danger("[src] blocks [projectile] with its shield!"))
visible_message(span_danger("[src] blocks [hitting_projectile] with its shield!"))
return BULLET_ACT_BLOCK
return ..()