Skip to content

Commit

Permalink
Unlimited Face Markings (#1435)
Browse files Browse the repository at this point in the history
# Description

Removes the marking limits for the Face category (was limited to 1
marking) for all non-IPC species, now having unlimited markings as
designed.

Moth makeup (Moth Blush / Moth Lipstick) is now usable again in the Face
category.

## Media

**Markings without limits**


![image](https://github.com/user-attachments/assets/768c4d8b-d982-4836-a57c-1be17e48a33f)

**Lizard with frills and earrings**


![image](https://github.com/user-attachments/assets/1cd4902d-e187-496b-950f-2113655d02c3)

**Moth Makeup**


![image](https://github.com/user-attachments/assets/29236624-c417-4ee6-bf91-e9f80acf8216)

# Changelog

:cl: Skubman
- fix: The Face marking category now has unlimited markings for all
species apart from IPCs.
- fix: Moth People can now apply Moth makeup markings again in the Face
category.
- tweak: Unathi now have 3 'Head (Side)' marking points available, so
they can use frills and both left and right-side earrings.
  • Loading branch information
angelofallars authored Jan 5, 2025
1 parent 72d6347 commit deecce3
Show file tree
Hide file tree
Showing 10 changed files with 3 additions and 26 deletions.
3 changes: 0 additions & 3 deletions Resources/Prototypes/DeltaV/Species/vulpkanin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@
- type: markingPoints
id: MobVulpkaninMarkingLimits
points:
Face:
points: 1
required: false
Hair:
points: 1
required: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
- type: marking
id: MakeupMothBlush
bodyPart: Face
markingCategory: Overlay
markingCategory: Face
speciesRestriction: [Moth]
coloring:
default:
Expand Down
3 changes: 0 additions & 3 deletions Resources/Prototypes/Nyanotrasen/Species/Oni.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
- type: markingPoints
id: MobOniMarkingLimits
points:
Face:
points: 1
required: false
Hair:
points: 1
required: false
Expand Down
3 changes: 0 additions & 3 deletions Resources/Prototypes/Nyanotrasen/Species/felinid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
- type: markingPoints
id: MobFelinidMarkingLimits
points:
Face:
points: 1
required: false
Hair:
points: 1
required: false
Expand Down
3 changes: 0 additions & 3 deletions Resources/Prototypes/Species/arachne.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
- type: markingPoints
id: MobArachneMarkingLimits
points:
Face:
points: 1
required: false
Hair:
points: 1
required: false
Expand Down
3 changes: 0 additions & 3 deletions Resources/Prototypes/Species/harpy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@
- type: markingPoints
id: MobHarpyMarkingLimits
points:
Face:
points: 1
required: false
Hair:
points: 1
required: false
Expand Down
3 changes: 0 additions & 3 deletions Resources/Prototypes/Species/human.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@
- type: markingPoints
id: MobHumanMarkingLimits
points:
Face:
points: 1
required: false
Hair:
points: 1
required: false
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Species/moth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
id: MobMothSprites
sprites:
Head: MobMothHead
Face: MobHumanoidAnyMarking
Snout: MobHumanoidAnyMarking
Chest: MobMothTorso
HeadTop: MobHumanoidAnyMarking
Expand Down
5 changes: 1 addition & 4 deletions Resources/Prototypes/Species/reptilian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@
id: MobReptilianMarkingLimits
onlyWhitelisted: true
points:
Face:
points: 1
required: false
Hair:
points: 0
required: false
Expand All @@ -63,7 +60,7 @@
points: 2
required: false
HeadSide:
points: 2
points: 3
required: false
Chest:
points: 1
Expand Down
3 changes: 0 additions & 3 deletions Resources/Prototypes/Species/slime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
- type: markingPoints
id: MobSlimeMarkingLimits
points:
Face:
points: 1
required: false
Hair:
points: 1
required: false
Expand Down

0 comments on commit deecce3

Please sign in to comment.