diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 357afca9957..995af885549 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -45,7 +45,7 @@ span_userdanger("You are kicked square in the chest by [A], sending you flying!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) var/atom/throw_target = get_edge_target_turf(D, A.dir) - D.throw_at(throw_target, 7, 14, A) + D.throw_at(throw_target, 7, 4, A) D.apply_damage(15, A.get_attack_type(), BODY_ZONE_CHEST, wound_bonus = CANT_WOUND) log_combat(A, D, "launchkicked (Sleeping Carp)") return diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index ebf8a739193..ab321c65aeb 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -151,12 +151,15 @@ var/atom/movable/thrown_thing var/obj/item/I = get_active_held_item() + var/neckgrab_throw = FALSE // we can't check for if it's a neckgrab throw when totaling up power_throw since we've already stopped pulling them by then, so get it early if(!I) if(pulling && isliving(pulling) && grab_state >= GRAB_AGGRESSIVE) var/mob/living/throwable_mob = pulling if(!throwable_mob.buckled) thrown_thing = throwable_mob + if(grab_state >= GRAB_NECK) + neckgrab_throw = TRUE stop_pulling() if(HAS_TRAIT(src, TRAIT_PACIFISM)) to_chat(src, span_notice("You gently let go of [throwable_mob].")) @@ -178,7 +181,7 @@ power_throw-- if(HAS_TRAIT(thrown_thing, TRAIT_DWARF)) power_throw++ - if(pulling && grab_state >= GRAB_NECK) + if(neckgrab_throw) power_throw++ visible_message(span_danger("[src] throws [thrown_thing][power_throw ? " really hard!" : "."]"), \ span_danger("You throw [thrown_thing][power_throw ? " really hard!" : "."]"))