Merge pull request #12937 from Ghommie/Ghommie-cit834

Fixing new bugs and stuff.
This commit is contained in:
silicons
2020-07-28 10:46:17 -07:00
committed by GitHub
7 changed files with 22 additions and 23 deletions

View File

@@ -249,7 +249,7 @@
msg += "[t_He] look[p_s()] extremely disgusted.\n"
var/apparent_blood_volume = blood_volume
if(skin_tone == "albino")
if(dna.species.use_skintones && skin_tone == "albino")
apparent_blood_volume -= 150 // enough to knock you down one tier
switch(apparent_blood_volume)
if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)

View File

@@ -390,7 +390,7 @@
// Checks the user has security clearence before allowing them to change arrest status via hud, comment out to enable all access
var/allowed_access = null
var/obj/item/clothing/glasses/G = H.glasses
if (!(G.obj_flags |= EMAGGED))
if (!(G.obj_flags & EMAGGED))
if(H.wear_id)
var/list/access = H.wear_id.GetAccess()
if(ACCESS_SEC_DOORS in access)