From a2b35d71fa2d7b77de2c00f972af149fcbb5e583 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 28 Jul 2019 08:07:44 -0400 Subject: [PATCH 1/2] port-part1 --- code/modules/research/xenobiology/crossbreeding/_weapons.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/research/xenobiology/crossbreeding/_weapons.dm b/code/modules/research/xenobiology/crossbreeding/_weapons.dm index 141e6b1fe1..53857b214c 100644 --- a/code/modules/research/xenobiology/crossbreeding/_weapons.dm +++ b/code/modules/research/xenobiology/crossbreeding/_weapons.dm @@ -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) \ No newline at end of file + target.apply_status_effect(/datum/status_effect/bloodchill) From ca2b4a8267ce353c971838a05abc44f8a30e8f54 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 28 Jul 2019 08:11:06 -0400 Subject: [PATCH 2/2] Update mutations.dm --- code/modules/antagonists/changeling/powers/mutations.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 4e0595362c..99d8ae797b 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -244,6 +244,7 @@ lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi' righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi' item_flags = NEEDS_PERMIT | ABSTRACT | DROPDEL | NOBLUDGEON + slot_flags = NONE flags_1 = NONE w_class = WEIGHT_CLASS_HUGE ammo_type = /obj/item/ammo_casing/magic/tentacle