cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +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

2
code/modules/shieldgen/shield_gen.dm
View File

@@ -42,7 +42,7 @@
return ..()
/obj/machinery/shield_gen/Destroy()
qdel_null_list(field)
QDEL_NULL_LIST(field)
return ..()
/obj/machinery/shield_gen/emag_act(var/remaining_charges, var/mob/user)