The Brawlening

code/datums/components/butchering.dm

@@ -54,7 +54,7 @@
 	if (!source.get_sharpness() && !can_be_blunt)
 		return
 
-	if (!user.combat_mode)
+	if (user.combat_mode) //DARKPACK EDIT CHANGE- quality of life for melee weapons, doesnt make sense you couldnt do combos in combat mode
 		return
 
 	// Can we butcher it?
@@ -334,6 +334,7 @@
 	var/static/list/butcher_spots = typecacheof(list(
 		/obj/structure/table,
 		/obj/structure/bed,
+		/obj/structure/chair, //DARKPACK EDIT BUTCHERING: Chairs added because of prevelence and the general non-supporting of construction mechanics
 		/obj/machinery/stasis,
 		/obj/structure/kitchenspike,
 	))
@@ -345,7 +346,7 @@
 			break
 
 	if (!found_spot)
-		to_chat(user, span_warning("You need a better spot to butcher [victim]!"))
+		to_chat(user, span_warning("You need to butcher [victim] on a table/chair!")) //DARKPACK EDIT BUTCHERING ORIGINAL: to_chat(user, span_warning("You need a better spot to butcher [victim]!"))
 		return
 
 	var/obj/item/bodypart/limb = victim.get_bodypart(deprecise_zone(user.zone_selected))

code/modules/surgery/bodyparts/head.dm

@@ -96,7 +96,7 @@
 		show_eyeless = FALSE
 
 		/// Can this head be dismembered normally?
-		can_dismember = FALSE
+		can_dismember = TRUE //DARKPACK EDIT- For QOL it's much easier to leave it enabled by default, undismemberable heads are silly TGcode stuff
 
 /obj/item/bodypart/head/Initialize(mapload)
 	. = ..()
@@ -164,7 +164,7 @@
 	if (!can_dismember)
 		return FALSE
 
-	if(!HAS_TRAIT(owner, TRAIT_CURSED) && owner.stat < HARD_CRIT)
+	if (owner.stat < HARD_CRIT)
 		return FALSE
 
 	return ..()

modular_darkpack/modules/martial/artdefines.dm

@@ -0,0 +1,3 @@
+#define MARTIALART_DARKPACK_KUNGFU "kungfu"
+#define MARTIALART_DARKPACK_CQB "cqb"
+#define MARTIALART_DARKPACK_BOXING "streetboxing"

modular_darkpack/modules/martial/kungfu.dm

