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.

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

New years cap #2439

Merged
merged 7 commits into from
Dec 31, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -459,9 +459,9 @@
description: A festive hat worn by Santa Claus.
components:
- type: Sprite
sprite: Clothing/Head/Hats/santahat.rsi
sprite: SS220/Clothing/Head/Hats/santahat.rsi # ss220 new-years-cap
- type: Clothing
sprite: Clothing/Head/Hats/santahat.rsi
sprite: SS220/Clothing/Head/Hats/santahat.rsi # ss220 new-years-cap
#ss220 special_sounds start
- type: SpecialSounds
- type: Vocal
Expand Down
11 changes: 9 additions & 2 deletions Resources/Prototypes/Entities/Mobs/Player/observer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,18 @@
categories: [ HideSpawnMenu ]
components:
- type: Sprite
sprite: Mobs/Ghosts/ghost_human.rsi
color: "#fff8"
# sprite: Mobs/Ghosts/ghost_human.rsi ## ss220-new-years-cap
# color: "#fff8" ss220-new-years-cap
layers:
- state: animated
shader: unshaded
## ss220-new-years-cap begin
sprite: Mobs/Ghosts/ghost_human.rsi
color: "#fff8"
- state: cap-ghost
shader: unshaded
sprite: SS220/Clothing/Head/Hats/santahat.rsi
## ss220-new-years-cap end
- type: ContentEye
maxZoom: 1.44,1.44
- type: Eye
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Kirus59 marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Resources/Textures/SS220/Clothing/Head/Hats/santahat.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Sprited by plagexx (Discord) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-hamster",
"directions": 4
},
{
"name": "cap-ghost",
"directions": 4
}
]
}
Loading