Pain Tweaks (#1215)

* pain stuff

* fix

* PUT THE FUCKING CHECK IN

* traumatic shock screen alert

* fix these

* BRUH

* buff splinting

* splints + grab bug

* fix throwing the upgrade message

* im an idiot

* impliment TRAIT_STRONG_GRABBER

* fix

* add grab logging

* fix attacking yourself

* cleaner

* FUCK

* redo how dropping items from pain works, add cooldowns

* tweaks

* fix sutures, tweak scar expirey time

Author: Kapu1178

code/__DEFINES/inventory.dm

@@ -114,6 +114,10 @@
 //defines for the index of hands
 #define LEFT_HANDS 1
 #define RIGHT_HANDS 2
+/// Checks if the value is "left" - same as ISEVEN, but used primarily for hand or foot index contexts
+#define IS_RIGHT_INDEX(value) (value % 2 == 0)
+/// Checks if the value is "right" - same as ISODD, but used primarily for hand or foot index contexts
+#define IS_LEFT_INDEX(value) (value % 2 != 0)
 
 //flags for female outfits: How much the game can safely "take off" the uniform without it looking weird
 /// For when there's simply no need for a female version of this uniform.

code/__DEFINES/pain.dm

@@ -1,7 +1,3 @@
-/// Chance to drop your held item passed here
-#define PAIN_THRESHOLD_DROP_ITEM 50
-/// Chance to reduce paralysis duration passed here
-#define PAIN_THRESHOLD_REDUCE_PARALYSIS 10
 /// Stage at
 #define SHOCK_MIN_PAIN_TO_BEGIN 30
 
@@ -30,6 +26,17 @@
 #define PAIN_AMT_MEDIUM (PAIN_AMT_PASSOUT * 0.35)
 #define PAIN_AMT_AGONIZING (PAIN_AMT_PASSOUT * 0.85)
 
+#define PAIN_CLASS_NONE "none"
+#define PAIN_CLASS_NEGLIGIBLE "negligible"
+#define PAIN_CLASS_LOW "low"
+#define PAIN_CLASS_MEDIUM "medium"
+#define PAIN_CLASS_AGONIZING "agonizing"
+
+/// Chance to drop your held item passed here
+#define PAIN_THRESHOLD_DROP_ITEM 75
+/// Chance to reduce sleep duration passed here
+#define PAIN_THRESHOLD_REDUCE_SLEEP 10
+
 /// max_damage * this value is the amount of pain constantly applied when the limb bone is broken
 #define BROKEN_BONE_PAIN_FACTOR 0.1
 /// max_damage * this value is the amount of pain constantly applied when the limb is dislocated

code/__DEFINES/wounds.dm

@@ -18,8 +18,8 @@
 #define FLUIDLOSS_BURN_REQUIRED 5
 
 //CONFIG STUFF
-///A modifier applied to wound auto healing
-#define WOUND_REGENERATION_MODIFIER 0.25
+/// How much wound damage is healed per second if the wound is able to autoheal.
+#define WOUND_AUTOHEAL_RATE 0.1
 
 #define WOUND_BLEED_RATE(wound) (round(wound.damage / 40, DAMAGE_PRECISION))
 

code/_onclick/hud/alert.dm

@@ -95,6 +95,42 @@
 /mob/proc/has_alert(category)
 	return !isnull(alerts[category])
 
+// PRIVATE = only edit, use, or override these if you're editing the system as a whole
+
+// Re-render all alerts - also called in /datum/hud/show_hud() because it's needed there
+/datum/hud/proc/reorganize_alerts(mob/viewmob)
+	var/mob/screenmob = viewmob || mymob
+	if(!screenmob.client)
+		return
+	var/list/alerts = mymob.alerts
+	if(!hud_shown)
+		for(var/i in 1 to alerts.len)
+			screenmob.client.screen -= alerts[alerts[i]]
+		return 1
+	for(var/i in 1 to alerts.len)
+		var/atom/movable/screen/alert/alert = alerts[alerts[i]]
+		if(alert.icon_state == "template")
+			alert.icon = ui_style
+		switch(i)
+			if(1)
+				. = ui_alert1
+			if(2)
+				. = ui_alert2
+			if(3)
+				. = ui_alert3
+			if(4)
+				. = ui_alert4
+			if(5)
+				. = ui_alert5 // Right now there's 5 slots
+			else
+				. = ""
+		alert.screen_loc = .
+		screenmob.client.screen |= alert
+	if(!viewmob)
+		for(var/M in mymob.observers)
+			reorganize_alerts(M)
+	return 1
+
 /atom/movable/screen/alert
 	icon = 'icons/hud/screen_alert.dmi'
 	icon_state = "default"
@@ -110,9 +146,33 @@
 	/// Boolean. If TRUE, the Click() proc will attempt to Click() on the master first if there is a master.
 	var/click_master = TRUE
 
+/atom/movable/screen/alert/Destroy()
+	severity = 0
+	master_ref = null
+	owner = null
+	screen_loc = ""
+	return ..()
+
 /atom/movable/screen/alert/can_usr_use(mob/user)
 	return owner == usr
 
+/atom/movable/screen/alert/Click(location, control, params)
+	. = ..()
+	if(.)
+		return FALSE
+
+	if(usr != owner)
+		return FALSE
+	var/list/modifiers = params2list(params)
+	if(LAZYACCESS(modifiers, SHIFT_CLICK)) // screen objects don't do the normal Click() stuff so we'll cheat
+		to_chat(usr, span_boldnotice("[name]</span> - <span class='info'>[desc]"))
+		return FALSE
+	var/datum/our_master = master_ref?.resolve()
+	if(our_master && click_master)
+		return usr.client.Click(our_master, location, control, params)
+
+	return TRUE
+
 /atom/movable/screen/alert/MouseEntered(location,control,params)
 	. = ..()
 	if(!QDELETED(src))
@@ -852,62 +912,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 	var/mob/living/living_owner = owner
 	living_owner.set_resting(FALSE)
 
-// PRIVATE = only edit, use, or override these if you're editing the system as a whole
-
-// Re-render all alerts - also called in /datum/hud/show_hud() because it's needed there
-/datum/hud/proc/reorganize_alerts(mob/viewmob)
-	var/mob/screenmob = viewmob || mymob
-	if(!screenmob.client)
-		return
-	var/list/alerts = mymob.alerts
-	if(!hud_shown)
-		for(var/i in 1 to alerts.len)
-			screenmob.client.screen -= alerts[alerts[i]]
-		return 1
-	for(var/i in 1 to alerts.len)
-		var/atom/movable/screen/alert/alert = alerts[alerts[i]]
-		if(alert.icon_state == "template")
-			alert.icon = ui_style
-		switch(i)
-			if(1)
-				. = ui_alert1
-			if(2)
-				. = ui_alert2
-			if(3)
-				. = ui_alert3
-			if(4)
-				. = ui_alert4
-			if(5)
-				. = ui_alert5 // Right now there's 5 slots
-			else
-				. = ""
-		alert.screen_loc = .
-		screenmob.client.screen |= alert
-	if(!viewmob)
-		for(var/M in mymob.observers)
-			reorganize_alerts(M)
-	return 1
-
-/atom/movable/screen/alert/Click(location, control, params)
-	. = ..()
-	if(.)
-		return FALSE
-
-	if(usr != owner)
-		return FALSE
-	var/list/modifiers = params2list(params)
-	if(LAZYACCESS(modifiers, SHIFT_CLICK)) // screen objects don't do the normal Click() stuff so we'll cheat
-		to_chat(usr, span_boldnotice("[name]</span> - <span class='info'>[desc]"))
-		return FALSE
-	var/datum/our_master = master_ref?.resolve()
-	if(our_master && click_master)
-		return usr.client.Click(our_master, location, control, params)
-
-	return TRUE
-
-/atom/movable/screen/alert/Destroy()
-	severity = 0
-	master_ref = null
-	owner = null
-	screen_loc = ""
-	return ..()
+/atom/movable/screen/alert/shock
+	name = "Traumatic Shock"
+	desc = "You've endured a significant amount of pain."
+	icon_state = "convulsing"

code/datums/components/tackle.dm

@@ -266,7 +266,7 @@
 	var/leg_wounds = 0 // -1 defense per 2 leg wounds
 	var/static/list/check_areas = list(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
 	for(var/datum/wound/iterwound in target.get_wounds())
-		if((iterwound.parent.body_zone in check_areas))
+		if(iterwound.damage && (iterwound.parent.body_zone in check_areas))
 			leg_wounds++
 
 	defense_mod -= round(leg_wounds * 0.5)

code/game/objects/items/stacks/medical.dm

@@ -241,7 +241,7 @@
 
 	var/wound_desc
 	for(var/datum/wound/W as anything in shuffle(affecting.wounds))
-		if(W.wound_type != WOUND_CUT && W.wound_type != WOUND_PIERCE)
+		if(W.damage <= 0 || W.wound_type != WOUND_CUT && W.wound_type != WOUND_PIERCE)
 			continue
 		if(W.damage <= 15)
 			wound_desc = W.desc

code/game/objects/items/stacks/splint.dm

@@ -56,9 +56,7 @@
 		user.visible_message(span_warning("[user] fumbles [src]."))
 		return
 
-	var/obj/item/stack/splint = split_stack(null, 1, null)
-	if(!BP.apply_splint(splint))
-		splint.merge(src)
+	if(!BP.apply_splint(src))
 		to_chat(user, span_warning("You fail to apply [src]."))
 		return
 

code/game/objects/items/stacks/stack.dm

@@ -61,7 +61,7 @@
 	var/obj/structure/table/tableVariant // we tables now (stores table variant to be built from this stack)
 
 	// The following are all for medical treatment, they're here instead of /stack/medical because sticky tape can be used as a makeshift bandage or splint
-	/// If set and this used as a splint for a broken bone wound, this is used as a multiplier for applicable slowdowns (lower = better) (also for speeding up burn recoveries)
+	/// If set and this used as a splint for a broken bone wound, this is used as a modifier for applicable slowdowns (lower = better) (also for speeding up burn recoveries)
 	var/splint_slowdown = null
 	/// Like splint_factor but for burns instead of bone wounds. This is a multiplier used to speed up burn recoveries
 	var/burn_cleanliness_bonus

code/modules/grab/grab_carbon.dm

@@ -1,3 +1,3 @@
 // We're changing the default grab type here.
-/mob/living/carbon/make_grab(atom/movable/target, grab_type = /datum/grab/normal/passive)
+/mob/living/carbon/try_make_grab(atom/movable/target, grab_type = /datum/grab/normal/passive, use_offhand)
 	. = ..()

code/modules/grab/grab_datum.dm

@@ -198,7 +198,7 @@ GLOBAL_LIST_EMPTY(all_grabstates)
 		return FALSE
 
 	var/mob/living/L = G.get_affecting_mob()
-	if(!isliving(L))
+	if(!isliving(L) || L == G.assailant)
 		return FALSE
 
 	if(!(L.status_flags & CANPUSH) || HAS_TRAIT(L, TRAIT_PUSHIMMUNE))

code/modules/grab/grab_living.dm

@@ -49,10 +49,18 @@
 /mob/living/proc/try_make_grab(atom/movable/target, grab_type, use_offhand)
 	return canUseTopic(src, USE_IGNORE_TK|USE_CLOSE) && make_grab(target, grab_type, use_offhand)
 
+/// DO NOT CALL DIRECTLY. USE THE ABOVE.
 /mob/living/proc/make_grab(atom/movable/target, grab_type = /datum/grab/simple, use_offhand)
+	PRIVATE_PROC(TRUE)
+
 	if(SEND_SIGNAL(src, COMSIG_LIVING_TRY_GRAB, target, grab_type) & COMSIG_LIVING_CANCEL_GRAB)
 		return
 
+	// REALLY SHITTY CODE TO FIX A GAMEBREAKING BUG. I HATE GRAB CODE WHY DID I PORT THIS?
+	if(src == target)
+		if(ispath(grab_type, /datum/grab/normal) && grab_type != /datum/grab/normal/passive)
+			grab_type = /datum/grab/normal/passive
+
 	// Resolve to the 'topmost' atom in the buckle chain, as grabbing someone buckled to something tends to prevent further interaction.
 	var/atom/movable/original_target = target
 	if(ismob(target))

code/modules/grab/grab_object.dm

@@ -84,8 +84,10 @@
 	current_grab.special_bodyzone_effects(src)
 
 	var/mob/living/L = get_affecting_mob()
-	if(L && assailant.combat_mode)
-		upgrade(TRUE)
+	if(L)
+		log_combat(assailant, L, "grabbed")
+		if(L != assailant && assailant.combat_mode)
+			upgrade(TRUE)
 
 	/// Update appearance
 	update_appearance(UPDATE_ICON_STATE)
@@ -104,6 +106,7 @@
 		RegisterSignal(affecting, COMSIG_PARENT_QDELETING, PROC_REF(target_or_owner_del))
 	RegisterSignal(affecting, COMSIG_MOVABLE_PRE_THROW, PROC_REF(target_thrown))
 	RegisterSignal(affecting, COMSIG_ATOM_ATTACK_HAND, PROC_REF(intercept_attack_hand))
+	RegisterSignal(affecting, COMSIG_PARENT_ATTACKBY, PROC_REF(resolve_item_attack))
 
 	RegisterSignal(assailant, COMSIG_MOB_SELECTED_ZONE_SET, PROC_REF(on_target_change))
 
@@ -128,6 +131,9 @@
 	if(assailant)
 		assailant.after_grab_release(affecting)
 
+	if(ismob(affecting))
+		log_combat(assailant, affecting, "dropped a grab on")
+
 	//DEBUG CODE
 	if(HAS_TRAIT_FROM(affecting, TRAIT_AGGRESSIVE_GRAB, ref(src)))
 		stack_trace("Somehow all other safeties failed and [affecting] still is marked as grabbed from a qdeling grab, removing!")
@@ -183,7 +189,6 @@
 	if(src != assailant.get_active_held_item())
 		return // Note that because of this condition, there's no guarantee that target_zone = old_sel
 
-	new_sel = deprecise_zone(new_sel)
 	if(target_zone == new_sel)
 		return
 
@@ -204,8 +209,9 @@
 		to_chat(assailant, span_warning("You fail to grab \the [affecting] there as they do not have that bodypart!"))
 		return
 
-	name = "[initial(name)] ([BP.plaintext_zone])"
-	to_chat(assailant, span_notice("You are now holding \the [affecting] by \the [BP.plaintext_zone]."))
+	if(old_zone != target_zone)
+		name = "[initial(name)] ([BP.plaintext_zone])"
+		to_chat(assailant, span_notice("You are now holding \the [affecting] by \the [BP.plaintext_zone]."))
 
 	if(!isbodypart(BP))
 		qdel(src)
@@ -245,11 +251,18 @@
 	var/mob/living/L = get_affecting_mob()
 	return (L?.get_bodypart(deprecise_zone(target_zone)))
 
-/obj/item/hand_item/grab/proc/resolve_item_attack(mob/living/M, obj/item/I, target_zone)
-	if((M && ishuman(M)) && I)
-		return current_grab.resolve_item_attack(src, M, I, target_zone)
-	else
-		return 0
+// Intercepts attackby() calls on our target.
+/obj/item/hand_item/grab/proc/resolve_item_attack(datum/source, obj/item/I, mob/attacker, params)
+	SIGNAL_HANDLER
+
+	if(!ishuman(attacker))
+		return
+	var/mob/living/carbon/human/human_attacker = attacker
+	if(human_attacker.combat_mode)
+		return
+
+	if(current_grab.resolve_item_attack(src, attacker, I, human_attacker.zone_selected))
+		return COMPONENT_NO_AFTERATTACK
 
 /obj/item/hand_item/grab/proc/action_used()
 	COOLDOWN_START(src, action_cd, current_grab.action_cooldown)
@@ -325,6 +338,9 @@
 	adjust_position()
 	update_appearance()
 
+	if(ismob(affecting))
+		log_combat(assailant, affecting, "upgraded grab to [current_grab.type]")
+
 	SEND_SIGNAL(assailant, COMSIG_LIVING_GRAB_UPGRADE)
 
 /obj/item/hand_item/grab/proc/downgrade(silent)
@@ -348,6 +364,9 @@
 	adjust_position()
 	update_appearance()
 
+	if(ismob(affecting))
+		log_combat(assailant, affecting, "downgraded grab to [current_grab.type]")
+
 	SEND_SIGNAL(assailant, COMSIG_LIVING_GRAB_DOWNGRADE)
 
 /// Used to prevent repeated effect application or early effect removal

code/modules/grab/grabs/grab_normal.dm

@@ -17,9 +17,9 @@
 		return
 
 	if(G.affecting != G.assailant)
-		G.assailant.visible_message(span_warning("[G.assailant] has grabbed [G.affecting]'s [BP.plaintext_zone]!"))
+		G.assailant.visible_message(span_warning("<b>[G.assailant]</b> grabs <b>[G.affecting]</b> by [G.affecting.p_their()] [BP.plaintext_zone]."))
 	else
-		G.assailant.visible_message(span_notice("[G.assailant] has grabbed [G.assailant.p_their()] [BP.plaintext_zone]!"))
+		G.assailant.visible_message(span_notice("<b>[G.assailant]</b> grabs [G.assailant.p_their()] [BP.plaintext_zone]."))
 
 /datum/grab/normal/on_hit_help(obj/item/hand_item/grab/G, atom/A)
 
@@ -94,7 +94,7 @@
 			G.action_used()
 			BP.set_dislocated(FALSE)
 			assailant.visible_message(span_warning("\The [affecting]'s [BP.joint_name] pops back into place!"))
-			affecting.pain_message("AAAHHHHAAGGHHHH", 50, TRUE)
+			affecting.pain_message("AAAHHHHAAGGHHHH", PAIN_AMT_MEDIUM, TRUE)
 		return TRUE
 
 	if(BP.can_be_dislocated())
@@ -236,6 +236,9 @@
 	return TRUE
 
 /datum/grab/normal/resolve_item_attack(obj/item/hand_item/grab/G, mob/living/carbon/human/user, obj/item/I)
+	if(damage_stage < GRAB_AGGRESSIVE)
+		return
+
 	switch(G.target_zone)
 		if(BODY_ZONE_HEAD)
 			return attack_throat(G, I, user)