From dc63daf73df111e1eccaa554f3042e6ee3f9c00a Mon Sep 17 00:00:00 2001 From: SandPoot <43283559+SandPoot@users.noreply.github.com> Date: Sat, 6 Nov 2021 14:46:28 -0300 Subject: [PATCH] Adds demon tail (#191) --- .../dead/new_player/sprite_accessories/antenna.dm | 4 ++-- .../sprite_accessories/body_markings.dm | 5 ++--- .../dead/new_player/sprite_accessories/ears.dm | 6 ++---- .../dead/new_player/sprite_accessories/frills.dm | 5 +++-- .../dead/new_player/sprite_accessories/tails.dm | 11 +++++++++++ modular_sand/icons/mob/mam_tails.dmi | Bin 0 -> 388 bytes tgstation.dme | 1 + 7 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 modular_sand/code/modules/mob/dead/new_player/sprite_accessories/tails.dm create mode 100644 modular_sand/icons/mob/mam_tails.dmi diff --git a/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/antenna.dm b/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/antenna.dm index 5f54ac7ccd..9c9efee78f 100644 --- a/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/antenna.dm +++ b/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/antenna.dm @@ -1,13 +1,13 @@ /datum/sprite_accessory/antenna/synthliz/cobrahood name = "Synthetic Lizard - Cobra Hood" - icon_state = "cobrahood" icon = 'modular_sand/icons/mob/antenna.dmi' + icon_state = "cobrahood" color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN /datum/sprite_accessory/antenna/synthliz/cobrahoodears name = "Synthetic Lizard - Cobra Hood (Ears)" - icon_state = "cobraears" icon = 'modular_sand/icons/mob/antenna.dmi' + icon_state = "cobraears" color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN diff --git a/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm b/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm index f77aeaaca2..843470c583 100644 --- a/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm +++ b/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm @@ -1,6 +1,5 @@ /datum/sprite_accessory/mam_body_markings/colorbelly name = "Coloured Belly" - color_src = MATRIXED - icon_state = "colorbelly" icon = 'modular_sand/icons/mob/skyrat_markings.dmi' - matrixed_sections = MATRIX_GREEN + icon_state = "colorbelly" + covered_limbs = list("Chest" = MATRIX_GREEN) diff --git a/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/ears.dm b/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/ears.dm index 5f61f606d4..ae41189936 100644 --- a/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/ears.dm +++ b/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/ears.dm @@ -1,13 +1,11 @@ /datum/sprite_accessory/ears/mam_ears/cobrahood name = "Cobra Hood" - icon_state = "cobrahood" icon = 'modular_sand/icons/mob/mam_ears.dmi' - color_src = MATRIXED + icon_state = "cobrahood" matrixed_sections = MATRIX_RED_GREEN /datum/sprite_accessory/ears/mam_ears/cobrahoodears name = "Cobra Hood (Ears)" - icon_state = "cobraears" icon = 'modular_sand/icons/mob/mam_ears.dmi' - color_src = MATRIXED + icon_state = "cobraears" matrixed_sections = MATRIX_RED_GREEN diff --git a/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/frills.dm b/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/frills.dm index 34400292e3..d5131e8d55 100644 --- a/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/frills.dm +++ b/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/frills.dm @@ -1,12 +1,13 @@ /datum/sprite_accessory/frills/cobrahood name = "Cobra Hood" - icon_state = "cobrahood" icon = 'modular_sand/icons/mob/frills.dmi' + icon_state = "cobrahood" color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN + /datum/sprite_accessory/frills/cobrahoodears name = "Cobra Hood (Ears)" - icon_state = "cobraears" icon = 'modular_sand/icons/mob/frills.dmi' + icon_state = "cobraears" color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN diff --git a/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/tails.dm b/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/tails.dm new file mode 100644 index 0000000000..9465fc210f --- /dev/null +++ b/modular_sand/code/modules/mob/dead/new_player/sprite_accessories/tails.dm @@ -0,0 +1,11 @@ +/datum/sprite_accessory/tails/mam_tails/demon_spade + name = "Demon Spade" + icon = 'modular_sand/icons/mob/mam_tails.dmi' + icon_state = "demonspade" + matrixed_sections = MATRIX_RED + +/datum/sprite_accessory/tails_animated/mam_tails_animated/demon_spade + name = "Demon Spade" + icon = 'modular_sand/icons/mob/mam_tails.dmi' + icon_state = "demonspade" + matrixed_sections = MATRIX_RED diff --git a/modular_sand/icons/mob/mam_tails.dmi b/modular_sand/icons/mob/mam_tails.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c0fa5d349ebfdaf4b4a2e5eb44caa6b3f3a1b95a GIT binary patch literal 388 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?K3?%mjbVdLv&H$efS0Mc#D8j(7B7LG5ki%FK zaK~d@VFTn*Lzdq6O*3~+9=6vvm zP=kxc4<6~9_t8AbP}I}A!@@Yo__DE=!kkBwj!X(s2-Y;;r($TVZl`K$Zohtqf}yJE zJ>3)c^<6rtwP77Z?xmDO#yDodGXw2W3 z1B}cJGap5$O5BeA2XtGnr;B4qL~C+_1nc4i0cLh5E;WIm1r8gV*qA=~wD2gba0qH> zUbP0l+XkK^gV*= literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index bc64df5842..68e172c82f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3966,6 +3966,7 @@ #include "modular_sand\code\modules\mob\dead\new_player\sprite_accessories\body_markings.dm" #include "modular_sand\code\modules\mob\dead\new_player\sprite_accessories\ears.dm" #include "modular_sand\code\modules\mob\dead\new_player\sprite_accessories\frills.dm" +#include "modular_sand\code\modules\mob\dead\new_player\sprite_accessories\tails.dm" #include "modular_sand\code\modules\mob\dead\observer\observer.dm" #include "modular_sand\code\modules\mob\living\combat_indicator.dm" #include "modular_sand\code\modules\mob\living\emote.dm"