Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scar and Tattoo Fixes #1889

Merged
merged 14 commits into from
Oct 30, 2024
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/deltav/markings/scars.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
marking-ScarChestFemale-scar_chest_female = Chest Scar
marking-ScarChestFemale = Chest Scar
8 changes: 8 additions & 0 deletions Resources/Locale/en-US/deltav/markings/tattoos.ftl
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/markings/tattoos.ftl
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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

Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
}
]
}

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading