Update stealth.dm

Author: Moltijoe

yogstation/code/datums/martial/stealth.dm

@@ -25,16 +25,15 @@
 /datum/martial_art/liquidator/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	if(!can_use(A))
 		return
-	if(findtext(streak, DAGGER_COMBO))
-		hidden_knife(A,D)
-		streak = ""
-		return TRUE
-		
-	if(findtext(streak, FINGERGUN_COMBO))
+	if(findtext(streak, FINGERGUN_COMBO)) //prioritize the gun combo because the dagger combo can combo into itself
 		fingergun(A,D)
 		streak = ""
 		return TRUE //don't upgrade the grab
 
+	if(findtext(streak, DAGGER_COMBO))
+		hidden_knife(A,D)
+		return TRUE
+
 /datum/martial_art/liquidator/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	if(!can_use(A))
 		return FALSE
@@ -51,8 +50,9 @@
 		return FALSE
 
 	add_to_streak("H",D)
-	check_streak(A,D)
-	return FALSE  ///We need it work like a generic, non martial art attack at all times
+	if(check_streak(A,D)) //stab doesn't seem like anything
+		return TRUE
+	return FALSE  ///We need it work like a generic, non martial art attack
 
 /datum/martial_art/liquidator/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	if(!(can_use(A)))
@@ -77,14 +77,97 @@
 //////////////////////////////////////////////////////////////////////////////////
 //------------------------------Hidden knife------------------------------------//
 //////////////////////////////////////////////////////////////////////////////////
