Skip to content

Commit f94eed0

Browse files
ZigTagZephyrpakportfiend
authored
cherrypick: old vulps from Misfit (#8)
<!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> ## About the PR <!-- What did you change? --> Reverts wizden sprite changes to the Paradise sprites, and adds back all the old markings, as well as removes messy drinker from them. ## Why / Balance <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> A majority of people seem to prefer the older sprites, it also means we have to change less. ## Technical details <!-- Summary of code changes for easier review. --> - cherrypick Misfit-Station/Misfit-Station-14#5 - remove the changes to sounds ## Media <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. --> <img width="235" height="332" alt="image" src="https://github.com/user-attachments/assets/a823667a-a21c-45e4-b885-6279125c5dc0" /> <img width="237" height="354" alt="image" src="https://github.com/user-attachments/assets/af59f7dc-a9db-4c4a-b851-8a6da452be6c" /> <img width="220" height="341" alt="image" src="https://github.com/user-attachments/assets/6aa7f815-9257-4e51-a0ff-83fc20912c1f" /> ## Requirements <!-- Confirm the following by placing an X in the brackets [X]: --> - [x] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [x] I have added media to this PR or it does not require an ingame showcase. <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion --> ## Breaking changes <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> Changes vulp sprite back to paradise sprites as well as removes displacement maps (this is how it is in DenOne) **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> 🆑 - remove: upstream vulp sprites --------- Co-authored-by: Zephyr <68482449+Zephyrpak@users.noreply.github.com> Co-authored-by: portfiend <109661617+portfiend@users.noreply.github.com>
1 parent 3918b2d commit f94eed0

35 files changed

Lines changed: 198 additions & 189 deletions

File tree

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Ears
2+
3+
marking-VulpEarWolf-wolf = Wolf ears (Base)
4+
marking-VulpEarWolf-wolf-inner = Wolf ears (Inner)
5+
marking-VulpEarWolf = Wolf Ears
6+
7+
# Tails
8+
marking-VulpTailCoyote-coyote = Coyote tail (Base)
9+
marking-VulpTailCoyote = Coyote
10+
11+
marking-VulpTailFox-fox = Fox tail (Base)
12+
marking-VulpTailFox-fox-tip = Fox tail (Tip)
13+
marking-VulpTailFox = Vulpkanin Fox
14+
15+
marking-VulpTailOtie-otie = Otie tail (Base)
16+
marking-VulpTailOtie = Otie

Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_tail.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
id: VulpTailFennec
44
bodyPart: Tail
55
markingCategory: Tail
6-
speciesRestriction: [ Vulpkanin ]
6+
speciesRestriction: [Vulpkanin]
77
sprites:
88
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
99
state: fennec
@@ -14,7 +14,7 @@
1414
id: VulpTailFluffy
1515
bodyPart: Tail
1616
markingCategory: Tail
17-
speciesRestriction: [ Vulpkanin ]
17+
speciesRestriction: [Vulpkanin]
1818
sprites:
1919
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
2020
state: fluffy
@@ -25,7 +25,7 @@
2525
id: VulpTailHusky
2626
bodyPart: Tail
2727
markingCategory: Tail
28-
speciesRestriction: [ Vulpkanin ]
28+
speciesRestriction: [Vulpkanin]
2929
sprites:
3030
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
3131
state: husky
@@ -38,7 +38,7 @@
3838
id: VulpTailLong
3939
bodyPart: Tail
4040
markingCategory: Tail
41-
speciesRestriction: [ Vulpkanin ]
41+
speciesRestriction: [Vulpkanin]
4242
sprites:
4343
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
4444
state: long
@@ -49,7 +49,7 @@
4949
id: VulpTailVulp
5050
bodyPart: Tail
5151
markingCategory: Tail
52-
speciesRestriction: [ Vulpkanin ]
52+
speciesRestriction: [Vulpkanin]
5353
sprites:
5454
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
5555
state: vulp
@@ -60,7 +60,7 @@
6060
id: VulpTailVulpFade
6161
bodyPart: Tail
6262
markingCategory: Tail
63-
speciesRestriction: [ Vulpkanin ]
63+
speciesRestriction: [Vulpkanin]
6464
sprites:
6565
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
6666
state: vulp

Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
id: ScarEyeRight
33
bodyPart: Head
44
markingCategory: Head
5-
speciesRestriction: [Human, Dwarf, SlimePerson]
5+
speciesRestriction: [Human, Dwarf, SlimePerson, Vulpkanin] # Misfit - added Vulpkanin
66
followSkinColor: true
77
sprites:
88
- sprite: Mobs/Customization/scars.rsi
@@ -12,7 +12,7 @@
1212
id: ScarEyeLeft
1313
bodyPart: Head
1414
markingCategory: Head
15-
speciesRestriction: [Human, Dwarf, SlimePerson]
15+
speciesRestriction: [Human, Dwarf, SlimePerson, Vulpkanin] # Misfit - added Vulpkanin
1616
followSkinColor: true
1717
sprites:
1818
- sprite: Mobs/Customization/scars.rsi
@@ -22,7 +22,7 @@
2222
id: ScarTopSurgeryShort
2323
bodyPart: Chest
2424
markingCategory: Chest
25-
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona]
25+
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Vulpkanin] # Misfit - added Vulpkanin
2626
sexRestriction: [Male]
2727
followSkinColor: true
2828
sprites:
@@ -33,7 +33,7 @@
3333
id: ScarTopSurgeryLong
3434
bodyPart: Chest
3535
markingCategory: Chest
36-
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona]
36+
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona, Vulpkanin] # Misfit - added Vulpkanin
3737
sexRestriction: [Male]
3838
followSkinColor: true
3939
sprites:
@@ -44,7 +44,7 @@
4444
id: ScarChest
4545
bodyPart: Chest
4646
markingCategory: Chest
47-
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona]
47+
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona, Vulpkanin] # Misfit - added Vulpkanin
4848
followSkinColor: true
4949
sprites:
5050
- sprite: Mobs/Customization/scars.rsi
@@ -54,7 +54,7 @@
5454
id: ScarNeck
5555
bodyPart: Head
5656
markingCategory: Head
57-
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson]
57+
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Vulpkanin] # Misfit - added Vulpkanin
5858
followSkinColor: true
5959
sprites:
6060
- sprite: Mobs/Customization/scars.rsi
@@ -64,7 +64,7 @@
6464
id: ScarChestBullets
6565
bodyPart: Chest
6666
markingCategory: Chest
67-
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid]
67+
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Vulpkanin] # Misfit - added Vulpkanin
6868
followSkinColor: true
6969
sprites:
7070
- sprite: Mobs/Customization/scars.rsi
@@ -74,7 +74,7 @@
7474
id: ScarStomachBullets
7575
bodyPart: Chest
7676
markingCategory: Chest
77-
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid]
77+
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Vulpkanin] # Misfit - added Vulpkanin
7878
followSkinColor: true
7979
sprites:
8080
- sprite: Mobs/Customization/scars.rsi
@@ -84,7 +84,7 @@
8484
id: ScarFace1
8585
bodyPart: Head
8686
markingCategory: Head
87-
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth]
87+
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Vulpkanin] # Misfit - added Vulpkanin
8888
followSkinColor: true
8989
sprites:
9090
- sprite: Mobs/Customization/scars.rsi
@@ -94,7 +94,7 @@
9494
id: ScarFace2
9595
bodyPart: Head
9696
markingCategory: Head
97-
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth]
97+
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Vulpkanin] # Misfit - added Vulpkanin
9898
followSkinColor: true
9999
sprites:
100100
- sprite: Mobs/Customization/scars.rsi
@@ -104,7 +104,7 @@
104104
id: ScarEyeRightSmall
105105
bodyPart: Head
106106
markingCategory: Head
107-
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson]
107+
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Vulpkanin] # Misfit - added Vulpkanin
108108
followSkinColor: true
109109
sprites:
110110
- sprite: Mobs/Customization/scars.rsi
@@ -114,7 +114,7 @@
114114
id: ScarEyeLeftSmall
115115
bodyPart: Head
116116
markingCategory: Head
117-
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson]
117+
speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Vulpkanin] # Misfit - added Vulpkanin
118118
followSkinColor: true
119119
sprites:
120120
- sprite: Mobs/Customization/scars.rsi

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

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
id: TattooEyeRight
115115
bodyPart: Eyes
116116
markingCategory: [Head]
117-
speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf]
117+
speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Vulpkanin] # Misfit - added vulpkanin
118118
coloring:
119119
default:
120120
type:
@@ -128,7 +128,7 @@
128128
id: TattooEyeLeft
129129
bodyPart: Eyes
130130
markingCategory: Head
131-
speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf]
131+
speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Vulpkanin] # Misfit - added vulpkanin
132132
coloring:
133133
default:
134134
type:
@@ -166,33 +166,7 @@
166166
- sprite: Mobs/Customization/tattoos.rsi
167167
state: tattoo_eye_moth_l
168168

