Skip to content

Commit 8072879

Browse files
dootythefrootyNotActuallyMartyCerberusWolfie
authored
Feroxi Marking Tweaks and Underclothing Tweaks (ProjectOmu#109)
* mark your days. * add underclothing layers * removed duped underwear maps * comment changes --------- Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com> Co-authored-by: John Willis <143434770+CerberusWolfie@users.noreply.github.com>
1 parent 669630e commit 8072879

17 files changed

Lines changed: 173 additions & 126 deletions

File tree

‎Resources/Locale/en-US/_DV/markings/feroxi.ftl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,13 @@ marking-FeroxiTorsoCountershadingM-feroxi-torso-countershading-m = Countershadin
133133
marking-FeroxiLegStripesBlitz = Calf Stripes
134134
marking-FeroxiLegStripesBlitz-feroxi-leg-stripes-blitz = Stripes
135135
136-
marking-FeroxiLegStripesTiger = Full Stripes
136+
## omu - changed because arm and leg options are in overlay category
137+
marking-FeroxiLegStripesTiger = Full Leg Stripes
137138
marking-FeroxiLegStripesTiger-feroxi-leg-stripes-tiger = Stripes
138139
139140
marking-FeroxiArmStripesBlitz = Shoulder Stripes
140141
marking-FeroxiArmStripesBlitz-feroxi-arm-stripes-blitz = Stripes
141142
142-
marking-FeroxiArmStripesTiger = Full Stripes
143+
## omu - changed because arm and leg options are in overlay category
144+
marking-FeroxiArmStripesTiger = Full Arm Stripes
143145
marking-FeroxiArmStripesTiger-feroxi-arm-stripes-tiger = Stripes

‎Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
id: MakeupNailPolishRight
3737
bodyPart: RHand
3838
markingCategory: RightHand
39-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne] # Delta V - Felinid, Oni, Vulpkanin
39+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Feroxi] # Delta V - Felinid, Oni, Vulpkanin # Omu - Feroxi
4040
coloring:
4141
default:
4242
type:
@@ -50,7 +50,7 @@
5050
id: MakeupNailPolishLeft
5151
bodyPart: LHand
5252
markingCategory: LeftHand
53-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne] # Delta V - Felinid, Oni, Vulpkanin
53+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Feroxi] # Delta V - Felinid, Oni, Vulpkanin # Omu - Feroxi
5454
coloring:
5555
default:
5656
type:

‎Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@
251251
id: TattooEyeRightGlowy
252252
bodyPart: Eyes
253253
markingCategory: Head
254-
speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Harpy, Rodentia, Tajaran, Oni, Shadowkin] # Delta V - Felinid, Harpy, Rodentia; Goob - Tajaran; EE- Oni, Shadowkins
254+
speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Harpy, Rodentia, Tajaran, Oni, Shadowkin, Feroxi] # Delta V - Felinid, Harpy, Rodentia; Goob - Tajaran; EE- Oni, Shadowkins; Omu - Feroxi
255255
coloring:
256256
default:
257257
type:
@@ -266,7 +266,7 @@
266266
id: TattooEyeLeftGlowy
267267
bodyPart: Eyes
268268
markingCategory: Head
269-
speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Harpy, Rodentia, Tajaran, Oni, Shadowkin] # Delta V - Felinid, Harpy, Rodentia; Goob - Tajaran; EE- Oni, Shadowkins
269+
speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Harpy, Rodentia, Tajaran, Oni, Shadowkin, Feroxi] # Delta V - Felinid, Harpy, Rodentia; Goob - Tajaran; EE- Oni, Shadowkins; Omu - Feroxi
270270
coloring:
271271
default:
272272
type:

