diff --git a/citadel.dme b/citadel.dme index 8f4774d717d..a2a60b2f8eb 100644 --- a/citadel.dme +++ b/citadel.dme @@ -5659,6 +5659,7 @@ #include "code\modules\sprite_accessories\hair\species\vulpkanin.dm" #include "code\modules\sprite_accessories\hair\species\xenomorph.dm" #include "code\modules\sprite_accessories\markings\_markings.dm" +#include "code\modules\sprite_accessories\markings\body_parts.dm" #include "code\modules\sprite_accessories\markings\diona_stuff.dm" #include "code\modules\sprite_accessories\markings\eye_stuff.dm" #include "code\modules\sprite_accessories\markings\panda.dm" diff --git a/code/modules/sprite_accessories/ears/animal/leporid.dm b/code/modules/sprite_accessories/ears/animal/leporid.dm index b454b9c196a..223fe993a0e 100644 --- a/code/modules/sprite_accessories/ears/animal/leporid.dm +++ b/code/modules/sprite_accessories/ears/animal/leporid.dm @@ -23,7 +23,8 @@ name = "bunny 2, dual-color" id = "ears_bunny_colorable_2" icon_state = "bunny-alt" - extra_overlay = "bunny-alt-inner" + extra_overlay = "bunny-alt-left" + extra_overlay2 = "bunny-alt-inner" do_colouration = 1 legacy_use_additive_color_matrix = FALSE @@ -31,6 +32,7 @@ name = "bunny, colorable" id = "ears_bunny_colorable" icon_state = "bunny" + extra_overlay = "bunny-left" do_colouration = 1 legacy_use_additive_color_matrix = FALSE @@ -38,6 +40,7 @@ name = "floppy bunny ears (colorable)" id = "ears_bunny_floppy" icon_state = "floppy_bun" + extra_overlay = "floppy_bun_left" do_colouration = 1 legacy_use_additive_color_matrix = FALSE @@ -46,7 +49,8 @@ id = "ears_bunny_tall" icon = 'icons/mob/sprite_accessories/ears_32x64.dmi' icon_state = "bunny-tall" - extra_overlay = "bunny-tall-inner" + extra_overlay = "bunny-tall-left" + extra_overlay2 = "bunny-tall-inner" do_colouration = 1 legacy_use_additive_color_matrix = FALSE @@ -54,12 +58,14 @@ name = "bunny, white" id = "ears_bunny_white" icon_state = "bunny" + extra_overlay = "bunny-left" /datum/sprite_accessory/ears/rabbit_swept name = "Rabbit Ears (swept back)" id = "ears_rabbit_back" icon = 'icons/mob/sprite_accessories/ears_32x64.dmi' icon_state = "rabbit-swept" + extra_overlay = "rabbit-swept-left" do_colouration = 1 legacy_use_additive_color_matrix = FALSE @@ -67,5 +73,6 @@ name = "Swooped bunny ears (colorable)" id = "ears_bunny_swoop" icon_state = "swooped_bunny" + extra_overlay = "swooped_bunny_left" do_colouration = 1 legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/markings/body_parts.dm b/code/modules/sprite_accessories/markings/body_parts.dm new file mode 100644 index 00000000000..4c31d5c0b38 --- /dev/null +++ b/code/modules/sprite_accessories/markings/body_parts.dm @@ -0,0 +1,101 @@ +/datum/sprite_accessory/marking/body_parts + abstract_type = /datum/sprite_accessory/marking/body_parts + icon = "icons/mob/sprite_accessories/markings/halves.dmi" + legacy_use_additive_color_matrix = FALSE + + +/datum/sprite_accessory/marking/body_parts/torso_f + name = "Half-Torso Female" + id = "marking_female_halftorso" + icon_state = "female" + body_parts = list(BP_TORSO, BP_GROIN) + +/datum/sprite_accessory/marking/body_parts/center_f + name = "Center-line Torso Female" + id = "marking_female_centerline" + icon_state = "female_center" + body_parts = list(BP_TORSO, BP_GROIN) + +/datum/sprite_accessory/marking/body_parts/torso_m + name = "Half-Torso Male" + id = "marking_male_halftorso" + icon_state = "male" + body_parts = list(BP_TORSO, BP_GROIN) + +/datum/sprite_accessory/marking/body_parts/center_m + name = "Center-line Torso Male" + id = "marking_male_centerline" + icon_state = "male_center" + body_parts = list(BP_TORSO, BP_GROIN) + +/datum/sprite_accessory/marking/body_parts/head_f + name = "Half-Head Female" + id = "marking_female_halfhead" + icon_state = "female" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/body_parts/head_center_f + name = "Center-line head Female" + id = "marking_female_ceterline_head" + icon_state = "center_f" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/body_parts/head_m + name = "Half-Head Male" + id = "marking_male_halfhead" + icon_state = "male" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/body_parts/head_center_m + name = "Center-line head Male" + id = "marking_male_centerline_head" + icon_state = "center_m" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/body_parts/r_arm + name = "Arm (Right)" + id = "marking_arm_right" + icon_state = "full" + body_parts = list(BP_R_ARM) + +/datum/sprite_accessory/marking/body_parts/l_arm + name = "Arm (Left)" + id = "marking_arm_left" + icon_state = "full" + body_parts = list(BP_L_ARM) + +/datum/sprite_accessory/marking/body_parts/r_hand + name = "Hand (Right)" + id = "marking_hand_right" + icon_state = "full" + body_parts = list(BP_R_HAND) + +/datum/sprite_accessory/marking/body_parts/l_hand + name = "Hand (Left)" + id = "marking_hand_left" + icon_state = "full" + body_parts = list(BP_L_HAND) + +/datum/sprite_accessory/marking/body_parts/r_leg + name = "Leg (Right)" + id = "marking_leg_right" + icon_state = "full" + body_parts = list(BP_R_LEG) + +/datum/sprite_accessory/marking/body_parts/l_leg + name = "Leg (Left)" + id = "marking_leg_left" + icon_state = "full" + body_parts = list(BP_L_LEG) + +/datum/sprite_accessory/marking/body_parts/r_foot + name = "Foot (Right)" + id = "marking_foot_right" + icon_state = "full" + body_parts = list(BP_R_FOOT) + +/datum/sprite_accessory/marking/body_parts/l_foot + name = "Foot (Left)" + id = "marking_foot_left" + icon_state = "full" + body_parts = list(BP_L_FOOT) diff --git a/icons/mob/sprite_accessories/ears.dmi b/icons/mob/sprite_accessories/ears.dmi index a251f125480..f5a418044ac 100644 Binary files a/icons/mob/sprite_accessories/ears.dmi and b/icons/mob/sprite_accessories/ears.dmi differ diff --git a/icons/mob/sprite_accessories/ears_32x64.dmi b/icons/mob/sprite_accessories/ears_32x64.dmi index df92e62a42e..782886661e8 100644 Binary files a/icons/mob/sprite_accessories/ears_32x64.dmi and b/icons/mob/sprite_accessories/ears_32x64.dmi differ diff --git a/icons/mob/sprite_accessories/markings/halves.dmi b/icons/mob/sprite_accessories/markings/halves.dmi new file mode 100644 index 00000000000..ab57abfd44c Binary files /dev/null and b/icons/mob/sprite_accessories/markings/halves.dmi differ