cyberpresidentvanellope/Skyrat-tg
1
0
Fork 0
mirror of https://github.com/Skyrat-SS13/Skyrat-tg.git synced 2026-08-28 07:17:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Cuts the number of apply_damage copypaste procs from 3(.5) to 1, fixing a few bugs along the way [MDB IGNORE] (#24619)

Browse Source 
* Cuts the number of `apply_damage` copypaste procs from 3(.5) to 1, fixing a few bugs along the way

* Update _species.dm

* Update damage_procs.dm

* Modular adjustments

* Update mutant_species.dm

* Update mutant_species.dm

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-10-27 18:22:32 -04:00
committed by GitHub
co-authored by MrMelbert Bloop
parent f4698f05af
commit e7a1ec5ba2
31 changed files with 427 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/bitrunning/components/avatar_connection.dm
+2 -2
View File
@@ -108,7 +108,7 @@
)
/// Transfers damage from the avatar to the old_body
/datum/component/avatar_connection/proc/on_linked_damage(datum/source, damage, damage_type, def_zone, blocked, forced)
/datum/component/avatar_connection/proc/on_linked_damage(datum/source, damage, damage_type, def_zone, blocked, ...)
SIGNAL_HANDLER
var/mob/living/carbon/old_body = old_body_ref?.resolve()
@@ -123,7 +123,7 @@
if(damage > 30 && prob(30))
INVOKE_ASYNC(old_body, TYPE_PROC_REF(/mob/living, emote), "scream")
old_body.apply_damage(damage, damage_type, def_zone, blocked, forced, wound_bonus = CANT_WOUND)
old_body.apply_damage(damage, damage_type, def_zone, blocked, wound_bonus = CANT_WOUND)
if(old_body.stat > SOFT_CRIT) // KO!
full_avatar_disconnect(forced = TRUE)