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

2019-11-15 00:36:50 +01:00
parent 09860d463f 364e267598
commit 6484eea339
447 changed files with 16075 additions and 3073 deletions
@@ -265,7 +265,7 @@
 		if (B && !QDELETED(B))
 			H.internal_organs -= B
 			qdel(B)
-		new /obj/effect/gibspawner/generic(get_turf(H), H.dna)
+		H.spawn_gibs()
 		return (BRUTELOSS)

 /obj/item/melee/classic_baton/telescopic/attack_self(mob/user)