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.

Sign up for GitHub

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

Upstream moth markings! #3

Merged
merged 5 commits into from
Jul 4, 2024
+341 −66
Merged

Upstream moth markings! #3

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9dd6828
Merged moth overlays from upstream
XavierSomething Jul 3, 2024
216486d
Merged moth overlays from upstream
XavierSomething Jul 3, 2024
283451f
Merged moth overlays from upstream
XavierSomething Jul 3, 2024
2fa0c20
Merged moth overlays from upstream
XavierSomething Jul 3, 2024
c81851b
Merge branch 'Fansana:master' into overlay
XavierSomething Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merged moth overlays from upstream
@XavierSomething
XavierSomething committed Jul 3, 2024
commit 283451fea14aafa4bf338ab09d93e5f2f64ef19b
10 changes: 5 additions & 5 deletions Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
View file
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@
id: GauzeBlindfold
bodyPart: Eyes
markingCategory: Overlay
speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, Vulpkanin
coloring:
default:
type:
@@ -100,7 +100,7 @@
id: GauzeUpperArmRight
bodyPart: RArm
markingCategory: Overlay
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Slimeperson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
coloring:
default:
type:
@@ -114,7 +114,7 @@
id: GauzeLowerArmRight
bodyPart: RArm, RHand
markingCategory: Overlay
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Slimeperson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
coloring:
default:
type:
@@ -198,7 +198,7 @@
id: GauzeBoxerWrapRight
bodyPart: RHand
markingCategory: Overlay
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Slimeperson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
coloring:
default:
type:
@@ -212,7 +212,7 @@
id: GauzeBoxerWrapLeft
bodyPart: LHand
markingCategory: Overlay
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Slimeperson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin
coloring:
default:
type: