diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index bd3ce36a164..79f9b3d3137 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -303,4 +303,4 @@ GLOBAL_LIST_INIT(pipe_paint_colors, list( #define MIASMA_CORPSE_MOLES 0.02 #define MIASMA_GIBS_MOLES 0.005 -#define MIASMA_HYGIENE_MOLES 0.01 +#define MIASMA_HYGIENE_MOLES 0.002 diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index 69ead620726..0896a396081 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -238,12 +238,6 @@ . = TRUE else if(H.w_uniform && !(H.w_uniform.clothing_flags & SHOWEROKAY)) . = TRUE - else if(H.shoes && !(H.shoes.clothing_flags & SHOWEROKAY)) - . = TRUE - else if(H.ears && !(H.ears.clothing_flags & SHOWEROKAY)) - . = TRUE - else if(H.gloves && !(H.gloves.clothing_flags & SHOWEROKAY)) - . = TRUE else if(H.wear_mask && !(H.wear_mask.clothing_flags & SHOWEROKAY)) . = TRUE else if(H.head && !(H.head.clothing_flags & SHOWEROKAY)) diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index 6224e2a3d91..c1dc8ebbec7 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -4,7 +4,7 @@ name = "space helmet" icon_state = "spaceold" desc = "A special helmet with solar UV shielding to protect your eyes from harmful rays." - clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL + clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SHOWEROKAY item_state = "spaceold" permeability_coefficient = 0.01 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 50, "fire" = 80, "acid" = 70) @@ -30,7 +30,7 @@ w_class = WEIGHT_CLASS_BULKY gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 - clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL + clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SHOWEROKAY body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/flashlight, /obj/item/tank/internals) slowdown = 1 diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 350f9b14d5a..463cf4900ff 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -4,7 +4,7 @@ icon_state = "bio" desc = "A hood that protects the head and face from biological contaminants." permeability_coefficient = 0.01 - clothing_flags = THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT + clothing_flags = THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT | SHOWEROKAY armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 80, "fire" = 30, "acid" = 100) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE resistance_flags = ACID_PROOF @@ -18,7 +18,7 @@ w_class = WEIGHT_CLASS_BULKY gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 - clothing_flags = THICKMATERIAL + clothing_flags = THICKMATERIAL | SHOWEROKAY body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS slowdown = 1 allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/pen, /obj/item/flashlight/pen, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 505c99adb4d..b5a9afe653b 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -330,18 +330,18 @@ set_hygiene(HYGIENE_LEVEL_CLEAN) return - var/hygiene_loss = -HYGIENE_FACTOR + var/hygiene_loss = -HYGIENE_FACTOR * 0.25 //Small loss per life //If you're covered in blood, you'll start smelling like shit faster. var/obj/item/head = get_item_by_slot(SLOT_HEAD) if(head) IF_HAS_BLOOD_DNA(head) - hygiene_loss -= 2 * HYGIENE_FACTOR + hygiene_loss -= 1 * HYGIENE_FACTOR var/obj/item/mask = get_item_by_slot(SLOT_HEAD) if(mask) IF_HAS_BLOOD_DNA(mask) - hygiene_loss -= 2 * HYGIENE_FACTOR + hygiene_loss -= 1 * HYGIENE_FACTOR var/obj/item/uniform = get_item_by_slot(SLOT_W_UNIFORM) if(uniform) @@ -356,7 +356,7 @@ var/obj/item/feet = get_item_by_slot(SLOT_SHOES) if(feet) IF_HAS_BLOOD_DNA(feet) - hygiene_loss -= 2 * HYGIENE_FACTOR + hygiene_loss -= 0.5 * HYGIENE_FACTOR adjust_hygiene(hygiene_loss)