From ebc98a7b41e0528fa085d9dd80f30bed3f7ba00d Mon Sep 17 00:00:00 2001
From: Mechoid <the60bucksisalie@gmail.com>
Date: Tue, 26 Sep 2023 13:21:31 -0700
Subject: [PATCH] Serpentids No longer wear headsets on their lower shoulder.
 Able to wear armor. Literally. They take the whole suit and just wear it like
 a tabard.

---
 code/modules/clothing/clothing.dm                 |   4 +++-
 code/modules/clothing/suits/armor.dm              |   2 --
 .../carbon/human/species/outsider/nabber.dm       |   2 ++
 icons/mob/species/nabber/ears.dmi                 | Bin 0 -> 253 bytes
 icons/mob/species/nabber/monarch/ears.dmi         | Bin 0 -> 254 bytes
 5 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 icons/mob/species/nabber/ears.dmi
 create mode 100644 icons/mob/species/nabber/monarch/ears.dmi

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 0000000000000000000000000000000000000000..e258c4b573b25f96aa3c4303dee033dbe8408d8b
GIT binary patch
literal 253
zcmeAS@N?(olHy`uVBq!ia0vp^4nQ2h#0(^_T%3IkNbv;tgt#6!aA3;*ZJnK+8#Zj1
zvH9&Jpg3bmkY6x^!?PP{Ku%s&NJNQCYH@N=W<g12ejWou#hl=<f}+yzUxEuhetn|l
zt*dqJ%=zFAp#~R?A3V}I@1uE=p{S>KhlO#F@nvH#2P3waqpF>%D;<^vxn(7J6=rn`
ziKly|1sZxx>NZ}hVQ4OT#Oz5>Si#p~Mrj^~3MQ%7r@g;O0c}?Gba4!^=uJ*Iz$S5#
xb%wzdnFFf|MS7YX8BTcYKVwpKN<$)$fnn<j#;(#A!rVX&44$rjF6*2UngE{gTh{;p

literal 0
HcmV?d00001

diff --git a/icons/mob/species/nabber/monarch/ears.dmi b/icons/mob/species/nabber/monarch/ears.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..a427f20396103fbbcaf47607088c7cb0bd213c2f
GIT binary patch
literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSJOMr-u0VRq{%xI|of|f65M&e&
z2J#t8g8YIR9G=}s19EbzLLy3BQj3#|G7CyF^Ya)OD&_=-6%>_z{}NpA@#_;UZ(Xf(
zXU+$22sOB9{NRz!c^}P_3`IS?J1mTYj4vB|Da?5^>ByuIg<wr(Q^TbeTU|Q4ja4_V
zkXX{&ZM;^)&|LJ0*^{8Kg0IDl(mV_mrc!U#%+_20v{%E^#WBR9H#uQ}bb_P!0|)Vh
wW&O@>2QRQOy<p;c!DRD-iOr<wR0li5wW$m>X?wy_fqED`UHx3vIVCg!0NJTm=>Px#

literal 0
HcmV?d00001