diff --git a/Resources/Locale/en-US/deltav/markings/scars.ftl b/Resources/Locale/en-US/deltav/markings/scars.ftl new file mode 100644 index 00000000000..151dcbf28b4 --- /dev/null +++ b/Resources/Locale/en-US/deltav/markings/scars.ftl @@ -0,0 +1,2 @@ +marking-ScarChestFemale-scar_chest_female = Chest Scar +marking-ScarChestFemale = Chest Scar diff --git a/Resources/Locale/en-US/deltav/markings/tattoos.ftl b/Resources/Locale/en-US/deltav/markings/tattoos.ftl new file mode 100644 index 00000000000..d62a118a890 --- /dev/null +++ b/Resources/Locale/en-US/deltav/markings/tattoos.ftl @@ -0,0 +1,8 @@ +marking-TattooHiveChestFemale-tattoo_hive_chest_female = Back Tattoo (Hive) +marking-TattooHiveChestFemale = Back Tattoo (Hive) + +marking-TattooNightlingChestMale-tattoo_nightling_male = Chest Tattoo (Nightling) +marking-TattooNightlingChestMale = Chest Tattoo (Nightling) + +marking-TattooNightlingChestFemale-tattoo_nightling_female = Chest Tattoo (Nightling) +marking-TattooNightlingChestFemale = Chest Tattoo (Nightling) diff --git a/Resources/Locale/en-US/markings/tattoos.ftl b/Resources/Locale/en-US/markings/tattoos.ftl index a3d1d1ef686..84a53561878 100644 --- a/Resources/Locale/en-US/markings/tattoos.ftl +++ b/Resources/Locale/en-US/markings/tattoos.ftl @@ -1,7 +1,7 @@ marking-TattooHiveChest-tattoo_hive_chest = Back Tattoo (Hive) marking-TattooHiveChest = Back Tattoo (Hive) -marking-TattooNightlingChest-tattoo_nightling = Chest Tattoo (nightling) +marking-TattooNightlingChest-tattoo_nightling = Chest Tattoo (Nightling) marking-TattooNightlingChest = Chest Tattoo (Nightling) marking-TattooSilverburghLeftLeg-tattoo_silverburgh_l_leg = Left Leg Tattoo (Silverburg) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/scars.yml new file mode 100644 index 00000000000..0b27c239baa --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/scars.yml @@ -0,0 +1,10 @@ +- type: marking + id: ScarChestFemale #DeltaV: Splitting the scars and tattoos + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni + sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos + followSkinColor: true + sprites: + - sprite: DeltaV/Mobs/Customization/scars.rsi + state: scar_chest_female diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/tattoos.yml new file mode 100644 index 00000000000..e8174f74b48 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/tattoos.yml @@ -0,0 +1,29 @@ +- type: marking + id: TattooHiveChestFemale #DeltaV: Splitting the scars and tattoos + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: DeltaV/Mobs/Customization/tattoos.rsi + state: tattoo_hive_chest_female + +- type: marking + id: TattooNightlingChestFemale #DeltaV: Splitting the scars and tattoos + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + sexRestriction: [Female] #DeltaV: Splitting the scars and tattoos + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: DeltaV/Mobs/Customization/tattoos.rsi + state: tattoo_nightling_female diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index 13c09f99089..687fe1ca4c3 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml @@ -45,7 +45,9 @@ bodyPart: Chest markingCategory: Chest speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni + sexRestriction: [Male] #DeltaV: Splitting the scars and tattoos followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi state: scar_chest + diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index 345115bf5aa..1e284c813b4 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -3,6 +3,7 @@ bodyPart: Chest markingCategory: Chest speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + sexRestriction: [Male] #DeltaV: Splitting the scars and tattoos coloring: default: type: @@ -17,13 +18,14 @@ bodyPart: Chest markingCategory: Chest speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + sexRestriction: [Male] #DeltaV: Splitting the scars and tattoos coloring: default: type: !type:TattooColoring fallbackColor: "#666666" sprites: - - sprite: Mobs/Customization/tattoos.rsi + - sprite: DeltaV/Mobs/Customization/tattoos.rsi #DeltaV: Splitting the scars and tattoos state: tattoo_nightling - type: marking diff --git a/Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/meta.json new file mode 100644 index 00000000000..bcdb3ffbf2e --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/meta.json @@ -0,0 +1,16 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn by Ubaser, modified by Aikakakah", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "scar_chest_female", + "directions": 4 + } + ] + } + \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/scar_chest_female.png b/Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/scar_chest_female.png new file mode 100644 index 00000000000..b6009e3b662 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/scars.rsi/scar_chest_female.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/meta.json new file mode 100644 index 00000000000..5693064c0f5 --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "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", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "tattoo_hive_chest_female", + "directions": 4 + }, + { + "name": "tattoo_nightling", + "directions": 4 + }, + { + "name": "tattoo_nightling_female", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_female.png b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_female.png new file mode 100644 index 00000000000..835ae506555 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_hive_chest_female.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling.png b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling.png new file mode 100644 index 00000000000..ab92c759219 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling_female.png b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling_female.png new file mode 100644 index 00000000000..06b4f37ae7d Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi/tattoo_nightling_female.png differ