Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add: 5 new human hairstyle & centcomm cloaks #1222

Merged
merged 2 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions modular_ss220/clothing/code/suits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,18 @@
icon_state = "ntsc_uniform"
icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'

/obj/item/clothing/suit/space/deathsquad/officer/field/cloak_nt
name = "армированная мантия офицера флота Нанотрейзен"
desc = "Один из вариантов торжественного одеяния сотрудников Верховного Командования Нанотрейзен, подойдет для официальной встречи или важного вылета. Сшита из лёгкой и сверхпрочной ткани."
icon = 'modular_ss220/clothing/icons/object/cloaks.dmi'
icon_state = "ntsc_cloak"
icon_override = 'modular_ss220/clothing/icons/mob/cloaks.dmi'

/obj/item/clothing/suit/space/deathsquad/officer/field/cloak_nt/coat_nt
name = "полевой плащ офицера флота Нанотрейзен"
desc = "Парадный плащ нового образца, внедряемый на объектах компании в последнее время. Отличительной чертой является стоячий воротник и резаный подол. Невысокие показатели защиты нивелируются пафосом, источаемым этим плащом."
icon_state = "ntsc_coat"

/obj/item/clothing/suit/hooded/vi_arcane
name = "куртка Вай"
desc = "Слегка потрёпанный жакет боевой девчушки Вай."
Expand Down
Binary file modified modular_ss220/clothing/icons/mob/cloaks.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/cloaks.dmi
Binary file not shown.
145 changes: 88 additions & 57 deletions modular_ss220/hairs/code/human_hair.dm
Original file line number Diff line number Diff line change
Expand Up @@ -180,63 +180,6 @@
/datum/sprite_accessory/hair/longemo
species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin")

/datum/sprite_accessory/hair/butterfly
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Butterfly"
icon_state = "butterfly"
secondary_theme = "beads"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/cascading_long_bob
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Cascading Long Bob"
icon_state = "cascading_long_bob"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/jinshi
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Jinshi"
icon_state = "jinshi"
secondary_theme = "beads"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/long_strait
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Long Strait"
icon_state = "long_strait"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/pine
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Pine"
icon_state = "pine"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/short_bob
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Short Bob"
icon_state = "short_bob"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/waves_mid
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Waves Mid"
icon_state = "waves_mid"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/whim
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Whim"
icon_state = "whim"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/vulpkanin/tomahawk_spiker
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Tomahawk Spiker"
icon_state = "tomahawk_spiker"
species_allowed = list("Human", "Slime People")


//////////////////////////////
//////START VG HAIRSTYLES/////
//////////////////////////////
Expand Down Expand Up @@ -512,3 +455,91 @@

/datum/sprite_accessory/hair/long_curls_alt
species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin")

/* New human hair */
/datum/sprite_accessory/hair/hair_glammetal
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Glam Metal"
icon_state = "hair_glammetal"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/hair_undercut_fem_s
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Undercut Female"
icon_state = "hair_undercut_fem"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/hair_curtains
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Curtains"
icon_state = "hair_curtains"
species_allowed = list("Human", "Slime People")
glasses_over = 0

/datum/sprite_accessory/hair/hair_damsel
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Damsel"
icon_state = "hair_damsel"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/zone_s
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Zone"
icon_state = "zone"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/butterfly
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Butterfly"
icon_state = "butterfly"
secondary_theme = "beads"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/cascading_long_bob
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Cascading Long Bob"
icon_state = "cascading_long_bob"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/jinshi
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Jinshi"
icon_state = "jinshi"
secondary_theme = "beads"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/long_strait
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Long Strait"
icon_state = "long_strait"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/pine
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Pine"
icon_state = "pine"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/short_bob
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Short Bob"
icon_state = "short_bob"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/waves_mid
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Waves Mid"
icon_state = "waves_mid"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/whim
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Whim"
icon_state = "whim"
species_allowed = list("Human", "Slime People")

/datum/sprite_accessory/hair/vulpkanin/tomahawk_spiker
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Tomahawk Spiker"
icon_state = "tomahawk_spiker"
species_allowed = list("Human", "Slime People")
Binary file modified modular_ss220/hairs/icons/human_hair.dmi
Binary file not shown.
Loading