‎Resources/Prototypes/Entities/Mobs/Customization/Markings/undershirt.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
id: UndershirtDefault
99
bodyPart: Undershirt
1010
markingCategory: Undershirt
11-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy]
11+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Feroxi, Tajaran, Shadowkin, IPC] # Omu - Feroxi, Tajaran, Shadowkin, IPC
1212
coloring:
1313
default:
1414
type:
@@ -22,7 +22,7 @@
2222
id: UndershirtRolled
2323
bodyPart: Undershirt
2424
markingCategory: Undershirt
25-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy]
25+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Feroxi, Tajaran, Shadowkin, IPC] # Omu - Feroxi, Tajaran, Shadowkin, IPC
2626
coloring:
2727
default:
2828
type:
@@ -36,7 +36,7 @@
3636
id: UndershirtSleeveless
3737
bodyPart: Undershirt
3838
markingCategory: Undershirt
39-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy]
39+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Feroxi, Tajaran, Shadowkin, IPC] # Omu - Feroxi, Tajaran, Shadowkin, IPC
4040
coloring:
4141
default:
4242
type:
@@ -50,7 +50,7 @@
5050
id: UndershirtRolledSleeveless
5151
bodyPart: Undershirt
5252
markingCategory: Undershirt
53-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy]
53+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Feroxi, Tajaran, Shadowkin, IPC] # Omu - Feroxi, Tajaran, Shadowkin, IPC
5454
coloring:
5555
default:
5656
type:
@@ -64,7 +64,7 @@
6464
id: UndershirtGrossSleeveless
6565
bodyPart: Undershirt
6666
markingCategory: Undershirt
67-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy]
67+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Feroxi, Tajaran, Shadowkin, IPC] # Omu - Feroxi, Tajaran, Shadowkin, IPC
6868
coloring:
6969
default:
7070
type:
@@ -78,7 +78,7 @@
7878
id: UndershirtNanotrasen
7979
bodyPart: Undershirt
8080
markingCategory: Undershirt
81-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy]
81+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Feroxi, Tajaran, Shadowkin, IPC] # Omu - Feroxi, Tajaran, Shadowkin, IPC
8282
coloring:
8383
default:
8484
type:
@@ -92,7 +92,7 @@
9292
id: UndershirtBinder
9393
bodyPart: Undershirt
9494
markingCategory: Undershirt
95-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy]
95+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Feroxi, Tajaran, Shadowkin, IPC] # Omu - Feroxi, Tajaran, Shadowkin, IPC
9696
coloring:
9797
default:
9898
type:
@@ -106,7 +106,7 @@
106106
id: UndershirtBraClassic
107107
bodyPart: Undershirt
108108
markingCategory: Undershirt
109-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy]
109+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Feroxi, Tajaran, Shadowkin, IPC] # Omu - Feroxi, Tajaran, Shadowkin, IPC
110110
coloring:
111111
default:
112112
type:
@@ -120,7 +120,7 @@
120120
id: UndershirtBraSports
121121
bodyPart: Undershirt
122122
markingCategory: Undershirt
123-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy]
123+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Feroxi, Tajaran, Shadowkin, IPC] # Omu - Feroxi, Tajaran, Shadowkin, IPC
124124
coloring:
125125
default:
126126
type:
@@ -134,7 +134,7 @@
134134
id: UndershirtBraStrapless
135135
bodyPart: Undershirt
136136
markingCategory: Undershirt
137-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy]
137+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Feroxi, Tajaran, Shadowkin, IPC] # Omu - Feroxi, Tajaran, Shadowkin, IPC
138138
coloring:
139139
default:
140140
type:

‎Resources/Prototypes/Entities/Mobs/Customization/Markings/underwear.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
id: UnderwearDefault
99
bodyPart: Underwear
1010
markingCategory: Underwear
11-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy]
11+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Feroxi, Tajaran, Shadowkin, IPC] # Omu - Feroxi, Tajaran, Shadowkin, IPC
1212
coloring:
1313
default:
1414
type:
@@ -22,7 +22,7 @@
2222
id: UnderwearBriefs
2323
bodyPart: Underwear
2424
markingCategory: Underwear
25-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy]
25+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Feroxi, Tajaran, Shadowkin, IPC] # Omu - Feroxi, Tajaran, Shadowkin, IPC
2626
coloring:
2727
default:
2828
type:
@@ -36,7 +36,7 @@
3636
id: UnderwearLowriders
3737
bodyPart: Underwear
3838
markingCategory: Underwear
39-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy]
39+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Feroxi, Tajaran, Shadowkin, IPC] # Omu - Feroxi, Tajaran, Shadowkin, IPC
4040
coloring:
4141
default:
4242
type:
@@ -50,7 +50,7 @@
5050
id: UnderwearSatin
5151
bodyPart: Underwear
5252
markingCategory: Underwear
53-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy]
53+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Feroxi, Tajaran, Shadowkin, IPC] # Omu - Feroxi, Tajaran, Shadowkin, IPC
5454
coloring:
5555
default:
5656
type:
@@ -64,7 +64,7 @@
6464
id: UnderwearTanga
6565
bodyPart: Underwear
6666
markingCategory: Underwear
67-
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy]
67+
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Feroxi, Tajaran, Shadowkin, IPC] # Omu - Feroxi, Tajaran, Shadowkin, IPC
6868
coloring:
6969
default:
7070
type:

