diff --git a/code/datums/disease.dm b/code/datums/disease.dm index a05b945f6b..f44293a8d0 100644 --- a/code/datums/disease.dm +++ b/code/datums/disease.dm @@ -64,15 +64,13 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease if(stage > max_stages) stage = max_stages - if(stage < max_stages && prob(stage_prob) && !cure_present) //now the disease shouldn't get back up to stage 4 in no time - stage++ - //world << "up" - if(stage > 0 && (cure_present && prob(cure_chance))) - stage-- - //world << "down" + if(!cure_present && prob(stage_prob)) //now the disease shouldn't get back up to stage 4 in no time + stage = min(stage + 1, max_stages) + + else if(cure_present && prob(cure_chance)) + stage = max(stage - 1, 1) if(stage <= 1 && ((prob(1) && curable) || (cure_present && prob(cure_chance)))) -// world << "Cured as stage act" cure() return return diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 96d6ad8705..b3c1eb5b9b 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -15,13 +15,13 @@ name = "welding helmet" desc = "A head-mounted face cover designed to protect the wearer completely from space-arc eye." icon_state = "welding" - flags = FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH + flags = (FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH) item_state = "welding" m_amt = 3000 g_amt = 1000 var/up = 0 armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) icon_action_button = "action_welding" /obj/item/clothing/head/welding/attack_self() @@ -36,13 +36,13 @@ if(usr.canmove && !usr.stat && !usr.restrained()) if(src.up) src.up = !src.up - src.flags |= HEADCOVERSEYES | HEADCOVERSMOUTH - flags_inv |= HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + src.flags |= (HEADCOVERSEYES | HEADCOVERSMOUTH) + flags_inv |= (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) icon_state = initial(icon_state) usr << "You flip the [src] down to protect your eyes." else src.up = !src.up - src.flags &= ~HEADCOVERSEYES | HEADCOVERSMOUTH + src.flags &= ~(HEADCOVERSEYES | HEADCOVERSMOUTH) flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) icon_state = "[initial(icon_state)]up" usr << "You push the [src] up out of your face."