Merge branch 'pr/21'

2019-07-29 22:57:40 +01:00
parent 5e5f2fea54 3d597ea508
commit fbbc4d8589
56 changed files with 930 additions and 367 deletions
@@ -9,6 +9,7 @@
 	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
 	item_flags = ABSTRACT | DROPDEL
 	w_class = WEIGHT_CLASS_HUGE
+	slot_flags = NONE
 	force = 5
 	max_charges = 1 //Recharging costs blood.
 	recharge_rate = 1
@@ -46,4 +47,4 @@
 /obj/item/projectile/magic/bloodchill/on_hit(mob/living/target)
 	. = ..()
 	if(isliving(target))
-		target.apply_status_effect(/datum/status_effect/bloodchill)
+		target.apply_status_effect(/datum/status_effect/bloodchill)