Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548

[MIRROR] Added a new ability to sentient diseases
This commit is contained in:
LetterJay
2018-04-01 19:50:43 -05:00
committed by GitHub
13 changed files with 169 additions and 24 deletions
+8 -4
View File
@@ -46,8 +46,12 @@
if(satiety>0 && prob(satiety/10)) // positive satiety makes it harder to contract the disease.
return
//Lefts and rights do not matter for arms and legs, they both run the same checks
if(!target_zone)
target_zone = pick(head_ch;BODY_ZONE_HEAD,body_ch;"body",hands_ch;"hands",feet_ch;"feet")
target_zone = pick(head_ch;BODY_ZONE_HEAD,body_ch;BODY_ZONE_CHEST,hands_ch;BODY_ZONE_L_ARM,feet_ch;BODY_ZONE_L_LEG)
else
target_zone = check_zone(target_zone)
if(ishuman(src))
var/mob/living/carbon/human/H = src
@@ -63,14 +67,14 @@
if(passed && isobj(H.wear_neck))
Cl = H.wear_neck
passed = prob((Cl.permeability_coefficient*100) - 1)
if("body")
if(BODY_ZONE_CHEST)
if(isobj(H.wear_suit))
Cl = H.wear_suit
passed = prob((Cl.permeability_coefficient*100) - 1)
if(passed && isobj(slot_w_uniform))
Cl = slot_w_uniform
passed = prob((Cl.permeability_coefficient*100) - 1)
if("hands")
if(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)
if(isobj(H.wear_suit) && H.wear_suit.body_parts_covered&HANDS)
Cl = H.wear_suit
passed = prob((Cl.permeability_coefficient*100) - 1)
@@ -78,7 +82,7 @@
if(passed && isobj(H.gloves))
Cl = H.gloves
passed = prob((Cl.permeability_coefficient*100) - 1)
if("feet")
if(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
if(isobj(H.wear_suit) && H.wear_suit.body_parts_covered&FEET)
Cl = H.wear_suit
passed = prob((Cl.permeability_coefficient*100) - 1)