Merge branch 'master' into translate

ss220club · Nov 23, 2024 · 7291eed · 7291eed
2 parents 8a72da6 + f973a07
commit 7291eed
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 0 deletions.
diff --git a/modular_ss220/hairs/code/human_hair.dm b/modular_ss220/hairs/code/human_hair.dm
@@ -693,3 +693,53 @@
 	icon_state = "punk_lying"
 	secondary_theme = "acs"
 	species_allowed = list("Human", "Slime People", "Tajaran")
+
+/datum/sprite_accessory/hair/halfshave
+	icon = 'modular_ss220/hairs/icons/human_hair.dmi'
+	name = "Halfshave"
+	icon_state = "halfshave"
+	species_allowed = list("Human", "Slime People", "Tajaran")
+
+/datum/sprite_accessory/hair/ruby
+	icon = 'modular_ss220/hairs/icons/human_hair.dmi'
+	name = "Ruby"
+	icon_state = "ruby"
+	species_allowed = list("Human", "Slime People", "Tajaran")
+
+/datum/sprite_accessory/hair/long_flipped
+	icon = 'modular_ss220/hairs/icons/human_hair.dmi'
+	name = "Long Flipped"
+	icon_state = "long_flipped"
+	species_allowed = list("Human", "Slime People", "Tajaran")
+
+/datum/sprite_accessory/hair/himeup
+	icon = 'modular_ss220/hairs/icons/human_hair.dmi'
+	name = "Hime Big Ponytail"
+	icon_state = "himeup"
+	species_allowed = list("Human", "Slime People", "Tajaran")
+
+/datum/sprite_accessory/hair/rosemary
+	icon = 'modular_ss220/hairs/icons/human_hair.dmi'
+	name = "Rosemary"
+	icon_state = "rosemary"
+	secondary_theme = "acs"
+	species_allowed = list("Human", "Slime People", "Tajaran")
+
+/datum/sprite_accessory/hair/slimetendrils
+	icon = 'modular_ss220/hairs/icons/human_hair.dmi'
+	name = "Slimetendrils"
+	icon_state = "slimetendrils"
+	species_allowed = list("Slime People")
+
+/datum/sprite_accessory/hair/country
+	icon = 'modular_ss220/hairs/icons/human_hair.dmi'
+	name = "Country"
+	icon_state = "country"
+	secondary_theme = "acs"
+	species_allowed = list("Human", "Slime People", "Tajaran")
+
+/datum/sprite_accessory/hair/jinx
+	icon = 'modular_ss220/hairs/icons/human_hair.dmi'
+	name = "Jinx"
+	icon_state = "jinx"
+	species_allowed = list("Human", "Slime People", "Tajaran")
diff --git a/modular_ss220/hairs/code/vulpkanin_hair.dm b/modular_ss220/hairs/code/vulpkanin_hair.dm
@@ -217,3 +217,8 @@
 	icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi'
 	name = "Braids"
 	icon_state = "braids"
+
+/datum/sprite_accessory/hair/vulpkanin/long_bedhead
+	icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi'
+	name = "Long Bedhead"
+	icon_state = "long_bedhead"
diff --git a/modular_ss220/hairs/icons/human_hair.dmi b/modular_ss220/hairs/icons/human_hair.dmi
diff --git a/modular_ss220/hairs/icons/vulpkanin_hair.dmi b/modular_ss220/hairs/icons/vulpkanin_hair.dmi
diff --git a/modular_ss220/species/code/mob/new_player/sprite_accessories/nucleation/nucleation_face.dm b/modular_ss220/species/code/mob/new_player/sprite_accessories/nucleation/nucleation_face.dm
@@ -30,3 +30,23 @@
 /datum/sprite_accessory/hair/nucleation/nuc_neutron
 	name = "Nucleation Neutron Bomb"
 	icon_state = "neutron"
+
+/datum/sprite_accessory/hair/nucleation/nuc_duelist
+	name = "Nucleation Crystalized Duelist"
+	icon_state = "duelist"
+
+/datum/sprite_accessory/hair/nucleation/nuc_psalad
+	name = "Nucleation Crystalized Psalad"
+	icon_state = "psalad"
+
+/datum/sprite_accessory/hair/nucleation/nuc_punk
+	name = "Nucleation Crystalized Punk"
+	icon_state = "punk"
+
+/datum/sprite_accessory/hair/nucleation/nuc_rows
+	name = "Nucleation Crystalized Rows"
+	icon_state = "rows"
+
+/datum/sprite_accessory/hair/nucleation/nuc_ziegler
+	name = "Nucleation Crystalized Ziegler"
+	icon_state = "ziegler"
diff --git a/modular_ss220/species/icons/mob/sprite_accessories/nucleation/nucleation_face.dmi b/modular_ss220/species/icons/mob/sprite_accessories/nucleation/nucleation_face.dmi