diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm index e54a41033a330..89f477777b035 100644 --- a/code/modules/mob/living/carbon/human/species_types/snail.dm +++ b/code/modules/mob/living/carbon/human/species_types/snail.dm @@ -4,7 +4,7 @@ id = SPECIES_SNAIL inherent_traits = list( TRAIT_MUTANT_COLORS, - TRAIT_NO_UNDERWEAR, + //TRAIT_NO_UNDERWEAR, // DOPPLER EDIT REMOVAL TRAIT_NO_SLIP_ALL, ) diff --git a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm index 756cda32fa327..016a80682cf53 100644 --- a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm +++ b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm @@ -23,7 +23,7 @@ dmg_overlay_type = null brute_modifier = 1.25 //ethereal are weak to brute damages wing_types = NONE - bodypart_traits = list(TRAIT_NO_UNDERWEAR) + //bodypart_traits = list(TRAIT_NO_UNDERWEAR) //DOPPLER EDIT REMOVAL /obj/item/bodypart/chest/ethereal/update_limb(dropping_limb, is_creating) . = ..() diff --git a/icons/mob/human/tails.dmi b/icons/mob/human/tails.dmi new file mode 100644 index 0000000000000..96a90eef11c8d Binary files /dev/null and b/icons/mob/human/tails.dmi differ diff --git a/modular_doppler/loadout_categories/categories/clothing.dm b/modular_doppler/loadout_categories/categories/clothing.dm index 6cc4a6ccdc19d..83def820f323e 100644 --- a/modular_doppler/loadout_categories/categories/clothing.dm +++ b/modular_doppler/loadout_categories/categories/clothing.dm @@ -103,6 +103,10 @@ name = "Green Labcoat" item_path = /obj/item/clothing/suit/toggle/labcoat/mad +/datum/loadout_item/suit/lalune_labcoat + name = "Sleeveless Labcoat" + item_path = /obj/item/clothing/suit/toggle/labcoat/lalunevest + /* * PONCHOS */ diff --git a/modular_doppler/loadout_categories/categories/gloves.dm b/modular_doppler/loadout_categories/categories/gloves.dm index 0d07980a3a890..be338ebeb7042 100644 --- a/modular_doppler/loadout_categories/categories/gloves.dm +++ b/modular_doppler/loadout_categories/categories/gloves.dm @@ -75,3 +75,11 @@ /datum/loadout_item/gloves/maid_arm_covers name = "Maid Costume" item_path = /obj/item/clothing/gloves/maid + +/datum/loadout_item/gloves/lalune_gloves + name = "Elbow Gloves" + item_path = /obj/item/clothing/gloves/lalune_long + +/datum/loadout_item/gloves/cloth_armwraps + name = "Cloth Armwraps" + item_path = /obj/item/clothing/gloves/bracer/wraps diff --git a/modular_doppler/loadout_categories/categories/undersuit.dm b/modular_doppler/loadout_categories/categories/undersuit.dm index 42f8f5d5cf6a6..002af1dded7e7 100644 --- a/modular_doppler/loadout_categories/categories/undersuit.dm +++ b/modular_doppler/loadout_categories/categories/undersuit.dm @@ -117,6 +117,22 @@ name = "Simple Skirt" item_path = /obj/item/clothing/under/shorts/shorter/skirt +/datum/loadout_item/undersuit/pants/skirt/medium + name = "Medium Skirt" + item_path = /obj/item/clothing/under/dress/skirt/medium + +/datum/loadout_item/undersuit/pants/skirt/long + name = "Long Skirt" + item_path = /obj/item/clothing/under/dress/skirt/long + +/datum/loadout_item/undersuit/pants/skirt/loincloth + name = "Loincloth" + item_path = /obj/item/clothing/under/dress/skirt/loincloth + +/datum/loadout_item/undersuit/pants/skirt/loincloth/alt + name = "Loincloth, Alt" + item_path = /obj/item/clothing/under/dress/skirt/loincloth/loincloth_alt + /* * BUTTONDOWNS */ @@ -146,6 +162,10 @@ name = "Dress" item_path = /obj/item/clothing/under/dress +/datum/loadout_item/undersuit/dress/giantscarf + name = "Giant Scarf" + item_path = /obj/item/clothing/under/dress/doppler/giant_scarf + /datum/loadout_item/undersuit/dress/evening name = "Evening Dress" item_path = /obj/item/clothing/under/dress/eveninggown @@ -263,3 +283,15 @@ /datum/loadout_item/undersuit/gear_harness name = "Gear Harness" item_path = /obj/item/clothing/under/misc/gear_harness + +/datum/loadout_item/undersuit/jumpsuit + name = "Colorable Jumpsuit" + item_path = /obj/item/clothing/under/color + +/datum/loadout_item/undersuit/jumpskirt + name = "Colorable Jumpskirt" + item_path = /obj/item/clothing/under/color/jumpskirt + +/datum/loadout_item/under/jumpsuit/frontier + name = "Frontier Jumpsuit" + item_path = /obj/item/clothing/under/frontier_colonist diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_hand.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_hand.dm new file mode 100644 index 0000000000000..89c6003d6fd38 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_hand.dm @@ -0,0 +1,22 @@ +/* \ / \/ \/ \/ / , + \ \ \/ \/ \/ \ \/ \/ / + .\ \/ \/ \/ \/ \/ / / / + *hedgehog noise* ) ' / / \/ \/ \/ \/ \/ \ \/ \ + This dm contains \ .' ) \/ \/ \/ \/ \/ \/ \ / \ + all glove grayscales \ / o ) \/ \/ \/ \/ \/ \/ \// / + o'_ ',__ .' ,.,.,.,.,.,.,.,'- ' + // \\ // \\ + '' '' '' '' +*/ + +// Armwraps + +/datum/greyscale_config/armwraps + name = "Cloth Arm Wraps" + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/hands/gloves.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hand/arm_wraps.json' + +/datum/greyscale_config/armwraps/worn + name = "Cloth Arm Wraps (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hand/arm_wraps_worn.json' diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm index b0aeed8e5c539..f1e487e0ee474 100644 --- a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm @@ -131,6 +131,16 @@ name = "Pentagram Strapped Dress (Worn)" icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi' +/datum/greyscale_config/giant_scarf + name = "Giant Scarf" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/giant_scarf.json' + +/datum/greyscale_config/giant_scarf/worn + name = "Giant Scarf (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi' + + /// LUNAR JAPANESE SECTION /datum/greyscale_config/lunar_japanese @@ -282,3 +292,21 @@ /datum/greyscale_config/skimpypants/worn/digi name = "Skimpy Pants (Worn, Digi)" icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi' + +/datum/greyscale_config/medium_skirt + name = "Medium Skirt" + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/medium_skirt.json' + +/datum/greyscale_config/medium_skirt/worn + name = "Medium Skirt (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi' + +/datum/greyscale_config/long_skirt + name = "Long Skirt" + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/long_skirt.json' + +/datum/greyscale_config/long_skirt/worn + name = "Long Skirt (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi' diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi index 51577e8a93636..5360511faea3b 100644 Binary files a/modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi and b/modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi differ diff --git a/modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi b/modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi index fdacc511c1010..4cec7058e2da4 100644 Binary files a/modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi and b/modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi differ diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/hand/arm_wraps.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/hand/arm_wraps.json new file mode 100644 index 0000000000000..cfe620714a378 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/hand/arm_wraps.json @@ -0,0 +1,10 @@ +{ + "arm_wraps": [ + { + "type": "icon_state", + "icon_state": "arm_wraps", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/hand/arm_wraps_worn.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/hand/arm_wraps_worn.json new file mode 100644 index 0000000000000..cfe620714a378 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/hand/arm_wraps_worn.json @@ -0,0 +1,10 @@ +{ + "arm_wraps": [ + { + "type": "icon_state", + "icon_state": "arm_wraps", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/under/giant_scarf.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/giant_scarf.json new file mode 100644 index 0000000000000..b52dab9898b23 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/giant_scarf.json @@ -0,0 +1,10 @@ +{ + "giant_scarf": [ + { + "type": "icon_state", + "icon_state": "giant_scarf_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] + } diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/under/giant_scarf_worn.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/giant_scarf_worn.json new file mode 100644 index 0000000000000..b52dab9898b23 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/giant_scarf_worn.json @@ -0,0 +1,10 @@ +{ + "giant_scarf": [ + { + "type": "icon_state", + "icon_state": "giant_scarf_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] + } diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/under/long_skirt.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/long_skirt.json new file mode 100644 index 0000000000000..19181dc1a276d --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/long_skirt.json @@ -0,0 +1,10 @@ +{ + "long_skirt": [ + { + "type": "icon_state", + "icon_state": "long_skirt", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/under/medium_skirt.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/medium_skirt.json new file mode 100644 index 0000000000000..c2fc37c937ca7 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/medium_skirt.json @@ -0,0 +1,10 @@ +{ + "medium_skirt": [ + { + "type": "icon_state", + "icon_state": "medium_skirt", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/code/hands/gloves.dm b/modular_doppler/modular_cosmetics/code/hands/gloves.dm index 0e504f20eedc2..294b0488871ae 100644 --- a/modular_doppler/modular_cosmetics/code/hands/gloves.dm +++ b/modular_doppler/modular_cosmetics/code/hands/gloves.dm @@ -1,4 +1,25 @@ /obj/item/clothing/gloves/latex/nitrile icon = 'modular_doppler/modular_cosmetics/icons/obj/hands/gloves.dmi' worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi' - greyscale_colors = "#B7DE5B" \ No newline at end of file + greyscale_colors = "#B7DE5B" + +/obj/item/clothing/gloves/lalune_long + icon = 'modular_doppler/modular_cosmetics/icons/obj/hands/gloves.dmi' + worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi' + name = "designer long gloves" + desc = "A fancy set of bicep-length black gloves. The La Lune insignia is sewn into the rims." + icon_state = "lalune_long" + strip_delay = 40 + equip_delay_other = 20 + +/obj/item/clothing/gloves/bracer/wraps + name = "cloth arm wraps" + desc = "Used for aesthetics, used for wiping sweat from the brow, used for... well, what about you?" + icon = 'modular_doppler/modular_cosmetics/icons/obj/hands/gloves.dmi' + worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi' + icon_state = "arm_wraps" + inhand_icon_state = "greyscale_gloves" + greyscale_config = /datum/greyscale_config/armwraps + greyscale_config_worn = /datum/greyscale_config/armwraps/worn + greyscale_colors = "#FFFFFF" + flags_1 = IS_PLAYER_COLORABLE_1 diff --git a/modular_doppler/modular_cosmetics/code/suits/labcoat.dm b/modular_doppler/modular_cosmetics/code/suits/labcoat.dm index 9509c36d37d57..d923591e01a8d 100644 --- a/modular_doppler/modular_cosmetics/code/suits/labcoat.dm +++ b/modular_doppler/modular_cosmetics/code/suits/labcoat.dm @@ -10,3 +10,11 @@ body_parts_covered = NONE //Allows surgeries despite wearing it; hiding genitals is handled in /datum/sprite_accessory/genital/is_hidden() (Only place it'd work sadly) armor_type = /datum/armor/none equip_delay_other = 8 + +/obj/item/clothing/suit/toggle/labcoat/lalunevest + name = "sleeveless buttoned coat" + desc = "A fashionable jacket bearing the La Lune insignia on the inside. It appears similar to a labcoat in design and materials, though the tag warns against it being a replacement for such." + icon_state = "labcoat_lalunevest" + icon = 'modular_doppler/modular_cosmetics/icons/obj/suit/labcoat.dmi' + worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/suit/labcoat.dmi' + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON diff --git a/modular_doppler/modular_cosmetics/code/under/dresses.dm b/modular_doppler/modular_cosmetics/code/under/dresses.dm index 8dcad9997279a..f3ca60eecbcbc 100644 --- a/modular_doppler/modular_cosmetics/code/under/dresses.dm +++ b/modular_doppler/modular_cosmetics/code/under/dresses.dm @@ -26,6 +26,18 @@ greyscale_colors = "#cc0000#5f5f5f" flags_1 = IS_PLAYER_COLORABLE_1 +/obj/item/clothing/under/dress/doppler/giant_scarf + name = "giant scarf" + desc = "An absurdly massive scarf, worn as the main article of clothing over the body. Ironically, not very suitable for the cold." + icon_state = "giant_scarf" + body_parts_covered = CHEST|GROIN|LEGS + greyscale_config = /datum/greyscale_config/giant_scarf + greyscale_config_worn = /datum/greyscale_config/giant_scarf/worn + greyscale_colors = "#EEEEEE" + female_sprite_flags = NO_FEMALE_UNIFORM + flags_1 = IS_PLAYER_COLORABLE_1 + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + /obj/item/clothing/under/dress/doppler/flower name = "flower dress" desc = "Lovely dress. Colored like the autumn leaves." diff --git a/modular_doppler/modular_cosmetics/code/under/pants.dm b/modular_doppler/modular_cosmetics/code/under/pants.dm index b2f41d2878af5..e530dbe304582 100644 --- a/modular_doppler/modular_cosmetics/code/under/pants.dm +++ b/modular_doppler/modular_cosmetics/code/under/pants.dm @@ -108,3 +108,26 @@ name = "simple skirt" desc = "A lone skirt, suitable to combo with your favorite getup." icon_state = "skirt" + +/obj/item/clothing/under/dress/skirt/medium + name = "medium skirt" + desc = "An appealing medium-length skirt. Top not included." + icon_state = "medium_skirt" + body_parts_covered = GROIN + greyscale_config = /datum/greyscale_config/medium_skirt + greyscale_config_worn = /datum/greyscale_config/medium_skirt/worn + greyscale_colors = "#3a3c45" + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/under/dress/skirt/long + name = "long skirt" + desc = "An appealing long skirt. At this point does it qualify as a dress?" + icon_state = "long_skirt" + body_parts_covered = GROIN|LEGS + greyscale_config = /datum/greyscale_config/long_skirt + greyscale_config_worn = /datum/greyscale_config/long_skirt/worn + greyscale_colors = "#3a3c45" + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS + alternate_worn_layer = ABOVE_SHOES_LAYER + flags_1 = IS_PLAYER_COLORABLE_1 diff --git a/modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi b/modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi index ad4bab2407cd1..dd650ffcf8209 100644 Binary files a/modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi and b/modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/mob/suit/labcoat.dmi b/modular_doppler/modular_cosmetics/icons/mob/suit/labcoat.dmi index ecf0f2de15c16..bdf732408e4d4 100644 Binary files a/modular_doppler/modular_cosmetics/icons/mob/suit/labcoat.dmi and b/modular_doppler/modular_cosmetics/icons/mob/suit/labcoat.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi b/modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi index 6d3a12dc352e4..7bebe8b30d71d 100644 Binary files a/modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi and b/modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/obj/hands/gloves.dmi b/modular_doppler/modular_cosmetics/icons/obj/hands/gloves.dmi index 73a2d2ce4199b..867d49a9d11b6 100644 Binary files a/modular_doppler/modular_cosmetics/icons/obj/hands/gloves.dmi and b/modular_doppler/modular_cosmetics/icons/obj/hands/gloves.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/obj/suit/labcoat.dmi b/modular_doppler/modular_cosmetics/icons/obj/suit/labcoat.dmi index 8541cb21a5ad4..f70feca3b5d6f 100644 Binary files a/modular_doppler/modular_cosmetics/icons/obj/suit/labcoat.dmi and b/modular_doppler/modular_cosmetics/icons/obj/suit/labcoat.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi b/modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi index 8ae4e4773eafe..29cdaa73b3ae2 100644 Binary files a/modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi and b/modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi differ diff --git a/modular_doppler/modular_customization/accessories/code/aquatic_accessories/aquatic_tail.dm b/modular_doppler/modular_customization/accessories/code/aquatic_accessories/aquatic_tail.dm index bc9c54c39115b..06aae07b35f20 100644 --- a/modular_doppler/modular_customization/accessories/code/aquatic_accessories/aquatic_tail.dm +++ b/modular_doppler/modular_customization/accessories/code/aquatic_accessories/aquatic_tail.dm @@ -30,6 +30,11 @@ name = "Azulean" icon_state = "akula" +/datum/sprite_accessory/tails/fish/shrimp + name = "Shrimp (Fish)" + icon = 'modular_doppler/modular_customization/accessories/icons/insectoid/insect_tail.dmi' + icon_state = "segmentedtail" + /datum/sprite_accessory/tails/fish/big // big .dmi starts here name = "Sea Slug" icon = 'modular_doppler/modular_customization/accessories/icons/aquatic/aquatic_tail_big.dmi' diff --git a/modular_doppler/modular_customization/accessories/code/insectoid_accessories/insect_ears.dm b/modular_doppler/modular_customization/accessories/code/insectoid_accessories/insect_ears.dm index b964d3285dced..4269dfa8a7880 100644 --- a/modular_doppler/modular_customization/accessories/code/insectoid_accessories/insect_ears.dm +++ b/modular_doppler/modular_customization/accessories/code/insectoid_accessories/insect_ears.dm @@ -12,3 +12,15 @@ /datum/sprite_accessory/ears_more/bug/default name = "Royal" icon_state = "royal" + +/datum/sprite_accessory/ears_more/bug/setaceous + name = "Setaceous Antenna" + icon_state = "setaceous" + +/datum/sprite_accessory/ears_more/bug/setaceousm + name = "Medium Setaceous Antenna" + icon_state = "setaceousm" + +/datum/sprite_accessory/ears_more/bug/geniculate + name = "Geniculate Antenna" + icon_state = "geniculate" diff --git a/modular_doppler/modular_customization/accessories/code/insectoid_accessories/insect_snouts.dm b/modular_doppler/modular_customization/accessories/code/insectoid_accessories/insect_snouts.dm new file mode 100644 index 0000000000000..02a34f5e9e656 --- /dev/null +++ b/modular_doppler/modular_customization/accessories/code/insectoid_accessories/insect_snouts.dm @@ -0,0 +1,4 @@ +/datum/sprite_accessory/snouts/insect + icon = 'modular_doppler/modular_customization/accessories/icons/insectoid/insect_snouts.dmi' + name = "Mandibles" + icon_state = "mandibles" diff --git a/modular_doppler/modular_customization/accessories/code/insectoid_accessories/insect_tail.dm b/modular_doppler/modular_customization/accessories/code/insectoid_accessories/insect_tail.dm index 881decfe9aae1..63ff05e512b90 100644 --- a/modular_doppler/modular_customization/accessories/code/insectoid_accessories/insect_tail.dm +++ b/modular_doppler/modular_customization/accessories/code/insectoid_accessories/insect_tail.dm @@ -4,3 +4,7 @@ /datum/sprite_accessory/tails/bug/default name = "Bug" icon_state = "bug" + +/datum/sprite_accessory/tails/bug/shrimp + name = "Shrimp (Insect)" + icon_state = "segmentedtail" diff --git a/modular_doppler/modular_customization/accessories/code/lizard_accessories/lizard_tail.dm b/modular_doppler/modular_customization/accessories/code/lizard_accessories/lizard_tail.dm index cb77cc7ae1f58..1341662e71769 100644 --- a/modular_doppler/modular_customization/accessories/code/lizard_accessories/lizard_tail.dm +++ b/modular_doppler/modular_customization/accessories/code/lizard_accessories/lizard_tail.dm @@ -25,6 +25,9 @@ name = "Rattlesnake" icon_state = "rattlesnake" +/datum/sprite_accessory/tails/lizard/gecko + name = "Gecko" + icon_state = "gecko" /datum/sprite_accessory/tails/lizard/big icon = 'modular_doppler/modular_customization/accessories/icons/lizard/lizard_tail_big.dmi' diff --git a/modular_doppler/modular_customization/accessories/code/non_species_specific/cow_accessories/cow_tails.dm b/modular_doppler/modular_customization/accessories/code/non_species_specific/cow_accessories/cow_tails.dm new file mode 100644 index 0000000000000..6700d75f6aa52 --- /dev/null +++ b/modular_doppler/modular_customization/accessories/code/non_species_specific/cow_accessories/cow_tails.dm @@ -0,0 +1,8 @@ +/datum/sprite_accessory/tails/deer/cow + name = "Cow (Short)" + icon_state = "cows" + icon = 'modular_doppler/modular_customization/accessories/icons/non_species_specific/cow/cow_tails.dmi' + +/datum/sprite_accessory/tails/deer/cow/long + name = "Cow (Long)" + icon_state = "cowl" diff --git a/modular_doppler/modular_customization/accessories/code/non_species_specific/pig_accessories/pig_ears.dm b/modular_doppler/modular_customization/accessories/code/non_species_specific/pig_accessories/pig_ears.dm new file mode 100644 index 0000000000000..0300685cd53c0 --- /dev/null +++ b/modular_doppler/modular_customization/accessories/code/non_species_specific/pig_accessories/pig_ears.dm @@ -0,0 +1,4 @@ +/datum/sprite_accessory/ears_more/deer/pig + name = "Floppy" + icon_state = "floppy" + icon = 'modular_doppler/modular_customization/accessories/icons/non_species_specific/pig/pig_ears.dmi' diff --git a/modular_doppler/modular_customization/accessories/code/non_species_specific/pig_accessories/pig_snouts.dm b/modular_doppler/modular_customization/accessories/code/non_species_specific/pig_accessories/pig_snouts.dm new file mode 100644 index 0000000000000..67aaf30950e62 --- /dev/null +++ b/modular_doppler/modular_customization/accessories/code/non_species_specific/pig_accessories/pig_snouts.dm @@ -0,0 +1,9 @@ +/datum/sprite_accessory/snouts/pig + icon = 'modular_doppler/modular_customization/accessories/icons/non_species_specific/pig/pig_snouts.dmi' + name = "Pig" + icon_state = "pig" + +/datum/sprite_accessory/snouts/pig/boar + name = "Pig + Tusks" + icon_state = "boar" + diff --git a/modular_doppler/modular_customization/accessories/icons/insectoid/insect_ears.dmi b/modular_doppler/modular_customization/accessories/icons/insectoid/insect_ears.dmi index c09be3fc8ab24..9b3ee7e7ba5bb 100644 Binary files a/modular_doppler/modular_customization/accessories/icons/insectoid/insect_ears.dmi and b/modular_doppler/modular_customization/accessories/icons/insectoid/insect_ears.dmi differ diff --git a/modular_doppler/modular_customization/accessories/icons/insectoid/insect_snouts.dmi b/modular_doppler/modular_customization/accessories/icons/insectoid/insect_snouts.dmi new file mode 100644 index 0000000000000..44cf0131f5d7a Binary files /dev/null and b/modular_doppler/modular_customization/accessories/icons/insectoid/insect_snouts.dmi differ diff --git a/modular_doppler/modular_customization/accessories/icons/insectoid/insect_tail.dmi b/modular_doppler/modular_customization/accessories/icons/insectoid/insect_tail.dmi index b727c1b787008..af17a4a3f2969 100644 Binary files a/modular_doppler/modular_customization/accessories/icons/insectoid/insect_tail.dmi and b/modular_doppler/modular_customization/accessories/icons/insectoid/insect_tail.dmi differ diff --git a/modular_doppler/modular_customization/accessories/icons/lizard/lizard_horns.dmi b/modular_doppler/modular_customization/accessories/icons/lizard/lizard_horns.dmi index d5381a2cb6132..c8773aa9281be 100644 Binary files a/modular_doppler/modular_customization/accessories/icons/lizard/lizard_horns.dmi and b/modular_doppler/modular_customization/accessories/icons/lizard/lizard_horns.dmi differ diff --git a/modular_doppler/modular_customization/accessories/icons/lizard/lizard_tail.dmi b/modular_doppler/modular_customization/accessories/icons/lizard/lizard_tail.dmi index d156e0c34c105..98f683576f7a8 100644 Binary files a/modular_doppler/modular_customization/accessories/icons/lizard/lizard_tail.dmi and b/modular_doppler/modular_customization/accessories/icons/lizard/lizard_tail.dmi differ diff --git a/modular_doppler/modular_customization/accessories/icons/non_species_specific/cow/cow_tails.dmi b/modular_doppler/modular_customization/accessories/icons/non_species_specific/cow/cow_tails.dmi new file mode 100644 index 0000000000000..5fb9d9379e2f4 Binary files /dev/null and b/modular_doppler/modular_customization/accessories/icons/non_species_specific/cow/cow_tails.dmi differ diff --git a/modular_doppler/modular_customization/accessories/icons/non_species_specific/pig/pig_ears.dmi b/modular_doppler/modular_customization/accessories/icons/non_species_specific/pig/pig_ears.dmi new file mode 100644 index 0000000000000..ccbae8ed8bcee Binary files /dev/null and b/modular_doppler/modular_customization/accessories/icons/non_species_specific/pig/pig_ears.dmi differ diff --git a/modular_doppler/modular_customization/accessories/icons/non_species_specific/pig/pig_snouts.dmi b/modular_doppler/modular_customization/accessories/icons/non_species_specific/pig/pig_snouts.dmi new file mode 100644 index 0000000000000..8676facb1d4ee Binary files /dev/null and b/modular_doppler/modular_customization/accessories/icons/non_species_specific/pig/pig_snouts.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 80d012718dda0..d8b19d727820c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6831,6 +6831,7 @@ #include "modular_doppler\modular_cosmetics\code\under\miscellania.dm" #include "modular_doppler\modular_cosmetics\code\under\pants.dm" #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_face.dm" +#include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_hand.dm" #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_head.dm" #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_neck.dm" #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_objects.dm" @@ -6855,6 +6856,7 @@ #include "modular_doppler\modular_customization\accessories\code\human_accessories\human_tail.dm" #include "modular_doppler\modular_customization\accessories\code\insectoid_accessories\insect_ears.dm" #include "modular_doppler\modular_customization\accessories\code\insectoid_accessories\insect_fluff.dm" +#include "modular_doppler\modular_customization\accessories\code\insectoid_accessories\insect_snouts.dm" #include "modular_doppler\modular_customization\accessories\code\insectoid_accessories\insect_tail.dm" #include "modular_doppler\modular_customization\accessories\code\insectoid_accessories\insect_wings.dm" #include "modular_doppler\modular_customization\accessories\code\insectoid_accessories\insectoid_body_markings.dm" @@ -6881,6 +6883,7 @@ #include "modular_doppler\modular_customization\accessories\code\non_species_specific\cervid_accessories\cervid_ears.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\cervid_accessories\cervid_horns.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\cervid_accessories\cervid_tail.dm" +#include "modular_doppler\modular_customization\accessories\code\non_species_specific\cow_accessories\cow_tails.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\feline_accessories\feline_ears.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\feline_accessories\feline_snout.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\feline_accessories\feline_tail.dm" @@ -6889,6 +6892,8 @@ #include "modular_doppler\modular_customization\accessories\code\non_species_specific\leporid_accessories\leporid_tail.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\murid_accessories\murid_ears.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\murid_accessories\murid_tail.dm" +#include "modular_doppler\modular_customization\accessories\code\non_species_specific\pig_accessories\pig_ears.dm" +#include "modular_doppler\modular_customization\accessories\code\non_species_specific\pig_accessories\pig_snouts.dm" #include "modular_doppler\modular_customization\accessories\code\ramatan_accessories\ramatan_body_markings.dm" #include "modular_doppler\modular_customization\accessories\code\ramatan_accessories\ramatan_ears.dm" #include "modular_doppler\modular_customization\accessories\code\ramatan_accessories\ramatan_frills.dm"