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

Шляпки для Иана #255

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Шляпки для Иана #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2334064
HATS OMG
ASTRALIXIX Jan 29, 2025
45ef492
Oops
ASTRALIXIX Jan 29, 2025
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
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
- type: cargoProduct
id: LivestockCorgi
icon:
sprite: Mobs/Pets/corgi.rsi
sprite: Mobs/Pets/corgi/corgi.rsi
state: corgi
product: CrateNPCCorgi
cost: 1200
Expand All @@ -71,7 +71,7 @@
- type: cargoProduct
id: LivestockPupCorgi
icon:
sprite: Mobs/Pets/corgi.rsi
sprite: Mobs/Pets/corgi/corgi.rsi
state: puppy
product: CrateNPCPuppyCorgi
cost: 1200
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
- type: Tag
tags:
- HudMedical
- CorgiWearable

- type: entity
parent: [ClothingEyesBase, ShowSecurityIcons, BaseRestrictedContraband]
Expand All @@ -57,6 +58,7 @@
- type: Tag
tags:
- HudSecurity
- CorgiWearable

- type: entity
parent: [ClothingEyesBase, BaseCommandContraband]
Expand All @@ -69,6 +71,9 @@
- type: Clothing
sprite: Clothing/Eyes/Hud/command.rsi
- type: ShowJobIcons
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: ClothingEyesBase
Expand Down Expand Up @@ -235,6 +240,9 @@
sprite: Clothing/Eyes/Hud/medpatch.rsi
- type: Clothing
sprite: Clothing/Eyes/Hud/medpatch.rsi
- type: Tag
tags:
- HudMedical

- type: entity
parent: [ClothingEyesEyepatchHudMedical, ClothingHeadEyeBaseFlipped]
Expand All @@ -251,6 +259,9 @@
sprite: Clothing/Eyes/Hud/secpatch.rsi
- type: Clothing
sprite: Clothing/Eyes/Hud/secpatch.rsi
- type: Tag
tags:
- HudSecurity

- type: entity
parent: [ClothingEyesEyepatchHudSecurity, ClothingHeadEyeBaseFlipped]
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
- type: Tag
tags:
- WhitelistChameleon
- CorgiWearable

- type: entity
parent: ClothingHeadHatHardhatBase
Expand Down
54 changes: 54 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/hats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
sprite: Clothing/Head/Hats/beaver_hat.rsi
- type: Clothing
sprite: Clothing/Head/Hats/beaver_hat.rsi
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: ClothingHeadBase
Expand Down Expand Up @@ -41,6 +44,7 @@
tags:
- ClothMade
- WhitelistChameleon
- CorgiWearable

- type: entity
parent: ClothingHeadBase
Expand Down Expand Up @@ -72,6 +76,7 @@
tags:
- ClothMade
- WhitelistChameleon
- CorgiWearable

