cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Roxy
2025-11-12 16:44:13 -05:00
parent b4dbcc9db1 44b3075544
commit 71faa643bf
379 changed files with 37535 additions and 33147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile/bullets/cannonball.dm
+1 -1
View File
@@ -57,7 +57,7 @@
damage = 15 //very low
/obj/projectile/bullet/cannonball/emp/on_hit(atom/target, blocked = 0, pierce_hit)
empulse(src, 4, 10)
empulse(src, 4, 10, emp_source = src)
. = ..()
/obj/projectile/bullet/cannonball/biggest_one
code/modules/projectiles/projectile/bullets/sniper.dm
+1 -1
View File
@@ -50,7 +50,7 @@
if(issilicon(target)) //also especially good against borgs
var/mob/living/silicon/borg_boy = target
borg_boy.apply_damage(damage, BRUTE)
empulse(target, emp_radius, emp_radius)
empulse(target, emp_radius, emp_radius, emp_source = src)
/obj/projectile/bullet/p50/incendiary
name =".50 BMG incendiary bullet"