diff --git a/Content.Shared/Humanoid/HumanoidVisualLayers.cs b/Content.Shared/Humanoid/HumanoidVisualLayers.cs index cecd8a1c13e..f55ee48d17e 100644 --- a/Content.Shared/Humanoid/HumanoidVisualLayers.cs +++ b/Content.Shared/Humanoid/HumanoidVisualLayers.cs @@ -11,6 +11,8 @@ public enum HumanoidVisualLayers : byte Hair, FacialHair, Chest, + Underwear, // DeltaV + Undershirt, // DeltaV Head, Snout, HeadSide, // side parts (i.e., frills) diff --git a/Content.Shared/Humanoid/Markings/MarkingCategories.cs b/Content.Shared/Humanoid/Markings/MarkingCategories.cs index db82fb1fd3d..062ed4c4f5e 100644 --- a/Content.Shared/Humanoid/Markings/MarkingCategories.cs +++ b/Content.Shared/Humanoid/Markings/MarkingCategories.cs @@ -13,6 +13,8 @@ public enum MarkingCategories : byte HeadSide, Snout, Chest, + Underwear, // DeltaV + Undershirt, // DeltaV Arms, Legs, Tail, @@ -32,6 +34,8 @@ public static MarkingCategories FromHumanoidVisualLayers(HumanoidVisualLayers la HumanoidVisualLayers.HeadTop => MarkingCategories.HeadTop, HumanoidVisualLayers.HeadSide => MarkingCategories.HeadSide, HumanoidVisualLayers.Snout => MarkingCategories.Snout, + HumanoidVisualLayers.Undershirt => MarkingCategories.Undershirt, // DeltaV + HumanoidVisualLayers.Underwear => MarkingCategories.Underwear, // DeltaV HumanoidVisualLayers.Chest => MarkingCategories.Chest, HumanoidVisualLayers.RArm => MarkingCategories.Arms, HumanoidVisualLayers.LArm => MarkingCategories.Arms, diff --git a/Resources/Locale/en-US/_DV/markings/tattoos.ftl b/Resources/Locale/en-US/_DV/markings/tattoos.ftl index d62a118a890..313fea08041 100644 --- a/Resources/Locale/en-US/_DV/markings/tattoos.ftl +++ b/Resources/Locale/en-US/_DV/markings/tattoos.ftl @@ -6,3 +6,6 @@ marking-TattooNightlingChestMale = Chest Tattoo (Nightling) marking-TattooNightlingChestFemale-tattoo_nightling_female = Chest Tattoo (Nightling) marking-TattooNightlingChestFemale = Chest Tattoo (Nightling) + +marking-TattooNanotrasenChest-tattoo_nanotrasen_chest = Chest Tattoo (Nanotrasen) +marking-TattooNanotrasenChest = Chest Tattoo (Nanotrasen) \ No newline at end of file diff --git a/Resources/Locale/en-US/_DV/markings/undershirt.ftl b/Resources/Locale/en-US/_DV/markings/undershirt.ftl new file mode 100644 index 00000000000..42ab4857c33 --- /dev/null +++ b/Resources/Locale/en-US/_DV/markings/undershirt.ftl @@ -0,0 +1,29 @@ +marking-UndershirtDefault-undershirt = Undershirt +marking-UndershirtDefault = Undershirt (Default) + +marking-UndershirtRolled-rolled_undershirt = Undershirt +marking-UndershirtRolled = Undershirt (Rolled) + +marking-UndershirtSleeveless-sleeveless = Tanktop +marking-UndershirtSleeveless = Tanktop + +marking-UndershirtGrossSleeveless-gross_sleeveless = Tanktop +marking-UndershirtGrossSleeveless = Tanktop (Gross) + +marking-UndershirtRolledSleeveless-rolled_undershirt_sleeveless = Tanktop +marking-UndershirtRolledSleeveless = Tanktop (Rolled) + +marking-UndershirtNanotrasen-nanotrasen = Undershirt +marking-UndershirtNanotrasen = Undershirt (Nanotrasen) + +marking-UndershirtBinder-binder = Binder +marking-UndershirtBinder = Binder + +marking-UndershirtBraClassic-classic = Bra +marking-UndershirtBraClassic = Bra (Classic) + +marking-UndershirtBraSports-sports = Bra +marking-UndershirtBraSports = Bra (Sports) + +marking-UndershirtBraStrapless-strapless = Bra +marking-UndershirtBraStrapless = Bra (Strapless) \ No newline at end of file diff --git a/Resources/Locale/en-US/_DV/markings/underwear.ftl b/Resources/Locale/en-US/_DV/markings/underwear.ftl new file mode 100644 index 00000000000..facdecba5f0 --- /dev/null +++ b/Resources/Locale/en-US/_DV/markings/underwear.ftl @@ -0,0 +1,10 @@ +marking-UnderwearDefault-boxers = Underwear +marking-UnderwearDefault = Underwear (Default) +marking-UnderwearBriefs-briefs = Underwear +marking-UnderwearBriefs = Underwear (Briefs) +marking-UnderwearLowriders-lowriders = Underwear +marking-UnderwearLowriders = Underwear (Lowriders) +marking-UnderwearSatin-satin = Underwear +marking-UnderwearSatin = Underwear (Satin) +marking-UnderwearTanga-tanga = Underwear +marking-UnderwearTanga = Underwear (Tanga) \ No newline at end of file diff --git a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl index c768a2b4b62..7232fd4e9b2 100644 --- a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl +++ b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl @@ -25,3 +25,7 @@ markings-category-Arms = Arms markings-category-Legs = Legs markings-category-Tail = Tail markings-category-Overlay = Overlay +# begin DeltaV +markings-category-Undershirt = Undershirt +markings-category-Underwear = Underwear +# end DeltaV \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index ef6f057d823..6310f1b34f2 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -2,7 +2,7 @@ id: TattooHiveChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos coloring: default: @@ -17,7 +17,7 @@ id: TattooNightlingChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos coloring: default: diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index 0fd52d3f87a..56f43a2a78e 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -83,6 +83,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] # DeltaV + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # DeltaV - map: ["jumpsuit"] - map: ["enum.HumanoidVisualLayers.LFoot"] - map: ["enum.HumanoidVisualLayers.RFoot"] diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 969e8a24650..4a31f7ee924 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -19,6 +19,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] - map: ["jumpsuit"] - map: ["enum.HumanoidVisualLayers.LFoot"] - map: ["enum.HumanoidVisualLayers.RFoot"] @@ -322,6 +324,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] # DeltaV + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # DeltaV - map: ["jumpsuit"] - map: ["enum.HumanoidVisualLayers.LFoot"] - map: ["enum.HumanoidVisualLayers.RFoot"] diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index 92592116f21..2284af6b080 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -84,6 +84,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] # DeltaV + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # DeltaV - map: [ "jumpsuit" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml index d5e6cd459ed..88ee0825f2b 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml @@ -35,6 +35,12 @@ Chest: points: 1 required: false + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false Legs: points: 6 required: false diff --git a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml index e6a64379d93..8a3eb7fa997 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml @@ -28,6 +28,12 @@ Chest: points: 1 required: false + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false Legs: points: 6 required: false diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index 5dedba1b447..afc0ba9ff16 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -19,6 +19,8 @@ sprites: Head: MobArachnidHead Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobArachnidTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -63,6 +65,12 @@ Chest: points: 1 required: false + Underwear: # DeltaV + points: 1 + required: false + Undershirt: # DeltaV + points: 1 + required: false Legs: points: 6 required: false diff --git a/Resources/Prototypes/Species/diona.yml b/Resources/Prototypes/Species/diona.yml index 19fafaa3e1b..72828e45920 100644 --- a/Resources/Prototypes/Species/diona.yml +++ b/Resources/Prototypes/Species/diona.yml @@ -19,6 +19,8 @@ Head: MobDionaHead HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobDionaTorso Eyes: MobDionaEyes LArm: MobDionaLArm @@ -49,6 +51,12 @@ Legs: points: 2 required: false + Underwear: # DeltaV + points: 1 + required: false + Undershirt: # DeltaV + points: 1 + required: false Arms: points: 2 required: false diff --git a/Resources/Prototypes/Species/gingerbread.yml b/Resources/Prototypes/Species/gingerbread.yml index e6fc0d20df5..148799cb1c0 100644 --- a/Resources/Prototypes/Species/gingerbread.yml +++ b/Resources/Prototypes/Species/gingerbread.yml @@ -15,6 +15,8 @@ Head: MobGingerbreadHead HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobGingerbreadTorso Eyes: MobGingerbreadEyes LArm: MobGingerbreadLArm diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml index bb494bfa799..7347fa39eef 100644 --- a/Resources/Prototypes/Species/human.yml +++ b/Resources/Prototypes/Species/human.yml @@ -22,6 +22,8 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobHumanTorso Eyes: MobHumanoidEyes HeadTop: MobHumanoidAnyMarking @@ -60,6 +62,12 @@ Chest: points: 1 required: false + Underwear: # DeltaV + points: 1 + required: false + Undershirt: # DeltaV + points: 1 + required: false Legs: points: 6 required: false diff --git a/Resources/Prototypes/Species/moth.yml b/Resources/Prototypes/Species/moth.yml index 2623865b046..e6c3ed9008d 100644 --- a/Resources/Prototypes/Species/moth.yml +++ b/Resources/Prototypes/Species/moth.yml @@ -17,6 +17,8 @@ sprites: Head: MobMothHead Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobMothTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -67,6 +69,12 @@ Chest: points: 1 required: false + Underwear: # DeltaV + points: 1 + required: false + Undershirt: # DeltaV + points: 1 + required: false Legs: points: 6 required: false diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml index 16f2728070e..57a02d8f2e3 100644 --- a/Resources/Prototypes/Species/reptilian.yml +++ b/Resources/Prototypes/Species/reptilian.yml @@ -17,6 +17,8 @@ sprites: Head: MobReptilianHead Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobReptilianTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -58,6 +60,12 @@ Chest: points: 3 required: false + Underwear: # DeltaV + points: 1 + required: false + Undershirt: # DeltaV + points: 1 + required: false Legs: points: 6 required: false diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml index ef49e9b7cf6..4d6a312e87d 100644 --- a/Resources/Prototypes/Species/slime.yml +++ b/Resources/Prototypes/Species/slime.yml @@ -15,6 +15,8 @@ Head: MobSlimeHead Hair: MobSlimeMarkingFollowSkin FacialHair: MobSlimeMarkingFollowSkin + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobSlimeTorso Eyes: MobHumanoidEyes LArm: MobSlimeLArm @@ -38,6 +40,12 @@ Chest: points: 1 required: false + Underwear: # DeltaV + points: 1 + required: false + Undershirt: # DeltaV + points: 1 + required: false Legs: points: 4 required: false diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml index 7419f3f277e..0e8390a85a4 100644 --- a/Resources/Prototypes/Species/vox.yml +++ b/Resources/Prototypes/Species/vox.yml @@ -21,6 +21,8 @@ Snout: MobHumanoidAnyMarking Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking + Undershirt: MobHumanoidAnyMarking Chest: MobVoxTorso Eyes: MobVoxEyes LArm: MobVoxLArm @@ -58,6 +60,12 @@ points: 4 required: true defaultMarkings: [ VoxLLegScales, VoxRLegScales, VoxRFootScales, VoxLFootScales ] + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false Chest: points: 1 required: false diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/tattoos.yml index a3df1776332..2d92c02b429 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/tattoos.yml @@ -2,7 +2,7 @@ id: TattooHiveChestFemale # DeltaV: Splitting the scars and tattoos bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni sexRestriction: [Female] # DeltaV: Splitting the scars and tattoos coloring: default: @@ -17,7 +17,7 @@ id: TattooNightlingChestFemale # DeltaV: Splitting the scars and tattoos bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni sexRestriction: [Female] # DeltaV: Splitting the scars and tattoos coloring: default: @@ -27,3 +27,17 @@ sprites: - sprite: _DV/Mobs/Customization/tattoos.rsi state: tattoo_nightling_female + +- type: marking + id: TattooNanotrasenChest + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human, Dwarf, SlimePerson] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: _DV/Mobs/Customization/tattoos.rsi + state: tattoo_nanotrasen_chest diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/undershirt.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/undershirt.yml new file mode 100644 index 00000000000..604c619544a --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/undershirt.yml @@ -0,0 +1,139 @@ +- type: marking + id: UndershirtDefault + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _DV/Mobs/Customization/undershirt.rsi + state: undershirt + +- type: marking + id: UndershirtRolled + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _DV/Mobs/Customization/undershirt.rsi + state: rolled_undershirt + +- type: marking + id: UndershirtSleeveless + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _DV/Mobs/Customization/undershirt.rsi + state: sleeveless + +- type: marking + id: UndershirtRolledSleeveless + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _DV/Mobs/Customization/undershirt.rsi + state: rolled_undershirt_sleeveless + +- type: marking + id: UndershirtGrossSleeveless + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _DV/Mobs/Customization/undershirt.rsi + state: gross_sleeveless + +- type: marking + id: UndershirtNanotrasen + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _DV/Mobs/Customization/undershirt.rsi + state: nanotrasen + +- type: marking + id: UndershirtBinder + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _DV/Mobs/Customization/undershirt.rsi + state: binder + +- type: marking + id: UndershirtBraClassic + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _DV/Mobs/Customization/undershirt.rsi + state: classic + +- type: marking + id: UndershirtBraSports + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _DV/Mobs/Customization/undershirt.rsi + state: sports + +- type: marking + id: UndershirtBraStrapless + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _DV/Mobs/Customization/undershirt.rsi + state: strapless \ No newline at end of file diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/underwear.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/underwear.yml new file mode 100644 index 00000000000..42804dd1531 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/underwear.yml @@ -0,0 +1,69 @@ +- type: marking + id: UnderwearDefault + bodyPart: Underwear + markingCategory: Underwear + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _DV/Mobs/Customization/underwear.rsi + state: boxers + +- type: marking + id: UnderwearBriefs + bodyPart: Underwear + markingCategory: Underwear + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _DV/Mobs/Customization/underwear.rsi + state: briefs + +- type: marking + id: UnderwearLowriders + bodyPart: Underwear + markingCategory: Underwear + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _DV/Mobs/Customization/underwear.rsi + state: lowriders + +- type: marking + id: UnderwearSatin + bodyPart: Underwear + markingCategory: Underwear + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _DV/Mobs/Customization/underwear.rsi + state: satin + +- type: marking + id: UnderwearTanga + bodyPart: Underwear + markingCategory: Underwear + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _DV/Mobs/Customization/underwear.rsi + state: tanga \ No newline at end of file diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml index ec305698aa1..c057b353a74 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml @@ -42,6 +42,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] - map: [ "underpants" ] - map: [ "undershirt" ] - map: [ "socks" ] @@ -175,6 +177,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] - map: [ "underpants" ] - map: [ "undershirt" ] - map: [ "socks" ] diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml index 95e55cd02df..1fdd2cc0179 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml @@ -45,6 +45,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] - map: [ "jumpsuit" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml index ac7f62b86cc..07e3f627fd2 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml @@ -45,6 +45,8 @@ sprite: _DV/Mobs/Customization/Vulpkanin/masking_helpers.rsi state: female_full visible: false + - map: [ "enum.HumanoidVisualLayers.Underwear" ] + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] - map: [ "jumpsuit" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] diff --git a/Resources/Prototypes/_DV/Species/harpy.yml b/Resources/Prototypes/_DV/Species/harpy.yml index 49861c04a8e..3f47171710f 100644 --- a/Resources/Prototypes/_DV/Species/harpy.yml +++ b/Resources/Prototypes/_DV/Species/harpy.yml @@ -15,6 +15,8 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking + Undershirt: MobHumanoidAnyMarking Chest: MobHarpyTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -51,6 +53,12 @@ points: 1 required: true defaultMarkings: [ HarpyChestDefault ] + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false Legs: points: 2 required: false diff --git a/Resources/Prototypes/_DV/Species/rodentia.yml b/Resources/Prototypes/_DV/Species/rodentia.yml index 6d235be35ff..e92484d8dfd 100644 --- a/Resources/Prototypes/_DV/Species/rodentia.yml +++ b/Resources/Prototypes/_DV/Species/rodentia.yml @@ -20,6 +20,8 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking + Undershirt: MobHumanoidAnyMarking Chest: MobRodentiaTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -53,6 +55,12 @@ Arms: points: 6 required: false + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false Snout: points: 1 required: false diff --git a/Resources/Prototypes/_DV/Species/vulpkanin.yml b/Resources/Prototypes/_DV/Species/vulpkanin.yml index 1c5cd66457a..22e71716b76 100644 --- a/Resources/Prototypes/_DV/Species/vulpkanin.yml +++ b/Resources/Prototypes/_DV/Species/vulpkanin.yml @@ -19,6 +19,8 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking + Undershirt: MobHumanoidAnyMarking Chest: MobVulpkaninTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -49,6 +51,12 @@ Head: points: 3 required: false + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false Legs: points: 6 required: false diff --git a/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/meta.json index 5693064c0f5..3ea11b7584c 100644 --- a/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/meta.json +++ b/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi, modified by Aikakakah", + "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi, modified by Aikakakah. NanoTrasen tattoo ported from ImpStation as of https://github.com/impstation/imp-station-14/pull/384", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ { "name": "tattoo_nightling_female", "directions": 4 + }, + { + "name": "tattoo_nanotrasen_chest", + "directions": 4 } ] } diff --git a/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/tattoo_nanotrasen_chest.png b/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/tattoo_nanotrasen_chest.png new file mode 100644 index 00000000000..f97c3078a84 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/tattoo_nanotrasen_chest.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/binder.png b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/binder.png new file mode 100644 index 00000000000..57bd2017318 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/binder.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/classic.png b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/classic.png new file mode 100644 index 00000000000..bf277cb4a72 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/classic.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/gross_sleeveless.png b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/gross_sleeveless.png new file mode 100644 index 00000000000..2ec1b3f1f36 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/gross_sleeveless.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/meta.json new file mode 100644 index 00000000000..97825ce3a61 --- /dev/null +++ b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/meta.json @@ -0,0 +1,51 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/884ab172389b6fc54ef063f5fbea5e8b0a0a2235/icons/mob/humans/undershirt.dmi, nanotrasen taken from https://github.com/tgstation/tgstation/commit/c14e98740794eb107bfa40aad19bd4c4d307184f, undershirts modified by Pinkbat5(github), binder by Pinkbat5(github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "undershirt", + "directions": 4 + }, + { + "name": "sleeveless", + "directions": 4 + }, + { + "name": "gross_sleeveless", + "directions": 4 + }, + { + "name": "rolled_undershirt_sleeveless", + "directions": 4 + }, + { + "name": "rolled_undershirt", + "directions": 4 + }, + { + "name": "binder", + "directions": 4 + }, + { + "name": "classic", + "directions": 4 + }, + { + "name": "sports", + "directions": 4 + }, + { + "name": "strapless", + "directions": 4 + }, + { + "name": "nanotrasen", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/nanotrasen.png b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/nanotrasen.png new file mode 100644 index 00000000000..5d69f6dd8e4 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/nanotrasen.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/rolled_undershirt.png b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/rolled_undershirt.png new file mode 100644 index 00000000000..fb5a9b74e88 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/rolled_undershirt.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/rolled_undershirt_sleeveless.png b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/rolled_undershirt_sleeveless.png new file mode 100644 index 00000000000..ec51c413ed3 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/rolled_undershirt_sleeveless.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/sleeveless.png b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/sleeveless.png new file mode 100644 index 00000000000..7f6f870ed86 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/sleeveless.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/sports.png b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/sports.png new file mode 100644 index 00000000000..49feecd4a6e Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/sports.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/strapless.png b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/strapless.png new file mode 100644 index 00000000000..6736e280018 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/strapless.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/undershirt.png b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/undershirt.png new file mode 100644 index 00000000000..c1a3a40c0fe Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/undershirt.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/boxers.png b/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/boxers.png new file mode 100644 index 00000000000..18ec96ff084 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/boxers.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/briefs.png b/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/briefs.png new file mode 100644 index 00000000000..256345ff7d1 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/briefs.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/lowriders.png b/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/lowriders.png new file mode 100644 index 00000000000..986aa6a0f0f Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/lowriders.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/meta.json new file mode 100644 index 00000000000..59c8185fb72 --- /dev/null +++ b/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/884ab172389b6fc54ef063f5fbea5e8b0a0a2235/icons/mob/humans/underwear.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "briefs", + "directions": 4 + }, + { + "name": "lowriders", + "directions": 4 + }, + { + "name": "satin", + "directions": 4 + }, + { + "name": "tanga", + "directions": 4 + }, + { + "name": "boxers", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/satin.png b/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/satin.png new file mode 100644 index 00000000000..0482ac35592 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/satin.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/tanga.png b/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/tanga.png new file mode 100644 index 00000000000..5edf178a8d5 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/underwear.rsi/tanga.png differ