diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index d4a7517c847..f09b7bb69e4 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -191,7 +191,9 @@ var/global/list/light_overlay_cache = list() //see get_worn_overlay() on helmets throwforce = 2 slot_flags = SLOT_EARS sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi', + SPECIES_NABBER = 'icons/mob/species/nabber/ears.dmi', + SPECIES_NABBER_MONARCH = 'icons/mob/species/nabber/monarch/ears.dmi' ) /obj/item/clothing/ears/attack_hand(mob/user as mob) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 8e9c08028b5..5df1d45c87f 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -9,8 +9,6 @@ max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.6 - species_restricted = list("exclude", SPECIES_NABBER, SPECIES_NABBER_MONARCH) - /obj/item/clothing/suit/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = FALSE) if(..()) //This will only run if no other problems occurred when equipping. for(var/obj/item/clothing/I in list(H.gloves, H.shoes)) diff --git a/code/modules/mob/living/carbon/human/species/outsider/nabber.dm b/code/modules/mob/living/carbon/human/species/outsider/nabber.dm index a14cc1991c5..4e22ee65345 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/nabber.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/nabber.dm @@ -140,6 +140,7 @@ slot_back_str = list("[NORTH]" = list("x" = 0, "y" = 7), "[EAST]" = list("x" = 0, "y" = 8), "[SOUTH]" = list("x" = 0, "y" = 8), "[WEST]" = list("x" = 0, "y" = 8)), slot_belt_str = list("[NORTH]" = list("x" = 0, "y" = 0), "[EAST]" = list("x" = 8, "y" = 0), "[SOUTH]" = list("x" = 0, "y" = 0), "[WEST]" = list("x" = -8, "y" = 0)), slot_glasses_str = list("[NORTH]" = list("x" = 0, "y" = 10), "[EAST]" = list("x" = 3, "y" = 10), "[SOUTH]" = list("x" = 0, "y" = 9), "[WEST]" = list("x" = -3, "y" = 10)), + slot_l_ear_str = list("[NORTH]" = list("x" = 0, "y" = 10), "[EAST]" = list("x" = 3, "y" = 10), "[SOUTH]" = list("x" = 0, "y" = 9), "[WEST]" = list("x" = -3, "y" = 10)), slot_wear_mask_str = list("[NORTH]" = list("x" = 0, "y" = 10), "[EAST]" = list("x" = 3, "y" = 9), "[SOUTH]" = list("x" = 0, "y" = 9), "[WEST]" = list("x" = -3, "y" = 9)) ) ..() @@ -387,5 +388,6 @@ slot_back_str = list("[NORTH]" = list("x" = 0, "y" = -4), "[EAST]" = list("x" = 3, "y" = -4), "[SOUTH]" = list("x" = 0, "y" = -4), "[WEST]" = list("x" = -3, "y" = -4)), slot_belt_str = list("[NORTH]" = list("x" = 0, "y" = -2), "[EAST]" = list("x" = 8, "y" = -2), "[SOUTH]" = list("x" = 0, "y" = -2), "[WEST]" = list("x" = -8, "y" = -2)), slot_glasses_str = list("[NORTH]" = list("x" = 0, "y" = -3), "[EAST]" = list("x" = 3, "y" = -3), "[SOUTH]" = list("x" = 0, "y" = -3), "[WEST]" = list("x" = -3, "y" = -3)), + slot_l_ear_str = list("[NORTH]" = list("x" = 0, "y" = -3), "[EAST]" = list("x" = 3, "y" = -3), "[SOUTH]" = list("x" = 0, "y" = -3), "[WEST]" = list("x" = -3, "y" = -3)), slot_wear_mask_str = list("[NORTH]" = list("x" = 0, "y" = -3), "[EAST]" = list("x" = 3, "y" = -3), "[SOUTH]" = list("x" = 0, "y" = -3), "[WEST]" = list("x" = -3, "y" = -3)) ) diff --git a/icons/mob/species/nabber/ears.dmi b/icons/mob/species/nabber/ears.dmi new file mode 100644 index 00000000000..e258c4b573b Binary files /dev/null and b/icons/mob/species/nabber/ears.dmi differ diff --git a/icons/mob/species/nabber/monarch/ears.dmi b/icons/mob/species/nabber/monarch/ears.dmi new file mode 100644 index 00000000000..a427f203961 Binary files /dev/null and b/icons/mob/species/nabber/monarch/ears.dmi differ