cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes shitty martial arts code (#2911)

Browse Source 
* Fixes shitty martial arts code (#56397)

Fixes martial arts being handled in 2 places with a bit of a hack, this needs more attention in future (Hello 2025) -Lemon

* Fixes shitty martial arts code

Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-01-28 03:04:22 +01:00
committed by GitHub
co-authored by SmArtKar
parent 2687860dfd
commit b34fad8db8
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+2
View File
@@ -1929,6 +1929,8 @@
/mob/living/proc/apply_martial_art(mob/living/target)
if(HAS_TRAIT(target, TRAIT_MARTIAL_ARTS_IMMUNE))
return FALSE
if(ishuman(target) && ishuman(src)) //Human vs human are handled in species code
return FALSE
var/datum/martial_art/style = mind?.martial_art
var/attack_result = FALSE
if (style)