From 78f7d996ceb335689195f6908ff7ebf5a9d91fcc Mon Sep 17 00:00:00 2001 From: "B.A.L" Date: Fri, 14 Jun 2019 19:55:46 -0700 Subject: [PATCH] Fixes some issues --- code/modules/clothing/masks/miscellaneous.dm | 2 +- code/modules/mob/living/carbon/human/species/_species.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 5caf589a5fb..b11dfd45d68 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -117,7 +117,7 @@ security_lock = TRUE locked = FALSE materials = list(MAT_METAL=500, MAT_GLASS=50) - species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey" ) + sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Unathi" = 'icons/mob/species/unathi/mask.dmi', diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 44498ae5367..438d3386948 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -600,7 +600,7 @@ H.healthdoll.cached_healthdoll_overlays = new_overlays /datum/species/proc/handle_hud_icons_nutrition(mob/living/carbon/human/H) - if(H.mind && H.mind.vampire && (H.mind in ticker.mode.vampires)) //Vampires + if(H.mind && H.mind.vampire && (H.mind in SSticker.mode.vampires)) //Vampires switch(H.nutrition) if(NUTRITION_LEVEL_FULL to INFINITY) H.throw_alert("nutrition", /obj/screen/alert/fat/vampire) @@ -689,7 +689,7 @@ It'll return null if the organ doesn't correspond, so include null checks when u H.see_invisible = G.invis_override else H.see_invisible = min(G.invis_view, H.see_invisible) - + if(!isnull(G.lighting_alpha)) H.lighting_alpha = min(G.lighting_alpha, H.lighting_alpha)