@@ -0,0 +1,269 @@
+#define LAUNCH_KICK_COMBO "HD"
+#define DROP_KICK_COMBO "DD"
+#define KNEE_STOMACH_COMBO "GH"
+
+/datum/martial_art/darkpack_kungfu
+	name = "Kung Fu"
+	id = MARTIALART_DARKPACK_KUNGFU
+	help_verb = /mob/living/proc/kungfu_help
+	display_combos = TRUE
+	grab_state_modifier = 1
+
+
+/datum/martial_art/darkpack_kungfu/activate_style(mob/living/new_holder)
+	. = ..()
+	//RegisterSignal(new_holder, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby))
+	RegisterSignal(new_holder, COMSIG_ATOM_PRE_BULLET_ACT, PROC_REF(hit_by_projectile))
+	RegisterSignal(new_holder, COMSIG_LIVING_CHECK_BLOCK, PROC_REF(check_dodge))
+	if (iscarbon(new_holder))
+		var/list/obj/item/bodypart/affected_bodyparts
+		var/mob/living/carbon/human/carbon_owner = new_holder
+		for (var/obj/item/bodypart/limb as anything in carbon_owner.bodyparts)
+			if (!istype(limb, /obj/item/bodypart/arm) && !istype(limb, /obj/item/bodypart/leg))
+				continue
+
+			LAZYADD(affected_bodyparts, limb)
+
+			//limb.unarmed_damage_low += 5 Unsure on this one
+			//limb.unarmed_damage_high += 5
+			limb.unarmed_attack_effect = null
+			limb.unarmed_attack_sound = 'modular_darkpack/modules/martial/sounds/harmboxing.ogg'
+
+/datum/martial_art/darkpack_kungfu/deactivate_style(mob/living/remove_from)
+	UnregisterSignal(remove_from, list(COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_PRE_BULLET_ACT, COMSIG_LIVING_CHECK_BLOCK))
+	return ..()
+
+/datum/martial_art/darkpack_kungfu/proc/check_streak(mob/living/attacker, mob/living/defender)
+
+	if(findtext(streak,LAUNCH_KICK_COMBO))
+		reset_streak()
+		return launch_kick(attacker, defender)
+
+	if(findtext(streak,DROP_KICK_COMBO))
+		reset_streak()
+		return drop_kick(attacker, defender)
+
+	if(findtext(streak,KNEE_STOMACH_COMBO))
+		reset_streak()
+		return knee_stomach(attacker, defender)
+
+	return FALSE
+
+/// Frontal Kick: Harm Disarm combo, knocks back relative to Attacker Str - Defender Fort
+/datum/martial_art/darkpack_kungfu/proc/launch_kick(mob/living/attacker, mob/living/defender)
+	attacker.do_attack_animation(defender, ATTACK_EFFECT_KICK)
+	defender.visible_message(
+		span_warning("[attacker] kicks [defender] square in the chest, sending them flying!"),
+		span_userdanger("You are kicked square in the chest by [attacker], sending you flying!"),
+		span_hear("You hear a sickening sound of flesh hitting flesh!"),
+		COMBAT_MESSAGE_RANGE,
+		attacker,
+	)
+	to_chat(attacker, span_danger("You kick [defender] square in the chest, sending them flying!"))
+	playsound(attacker, 'modular_darkpack/modules/martial/sounds/frontalkick.ogg', 50, TRUE, -1)
+	var/atom/throw_target = get_edge_target_turf(defender, attacker.dir)
+	var/throw_distance = clamp((attacker.st_get_stat(STAT_STRENGTH) - defender.st_get_stat(STAT_STAMINA)), 1, 3)
+	defender.throw_at(throw_target, throw_distance, 4, attacker)
+	defender.apply_damage(15, attacker.get_attack_type(), BODY_ZONE_CHEST)
+	log_combat(attacker, defender, "Frontal Kicked (Kungfu)")
+	return TRUE
+
+/// Roundhouse Kick: Disarm Disarm combo, knocks people down and deals substantial stamina damage, and also discombobulates them. Knocks objects out of their hands if they're already on the ground.
+/datum/martial_art/darkpack_kungfu/proc/drop_kick(mob/living/attacker, mob/living/defender)
+	attacker.do_attack_animation(defender, ATTACK_EFFECT_KICK)
+	playsound(attacker, 'modular_darkpack/modules/martial/sounds/roundhousekick.ogg', 50, TRUE, -1)
+	var/kickpower = SSroll.storyteller_roll((attacker.st_get_stat(STAT_STRENGTH) + attacker.st_get_stat(STAT_BRAWL)), difficulty = 7, numerical = TRUE, roller = attacker)
+	if(defender.body_position == STANDING_UP && (kickpower >= 0))
+		defender.Knockdown(kickpower SECONDS)
+		defender.visible_message(span_warning("[attacker] kicks [defender] in the head, sending them face first into the floor!"), \
+					span_userdanger("You are kicked in the head by [attacker], sending you crashing to the floor!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, attacker)
+	else
+		defender.drop_all_held_items()
+		defender.visible_message(span_warning("[attacker] kicks [defender] in the head!"), \
+					span_userdanger("You are kicked in the head by [attacker]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, attacker)
+	defender.apply_damage(10, attacker.get_attack_type())
+	defender.apply_damage(40, STAMINA)
+	defender.adjust_dizzy_up_to(10 SECONDS, 10 SECONDS)
+	log_combat(attacker, defender, "Roundhoused (KungFu)")
+	return TRUE
+
+/// Flying Knee: Grab Harm combo, causes them to be silenced and briefly stunned, as well as doing a moderate amount of stamina damage.
+/datum/martial_art/darkpack_kungfu/proc/knee_stomach(mob/living/attacker, mob/living/defender)
+	attacker.do_attack_animation(defender, ATTACK_EFFECT_KICK)
+	playsound(attacker, 'modular_darkpack/modules/martial/sounds/grabbed.ogg', 70, TRUE, -1)
+	defender.visible_message(
+		span_warning("[attacker] violently slams [attacker.p_their()] knee into [defender]!"),
+		span_userdanger("You slam your knee straight into [defender]!"),
+		span_hear("You hear a sickening sound of flesh hitting flesh!"),
+		COMBAT_MESSAGE_RANGE,
+		attacker,
+	)
+	var/roll_success = SSroll.storyteller_roll((attacker.st_get_stat(STAT_STRENGTH) + attacker.st_get_stat(STAT_BRAWL)), difficulty = 8, roller = attacker)
+	if(roll_success)
+		defender.Knockdown(3 SECONDS)
+	defender.apply_damage(40, STAMINA)
+	defender.adjust_silence_up_to(5 SECONDS, 5 SECONDS)
+	log_combat(attacker, defender, "kneed in the stomach (Kung-Fu)")
+	return TRUE
+
+/datum/martial_art/darkpack_kungfu/grab_act(mob/living/attacker, mob/living/defender)
+	if(!can_deflect(attacker)) //allows for deniability
+		return MARTIAL_ATTACK_INVALID
+
+	if(defender.check_block(attacker, 0, "[attacker]'s grab", UNARMED_ATTACK))
+		return MARTIAL_ATTACK_FAIL
+
+	add_to_streak("G", defender)
+	if(check_streak(attacker, defender))
+		return MARTIAL_ATTACK_SUCCESS
+
+	var/grab_log_description = "grabbed"
+	attacker.do_attack_animation(defender, ATTACK_EFFECT_PUNCH)
+	playsound(defender, 'modular_darkpack/modules/martial/sounds/frontalkick2.ogg', 25, TRUE, -1)
+	defender.apply_damage(20, STAMINA)
+	log_combat(attacker, defender, "[grab_log_description] (Sleeping Carp)")
+	return MARTIAL_ATTACK_INVALID // normal grab
+
+/datum/martial_art/darkpack_kungfu/harm_act(mob/living/attacker, mob/living/defender)
+	if(defender.check_block(attacker, 10, attacker.name, UNARMED_ATTACK))
+		return MARTIAL_ATTACK_FAIL
+
+	add_to_streak("H", defender)
+	if(check_streak(attacker, defender))
+		return MARTIAL_ATTACK_SUCCESS
+
+	return MARTIAL_ATTACK_INVALID // normal punch
+
+/datum/martial_art/darkpack_kungfu/disarm_act(mob/living/attacker, mob/living/defender)
+	if(!can_deflect(attacker)) //allows for deniability
+		return MARTIAL_ATTACK_INVALID
+	if(defender.check_block(attacker, 0, attacker.name, UNARMED_ATTACK))
+		return MARTIAL_ATTACK_FAIL
+
+	add_to_streak("D", defender)
+	if(check_streak(attacker, defender))
+		return MARTIAL_ATTACK_SUCCESS
+
+	attacker.do_attack_animation(defender, ATTACK_EFFECT_PUNCH)
+	playsound(defender, 'sound/items/weapons/punch1.ogg', 25, TRUE, -1)
+	defender.apply_damage(20, STAMINA)
+	log_combat(attacker, defender, "disarmed (Sleeping Carp)")
+	return MARTIAL_ATTACK_INVALID // normal disarm
+
+/datum/martial_art/darkpack_kungfu/proc/can_deflect(mob/living/user)
+	if(!can_use(user) || !user.combat_mode)
+		return FALSE
+	if(INCAPACITATED_IGNORING(user, INCAPABLE_GRAB)) //NO STUN
+		return FALSE
+	if(!(user.mobility_flags & MOBILITY_USE)) //NO UNABLE TO USE
+		return FALSE
+	if(HAS_TRAIT(user, TRAIT_HULK)) //NO HULK
+		return FALSE
+	if(!isturf(user.loc)) //NO MOTHERFLIPPIN MECHS!
+		return FALSE
+	return TRUE
+
+/datum/martial_art/darkpack_kungfu/proc/reset_animation(mob/living/user, fadein)
+	if(fadein)
+		animate(user, alpha = 225, time = 0.1 SECONDS)
+		return
+	else
+		animate(user, pixel_x = 0, pixel_y = 0, time = 0.1 SECONDS)
+
+/datum/martial_art/darkpack_kungfu/proc/hit_by_projectile(mob/living/user, obj/projectile/hitting_projectile, def_zone)
+	SIGNAL_HANDLER
+
+	if(!user.is_clan(/datum/vampire_clan/true_brujah))
+		return NONE //No, you cant dodge bullets normally, bum.
+
+	var/determine_avoidance = ((user.st_get_stat(STAT_ATHLETICS) + user.st_get_stat(STAT_DEXTERITY)) * 7)
+
+	if(!can_deflect(user))
+		return NONE
+
+	if(!prob(determine_avoidance))
+		return NONE
+
+	user.visible_message(
+		span_danger("[user] effortlessly dodges the [hitting_projectile]! [user.p_They()] is unnaturally fast!"),
+		span_userdanger("You dodge [hitting_projectile]!"),
+	)
+	playsound(user, SFX_BULLET_MISS, 75, TRUE)
+	hitting_projectile.firer = user
+	var/mob/living/carbon/human/dodger = user
+	if(dodger.is_clan(/datum/vampire_clan/true_brujah))
+		animate(user, alpha = 0, time = 0.2 SECONDS)
+		new /obj/effect/temporis/weskar(user.loc, user)
+		addtimer(CALLBACK(src, PROC_REF(reset_animation), user, TRUE), 0.1 SECONDS)
+	else
+		animate(user, pixel_x = rand(-16,16), pixel_y = rand(-16,16), time = 0.2 SECONDS)
+		addtimer(CALLBACK(src, PROC_REF(reset_animation), user, FALSE), 0.1 SECONDS)
+	//hitting_projectile.set_angle(rand(0, 360)) theoretically it should go straight through if you avoided
+	return COMPONENT_BULLET_PIERCED
+
+/// If our user has committed to being as martial arty as they can be, they may be able to avoid incoming attacks.
+/datum/martial_art/darkpack_kungfu/proc/check_dodge(mob/living/user, atom/movable/hitby, damage, attack_text, attack_type, ...)
+	SIGNAL_HANDLER
+
+	var/determine_avoidance = ((user.st_get_stat(STAT_ATHLETICS) + user.st_get_stat(STAT_DEXTERITY)))
+
+	if(!can_deflect(user))
+		return
+
+	if(user.throw_mode)
+		determine_avoidance *= 2
+
+	if(attack_type == PROJECTILE_ATTACK || attack_type == THROWN_PROJECTILE_ATTACK)
+		return NONE
+
+	if(!prob(determine_avoidance))
+		return NONE
+
+	user.visible_message(
+		span_danger("[user] cleanly avoids [attack_text] with incredible speed!"),
+		span_userdanger("You dodge [attack_text]"),
+	)
+	playsound(user.loc, 'sound/items/weapons/punchmiss.ogg', 25, TRUE, -1)
+	var/mob/living/carbon/human/dodger = user
+	if(dodger.is_clan(/datum/vampire_clan/true_brujah))
+		animate(user, alpha = 0, time = 0.3 SECONDS)
+		new /obj/effect/temporis/weskar(user.loc, user)
+		addtimer(CALLBACK(src, PROC_REF(reset_animation), user, TRUE), 0.1 SECONDS)
+	else
+		animate(user, pixel_x = rand(-16,16), pixel_y = rand(-16,16), time = 0.1 SECONDS)
+		addtimer(CALLBACK(src, PROC_REF(reset_animation), user, FALSE), 0.1 SECONDS)
+
+
+
+	return SUCCESSFUL_BLOCK
+
+/mob/living/proc/kungfu_help()
+	set name = "Recall Teachings"
+	set desc = "Remember the martial techniques of the Kung-Fu"
+	set category = "Martial Arts"
+
+	to_chat(usr, span_info("<b><i>You retreat inward and recall your past training</i></b>"))
+	to_chat(usr, "[span_notice("Frontal Kick")]: Punch Shove. Launch your opponent away from you with incredible force!")
+	to_chat(usr, "[span_notice("Roundhouse Kick")]: Shove Shove. Nonlethally kick an opponent to the floor, knocking them down, discombobulating them and dealing substantial stamina damage. If they're already prone, disarm them as well.")
+	to_chat(usr, "[span_notice("Flying Knee")]: Grab Punch. Deliver a knee jab into the opponent, dealing high stamina damage, as well as briefly stunning them, winding them and making it difficult for them to speak.")
+	to_chat(usr, "[span_notice("Grabs and Shoves")]: While in combat mode, your typical grab and shove do decent stamina damage, and your grabs harder to break. If you grab someone who has substantial amounts of stamina damage, you knock them out!")
+
+
+#undef LAUNCH_KICK_COMBO
+#undef DROP_KICK_COMBO
+#undef KNEE_STOMACH_COMBO
+
+/obj/item/clothing/gloves/kungfu_gloves
+	name = "Debugging Gloves"
+	desc = "Delete at some point"
+	icon_state = "black"
+	greyscale_colors = COLOR_BLACK
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+	resistance_flags = NONE
+
+/obj/item/clothing/gloves/kungfu_gloves/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/martial_art_giver, /datum/martial_art/darkpack_kungfu)