diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/ears.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/ears.dm new file mode 100644 index 0000000000..9097963fb6 --- /dev/null +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/ears.dm @@ -0,0 +1,27 @@ +//GS13 - markings, ported or our own (preferably mark where you took them from) +//I don't know why these need both mam_ears and human variants, because some other ear datums just work fine without that?? +//It didn't want to show up otherwise so I'll keep it as that + +/datum/sprite_accessory/ears/mam_ears/dragon //ported from Virgo + name = "Dragon" + icon = 'GainStation13/icons/mob/markings/mam_ears.dmi' + icon_state = "dragon" + +/datum/sprite_accessory/ears/human/dragon //ported from Virgo + name = "Dragon" + icon = 'GainStation13/icons/mob/markings/mam_ears.dmi' + icon_state = "dragon" + +/datum/sprite_accessory/ears/mam_ears/avali + name = "Avali" + icon_state = "avali" + icon = 'GainStation13/icons/mob/markings/mam_ears.dmi' + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/ears/human/avali + name = "Avali" + icon_state = "avali" + icon = 'GainStation13/icons/mob/markings/mam_ears.dmi' + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/frills.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/frills.dm new file mode 100644 index 0000000000..f25748e7ce --- /dev/null +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/frills.dm @@ -0,0 +1,22 @@ +//GS13 - markings, ported or our own (preferably mark where you took them from) + +/datum/sprite_accessory/frills/cobra + name = "Cobra Hood" + icon_state = "cobrahood" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + icon = 'hyperstation/icons/mob/snek.dmi' + +/datum/sprite_accessory/frills/cobraslim + name = "Narrow Cobra Hood" + icon_state = "cobraslim" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + icon = 'hyperstation/icons/mob/snek.dmi' + +/datum/sprite_accessory/frills/cobrahood_alt + name = "Cobra Hood - Alt" + icon_state = "cobrahood_alt" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + icon = 'hyperstation/icons/mob/snek.dmi' diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_face.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_face.dm new file mode 100644 index 0000000000..f0575e50f0 --- /dev/null +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_face.dm @@ -0,0 +1 @@ +//GS13 - markings, ported or our own (preferably mark where you took them from) diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm new file mode 100644 index 0000000000..f0575e50f0 --- /dev/null +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm @@ -0,0 +1 @@ +//GS13 - markings, ported or our own (preferably mark where you took them from) diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/horns.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/horns.dm new file mode 100644 index 0000000000..f0575e50f0 --- /dev/null +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/horns.dm @@ -0,0 +1 @@ +//GS13 - markings, ported or our own (preferably mark where you took them from) diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/ipc_synths.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/ipc_synths.dm new file mode 100644 index 0000000000..f0575e50f0 --- /dev/null +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/ipc_synths.dm @@ -0,0 +1 @@ +//GS13 - markings, ported or our own (preferably mark where you took them from) diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm new file mode 100644 index 0000000000..e2ab27aad4 --- /dev/null +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm @@ -0,0 +1,48 @@ +//GS13 - markings, ported or our own (preferably mark where you took them from) + + +/datum/sprite_accessory/taur/gator //ported from Vorestation + name = "Gator" + icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' + icon_state = "gator" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/taur/fatdrake //ported from Vorestation + name = "Fat Drake" + icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' + icon_state = "fatdrake" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/taur/fatwolf //ported from Vorestation + name = "Fat Wolf" + icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' + icon_state = "fatwolf" + color_src = MUTCOLORS + +/datum/sprite_accessory/taur/fatliz //ported from Vorestation + name = "Fat Lizard" + icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' + icon_state = "fatliz" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/taur/longtailfluff //ported from Vorestation + name = "Long Fluffy Tail" + icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' + icon_state = "longtailfluff" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/taur/fatsynthwolf //ported from Vorestation + name = "Fat Synth Wolf" + icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' + icon_state = "fatsynthwolf" + color_src = MUTCOLORS + +/datum/sprite_accessory/taur/bigleggies //ported from Vorestation + name = "Big Leggies" + icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' + icon_state = "bigleggy" + color_src = MUTCOLORS diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm new file mode 100644 index 0000000000..40fb7df37f --- /dev/null +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm @@ -0,0 +1,8 @@ +//GS13 - markings, ported or our own (preferably mark where you took them from) + +/datum/sprite_accessory/snouts/mam_snouts/hjackal + name = "Jackal" + icon = 'GainStation13/icons/mob/markings/mam_snouts.dmi' + icon_state = "hjackal" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/synthliz.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/synthliz.dm new file mode 100644 index 0000000000..f0575e50f0 --- /dev/null +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/synthliz.dm @@ -0,0 +1 @@ +//GS13 - markings, ported or our own (preferably mark where you took them from) diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/tails.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/tails.dm new file mode 100644 index 0000000000..f0575e50f0 --- /dev/null +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/tails.dm @@ -0,0 +1 @@ +//GS13 - markings, ported or our own (preferably mark where you took them from) diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/wings.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/wings.dm new file mode 100644 index 0000000000..f0575e50f0 --- /dev/null +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/wings.dm @@ -0,0 +1 @@ +//GS13 - markings, ported or our own (preferably mark where you took them from) diff --git a/GainStation13/icons/mob/markings/ipc_antennas.dmi b/GainStation13/icons/mob/markings/ipc_antennas.dmi new file mode 100644 index 0000000000..9f20aa4429 Binary files /dev/null and b/GainStation13/icons/mob/markings/ipc_antennas.dmi differ diff --git a/GainStation13/icons/mob/markings/ipc_screens.dmi b/GainStation13/icons/mob/markings/ipc_screens.dmi new file mode 100644 index 0000000000..c7d44da5a8 Binary files /dev/null and b/GainStation13/icons/mob/markings/ipc_screens.dmi differ diff --git a/GainStation13/icons/mob/markings/mam_ears.dmi b/GainStation13/icons/mob/markings/mam_ears.dmi new file mode 100644 index 0000000000..ceffc09310 Binary files /dev/null and b/GainStation13/icons/mob/markings/mam_ears.dmi differ diff --git a/GainStation13/icons/mob/markings/mam_markings.dmi b/GainStation13/icons/mob/markings/mam_markings.dmi new file mode 100644 index 0000000000..f4195d7ba3 Binary files /dev/null and b/GainStation13/icons/mob/markings/mam_markings.dmi differ diff --git a/GainStation13/icons/mob/markings/mam_snouts.dmi b/GainStation13/icons/mob/markings/mam_snouts.dmi new file mode 100644 index 0000000000..78adeedc40 Binary files /dev/null and b/GainStation13/icons/mob/markings/mam_snouts.dmi differ diff --git a/GainStation13/icons/mob/markings/mam_tails.dmi b/GainStation13/icons/mob/markings/mam_tails.dmi new file mode 100644 index 0000000000..583772d842 Binary files /dev/null and b/GainStation13/icons/mob/markings/mam_tails.dmi differ diff --git a/GainStation13/icons/mob/markings/mam_taur.dmi b/GainStation13/icons/mob/markings/mam_taur.dmi new file mode 100644 index 0000000000..3b6ed4bcfa Binary files /dev/null and b/GainStation13/icons/mob/markings/mam_taur.dmi differ diff --git a/GainStation13/icons/mob/markings/markings_notmammals.dmi b/GainStation13/icons/mob/markings/markings_notmammals.dmi new file mode 100644 index 0000000000..157c02d656 Binary files /dev/null and b/GainStation13/icons/mob/markings/markings_notmammals.dmi differ diff --git a/GainStation13/icons/mob/markings/mutant_bodyparts.dmi b/GainStation13/icons/mob/markings/mutant_bodyparts.dmi new file mode 100644 index 0000000000..99f4f83d17 Binary files /dev/null and b/GainStation13/icons/mob/markings/mutant_bodyparts.dmi differ diff --git a/GainStation13/icons/mob/markings/taur_canine.dmi b/GainStation13/icons/mob/markings/taur_canine.dmi new file mode 100644 index 0000000000..85b3d19882 Binary files /dev/null and b/GainStation13/icons/mob/markings/taur_canine.dmi differ diff --git a/GainStation13/icons/mob/markings/taur_hooved.dmi b/GainStation13/icons/mob/markings/taur_hooved.dmi new file mode 100644 index 0000000000..fc50161862 Binary files /dev/null and b/GainStation13/icons/mob/markings/taur_hooved.dmi differ diff --git a/GainStation13/icons/mob/markings/taur_naga.dmi b/GainStation13/icons/mob/markings/taur_naga.dmi new file mode 100644 index 0000000000..48a51d734a Binary files /dev/null and b/GainStation13/icons/mob/markings/taur_naga.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 322f354d00..028f44d476 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4000,6 +4000,17 @@ #include "GainStation13\code\modules\loadout\tablet.dm" #include "GainStation13\code\modules\mapping\areas.dm" #include "GainStation13\code\modules\mapping\ghost_roles.dm" +#include "GainStation13\code\modules\mob\dead\new_player\sprite_accessories\ears.dm" +#include "GainStation13\code\modules\mob\dead\new_player\sprite_accessories\frills.dm" +#include "GainStation13\code\modules\mob\dead\new_player\sprite_accessories\hair_face.dm" +#include "GainStation13\code\modules\mob\dead\new_player\sprite_accessories\hair_head.dm" +#include "GainStation13\code\modules\mob\dead\new_player\sprite_accessories\horns.dm" +#include "GainStation13\code\modules\mob\dead\new_player\sprite_accessories\ipc_synths.dm" +#include "GainStation13\code\modules\mob\dead\new_player\sprite_accessories\legs_and_taurs.dm" +#include "GainStation13\code\modules\mob\dead\new_player\sprite_accessories\snouts.dm" +#include "GainStation13\code\modules\mob\dead\new_player\sprite_accessories\synthliz.dm" +#include "GainStation13\code\modules\mob\dead\new_player\sprite_accessories\tails.dm" +#include "GainStation13\code\modules\mob\dead\new_player\sprite_accessories\wings.dm" #include "GainStation13\code\modules\mob\living\belly.dm" #include "GainStation13\code\modules\mob\living\emote.dm" #include "GainStation13\code\modules\mob\living\emote_modular.dm"