Merge remote-tracking branch 'origin/master' into HEAD

modular_bandastation/modular_bandastation.dme

@@ -42,6 +42,7 @@
 #include "automatic_crew_transfer/_automatic_crew_transfer.dme"
 #include "outfits/_outfits.dme"
 #include "overrides/_overrides.dme"
+#include "species/_species.dme"
 
 
 // --- PRIME --- //

modular_bandastation/species/_species.dm

@@ -0,0 +1,4 @@
+/datum/modpack/species
+	name = "Species"
+	desc = "Добавление архитектуры для новых видов и конфигурирования существующих."
+	author = "Podvaldeda"

modular_bandastation/species/_species.dme

@@ -0,0 +1,3 @@
+#include "_species.dm"
+
+#include "code/lizardperson/sprite_accesories/hair.dm"

modular_bandastation/species/code/lizardperson/sprite_accesories/hair.dm

@@ -0,0 +1,116 @@
+// MARK: Frills
+/datum/sprite_accessory/frills/divinity
+	name = "Divinity"
+	icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi'
+	icon_state = "divinity"
+
+/datum/sprite_accessory/frills/horns
+	name = "Horns"
+	icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi'
+	icon_state = "horns"
+
+/datum/sprite_accessory/frills/hornsdouble
+	name = "Horns Double"
+	icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi'
+	icon_state = "hornsdouble"
+
+/datum/sprite_accessory/frills/big
+	name = "Big"
+	icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi'
+	icon_state = "big"
+
+/datum/sprite_accessory/frills/cobrahood
+	name = "Cobrahood"
+	icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi'
+	icon_state = "cobrahood"
+
+/datum/sprite_accessory/frills/cobraears
+	name = "Cobraears"
+	icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi'
+	icon_state = "cobraears"
+
+/datum/sprite_accessory/frills/neck
+	name = "Neck"
+	icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi'
+	icon_state = "neck"
+
+/datum/sprite_accessory/frills/neckfull
+	name = "Neck Full"
+	icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi'
+	icon_state = "neckfull"
+
+/datum/sprite_accessory/frills/cobraslim
+	name = "Cobraslim"
+	icon = 'modular_bandastation/species/icons/lizardperson/frills.dmi'
+	icon_state = "cobraslim"
+
+// MARK: Horns
+/datum/sprite_accessory/horns/guilmon
+	name = "Guilmon"
+	icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi'
+	icon_state = "guilmon"
+
+/datum/sprite_accessory/horns/drake
+	name = "Drake"
+	icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi'
+	icon_state = "drake"
+
+/datum/sprite_accessory/horns/knight
+	name = "Knight"
+	icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi'
+	icon_state = "knight"
+
+/datum/sprite_accessory/horns/uni
+	name = "Uni"
+	icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi'
+	icon_state = "uni"
+
+/datum/sprite_accessory/horns/oni
+	name = "Oni"
+	icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi'
+	icon_state = "oni"
+
+/datum/sprite_accessory/horns/onilarge
+	name = "Oni Large"
+	icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi'
+	icon_state = "onilarge"
+
+/datum/sprite_accessory/horns/broken
+	name = "Broken"
+	icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi'
+	icon_state = "broken"
+
+/datum/sprite_accessory/horns/rbroken
+	name = "Right Broken"
+	icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi'
+	icon_state = "rbroken"
+
+/datum/sprite_accessory/horns/lbroken
+	name = "Left Broken"
+	icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi'
+	icon_state = "lbroken"
+
+/datum/sprite_accessory/horns/dragon
+	name = "Dragon"
+	icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi'
+	icon_state = "dragon"
+
+/datum/sprite_accessory/horns/lifted
+	name = "Lifted"
+	icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi'
+	icon_state = "lifted"
+
+/datum/sprite_accessory/horns/newcurly
+	name = "New Curly"
+	icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi'
+	icon_state = "newcurly"
+
+/datum/sprite_accessory/horns/upwardshorns
+	name = "Upwards Horns"
+	icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi'
+	icon_state = "upwardshorns"
+
+/datum/sprite_accessory/horns/sideswept
+	name = "Side Swept"
+	icon = 'modular_bandastation/species/icons/lizardperson/horns.dmi'
+	icon_state = "sideswept"