Merge branch 'themostextreme' of https://github.com/Nerev4r/DopplerShift

into themostextreme
DopplerShift13 · Sep 22, 2024 · 85eb1f9 · 85eb1f9
2 parents 0b3239e + 91a9330
commit 85eb1f9
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 33 deletions.
diff --git a/code/__HELPERS/~doppler_helpers/is_helpers.dm b/code/__HELPERS/~doppler_helpers/is_helpers.dm
diff --git a/...r_doppler/sprite_accessories/code/hair.dm → ...ar_customization/accessories/code/hair.dm b/...r_doppler/sprite_accessories/code/hair.dm → ...ar_customization/accessories/code/hair.dm
@@ -1,7 +1,7 @@
 // Hairstyles
 
 /datum/sprite_accessory/hair/modular
-	icon = 'modular_doppler/sprite_accessories/icons/hair.dmi'
+	icon = 'modular_doppler/modular_customization/accessories/icons/hair.dmi'
 
 /datum/sprite_accessory/hair/modular/pigtails4
 	name = "Pigtails 4"
@@ -654,7 +654,7 @@
 // Facial hair
 
 /datum/sprite_accessory/facial_hair/modular
-	icon = 'modular_doppler/sprite_accessories/icons/facialhair.dmi'
+	icon = 'modular_doppler/modular_customization/accessories/icons/facialhair.dmi'
 
 /datum/sprite_accessory/facial_hair/modular/sideburns
 	name = "Sideburns"

diff --git a/...r/sprite_accessories/icons/facialhair.dmi → ...mization/accessories/icons/facialhair.dmi b/...r/sprite_accessories/icons/facialhair.dmi → ...mization/accessories/icons/facialhair.dmi
diff --git a/...doppler/sprite_accessories/icons/hair.dmi → ..._customization/accessories/icons/hair.dmi b/...doppler/sprite_accessories/icons/hair.dmi → ..._customization/accessories/icons/hair.dmi
diff --git a/...r_doppler/sprite_accessories/code/eyes.dm → ...lar_customization/organs/internal/eyes.dm b/...r_doppler/sprite_accessories/code/eyes.dm → ...lar_customization/organs/internal/eyes.dm
diff --git a/tgstation.dme b/tgstation.dme
@@ -6617,6 +6617,7 @@
 #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_under.dm"
 #include "modular_doppler\modular_crafting\code\crafting_extended.dm"
 #include "modular_doppler\modular_crafting\code\sheet_types.dm"
+#include "modular_doppler\modular_customization\accessories\code\hair.dm"
 #include "modular_doppler\modular_customization\accessories\code\aquatic_accessories\aquatic_body_markings.dm"
 #include "modular_doppler\modular_customization\accessories\code\aquatic_accessories\aquatic_ears.dm"
 #include "modular_doppler\modular_customization\accessories\code\aquatic_accessories\aquatic_snout.dm"
@@ -6673,6 +6674,7 @@
 #include "modular_doppler\modular_customization\organs\external\tail.dm"
 #include "modular_doppler\modular_customization\organs\external\wings.dm"
 #include "modular_doppler\modular_customization\organs\internal\ears.dm"
+#include "modular_doppler\modular_customization\organs\internal\eyes.dm"
 #include "modular_doppler\modular_customization\preferences\antennae.dm"
 #include "modular_doppler\modular_customization\preferences\body_marking_lizard.dm"
 #include "modular_doppler\modular_customization\preferences\body_marking_moth.dm"
@@ -6768,8 +6770,6 @@
 #include "modular_doppler\religion\code\chaplain.dm"
 #include "modular_doppler\religion\code\mind.dm"
 #include "modular_doppler\religion\code\religious_sects.dm"
-#include "modular_doppler\sprite_accessories\code\eyes.dm"
-#include "modular_doppler\sprite_accessories\code\hair.dm"
 #include "modular_doppler\stone\code\ore_veins.dm"
 #include "modular_doppler\stone\code\stone.dm"
 #include "modular_doppler\tableflip\tableflip.dm"