shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8150 from Trilbyspaceclone/patch-84

Browse Source 
MIRROR - Fixes runtime from attempting checking armor on missing bodypart, improves ran_zone selection mechanism #43222
This commit is contained in:
deathride58
2019-03-21 15:33:34 -04:00
committed by GitHub
parent e49ef21298 d04606acb1
commit 974420eb5a
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/carbon/human/human_defense.dm
View File

@@ -4,7 +4,9 @@
if(def_zone)
if(isbodypart(def_zone))
return checkarmor(def_zone, type)
var/obj/item/bodypart/bp = def_zone
if(bp.body_part)
return checkarmor(def_zone, type)
var/obj/item/bodypart/affecting = get_bodypart(ran_zone(def_zone))
return checkarmor(affecting, type)
//If a specific bodypart is targetted, check how that bodypart is protected and return the value.

23
code/modules/mob/mob_helpers.dm
View File

@@ -29,27 +29,10 @@
/proc/ran_zone(zone, probability = 80)
zone = check_zone(zone)
if(prob(probability))
return zone
var/t = rand(1, 18) // randomly pick a different zone, or maybe the same one
switch(t)
if(1)
return BODY_ZONE_HEAD
if(2)
return BODY_ZONE_CHEST
if(3 to 6)
return BODY_ZONE_L_ARM
if(7 to 10)
return BODY_ZONE_R_ARM
if(11 to 14)
return BODY_ZONE_L_LEG
if(15 to 18)
return BODY_ZONE_R_LEG
zone = check_zone(zone)
else
zone = pickweight(list(BODY_ZONE_HEAD = 6, BODY_ZONE_CHEST = 6, BODY_ZONE_L_ARM = 22, BODY_ZONE_R_ARM = 22, BODY_ZONE_L_LEG = 22, BODY_ZONE_R_LEG = 22))
return zone
/proc/above_neck(zone)