169-
- type: marking
170-
id: TattooEyeVulpkaninRight
171-
bodyPart: Eyes
172-
markingCategory: [Head]
173-
speciesRestriction: [Vulpkanin]
174-
coloring:
175-
default:
176-
type:
177-
!type:EyeColoring
178-
negative: true
179-
sprites:
180-
- sprite: Mobs/Customization/tattoos.rsi
181-
state: tattoo_eye_vulpkanin_r
182-
183-
- type: marking
184-
id: TattooEyeVulpkaninLeft
185-
bodyPart: Eyes
186-
markingCategory: Head
187-
speciesRestriction: [Vulpkanin]
188-
coloring:
189-
default:
190-
type:
191-
!type:EyeColoring
192-
negative: true
193-
sprites:
194-
- sprite: Mobs/Customization/tattoos.rsi
195-
state: tattoo_eye_vulpkanin_l
169+
# Misfit - removed vulpkanin eye tattoo in exchange for the human one
196170

197171
- type: marking
198172
id: TattooEyeshadowUpper
@@ -217,4 +191,4 @@
217191
forcedColoring: true
218192
sprites:
219193
- sprite: Mobs/Customization/tattoos.rsi
220-
state: eyeshadow_lower
194+
state: eyeshadow_lower

Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml

Lines changed: 6 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
components:
88
- type: Hunger
99
- type: Thirst
10-
- type: MessyDrinker
11-
spillChance: 0.33
10+
# - type: MessyDrinker # Misfit - Removed messy drinker. Goofy gimmick.
11+
# spillChance: 0.33
1212
- type: Icon
13-
sprite: Mobs/Species/Vulpkanin/parts.rsi
13+
sprite: _Misfit/Mobs/Species/Vulpkanin/parts.rsi # Misfit - Change to Paradise based sprites
1414
state: full
1515
- type: Body
1616
prototype: Vulpkanin
@@ -49,16 +49,7 @@
4949
- type: TemperatureProtection
5050
heatingCoefficient: 1.2
5151
coolingCoefficient: 0.3
52-
- type: JumpAbility
53-
action: ActionVulpkaninGravityJump
54-
canCollide: true
55-
jumpDistance: 3
56-
jumpSound:
57-
path: /Audio/Weapons/punchmiss.ogg
58-
params:
59-
pitch: 1.33
60-
volume: -5
61-
variation: 0.05
52+
# The Den - Removed jump ability for being to gamey.
6253
- type: Sprite # Drawlayers. Top to bottom in order I believe.
6354
netsync: false
6455
layers:
@@ -115,61 +106,7 @@
115106
- HeadTop
116107
- HeadSide
117108
- FacialHair
118-
- Hair
119-
markingsDisplacement:
120-
Hair:
121-
sizeMaps:
122-
32:
123-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
124-
state: hair
125-
- type: Inventory
126-
speciesId: vulpkanin
127-
displacements:
128-
jumpsuit:
129-
sizeMaps:
130-
32:
131-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
132-
state: jumpsuit
133-
back:
134-
sizeMaps:
135-
32:
136-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
137-
state: back
138-
outerClothing:
139-
sizeMaps:
140-
32:
141-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
142-
state: outerwear
143-
gloves:
144-
sizeMaps:
145-
32:
146-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
147-
state: hand
148-
shoes:
149-
sizeMaps:
150-
32:
151-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
152-
state: shoes
153-
head:
154-
sizeMaps:
155-
32:
156-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
157-
state: head
158-
neck:
159-
sizeMaps:
160-
32:
161-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
162-
state: neck
163-
eyes:
164-
sizeMaps:
165-
32:
166-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
167-
state: eyes
168-
belt:
169-
sizeMaps:
170-
32:
171-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
172-
state: belt
109+
# Misfit - deleted displacement maps
173110

