Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435

2019-12-06 19:05:50 +01:00
parent 91e628c73d 6484eea339
commit 72c093d14e
122 changed files with 553 additions and 437 deletions
@@ -65,7 +65,7 @@
 	else
 		return ..()

-/obj/item/ammo_casing/throw_impact(atom/A)
+/obj/item/ammo_casing/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
 	if(heavy_metal)
 		bounce_away(FALSE, NONE)
 	. = ..()