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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mech_Equipment_Carepackage1

Browse Source
This commit is contained in:
Mechoid
2018-08-23 20:17:49 -07:00
parent 509addffdf 1508273110
commit be703cee04
75 changed files with 449 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/projectiles/guns/magnetic/magnetic.dm
View File

@@ -31,9 +31,9 @@
/obj/item/weapon/gun/magnetic/Destroy()
processing_objects.Remove(src)
qdel_null(cell)
qdel_null(loaded)
qdel_null(capacitor)
QDEL_NULL(cell)
QDEL_NULL(loaded)
QDEL_NULL(capacitor)
. = ..()
/obj/item/weapon/gun/magnetic/get_cell()

2
code/modules/projectiles/projectile/arc.dm
View File

@@ -20,7 +20,7 @@
return ..()
/obj/item/projectile/arc/Destroy()
qdel_null(shadow)
QDEL_NULL(shadow)
return ..()
/obj/item/projectile/arc/Bump(atom/A, forced=0)