174111
- type: entity
175112
parent: [BaseSpeciesDummy]
@@ -182,57 +119,4 @@
182119
- Snout
183120
- HeadTop
184121
- HeadSide
185-
markingsDisplacement:
186-
Hair:
187-
sizeMaps:
188-
32:
189-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
190-
state: hair
191-
- type: Inventory
192-
speciesId: vulpkanin
193-
displacements:
194-
jumpsuit:
195-
sizeMaps:
196-
32:
197-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
198-
state: jumpsuit
199-
back:
200-
sizeMaps:
201-
32:
202-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
203-
state: back
204-
outerClothing:
205-
sizeMaps:
206-
32:
207-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
208-
state: outerwear
209-
gloves:
210-
sizeMaps:
211-
32:
212-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
213-
state: hand
214-
shoes:
215-
sizeMaps:
216-
32:
217-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
218-
state: shoes
219-
head:
220-
sizeMaps:
221-
32:
222-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
223-
state: head
224-
neck:
225-
sizeMaps:
226-
32:
227-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
228-
state: neck
229-
eyes:
230-
sizeMaps:
231-
32:
232-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
233-
state: eyes
234-
belt:
235-
sizeMaps:
236-
32:
237-
sprite: Mobs/Species/Vulpkanin/displacement.rsi
238-
state: belt
122+
# Misfit - deleted displacement maps

0 commit comments

Comments
 (0)