diff --git a/code/modules/vore/resizing/holder_micro_ch.dm b/code/modules/vore/resizing/holder_micro_ch.dm index 7fdf4be115..84774c0a9f 100644 --- a/code/modules/vore/resizing/holder_micro_ch.dm +++ b/code/modules/vore/resizing/holder_micro_ch.dm @@ -5,7 +5,7 @@ /obj/item/weapon/holder/micro/Initialize(mapload, mob/held) . = ..() var/mob/living/carbon/human/H = held_mob - if(istype(H) && H.species.name == SPECIES_TESHARI) + if(istype(H) && H.species.get_bodytype() == SPECIES_TESHARI) item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_toys_yw.dmi', slot_r_hand_str = 'icons/mob/items/righthand_toys_yw.dmi', @@ -22,8 +22,8 @@ /obj/item/weapon/holder/micro/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer,var/icon/clip_mask = null) var/mob/living/carbon/human/H = held_mob - // Only proceed if dealing with a tesh - if(istype(H) && H.species.name == SPECIES_TESHARI) + // Only proceed if dealing with a tesh (or something shaped like a tesh) + if(istype(H) && H.species.get_bodytype() == SPECIES_TESHARI) var/colortemp = color //save original color var to a temp var //convert numerical RGB to Hex #000000 format - is this necessary? //then 'inject' changed color (from skin color) into original proc call diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/teshari.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/teshari.dm index 1c5a7ba8e1..05051aee64 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/teshari.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/teshari.dm @@ -9,8 +9,8 @@ var/mob/living/carbon/human/DraggedH = src - //make sure src (the dragged) is a teshari - if(DraggedH.species.name == SPECIES_TESHARI) + //make sure src (the dragged) is a teshari (or shaped like one) + if(DraggedH.species.get_bodytype() == SPECIES_TESHARI) var/mob/living/M = over_object // only perform the grab if; grabber and grabbed adjacent, caller is grabbed OR grabber, and the grabbed's grab preference is true. if(holder_type && istype(M) && Adjacent(M) && (usr == M || usr == DraggedH) && DraggedH != M && !M.incapacitated() && DraggedH.pickup_pref && (M != usr || (M == usr && M.pickup_active)) && (DraggedH.a_intent == I_HELP && M.a_intent == I_HELP)) //VOREStation Edit @@ -23,7 +23,7 @@ /obj/structure/plasticflaps/CanPass(atom/A, turf/T) var/mob/living/carbon/human/H = A if(istype(H)) - if(H.species.name == SPECIES_TESHARI) + if(H.species.get_bodytype() == SPECIES_TESHARI) return 1 return ..() \ No newline at end of file