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

Xmas resprites #2416

Merged
merged 8 commits into from
Jan 1, 2025
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
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
- SimpleHostile
- type: Sprite
drawdepth: SmallMobs
sprite: Mobs/Animals/regalrat.rsi
sprite: SS220/Mobs/Animals/regalrat.rsi #SS20 XMAS
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: regalrat
Expand Down Expand Up @@ -197,7 +197,7 @@
- SimpleHostile
- type: Sprite
drawdepth: SmallMobs
sprite: Mobs/Animals/rat.rsi
sprite: SS220/Mobs/Animals/rat.rsi #SS220 XMAS
layers:
- map: ["enum.DamageStateVisualLayers.Base", "movement"]
state: rat
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Entities/Mobs/Player/silicon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
- type: StationAiVision
- type: InteractionOutline
- type: Sprite
sprite: Mobs/Silicon/station_ai.rsi
sprite: SS220/Mobs/Silicon/station_ai.rsi #SS220 XMAS
layers:
- state: base
- state: ai_empty
Expand All @@ -360,7 +360,7 @@
containerId: station_ai_mind_slot
job: StationAi
- type: Sprite
sprite: Mobs/Silicon/station_ai.rsi
sprite: SS220/Mobs/Silicon/station_ai.rsi #SS220 XMAS
layers:
- state: base
- state: ai
Expand Down Expand Up @@ -425,7 +425,7 @@
- type: Visibility
layer: 2
- type: Sprite
sprite: Mobs/Silicon/station_ai.rsi
sprite: SS220/Mobs/Silicon/station_ai.rsi #SS220 XMAS
layers:
- state: ai_camera
shader: unshaded
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Entities/Objects/Fun/pai.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
type: StationMapBoundUserInterface
requireInputValidation: false
- type: Sprite
sprite: Objects/Fun/pai.rsi
sprite: SS220/Objects/Fun/pai.rsi #SS220 XMAS
layers:
- state: pai-base
- state: pai-off-overlay
Expand Down Expand Up @@ -87,7 +87,7 @@
description: Your Syndicate pal who's fun to be with!
components:
- type: Sprite
sprite: Objects/Fun/pai.rsi
sprite: SS220/Objects/Fun/pai.rsi #SS220 XMAS
layers:
- state: pai-base
- state: syndicate-pai-off-overlay
Expand Down Expand Up @@ -129,7 +129,7 @@
description: It's a potato. You forced it to be sentient, you monster.
components:
- type: Sprite
sprite: Objects/Fun/pai.rsi
sprite: SS220/Objects/Fun/pai.rsi #SS220 XMAS
layers:
- state: potato-base
- state: potato-off-overlay
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,7 @@
name: loadout-group-chief-engineer-head
minLimit: 0
loadouts:
- ChiefEngineerHeadXmas #SS220 XMAS
- ChiefEngineerHead
- ChiefEngineerBeret
- BeretCE #SS220-CEBeret
Expand Down Expand Up @@ -908,6 +909,7 @@
id: StationEngineerHead
name: loadout-group-station-engineer-head
loadouts:
- StationEngineerHardhatYellowXmas #SS220 XMAS
- StationEngineerHardhatYellow
- StationEngineerHardhatOrange
- StationEngineerHardhatRed
Expand Down Expand Up @@ -1220,6 +1222,7 @@
name: loadout-group-security-head
minLimit: 0
loadouts:
- SecurityHelmetXmas #SS220 XMAS
- SecurityHelmet
- SecurityBeret
- SecurityHat
Expand Down
33 changes: 33 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Head/hardhats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,39 @@
- type: Clothing
sprite: SS220/Clothing/Head/Hardhats/violet.rsi

- type: entity
parent: ClothingHeadHatHardhatBase
id: ClothingHeadHatHardhatWhiteXmas
name: новогодняя белая каска
description: Новогоднее настроение на вашей голове и защита в одном!
components:
- type: Sprite
sprite: SS220/Clothing/Head/Hardhats/white_xmas.rsi
- type: Clothing
sprite: SS220/Clothing/Head/Hardhats/white_xmas.rsi

- type: entity
parent: ClothingHeadHatHardhatBase
id: ClothingHeadHatHardhatYellowXmas
name: новогодняя жёлтая каска
description: Новогоднее настроение на вашей голове и защита в одном!
components:
- type: Sprite
sprite: SS220/Clothing/Head/Hardhats/yellow_xmas.rsi
- type: Clothing
sprite: SS220/Clothing/Head/Hardhats/yellow_xmas.rsi

