Skip to content

Commit 49763e1

Browse files
authored
more resomi markings + shadowkin hair unlock (ProjectOmu#1045)
* resomi markings and shadowkin displacement + hair unlock * ingame marking names * update fluffy_tail.png
1 parent b63e6e1 commit 49763e1

10 files changed

Lines changed: 91 additions & 0 deletions

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
marking-ResomiFluffForehead = Fluffy Forehead
2+
marking-ResomiFluffEars = Fluffy Ears
3+
marking-ResomiFluffyTail = Fluffy Tail

Resources/Prototypes/_EinsteinEngines/Entities/Mobs/Species/shadowkin.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@
8282
- type: Thirst
8383
- type: Carriable
8484
- type: HumanoidAppearance
85+
markingsDisplacement: # Omu Start
86+
Hair:
87+
sizeMaps:
88+
32:
89+
sprite: _Omu/Mobs/Species/Shadowkin/displacement.rsi
90+
state: hair # Omu End
8591
species: Shadowkin
8692
- type: Icon
8793
sprite: _EinsteinEngines/Mobs/Species/Shadowkin/parts.rsi
@@ -240,6 +246,12 @@
240246
description: A dummy shadowkin meant to be used in character setup.
241247
components:
242248
- type: HumanoidAppearance
249+
markingsDisplacement: # Omu Start
250+
Hair:
251+
sizeMaps:
252+
32:
253+
sprite: _Omu/Mobs/Species/Shadowkin/displacement.rsi
254+
state: hair # Omu End
243255
species: Shadowkin
244256
- type: Sprite
245257
netsync: false

Resources/Prototypes/_EinsteinEngines/Species/shadowkin.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
HeadSide: MobShadowkinAnyMarkingFollowSkin
4343
Tail: MobShadowkinAnyMarkingFollowSkin
4444
#omu start
45+
Hair: MobHumanoidAnyMarking
4546
Undershirt: MobHumanoidAnyMarking
4647
Underwear: MobHumanoidAnyMarking
4748
#omu end
@@ -60,6 +61,9 @@
6061
- type: markingPoints
6162
id: MobShadowkinMarkingLimits
6263
points:
64+
Hair: # Omu
65+
points: 1
66+
required: false
6367
Tail:
6468
points: 1
6569
required: true

Resources/Prototypes/_Floofstation/Entities/Mobs/Customization/Markings/resomi.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,17 @@
2424
- sprite: _Floofstation/Mobs/Customization/resomi_parts.rsi
2525
state: tail_feathers
2626

27+
# Omu Start
28+
- type: marking
29+
id: ResomiFluffyTail
30+
bodyPart: Tail
31+
markingCategory: Tail
32+
speciesRestriction: [Resomi]
33+
sprites:
34+
- sprite: _Omu/Mobs/Customization/Resomi/markings.rsi
35+
state: fluffy_tail
36+
# Omu End
37+
2738
- type: marking
2839
id: ResomiLArmFeathers
2940
bodyPart: LHand
@@ -86,3 +97,23 @@
8697
sprites:
8798
- sprite: _Floofstation/Mobs/Customization/resomi_parts.rsi
8899
state: fluff_head_up
100+
101+
# Omu Start
102+
- type: marking
103+
id: ResomiFluffForehead
104+
bodyPart: Head
105+
markingCategory: Head
106+
speciesRestriction: [Resomi]
107+
sprites:
108+
- sprite: _Omu/Mobs/Customization/Resomi/markings.rsi
109+
state: forehead_fluff
110+
111+
- type: marking
112+
id: ResomiFluffEars
113+
bodyPart: Head
114+
markingCategory: Head
115+
speciesRestriction: [Resomi]
116+
sprites:
117+
- sprite: _Omu/Mobs/Customization/Resomi/markings.rsi
118+
state: fluffy_ears
119+
# Omu End
548 Bytes
Loading
599 Bytes
Loading
601 Bytes
Loading
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"version": 1,
3+
"license": "CC-BY-SA-4.0",
4+
"copyright": "Made by Marikiii, tail from (https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore and Bighorn are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14. Large drawn by Ubaser. Wagging tail by SonicDC. Splotch modified from Sharp by KittenColony(github). Frills neckfull come from: https://github.com/Bubberstation/Bubberstation/commit/8bc6b83404803466a560b694bf22ef3c0ac266a2), modified by Marikiii",
5+
"size": {
6+
"x": 32,
7+
"y": 32
8+
},
9+
"states": [
10+
{
11+
"name": "fluffy_ears",
12+
"directions": 4
13+
},
14+
{
15+
"name": "fluffy_tail",
16+
"directions": 4
17+
},
18+
{
19+
"name": "forehead_fluff",
20+
"directions": 4
21+
}
22+
]
23+
}
550 Bytes
Loading
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"version": 1,
3+
"license": "CC-BY-SA-4.0",
4+
"copyright": "Displacements by Marikiii",
5+
"size": {
6+
"x": 32,
7+
"y": 32
8+
},
9+
"load": {
10+
"srgb": false
11+
},
12+
"states": [
13+
{
14+
"name": "hair",
15+
"directions": 4
16+
}
17+
]
18+
}

0 commit comments

Comments
 (0)