cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] EMP cleanup (#11939)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-11-08 02:48:48 -07:00
committed by GitHub
parent 18997e2c84
commit e98a9f484a
122 changed files with 222 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/projectiles/ammunition/rounds.dm
View File

@@ -315,7 +315,7 @@
projectile_type = /obj/item/projectile/energy/electrode/stunshot
matter = list(MAT_STEEL = 360, MAT_GLASS = 720)
/obj/item/ammo_casing/a12g/stunshell/emp_act(severity)
/obj/item/ammo_casing/a12g/stunshell/emp_act(severity, recursive)
if(prob(100/severity)) BB = null
update_icon()

6
code/modules/projectiles/ammunition/smartmag.dm
View File

@@ -122,12 +122,6 @@
return
..()
// Classic emp_act, just drains the battery
/obj/item/ammo_magazine/smart/emp_act(severity)
..()
if(attached_cell)
attached_cell.emp_act(severity)
// Finds the cell for the magazine, used by rechargers
/obj/item/ammo_magazine/smart/get_cell()
return attached_cell