- type: entity
parent: ClothingHeadBase
Expand All @@ -83,6 +88,9 @@
sprite: Clothing/Head/Hats/casa.rsi
- type: Clothing
sprite: Clothing/Head/Hats/casa.rsi
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: ClothingHeadBase
Expand Down Expand Up @@ -180,6 +188,9 @@
sprite: Clothing/Head/Hats/beret_brigmedic.rsi
- type: Clothing
sprite: Clothing/Head/Hats/beret_brigmedic.rsi
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: [ ClothingHeadBase ]
Expand All @@ -202,6 +213,9 @@
sprite: Clothing/Head/Hats/bowler_hat.rsi
- type: Clothing
sprite: Clothing/Head/Hats/bowler_hat.rsi
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: [ClothingHeadBase, BaseCommandContraband]
Expand Down Expand Up @@ -301,6 +315,9 @@
sprite: Clothing/Head/Hats/greyfedora.rsi
- type: Clothing
sprite: Clothing/Head/Hats/greyfedora.rsi
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: ClothingHeadBase
Expand All @@ -312,6 +329,9 @@
sprite: Clothing/Head/Hats/fez.rsi
- type: Clothing
sprite: Clothing/Head/Hats/fez.rsi
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: [ClothingHeadBase, BaseCommandContraband]
Expand Down Expand Up @@ -366,6 +386,9 @@
sprite: Clothing/Head/Hats/witchhat.rsi
- type: Clothing
sprite: Clothing/Head/Hats/witchhat.rsi
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: ClothingHeadBase
Expand All @@ -377,6 +400,9 @@
sprite: Clothing/Head/Hats/paper.rsi
- type: Clothing
sprite: Clothing/Head/Hats/paper.rsi
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: ClothingHeadBase
Expand All @@ -388,6 +414,9 @@
sprite: Clothing/Head/Hats/pirate.rsi
- type: Clothing
sprite: Clothing/Head/Hats/pirate.rsi
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: ClothingHeadBase
Expand Down Expand Up @@ -430,6 +459,9 @@
sprite: Clothing/Head/Hats/santahat.rsi
- type: Clothing
sprite: Clothing/Head/Hats/santahat.rsi
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: ClothingHeadBase
Expand All @@ -443,6 +475,9 @@
sprite: Clothing/Head/Hats/sombrero.rsi
- type: AddAccentClothing
accent: SpanishAccent
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: ClothingHeadBase
Expand Down Expand Up @@ -563,6 +598,7 @@
tags:
- WhitelistChameleon
- ClothMade
- CorgiWearable
- type: HideLayerClothing
slots:
- Hair
Expand Down Expand Up @@ -633,6 +669,9 @@
sprite: Clothing/Head/Hats/pyjamasyndicateblack.rsi
- type: Clothing
sprite: Clothing/Head/Hats/pyjamasyndicateblack.rsi
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: [ ClothingHeadBase, BaseSyndicateContraband ]
Expand All @@ -644,6 +683,9 @@
sprite: Clothing/Head/Hats/pyjamasyndicatepink.rsi
- type: Clothing
sprite: Clothing/Head/Hats/pyjamasyndicatepink.rsi
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: [ ClothingHeadBase, BaseSyndicateContraband ]
Expand All @@ -655,6 +697,9 @@
sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi
- type: Clothing
sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: ClothingHeadBase
Expand Down Expand Up @@ -728,6 +773,9 @@
sprite: Clothing/Head/Hats/safarihat.rsi
- type: Clothing
sprite: Clothing/Head/Hats/safarihat.rsi
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: ClothingHeadBase
Expand Down Expand Up @@ -1028,6 +1076,9 @@
- type: AddAccentClothing
accent: ReplacementAccent
replacement: cowboy
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: ClothingHeadHatCowboyBrown
Expand Down Expand Up @@ -1133,3 +1184,6 @@
sprite: Clothing/Head/Hats/beret_medic.rsi
- type: Clothing
sprite: Clothing/Head/Hats/beret_medic.rsi
- type: Tag
tags:
- CorgiWearable
7 changes: 7 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/helmets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
tags:
- WhitelistChameleon
- SecurityHelmet
- CorgiWearable

#Mercenary Helmet
- type: entity
Expand Down Expand Up @@ -71,6 +72,9 @@
Caustic: 0.95
- type: ExplosionResistance
damageCoefficient: 0.75
- type: Tag
tags:
- CorgiWearable

#Syndicate SWAT Helmet
- type: entity
Expand Down Expand Up @@ -103,6 +107,9 @@
Blunt: 0.8
Slash: 0.8
Piercing: 0.95
- type: Tag
tags:
- CorgiWearable

#Bombsuit Helmet
- type: entity
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/misc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
sprite: Clothing/Head/Misc/bunny.rsi
- type: Clothing
sprite: Clothing/Head/Misc/bunny.rsi
- type: Tag
tags:
- CorgiWearable

- type: entity
parent: ClothingHeadBase
Expand Down
Loading
Loading