Merge pull request #722 from Moribun/Quick-Fix

Shakey Shakey my Tail is Snakey
This commit is contained in:
BongaTheProto
2023-01-30 14:19:30 -05:00
committed by GitHub
5 changed files with 47 additions and 1 deletions

View File

@@ -114,7 +114,10 @@
icon_state = "vaultsuit" icon_state = "vaultsuit"
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi' mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
item_state = "b_suit" item_state = "b_suit"
item_state = "b_suit"
can_adjust = FALSE 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/firstpickup = TRUE
var/pickupsound = TRUE var/pickupsound = TRUE

View File

@@ -235,6 +235,20 @@
icon_state = "fluffy" icon_state = "fluffy"
color_src = MUTCOLORS 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 //Lizard tails
/datum/sprite_accessory/tails/lizard/tailmaw /datum/sprite_accessory/tails/lizard/tailmaw
name = "Tailmaw" name = "Tailmaw"
@@ -278,6 +292,20 @@
icon = 'modular_splurt/icons/mob/mam_tails.dmi' icon = 'modular_splurt/icons/mob/mam_tails.dmi'
matrixed_sections = MATRIX_ALL 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 //Human tails
/datum/sprite_accessory/tails/human/deer /datum/sprite_accessory/tails/human/deer
name = "Deer" name = "Deer"
@@ -358,3 +386,17 @@
dimension_x = 64 dimension_x = 64
center = TRUE center = TRUE
color_src = MUTCOLORS 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

View File

@@ -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() /mob/living/carbon/human/handle_blood()
if(iszombie(src)) //We're basically pudding pops. if(iszombie(src)) //We're basically pudding pops.
return return
@@ -8,7 +9,7 @@
var/obj/item/organ/heart/decayed_heart/decaying = getorgan(/obj/item/organ/heart/decayed_heart) var/obj/item/organ/heart/decayed_heart/decaying = getorgan(/obj/item/organ/heart/decayed_heart)
if(decaying) if(decaying)
. += "Current blood level: [blood_volume]/[BLOOD_VOLUME_MAXIMUM]." . += "Current blood level: [blood_volume]/[BLOOD_VOLUME_MAXIMUM]."
*/
/datum/species/mammal/undead /datum/species/mammal/undead
// takes 30% more damage but doesn't crit // takes 30% more damage but doesn't crit
id = SPECIES_UMAMMAL id = SPECIES_UMAMMAL

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 30 KiB