From 3cc9921afdc65e2bf76f7f2af7648bfb83179d18 Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:37:31 +0200 Subject: [PATCH 1/2] moves the broken xeno domes from ears to hair, and fixes them --- citadel.dme | 1 - .../sprite_accessories/ears/xenomorph.dm | 22 ------------------- .../hair/species/xenomorph.dm | 22 +++++++++++++++++++ 3 files changed, 22 insertions(+), 23 deletions(-) delete mode 100644 code/modules/sprite_accessories/ears/xenomorph.dm diff --git a/citadel.dme b/citadel.dme index 15d9dad0a07d..31f46e8f17eb 100644 --- a/citadel.dme +++ b/citadel.dme @@ -4805,7 +4805,6 @@ #include "code\modules\sprite_accessories\ears\antenna.dm" #include "code\modules\sprite_accessories\ears\horns.dm" #include "code\modules\sprite_accessories\ears\misc.dm" -#include "code\modules\sprite_accessories\ears\xenomorph.dm" #include "code\modules\sprite_accessories\ears\animal\avian.dm" #include "code\modules\sprite_accessories\ears\animal\bee.dm" #include "code\modules\sprite_accessories\ears\animal\bovine.dm" diff --git a/code/modules/sprite_accessories/ears/xenomorph.dm b/code/modules/sprite_accessories/ears/xenomorph.dm deleted file mode 100644 index bc2bdec00515..000000000000 --- a/code/modules/sprite_accessories/ears/xenomorph.dm +++ /dev/null @@ -1,22 +0,0 @@ -/datum/sprite_accessory/ears/xenohead - name = "Xenomorph Drone dome" - id = "ears_xeno_drone" - icon = "icons/mob/sprite_accessories/xeno_parts.dmi" - icon_state = "xenohead_standard" - do_colouration = 1 - legacy_use_additive_color_matrix = FALSE - -/datum/sprite_accessory/ears/xenohead/royal - name = "Xenomorph Royal dome" - id = "ears_xeno_royal" - icon_state = "xenohead_royal" - -/datum/sprite_accessory/ears/xenohead/warrior - name = "Xenomorph Warrior dome" - id = "ears_xeno_warrior" - icon_state = "xenohead_warrior" - -/datum/sprite_accessory/ears/xenohead/net - name = "Xenomorph Net dome" - id = "ears_xeno_net" - icon_state = "xenohead_net" diff --git a/code/modules/sprite_accessories/hair/species/xenomorph.dm b/code/modules/sprite_accessories/hair/species/xenomorph.dm index 78f3c71cf7a3..d46ec41edfec 100644 --- a/code/modules/sprite_accessories/hair/species/xenomorph.dm +++ b/code/modules/sprite_accessories/hair/species/xenomorph.dm @@ -56,3 +56,25 @@ species_allowed = list(SPECIES_XENOHYBRID) random_generation_gender = null +/datum/sprite_accessory/hair/xenohead + name = "Xenomorph Drone dome" + id = "ears_xeno_drone" + icon = 'icons/mob/sprite_accessories/xeno_parts.dmi' + icon_state = "xenohead_standard" + do_colouration = 1 + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/hair/xenohead/royal + name = "Xenomorph Royal dome" + id = "ears_xeno_royal" + icon_state = "xenohead_royal" + +/datum/sprite_accessory/hair/xenohead/warrior + name = "Xenomorph Warrior dome" + id = "ears_xeno_warrior" + icon_state = "xenohead_warrior" + +/datum/sprite_accessory/hair/xenohead/net + name = "Xenomorph Net dome" + id = "ears_xeno_net" + icon_state = "xenohead_net" From 36b5ff6670ce5c436202e5094c2248508e24179f Mon Sep 17 00:00:00 2001 From: LordME <58342752+TheLordME@users.noreply.github.com> Date: Mon, 23 Sep 2024 18:49:02 +0200 Subject: [PATCH 2/2] fixes the error on the xenodomes --- code/modules/sprite_accessories/hair/species/xenomorph.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/sprite_accessories/hair/species/xenomorph.dm b/code/modules/sprite_accessories/hair/species/xenomorph.dm index d46ec41edfec..d4d6f62ad36c 100644 --- a/code/modules/sprite_accessories/hair/species/xenomorph.dm +++ b/code/modules/sprite_accessories/hair/species/xenomorph.dm @@ -60,6 +60,7 @@ name = "Xenomorph Drone dome" id = "ears_xeno_drone" icon = 'icons/mob/sprite_accessories/xeno_parts.dmi' + icon_add_legacy = null icon_state = "xenohead_standard" do_colouration = 1 legacy_use_additive_color_matrix = FALSE