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

Merge pull request #42312 from Qustinnus/quickfix

Browse Source 
initial hygiene tweaks
This commit is contained in:
oranges
2019-01-12 10:41:44 +13:00
committed by GitHub
parent e9d0d3ad75 145ac716cb
commit 8aa9a2a64a
5 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/spacesuits/_spacesuits.dm
+2 -2
View File
@@ -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
code/modules/clothing/suits/bio.dm
+2 -2
View File
@@ -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)
code/modules/mob/living/carbon/human/life.dm
+4 -4
View File
@@ -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)