- type: entity
parent: ClothingHeadHatHardhatBase
id: ClothingHeadHatHardhatVioletXmas
name: новогодняя фиолетовая каска
description: Новогоднее настроение на вашей голове и защита в одном!
components:
- type: Sprite
sprite: SS220/Clothing/Head/Hardhats/violet_xmas.rsi
- type: Clothing
sprite: SS220/Clothing/Head/Hardhats/violet_xmas.rsi

# Уборщик

- type: entity
Expand Down
19 changes: 19 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Head/helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,25 @@
- type: Clothing
sprite: SS220/Clothing/Head/Helmets/opscore.rsi

- type: entity
parent: [ClothingHeadHelmetBase]
id: ClothingHeadHelmetBasicXmas
name: новогодний шлем
description: Новогоднее настроение на вашей голове и защита в одном!
components:
- type: EmitSoundOnLand ##new sound_drop effect, add MIXnikita
sound:
path: /Audio/SS220/Effects/Drop/clothing_head_helmedeva.ogg
params:
volume: 2
- type: Sprite
sprite: SS220/Clothing/Head/Helmets/security_xmas.rsi
- type: Clothing
sprite: SS220/Clothing/Head/Helmets/security_xmas.rsi
- type: Tag
tags:
- Kangaroo #SS220-ghost-roles

#Military Police Helmet #by MIXnikita for SS200
- type: entity
parent: ClothingHeadBase
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/SS220/Entities/Objects/Fun/pai.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
type: StationMapBoundUserInterface
requireInputValidation: false
- type: Sprite
sprite: Objects/Fun/pai.rsi
sprite: SS220/Objects/Fun/pai.rsi #XMAS
layers:
- state: pai-base
- state: pai-off-overlay
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@
equipment:
head: ClothingHeadBandSalvage

- type: loadout
id: ClothingHeadHatHardhatVioletXmas
equipment:
head: ClothingHeadHatHardhatVioletXmas

- type: loadout
id: ClothingHeadHatHardhatViolet
equipment:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,7 @@
equipment:
head: ClothingHeadHatBeretCE

- type: loadout
id: ChiefEngineerHeadXmas
equipment:
head: ClothingHeadHatHardhatWhiteXmas
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
role: JobStationEngineer
time: 108000 # 30 hrs

# Head
- type: loadout
id: StationEngineerHardhatYellowXmas
equipment:
head: ClothingHeadHatHardhatYellowXmas

# Glasses
- type: loadout
id: GlassesEngineer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@
jumpsuit: ClothingUniformJumpsuitVaas

# Head
- type: loadout
id: SecurityHelmetXmas
equipment:
head: ClothingHeadHelmetBasicXmas

- type: loadout
id: HatCowboyBlack
equipment:
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/SS220/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@
name: loadout-group-security-pilot-head
minLimit: 0
loadouts:
- SecurityHelmetXmas
- SecurityHelmet
- SecurityBeret
- SecurityHat
Expand Down Expand Up @@ -533,6 +534,7 @@
loadouts:
- ClothingHeadHatSalvage
- ClothingHeadBandSalvage
- ClothingHeadHatHardhatVioletXmas
- ClothingHeadHatHardhatViolet
- ClothingHeadBeretSalvageSpecialist
# Утилизатор (Конец)
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"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 dinazewwr (Discord) for SS220 XMAS resprite by vimenant2",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "light-icon"
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "off-inhand-left",
"directions": 4
},
{
"name": "off-inhand-right",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4
},
{
"name": "on-inhand-right",
"directions": 4
}
]
}
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.
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,41 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 XMAS resprite by vimenant2 (discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "light-icon"
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "off-inhand-left",
"directions": 4
},
{
"name": "off-inhand-right",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4
},
{
"name": "on-inhand-right",
"directions": 4
}
]
}
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.
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,41 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 XMAS resprite by vimenant2 (discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "light-icon"
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "off-inhand-left",
"directions": 4
},
{
"name": "off-inhand-right",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4
},
{
"name": "on-inhand-right",
"directions": 4
}
]
}
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.
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,34 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhand taken at commit https://github.com/tgstation/tgstation/commit/d1582bf1b41a0e24fd7a18124c6ff46b86b393f9 and modified by github:Morb0, equipped-HELMET-kangaroo is a modified version by github:TheArturZh, Vox state made by DieselMohawk for use in SS14, XMAS resprite by vimenant2",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-kangaroo",
"directions": 4
},
{
"name": "equipped-HELMET-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Loading