Brain Traumas

code/datums/martial/cqc.dm

@@ -58,7 +58,7 @@
 					  		"<span class='userdanger'>[A] kicks your head, knocking you out!</span>")
 		playsound(get_turf(A), 'sound/weapons/genhit1.ogg', 50, 1, -1)
 		D.SetSleeping(300)
-		D.adjustBrainLoss(25)
+		D.adjustBrainLoss(15, 150)
 	return 1
 
 /datum/martial_art/cqc/proc/Pressure(mob/living/carbon/human/A, mob/living/carbon/human/D)

code/datums/martial/psychotic_brawl.dm

@@ -0,0 +1,68 @@
+/datum/martial_art/psychotic_brawling
+	name = "Psychotic Brawling"
+
+/datum/martial_art/psychotic_brawling/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	return psycho_attack(A,D)
+
+/datum/martial_art/psychotic_brawling/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	return psycho_attack(A,D)
+
+/datum/martial_art/psychotic_brawling/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	return psycho_attack(A,D)
+
+/datum/martial_art/psychotic_brawling/proc/psycho_attack(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	var/atk_verb
+	switch(rand(1,8))
+		if(1)
+			D.help_shake_act(A)
+			atk_verb = "helped"
+		if(2)
+			A.emote("cry")
+			A.Stun(20)
+			atk_verb = "cried looking at"
+		if(3)
+			if(A.grab_state >= GRAB_AGGRESSIVE)
+				D.grabbedby(A, 1)
+			else
+				A.start_pulling(D, 1)
+				if(A.pulling)
+					D.drop_all_held_items()
+					D.stop_pulling()
+					if(A.a_intent == INTENT_GRAB)
+						add_logs(A, D, "grabbed", addition="aggressively")
+						D.visible_message("<span class='warning'>[A] violently grabs [D]!</span>", \
+						  "<span class='userdanger'>[A] violently grabs you!</span>")
+						A.grab_state = GRAB_AGGRESSIVE //Instant aggressive grab
+					else
+						add_logs(A, D, "grabbed", addition="passively")
+						A.grab_state = GRAB_PASSIVE
+		if(4)
+			A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
+			atk_verb = "headbutts"
+			D.visible_message("<span class='danger'>[A] [atk_verb] [D]!</span>", \
+					  "<span class='userdanger'>[A] [atk_verb] you!</span>")
+			playsound(get_turf(D), 'sound/weapons/punch1.ogg', 40, 1, -1)
+			D.apply_damage(rand(5,10), BRUTE, "head")
+			A.apply_damage(rand(5,10), BRUTE, "head")
+			if(!istype(A.head,/obj/item/clothing/head/helmet/) && !istype(A.head,/obj/item/clothing/head/hardhat))
+				A.adjustBrainLoss(5)
+			if(!istype(D.head,/obj/item/clothing/head/helmet/) && !istype(D.head,/obj/item/clothing/head/hardhat))
+				D.adjustBrainLoss(5)
+			A.Stun(rand(5,30))
+			D.Stun(rand(5,30))
+		if(5,6)
+			A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
+			atk_verb = pick("punches", "kicks", "hits", "slams into")
+			D.visible_message("<span class='danger'>[A] [atk_verb] [D] with inhuman strength, sending [D.p_them()] flying backwards!</span>", \
+							  "<span class='userdanger'>[A] [atk_verb] you with inhuman strength, sending you flying backwards!</span>")
+			D.apply_damage(rand(15,30), BRUTE)
+			playsound(get_turf(D), 'sound/effects/meteorimpact.ogg', 25, 1, -1)
+			var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A)))
+			D.throw_at(throwtarget, 4, 2, A)//So stuff gets tossed around at the same time.
+			D.Knockdown(60)
+		if(7,8)
+			basic_hit(A,D)
+
+	if(atk_verb)
+		add_logs(A, D, "[atk_verb] (Psychotic Brawling)")
+	return 1

code/datums/martial/sleeping_carp.dm

@@ -240,7 +240,7 @@
 				H.visible_message("<span class='warning'>[user] delivers a heavy hit to [H]'s head, knocking them out cold!</span>", \
 									   "<span class='userdanger'>[user] knocks you unconscious!</span>")
 				H.SetSleeping(600)
-				H.adjustBrainLoss(25)
+				H.adjustBrainLoss(15, 150)
 	else
 		return ..()