From 53d6801ab94bea68eadd655bb0d5be43b3f56d26 Mon Sep 17 00:00:00 2001
From: FatFatFat1 <48385210+FatFatFat1@users.noreply.github.com>
Date: Tue, 17 Sep 2024 16:46:31 +0700
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D0=BB?=
=?UTF-8?q?=D0=B0=D0=BB=20=D1=81=D0=B8=D0=B3=D0=BD=D0=B0=D0=BB=D1=8B=20?=
=?UTF-8?q?=D0=B0=D1=82=D0=B0=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
code/_onclick/item_attack.dm | 11 ++++++++---
code/datums/components/clickplace.dm | 3 ++-
.../abduction/abduction_gear.dm | 4 ++--
code/game/machinery/kitchen/gibber.dm | 4 ++--
code/game/mecha/equipment/tools/tools.dm | 10 +++++++---
code/game/objects/items.dm | 3 ++-
.../items/devices/scanners/health_analyzer.dm | 3 ++-
code/game/objects/items/weapons/explosives.dm | 3 ++-
code/game/objects/items/weapons/hydroponics.dm | 6 ++++--
code/game/objects/items/weapons/kitchen.dm | 3 ++-
code/game/objects/items/weapons/makeshift.dm | 6 ++++--
.../objects/items/weapons/swords_axes_etc.dm | 6 ++++--
code/game/objects/structures/tables_racks.dm | 3 ++-
code/game/objects/structures/windows/window.dm | 9 ++++++---
code/modules/clothing/gloves/power_gloves.dm | 3 ++-
code/modules/mob/living/living_defense.dm | 18 +++++-------------
code/modules/mob/mob_grab.dm | 14 +++++++++-----
code/modules/organs/organ_external.dm | 4 +++-
code/modules/surgery/braincore.dm | 4 ++--
code/modules/unarmed_combat/combos/harmful.dm | 4 ++--
.../unarmed_combat/living_procs_defines.dm | 3 ++-
code/modules/vehicles/spacebike.dm | 3 ++-
22 files changed, 76 insertions(+), 51 deletions(-)
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index a8e703fe05eb..f8b12f65728b 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -86,7 +86,8 @@
flick(G.hud.icon_state, G.hud)
user.SetNextMove(CLICK_CD_ACTION)
user.visible_message("[user] slit [M]'s throat open with \the [name]!")
- M.process_aggresive_action(user, "knifed with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
+ M.log_combat(user, "knifed with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, M)
return
if (isbrain(M))
@@ -104,7 +105,9 @@
user.remove_from_mob(src)
M.equip_to_slot_if_possible(src, SLOT_HEAD, disable_warning = TRUE)
user.visible_message("[user] slams [name] on the [M]'s head!")
- M.process_aggresive_action(user, "slammed with [name] on the head (INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(BRUTE)])")
+ M.log_combat(user, "slammed with [name] on the head (INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(BRUTE)])")
+ if(force > 0)
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, M)
var/list/data = user.get_unarmed_attack()
// if item has no force just assume attacker smashed his fist (no scratches or any modifiers) against victim's head.
if(user.a_intent in list(INTENT_PUSH, INTENT_GRAB))
@@ -112,7 +115,9 @@
playsound(M, data["sound"], VOL_EFFECTS_MASTER)
return TRUE
- M.process_aggresive_action(user, "attacked with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
+ M.log_combat(user, "attacked with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
+ if(force > 0)
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, M)
var/power = force
if(ishuman(user) && damtype == BRUTE)
diff --git a/code/datums/components/clickplace.dm b/code/datums/components/clickplace.dm
index a650ee0395ec..2e7e2416f1c1 100644
--- a/code/datums/components/clickplace.dm
+++ b/code/datums/components/clickplace.dm
@@ -227,7 +227,8 @@
INVOKE_ASYNC(victim, TYPE_PROC_REF(/atom/movable, do_simple_move_animation), A.loc, old_loc)
victim.Stun(2)
victim.Weaken(5)
- victim.process_aggresive_action(assailant, "laid on [A]")
+ victim.log_combat(assailant, "laid on [A]")
+ SEND_SIGNAL(assailant, COMSIG_HUMAN_HARMED_OTHER, victim)
else if(assailant.a_intent != INTENT_HARM)
/// Let's pretend a face-slam doesn't exist.
to_chat(assailant, "You need a better grip to do that!")
diff --git a/code/game/gamemodes/modes_gameplays/abduction/abduction_gear.dm b/code/game/gamemodes/modes_gameplays/abduction/abduction_gear.dm
index 94174e429d22..08c6dca4664c 100644
--- a/code/game/gamemodes/modes_gameplays/abduction/abduction_gear.dm
+++ b/code/game/gamemodes/modes_gameplays/abduction/abduction_gear.dm
@@ -411,7 +411,7 @@
"[user] has stunned you with [src]!")
playsound(src, 'sound/weapons/Egloves.ogg', VOL_EFFECTS_MASTER)
- L.process_aggresive_action(user, "stunned with [name]")
+ L.log_combat(user, "stunned with [name]")
return
/obj/item/weapon/abductor_baton/proc/SleepAttack(mob/living/L,mob/living/user)
@@ -421,7 +421,7 @@
"You suddenly feel very drowsy!")
playsound(src, 'sound/weapons/Egloves.ogg', VOL_EFFECTS_MASTER)
- L.process_aggresive_action(user, "put to sleep with \a [src]")
+ L.log_combat(user, "put to sleep with \a [src]")
return
/obj/item/weapon/abductor_baton/proc/CuffAttack(mob/living/L,mob/living/user)
diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm
index c7359fc95a09..4e6072cab56a 100644
--- a/code/game/machinery/kitchen/gibber.dm
+++ b/code/game/machinery/kitchen/gibber.dm
@@ -206,8 +206,8 @@
addtimer(CALLBACK(src, PROC_REF(gib_mob), user), gibtime)
/obj/machinery/gibber/proc/gib_mob(mob/user)
- occupant.process_aggresive_action(user, "gibbed via [name]")
-
+ occupant.log_combat(user, "gibbed via [name]")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, occupant)
occupant.ghostize(bancheck = TRUE)
occupant.harvest()
diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index 82f76d48e212..988704461fa3 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -79,7 +79,8 @@
occupant_message("You squeeze [target] with [src.name]. Something cracks.")
chassis.visible_message("[chassis] squeezes [target].")
- M.process_aggresive_action(chassis.occupant, "attacked via [chassis]'s [name]")
+ M.log_combat(chassis.occupant, "attacked via [chassis]'s [name]")
+ SEND_SIGNAL(chassis.occupant, COMSIG_HUMAN_HARMED_OTHER, M)
else
step_away(M,chassis)
occupant_message("You push [target] out of the way.")
@@ -144,7 +145,8 @@
else if(target.loc == C)
if(isliving(target))
var/mob/living/M = target
- M.process_aggresive_action(chassis.occupant, "attacked via [chassis]'s [name]")
+ M.log_combat(chassis.occupant, "attacked via [chassis]'s [name]")
+ SEND_SIGNAL(chassis.occupant, COMSIG_HUMAN_HARMED_OTHER, M)
log_message("Drilled through [target]")
target.ex_act(EXPLODE_HEAVY)
@@ -211,7 +213,9 @@
else if(target.loc == C)
if(isliving(target))
var/mob/living/M = target
- M.process_aggresive_action(chassis.occupant, "attacked via [chassis]'s [name]")
+ M.log_combat(chassis.occupant, "attacked via [chassis]'s [name]")
+ SEND_SIGNAL(chassis.occupant, COMSIG_HUMAN_HARMED_OTHER, M)
+
log_message("Drilled through [target]")
target.ex_act(EXPLODE_HEAVY)
return 1
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 8871d1c26bd5..49faaea0ec1f 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -845,7 +845,8 @@
user.do_attack_animation(M)
playsound(M, 'sound/items/tools/screwdriver-stab.ogg', VOL_EFFECTS_MASTER)
- M.process_aggresive_action(user, "eyestabbed with [name]")
+ M.log_combat(user, "eyestabbed with [name]")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, M)
add_fingerprint(user)
if(M != user)
diff --git a/code/game/objects/items/devices/scanners/health_analyzer.dm b/code/game/objects/items/devices/scanners/health_analyzer.dm
index a5f5ea774f69..fb9276d386ea 100644
--- a/code/game/objects/items/devices/scanners/health_analyzer.dm
+++ b/code/game/objects/items/devices/scanners/health_analyzer.dm
@@ -116,7 +116,8 @@
used = 0
icon_state = "health"
to_chat(user,"Успешное облучение [M].")
- M.process_aggresive_action(user, "irradiated with [name]")
+ M.log_combat(user, "irradiated with [name]")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, M)
spawn((wavelength+(intensity*4))*5)
if(M)
if(intensity >= 5)
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index da3bcc21f498..96aa8adcbc5c 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -30,7 +30,8 @@
to_chat(user, "Устанавливает взрывчатку...")
if(ismob(target))
var/mob/living/M = target
- M.process_aggresive_action(user, "planted (attempt) with [name]")
+ M.log_combat(user, "planted (attempt) with [name]")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, M)
user.visible_message(" [user.name] пытается установить взрывчатку на [M.name]!")
else
user.attack_log += "\[[time_stamp()]\] [user.real_name] tried planting [name] on [target.name]"
diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm
index bf1e325e288a..7bc8dc168ef8 100644
--- a/code/game/objects/items/weapons/hydroponics.dm
+++ b/code/game/objects/items/weapons/hydroponics.dm
@@ -89,7 +89,8 @@
if(isliving(M))
to_chat(M, "You are stunned by the powerful acid of the Deathnettle!")
- M.process_aggresive_action(user, "stunned with [name]")
+ M.log_combat(user, "stunned with [name]")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, M)
playsound(src, 'sound/weapons/bladeslice.ogg', VOL_EFFECTS_MASTER)
@@ -371,6 +372,7 @@ var/global/gourd_name = null
user.visible_message("[target] has attacked himself with \a [name]!")
//Attack logs
- target.process_aggresive_action(user, "smashed with a [name] (INTENT: [uppertext(user.a_intent)])")
+ target.log_combat(user, "smashed with a [name] (INTENT: [uppertext(user.a_intent)])")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, target)
qdel(src)
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index 7698f67f30a9..f249b46ece4b 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -257,7 +257,8 @@
user.Paralyse(2)
return
- M.process_aggresive_action(user, "attacked with [name]")
+ M.log_combat(user, "attacked with [name]")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, M)
var/t = user.get_targetzone()
if (t == BP_HEAD)
diff --git a/code/game/objects/items/weapons/makeshift.dm b/code/game/objects/items/weapons/makeshift.dm
index 05e9a34b8ec6..7965e786e258 100644
--- a/code/game/objects/items/weapons/makeshift.dm
+++ b/code/game/objects/items/weapons/makeshift.dm
@@ -185,7 +185,8 @@
if(!..()) return
H.visible_message("[M] has been beaten with the [src] by [user]!")
- H.process_aggresive_action(user, "attacked with [name]")
+ H.log_combat(user, "attacked with [name]")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, H)
playsound(src, pick(SOUNDIN_GENHIT), VOL_EFFECTS_MASTER)
else if(!status)
@@ -206,7 +207,8 @@
deductcharge(hitcost)
H.visible_message("[M] has been stunned with the [src] by [user]!")
- H.process_aggresive_action(user, "stunned with [name]")
+ H.log_combat(user, "stunned with [name]")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, H)
playsound(src, 'sound/weapons/Egloves.ogg', VOL_EFFECTS_MASTER)
// if(charges < 1)
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index 04f7dad628bf..056475ee0330 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -140,7 +140,8 @@
add_fingerprint(user)
user.visible_message("[M] has been stunned with \the [src] by [user]!", blind_message = "You hear someone fall")
- M.process_aggresive_action(user, "attacked with [name] (INTENT: [uppertext(user.a_intent)])")
+ M.log_combat(user, "attacked with [name] (INTENT: [uppertext(user.a_intent)])")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, M)
//Telescopic baton
/obj/item/weapon/melee/telebaton
@@ -232,7 +233,8 @@
playsound(src, 'sound/weapons/hit_metalic.ogg', VOL_EFFECTS_MASTER)
user.do_attack_animation(H)
H.visible_message("[user] hit [H] harmlessly with a telebaton.")
- H.process_aggresive_action(user, "hit harmlessly with [name]")
+ H.log_combat(user, "hit harmlessly with [name]")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, H)
return
if(..())
L.apply_effect(30, AGONY, target_armor)
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 0c1fbbb23a3d..7fb8dff59549 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -435,7 +435,8 @@
visible_message("[assailant] slams [victim]'s face against \the [src], breaking it!")
playsound(src, 'sound/weapons/tablehit1.ogg', VOL_EFFECTS_MASTER)
- victim.process_aggresive_action(assailant, "face-slammed against [name]")
+ victim.log_combat(assailant, "face-slammed against [name]")
+ SEND_SIGNAL(assailant, COMSIG_HUMAN_HARMED_OTHER,victim)
if(prob(30) && ishuman(victim))
var/mob/living/carbon/human/H = victim
diff --git a/code/game/objects/structures/windows/window.dm b/code/game/objects/structures/windows/window.dm
index 40796286766c..6a2562a60698 100644
--- a/code/game/objects/structures/windows/window.dm
+++ b/code/game/objects/structures/windows/window.dm
@@ -94,7 +94,8 @@
take_damage(7, BRUTE, MELEE)
visible_message("[A] slams [M] against \the [src]!")
- M.process_aggresive_action(user, "slammed against [name]")
+ M.log_combat(user, "slammed against [name]")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, M)
if(2)
if (prob(50))
M.Stun(1)
@@ -102,14 +103,16 @@
M.apply_damage(8)
take_damage(9, BRUTE, MELEE)
visible_message("[A] bashes [M] against \the [src]!")
- M.process_aggresive_action(user, "bashed against [name]")
+ M.log_combat(user, "bashed against [name]")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, M)
if(3)
M.Stun(5)
M.Weaken(5)
M.apply_damage(20)
take_damage(12, BRUTE, MELEE)
visible_message("[A] crushes [M] against \the [src]!")
- M.process_aggresive_action(user, "crushed against [name]")
+ M.log_combat(user, "crushed against [name]")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, M)
return
return ..()
diff --git a/code/modules/clothing/gloves/power_gloves.dm b/code/modules/clothing/gloves/power_gloves.dm
index e9063b5b873b..ff060f02d40f 100644
--- a/code/modules/clothing/gloves/power_gloves.dm
+++ b/code/modules/clothing/gloves/power_gloves.dm
@@ -104,7 +104,8 @@
var/obj/item/organ/external/BP = H.get_bodypart(attacker.get_targetzone())
calc_power *= H.get_siemens_coefficient_organ(BP)
L.visible_message("[L] has been touched with the gloves by [attacker]!")
- L.process_aggresive_action(attacker, "stungloved with [name]")
+ L.log_combat(attacker, "stungloved with [name]")
+ SEND_SIGNAL(attacker, COMSIG_HUMAN_HARMED_OTHER, L)
L.apply_damage(calc_power, HALLOSS)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread()
s.set_up(3, 1, L)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 92e779b862b6..aca64d64e31a 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -6,17 +6,6 @@
if(alert_admins)
msg_admin_attack("[key_name(src)] has been [msg], by [key_name(attacker)][redirected ? " (redirected)" : ""]", attacker)
-/mob/living/proc/process_aggresive_action(mob/living/attacker, msg, alert_admins=TRUE, redirected=FALSE)
- if(ishuman(attacker))
- var/mob/living/carbon/human/H = attacker
- var/obj/item/item_in_hand = H.get_active_hand()
- if(item_in_hand)
- if(item_in_hand.force > 0)
- SEND_SIGNAL(H, COMSIG_HUMAN_HARMED_OTHER, src)
- else
- SEND_SIGNAL(H, COMSIG_HUMAN_HARMED_OTHER, src)
- log_combat(attacker, msg, alert_admins=alert_admins, redirected=redirected)
-
/mob/living/proc/run_armor_check(def_zone = null, attack_flag = MELEE, absorb_text = null, soften_text = null)
var/armor = getarmor(def_zone, attack_flag)
if(armor >= 100)
@@ -79,7 +68,8 @@
visible_message("[name] is hit by the [P.name] in the [parse_zone(def_zone)]!")
//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
if(P.firer)
- process_aggresive_action(P.firer, "shot with [P.type]", alert_admins = !P.fake, redirected = P.redirected)
+ log_combat(P.firer, "shot with [P.type]", alert_admins = !P.fake, redirected = P.redirected)
+ SEND_SIGNAL(P.firer, COMSIG_HUMAN_HARMED_OTHER, src)
else
attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT shot [src]/[ckey] with a [src]"
if(!P.fake)
@@ -156,7 +146,9 @@
if(L)
var/client/assailant = L.client
if(assailant)
- process_aggresive_action(L, "hit with thrown [O]")
+ log_combat(L, "hit with thrown [O]")
+ if(throw_damage > 0)
+ SEND_SIGNAL(L, COMSIG_HUMAN_HARMED_OTHER, src)
// Begin BS12 momentum-transfer code.
if(O.throw_source && AM.fly_speed >= 15)
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 9ab2e6412e76..d41c4dfe9a51 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -114,7 +114,7 @@
var/start_T_descriptor = "tile at [COORD(start_T)] in area [get_area(start_T)]"
var/end_T_descriptor = "tile at [COORD(end_T)] in area [get_area(end_T)]"
- L.process_aggresive_action(usr, "thrown from [start_T_descriptor] with the target [end_T_descriptor]")
+ L.log_combat(usr, "thrown from [start_T_descriptor] with the target [end_T_descriptor]")
qdel(src)
@@ -386,7 +386,8 @@
assailant.visible_message("[assailant] has reinforced \his grip on [affecting] (now neck)!")
assailant.set_dir(get_dir(assailant, affecting))
- affecting.process_aggresive_action(assailant, "neck-grabbed")
+ affecting.log_combat(assailant, "neck-grabbed")
+ SEND_SIGNAL(assailant, COMSIG_HUMAN_HARMED_OTHER, affecting)
affecting.Stun(10) //10 ticks of ensured grab
set_state(GRAB_NECK)
@@ -400,7 +401,8 @@
assailant.visible_message("[assailant] has tightened \his grip on [affecting]'s neck!")
- affecting.process_aggresive_action(assailant, "strangled")
+ affecting.log_combat(assailant, "strangled")
+ SEND_SIGNAL(assailant, COMSIG_HUMAN_HARMED_OTHER, affecting)
affecting.losebreath += 1
affecting.set_dir(WEST)
@@ -492,7 +494,8 @@
assailant.visible_message("[assailant] pressed \his fingers into [affecting]'s eyes!")
to_chat(affecting, "You experience immense pain as you feel digits being pressed into your eyes!")
- affecting.process_aggresive_action(assailant, "finger-pressed into the eyes")
+ affecting.log_combat(assailant, "finger-pressed into the eyes")
+ SEND_SIGNAL(assailant, COMSIG_HUMAN_HARMED_OTHER, affecting)
var/obj/item/organ/internal/eyes/IO = affecting:organs_by_name[O_EYES]
IO.damage += rand(3,4)
@@ -545,7 +548,8 @@
affecting.visible_message("[affecting] has been knocked unconscious!")
playsound(assailant, pick(SOUNDIN_GENHIT), VOL_EFFECTS_MASTER)
- affecting.process_aggresive_action(assailant, "headbutted")
+ affecting.log_combat(assailant, "headbutted")
+ SEND_SIGNAL(assailant, COMSIG_HUMAN_HARMED_OTHER, affecting)
assailant.drop_from_inventory(src)
src.loc = null
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 7f32dc23880b..f2756a6cef92 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -902,7 +902,9 @@ Note that amputating the affected organ does in fact remove the infection from t
to_chat(brainmob, "[user] severs your brain's connection to the spine with [I]!")
to_chat(user, "You sever [brainmob]'s brain's connection to the spine with [I]!")
- brainmob.process_aggresive_action(user, "debrained with [I.name] (INTENT: [uppertext(user.a_intent)])")
+ brainmob.log_combat(user, "debrained with [I.name] (INTENT: [uppertext(user.a_intent)])")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, brainmob)
+
if(istype(src,/obj/item/organ/external/head/robot))
var/obj/item/device/mmi/posibrain/B = new(loc)
diff --git a/code/modules/surgery/braincore.dm b/code/modules/surgery/braincore.dm
index 204b5b0bc4d4..2fb2e8b98a39 100644
--- a/code/modules/surgery/braincore.dm
+++ b/code/modules/surgery/braincore.dm
@@ -103,8 +103,8 @@
if(borer)
borer.detatch() //Should remove borer if the brain is removed - RR
- target.process_aggresive_action(user, "debrained with [tool.name] (INTENT: [uppertext(user.a_intent)])")
-
+ target.log_combat(user, "debrained with [tool.name] (INTENT: [uppertext(user.a_intent)])")
+ SEND_SIGNAL(user, COMSIG_HUMAN_HARMED_OTHER, target)
var/obj/item/brain/B
B = new(target.loc)
B.transfer_identity(target)
diff --git a/code/modules/unarmed_combat/combos/harmful.dm b/code/modules/unarmed_combat/combos/harmful.dm
index c50a863fdbd0..4c559899fca8 100644
--- a/code/modules/unarmed_combat/combos/harmful.dm
+++ b/code/modules/unarmed_combat/combos/harmful.dm
@@ -476,8 +476,8 @@
var/turf/end_T = target
var/end_T_descriptor = "tile at [COORD(end_T)] in area [get_area(end_T)]"
- M.process_aggresive_action(attacker, "throwm from [start_T_descriptor] with the target [end_T_descriptor]")
-
+ M.log_combat(attacker, "throwm from [start_T_descriptor] with the target [end_T_descriptor]")
+ SEND_SIGNAL(attacker, COMSIG_HUMAN_HARMED_OTHER, M)
M.throw_at(target, 6, 8, attacker)
apply_effect(3, STUN, M, attacker, attack_obj=attack_obj, min_value=1)
apply_effect(7, WEAKEN, M, attacker, attack_obj=attack_obj, min_value=1)
diff --git a/code/modules/unarmed_combat/living_procs_defines.dm b/code/modules/unarmed_combat/living_procs_defines.dm
index 078ee0ef1a2a..30bccbadb97f 100644
--- a/code/modules/unarmed_combat/living_procs_defines.dm
+++ b/code/modules/unarmed_combat/living_procs_defines.dm
@@ -271,7 +271,8 @@
visible_message("[attacker] tried to [damVerb] [src]!")
return FALSE
- process_aggresive_action(attacker, "[damVerb]ed")
+ log_combat(attacker, "[damVerb]ed")
+ SEND_SIGNAL(attacker, COMSIG_HUMAN_HARMED_OTHER, src)
var/armor_block = 0
var/obj/item/organ/external/BP = attacker.get_targetzone() // apply_damage accepts both the bodypart and the zone.
diff --git a/code/modules/vehicles/spacebike.dm b/code/modules/vehicles/spacebike.dm
index ff57b638a965..dd60ea8e509e 100644
--- a/code/modules/vehicles/spacebike.dm
+++ b/code/modules/vehicles/spacebike.dm
@@ -128,7 +128,8 @@
unload(Driver)
visible_message("[Driver] drives over [L]!")
- L.process_aggresive_action(Driver, "driven over with [src]")
+ L.log_combat(Driver, "driven over with [src]")
+ SEND_SIGNAL(Driver, COMSIG_HUMAN_HARMED_OTHER, L)
playsound(src, 'sound/effects/splat.ogg', VOL_EFFECTS_MASTER)
L.stop_pulling()