Merge remote-tracking branch 'citadel/master' into tgsync

This commit is contained in:
silicons
2021-01-08 00:33:57 -08:00
231 changed files with 8727 additions and 6166 deletions
+2 -1
View File
@@ -19,6 +19,7 @@
var/boom_sizes = list(0, 0, 3)
var/can_attach_mob = FALSE
var/full_damage_on_mobs = FALSE
var/can_gib_mobs = FALSE
/obj/item/grenade/plastic/Initialize()
. = ..()
@@ -72,7 +73,7 @@
explosion(get_step(T, aim_dir), boom_sizes[1], boom_sizes[2], boom_sizes[3])
else
explosion(location, boom_sizes[1], boom_sizes[2], boom_sizes[3])
if(ismob(target))
if(ismob(target) && can_gib_mobs)
var/mob/M = target
M.gib()
qdel(src)