Merge remote-tracking branch 'origin/master' into TGUI_Updoot

2020-09-21 00:16:12 +03:00
parent 74533d3f9d 16430dab4c
commit 435565f1d8
223 changed files with 7046 additions and 3941 deletions
@@ -51,11 +51,6 @@
 	cell.use(shot.energy_cost)
 	. = ..()

-/obj/item/gun/ballistic/automatic/magrifle/emp_act(severity)
-	. = ..()
-	if(!(. & EMP_PROTECT_CONTENTS))
-		cell.use(round(cell.charge / severity))
-
 /obj/item/gun/ballistic/automatic/magrifle/get_cell()
 	return cell