Skip to content

Commit

Permalink
Serpentids
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Mechoid committed Oct 10, 2023
1 parent 948ae37 commit ebc98a7
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion code/modules/clothing/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions code/modules/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
)
..()
Expand Down Expand Up @@ -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))
)
Binary file added icons/mob/species/nabber/ears.dmi
Binary file not shown.
Binary file added icons/mob/species/nabber/monarch/ears.dmi
Binary file not shown.

0 comments on commit ebc98a7

Please sign in to comment.