From f22f82d1f8e2ef3daa6f4dac0f2a2ee47f1e9d9d Mon Sep 17 00:00:00 2001 From: Gottfrei Date: Thu, 26 Oct 2023 20:29:00 +0300 Subject: [PATCH 1/2] Tribal Bola Fix --- code/game/objects/items/weapons/legcuffs.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index 8b7deb6d6d7..e18f2c03c14 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -318,12 +318,13 @@ reusable = FALSE -/obj/item/restraints/legcuffs/bola/sinew/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) - if(..()) +/obj/item/restraints/legcuffs/bola/sinew/dropped(mob/living/carbon/user, silent = FALSE) + . = ..() + + if(!istype(user) || user.legcuffed != src) return - var/mob/living/carbon/target = hit_atom // we already check for carbon in parent - target.apply_damage(10, BRUTE, (pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))) - new /obj/item/restraints/handcuffs/sinew(target.loc) - new /obj/item/stack/sheet/bone(target.loc, 2) + user.apply_damage(10, BRUTE, (pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))) + new /obj/item/restraints/handcuffs/sinew(user.loc) + new /obj/item/stack/sheet/bone(user.loc, 2) From 1ea9854213b0b2b54eafdb80feadfcdd094b9a39 Mon Sep 17 00:00:00 2001 From: Gottfrei Date: Fri, 27 Oct 2023 00:03:23 +0300 Subject: [PATCH 2/2] Ninja Eralier Innate Effects --- code/modules/antagonists/space_ninja/ninja_datum.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/space_ninja/ninja_datum.dm b/code/modules/antagonists/space_ninja/ninja_datum.dm index f866663c867..02dd3141526 100644 --- a/code/modules/antagonists/space_ninja/ninja_datum.dm +++ b/code/modules/antagonists/space_ninja/ninja_datum.dm @@ -40,6 +40,7 @@ owner.set_original_mob(owner.current) add_owner_to_gamemode() + apply_innate_effects() if(generate_antags) ninja_type = pick(NINJA_TYPE_PROTECTOR, NINJA_TYPE_HACKER, NINJA_TYPE_KILLER) @@ -48,7 +49,6 @@ if(give_objectives) give_objectives() - apply_innate_effects() finalize_antag() if(!silent)