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

This commit is contained in:
Ghommie
2019-12-06 19:05:50 +01:00
122 changed files with 553 additions and 437 deletions
+1 -1
View File
@@ -115,7 +115,7 @@
else
return ..()
/obj/item/bodypart/throw_impact(atom/hit_atom)
/obj/item/bodypart/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
..()
if(status != BODYPART_ROBOTIC)
playsound(get_turf(src), 'sound/misc/splort.ogg', 50, 1, -1)