-/datum/martial_art/liquidator/proc/hidden_knife(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	var/selected_zone = D.get_bodypart(A.zone_selected) ? A.zone_selected : BODY_ZONE_CHEST //check if the zone exists, if not, default to chest
-
-	var/armor_block = D.run_armor_check(selected_zone, MELEE, armour_penetration = 40)
-	D.apply_damage(A.get_punchdamagehigh() * 4, BRUTE, selected_zone, armor_block, sharpness = SHARP_EDGED) 	//28 damage by default
-	to_chat(A, span_warning("You stab [D] with a hidden blade!"))
-	to_chat(D, span_userdanger("You are suddenly stabbed with a blade!"))
-	A.playsound_local(A, 'sound/weapons/batonextend.ogg', 35, TRUE) //sound only to you as audio feedback that you stabbed them
+/datum/martial_art/liquidator/proc/hidden_knife(mob/living/carbon/human/user, mob/living/carbon/human/target)
+	/**
+	 * Literally just copy pasted all this from /proc/disarm in _species.dm
+	 * we are pretending to be a shove
+	 */
+	user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
+	playsound(target, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
+
+	var/shove_dir = get_dir(user.loc, target.loc)
+	var/turf/target_shove_turf = get_step(target.loc, shove_dir)
+	var/mob/living/carbon/human/target_collateral_human
+	var/shove_blocked = FALSE //Used to check if a shove is blocked so that if it is knockdown logic can be applied
+
+	//Thank you based whoneedsspace
+	target_collateral_human = locate(/mob/living/carbon/human) in target_shove_turf.contents
+	var/bothstanding = target_collateral_human && (target.mobility_flags & MOBILITY_STAND) && (target_collateral_human.mobility_flags & MOBILITY_STAND)
+	if(target_collateral_human && bothstanding)
+		shove_blocked = TRUE
+	else
+		target.Move(target_shove_turf, shove_dir)
+		if(get_turf(target) != target_shove_turf)
+			shove_blocked = TRUE
+
+	if(shove_blocked && !target.is_shove_knockdown_blocked() && !target.buckled)
+		var/directional_blocked = FALSE
+		if(shove_dir in GLOB.cardinals) //Directional checks to make sure that we're not shoving through a windoor or something like that
+			var/target_turf = get_turf(target)
+			for(var/obj/O in target_turf)
+				if(O.flags_1 & ON_BORDER_1 && O.dir == shove_dir && O.density)
+					directional_blocked = TRUE
+					break
+			if(target_turf != target_shove_turf) //Make sure that we don't run the exact same check twice on the same tile
+				for(var/obj/O in target_shove_turf)
+					if(O.flags_1 & ON_BORDER_1 && O.dir == turn(shove_dir, 180) && O.density)
+						directional_blocked = TRUE
+						break
+		if(!bothstanding || directional_blocked)
+			var/obj/item/I = target.get_active_held_item()
+			if(target.dropItemToGround(I))
+				user.visible_message(span_danger("[user.name] shoves [target.name], disarming them!"), span_danger("You shove [target.name], disarming them!"), null, COMBAT_MESSAGE_RANGE)
+				log_combat(user, target, "liquidator hidden knife shove", "disarming them")
+		else if(bothstanding)
+			target.Knockdown(SHOVE_KNOCKDOWN_HUMAN)
+			if(!target_collateral_human.is_shove_knockdown_blocked())
+				target_collateral_human.Knockdown(SHOVE_KNOCKDOWN_HUMAN)
+			user.visible_message(span_danger("[user.name] shoves [target.name] into [target_collateral_human.name]!"), span_danger("You shove [target.name] into [target_collateral_human.name]!"), null, COMBAT_MESSAGE_RANGE)
+			log_combat(user, target, "liquidator hidden knife shove", "into [target_collateral_human.name]")
+	else
+		user.visible_message(span_danger("[user.name] shoves [target.name]!"), null, null, COMBAT_MESSAGE_RANGE)
+		var/target_held_item = target.get_active_held_item()
+		var/knocked_item = FALSE
+
+		if(!is_type_in_typecache(target_held_item, GLOB.shove_disarming_types))
+			target_held_item = null
+
+		if(!target.has_movespeed_modifier(MOVESPEED_ID_SHOVE))
+			target.add_movespeed_modifier(MOVESPEED_ID_SHOVE, multiplicative_slowdown = SHOVE_SLOWDOWN_STRENGTH)
+			if(target_held_item)
+				target.visible_message(span_danger("[target.name]'s grip on \the [target_held_item] loosens!"), span_danger("Your grip on \the [target_held_item] loosens!"), null, COMBAT_MESSAGE_RANGE)
+			addtimer(CALLBACK(target, /mob/living/carbon/human/proc/clear_shove_slowdown), SHOVE_SLOWDOWN_LENGTH)
+		else if(target_held_item)
+			target.dropItemToGround(target_held_item)
+			knocked_item = TRUE
+			target.visible_message(span_danger("[target.name] drops \the [target_held_item]!!"), span_danger("You drop \the [target_held_item]!!"), null, COMBAT_MESSAGE_RANGE)
+		var/append_message = ""
+		if(target_held_item)
+			if(knocked_item)
+				append_message = "causing them to drop [target_held_item]"
+			else
+				append_message = "loosening their grip on [target_held_item]"
+		log_combat(user, target, "liquidator hidden knife shove", append_message)
+
+
+
+	/**
+	 * The actual martial art stuff
+	 */
+
+	var/selected_zone = target.get_bodypart(user.zone_selected) ? user.zone_selected : BODY_ZONE_CHEST //check if the zone exists, if not, default to chest
+
+	var/armor_block = target.run_armor_check(selected_zone, MELEE, armour_penetration = 40)
+	target.apply_damage(user.get_punchdamagehigh() * 4, BRUTE, selected_zone, armor_block, -100, 100, SHARP_POINTY) 	//28 damage by default  TWENTY EIGHT STAB WOUNDS (not gonna wound, unless the target has no armour)
+	if(shove_blocked) //if they're getting pushed into a wall or another person, they're probably down for the count, GET THEM
+		user.changeNext_move(CLICK_CD_RANGE) //stab stab stab stab stab stab stab stab
+
+	// Stab sounds only play to you and the target
+	user.playsound_local(target, 'sound/weapons/sword2.ogg', 30, FALSE)
+	target.playsound_local(target, 'sound/weapons/sword2.ogg', 30, FALSE)
+
+	to_chat(user, span_warning("You stab [target] with a hidden blade!"))
+	to_chat(target, span_userdanger("You are suddenly stabbed with a blade!"))
 
 /*---------------------------------------------------------------
 
@@ -95,9 +178,9 @@
 	var/obj/item/gun/ballistic/automatic/pistol/martial/gun = new /obj/item/gun/ballistic/automatic/pistol/martial (A)   ///I don't check does the user have an item in a hand, because it is a martial art action, and to use it... you need to have a empty hand
 	gun.gun_owner = A
 	A.put_in_hands(gun)
-	A.playsound_local(A, 'sound/items/change_jaws.ogg', 15, TRUE) //sound only to you as audio feedback that you pulled out a gun
 	to_chat(A, span_notice("You extract a hidden gun from your hand."))	
 	D.Stun(1 SECONDS)
+	A.changeNext_move(CLICK_CD_RANGE) //it's just pulling out a gun, not actually grabbing them, so have a shorter cooldown
 
 /obj/item/gun/ballistic/automatic/pistol/martial
 	desc = "A concelated version of a stechkin APS pistol, that comes with special Preternis upgrade modules."
@@ -142,6 +225,8 @@
 		qdel(src)	
 
 /obj/item/gun/ballistic/automatic/pistol/martial/proc/on_drop()
+	if(QDELETED(src))
+		return
 	to_chat(gun_owner, span_notice("You decide that it isn't the best time to use [src]"))
 	qdel(src)