Merge pull request #11418 from Ghommie/Ghommie-cit615

Fix runtimes some more.
2020-03-11 17:01:13 -07:00
parent 0d80c8c169 e41e3a5fbb
commit 480eb32c68
27 changed files with 49 additions and 63 deletions
@@ -39,7 +39,6 @@
 				magazine = AM
 				if(oldmag)
 					to_chat(user, "<span class='notice'>You perform a tactical reload on \the [src], replacing the magazine.</span>")
-					oldmag.dropped()
 					oldmag.forceMove(get_turf(src.loc))
 					oldmag.update_icon()
 				else
@@ -171,7 +171,7 @@
 	pump()
 	gun_type = type

-/obj/item/gun/ballistic/shotgun/boltaction/enchanted/dropped()
+/obj/item/gun/ballistic/shotgun/boltaction/enchanted/dropped(mob/user)
 	..()
 	guns_left = 0