‎Resources/Prototypes/Entities/Mobs/Customization/Markings/wrist.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
id: WristBraceletRight
88
bodyPart: RHand
99
markingCategory: RightHand
10-
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne]
10+
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Feroxi] # Omu - Feroxi
1111
coloring:
1212
default:
1313
type:
@@ -22,7 +22,7 @@
2222
id: WristBraceletLeft
2323
bodyPart: LHand
2424
markingCategory: LeftHand
25-
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne]
25+
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Feroxi] # Omu - Feroxi
2626
coloring:
2727
default:
2828
type:
@@ -36,7 +36,7 @@
3636
id: WristBraceletArmRight
3737
bodyPart: RArm
3838
markingCategory: RightArm
39-
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne]
39+
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Feroxi] # Omu - Feroxi
4040
coloring:
4141
default:
4242
type:
@@ -50,7 +50,7 @@
5050
id: WristBraceletArmLeft
5151
bodyPart: LArm
5252
markingCategory: LeftArm
53-
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne]
53+
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Feroxi] # Omu - Feroxi
5454
coloring:
5555
default:
5656
type:
@@ -64,7 +64,7 @@
6464
id: WristWatchRight
6565
bodyPart: RHand
6666
markingCategory: RightHand
67-
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne]
67+
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Feroxi] # Omu - Feroxi
6868
coloring:
6969
default:
7070
type:
@@ -78,7 +78,7 @@
7878
id: WristWatchLeft
7979
bodyPart: LHand
8080
markingCategory: LeftHand
81-
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne]
81+
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Feroxi] # Omu - Feroxi
8282
coloring:
8383
default:
8484
type:
@@ -92,7 +92,7 @@
9292
id: WristWatchSilverRight
9393
bodyPart: RHand
9494
markingCategory: RightHand
95-
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne]
95+
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Feroxi] # Omu - Feroxi
9696
coloring:
9797
default:
9898
type:
@@ -106,7 +106,7 @@
106106
id: WristWatchSilverLeft
107107
bodyPart: LHand
108108
markingCategory: LeftHand
109-
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne]
109+
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Feroxi] # Omu - Feroxi
110110
coloring:
111111
default:
112112
type:
@@ -120,7 +120,7 @@
120120
id: WristWatchGoldRight
121121
bodyPart: RHand
122122
markingCategory: RightHand
123-
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne]
123+
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Feroxi] # Omu - Feroxi
124124
coloring:
125125
default:
126126
type:
@@ -134,7 +134,7 @@
134134
id: WristWatchGoldLeft
135135
bodyPart: LHand
136136
markingCategory: LeftHand
137-
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne]
137+
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Feroxi] # Omu - Feroxi
138138
coloring:
139139
default:
140140
type:
@@ -148,7 +148,7 @@
148148
id: WristWatchHoloRight
149149
bodyPart: RHand
150150
markingCategory: RightHand
151-
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne]
151+
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Feroxi] # Omu - Feroxi
152152
coloring:
153153
default:
154154
type:
@@ -162,7 +162,7 @@
162162
id: WristWatchHoloLeft
163163
bodyPart: LHand
164164
markingCategory: LeftHand
165-
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne]
165+
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Feroxi] # Omu - Feroxi
166166
coloring:
167167
default:
168168
type:
@@ -176,7 +176,7 @@
176176
id: WristWatchLeatherRight
177177
bodyPart: RHand
178178
markingCategory: RightHand
179-
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne]
179+
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Feroxi] # Omu - Feroxi
180180
coloring:
181181
default:
182182
type:
@@ -190,7 +190,7 @@
190190
id: WristWatchLeatherLeft
191191
bodyPart: LHand
192192
markingCategory: LeftHand
193-
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne]
193+
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Feroxi] # Omu - Feroxi
194194
coloring:
195195
default:
196196
type:
@@ -204,7 +204,7 @@
204204
id: WristWatchColorableRight
205205
bodyPart: RHand
206206
markingCategory: RightHand
207-
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne]
207+
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Feroxi] # Omu - Feroxi
208208
coloring:
209209
default:
210210
type:
@@ -220,7 +220,7 @@
220220
id: WristWatchColorableLeft
221221
bodyPart: LHand
222222
markingCategory: LeftHand
223-
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne]
223+
speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Feroxi] # Omu - Feroxi
224224
coloring:
225225
default:
226226
type:

0 commit comments

Comments
 (0)