diff --git a/modular_splurt/code/modules/clothing/kinkyclothes.dm b/modular_splurt/code/modules/clothing/kinkyclothes.dm index a2bcaee4f6..4707c98cce 100644 --- a/modular_splurt/code/modules/clothing/kinkyclothes.dm +++ b/modular_splurt/code/modules/clothing/kinkyclothes.dm @@ -114,7 +114,10 @@ icon_state = "vaultsuit" mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi' item_state = "b_suit" + item_state = "b_suit" can_adjust = FALSE + anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/uniform_digi.dmi' + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_ALL_TAURIC var/firstpickup = TRUE var/pickupsound = TRUE diff --git a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/tails.dm b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/tails.dm index f08fba7584..4bc73fc724 100644 --- a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/tails.dm +++ b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/tails.dm @@ -235,6 +235,20 @@ icon_state = "fluffy" color_src = MUTCOLORS +/datum/sprite_accessory/tails/mam_tails/nightstalker + name = "Nightstalker" + icon_state = "nightstalker" + color_src = MATRIXED + icon = 'modular_splurt/icons/mob/mam_tails.dmi' + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/tails_animated/mam_tails_animated/nightstalker + name = "Nightstalker" + icon_state = "nightstalker" + color_src = MATRIXED + icon = 'modular_splurt/icons/mob/mam_tails.dmi' + matrixed_sections = MATRIX_RED_GREEN + //Lizard tails /datum/sprite_accessory/tails/lizard/tailmaw name = "Tailmaw" @@ -278,6 +292,20 @@ icon = 'modular_splurt/icons/mob/mam_tails.dmi' matrixed_sections = MATRIX_ALL +/datum/sprite_accessory/tails/lizard/nightstalker + name = "Nightstalker" + icon_state = "nightstalker" + color_src = MATRIXED + icon = 'modular_splurt/icons/mob/mam_tails.dmi' + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/tails_animated/lizard/nightstalker + name = "Nightstalker" + icon_state = "nightstalker" + color_src = MATRIXED + icon = 'modular_splurt/icons/mob/mam_tails.dmi' + matrixed_sections = MATRIX_RED_GREEN + //Human tails /datum/sprite_accessory/tails/human/deer name = "Deer" @@ -358,3 +386,17 @@ dimension_x = 64 center = TRUE color_src = MUTCOLORS + +/datum/sprite_accessory/tails/human/nightstalker + name = "Nightstalker" + icon_state = "nightstalker" + color_src = MATRIXED + icon = 'modular_splurt/icons/mob/mam_tails.dmi' + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/tails_animated/human/nightstalker + name = "Nightstalker" + icon_state = "nightstalker" + color_src = MATRIXED + icon = 'modular_splurt/icons/mob/mam_tails.dmi' + matrixed_sections = MATRIX_RED_GREEN diff --git a/modular_splurt/code/modules/mob/living/carbon/human/species_types/zombies2.dm b/modular_splurt/code/modules/mob/living/carbon/human/species_types/zombies2.dm index 53e887e98c..e812380fbc 100644 --- a/modular_splurt/code/modules/mob/living/carbon/human/species_types/zombies2.dm +++ b/modular_splurt/code/modules/mob/living/carbon/human/species_types/zombies2.dm @@ -1,3 +1,4 @@ +/* //striked out for now because I dont know what the fuck was planned here but this is breaking blood regain. /mob/living/carbon/human/handle_blood() if(iszombie(src)) //We're basically pudding pops. return @@ -8,7 +9,7 @@ var/obj/item/organ/heart/decayed_heart/decaying = getorgan(/obj/item/organ/heart/decayed_heart) if(decaying) . += "Current blood level: [blood_volume]/[BLOOD_VOLUME_MAXIMUM]." - + */ /datum/species/mammal/undead // takes 30% more damage but doesn't crit id = SPECIES_UMAMMAL diff --git a/modular_splurt/icons/mob/clothing/uniform_digi.dmi b/modular_splurt/icons/mob/clothing/uniform_digi.dmi index ce963b6af7..951d678785 100644 Binary files a/modular_splurt/icons/mob/clothing/uniform_digi.dmi and b/modular_splurt/icons/mob/clothing/uniform_digi.dmi differ diff --git a/modular_splurt/icons/mob/mam_tails.dmi b/modular_splurt/icons/mob/mam_tails.dmi index 4d4f4e6755..e2ec928443 100644 Binary files a/modular_splurt/icons/mob/mam_tails.dmi and b/modular_splurt/icons/mob/mam_tails.dmi differ