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 all 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
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,5 @@ ent-ClothingHeadHatInterdyne = кепка парамедика Interdyne
ent-ClothingHeadHatInterdyneFlipped = кепка парамедика Interdyne
.suffix = Interdyne, За время в игре, Flipped
.desc = { ent-ClothingHeadHatInterdyneFlipped.desc }
ent-ClothingHeadHatNewYearsCap = новогодний колпак
.desc = Яркий новогодний колпак с пушистым помпоном, добавляющий волшебства и праздничного настроения!
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockClothesFilled
cost: 2440
cost: 2500 #SS220 New years cap Begin \ Вернуть после нового года \ 2440
category: cargoproduct-category-name-service
group: market

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
ClothingHeadHatCorpsoft: 2
ClothingHeadFishCap: 2
ClothingHeadRastaHat: 2
ClothingHeadHatNewYearsCap: 5 #SS220 New years cap \ Убрать после нового года
ClothingBeltStorageWaistbag: 3
ClothingEyesGlasses: 6
ClothingHandsGlovesColorBlack: 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
ClothingOuterPoncho: 2
ClothingHeadHatSantahat: 2
ClothingOuterSanta: 2
ClothingHeadHatNewYearsCap: 2 #SS220 New years cap
ClothingHeadHatSkub: 2
ClothingOuterSkub: 2
ClothingHeadHatBeretFrench: 2
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/newyears_cap.rsi
## ss220-new-years-cap end
- type: ContentEye
maxZoom: 1.44,1.44
- type: Eye
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,10 @@
- type: AccessReader
access: []
#ss220 wires cut fix end
#SS220 New years cap Begin \ Убрать после нового года
- type: StaticPrice
price: 3000
#SS220 New years cap End \ Убрать после нового года

- type: entity
parent: VendingMachine
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -615,3 +615,14 @@
- type: Clothing
sprite: SS220/Clothing/Head/Hats/pith_helmet.rsi
# WMT Ebent end

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatNewYearsCap
name: new year`s cap
description: A bright New Year's hat with a fluffy pompom, adding magic and festive mood!
components:
- type: Sprite
sprite: SS220/Clothing/Head/Hats/newyears_cap.rsi
- type: Clothing
sprite: SS220/Clothing/Head/Hats/newyears_cap.rsi
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.
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.
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