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

Добавление игрушки Скида и Тыковки для хеллоуина. #666

Merged
merged 8 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from 5 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
5 changes: 5 additions & 0 deletions Resources/Audio/Items/Toys/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,8 @@
license: "CC0-1.0"
copyright: "Created by xprospero for ss14"
source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Audio/Items/Toys/rubber_chicken_3.ogg"

- files: ["scaryswings.ogg"]
license: "CC-BY-SA-3.0"
copyright: "Music made by MasterSwordRemix, from Spooky Month animation made by SrPelo"
source: "https://www.youtube.com/MasterSwordRemix"
Binary file added Resources/Audio/Items/Toys/scaryswings.ogg
Binary file not shown.
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ADT/Objects/Toys/SkidAndPump.ftl
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Перенести эту локализацию в \Resources\Locale\ru-RU\ADT\prototypes\Entities\Objects\Fun\toys.ftl

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ent-SkidAndPump = Скид и Тыковка
.desc = Это ЖУТКИЙ МЕСЯЦ!
.suffix = { "" }
20 changes: 20 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Fun/SkidAndPump.yml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Перенести прототип в \Resources\Prototypes\ADT\Entities\Objects\Fun\toys.yml

Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
- type: entity
parent: BaseItem
id: SkidAndPump
name: Skid&Pump
description: THIS IS SPOOKY MONTH!
components:
- type: Sprite
sprite: ADT/Objects/Fun/skidandpump.rsi
state: icon
- type: Item
sprite: ADT/Objects/Fun/skidandpump.rsi
- type: AmbientSound
enabled: true
volume: -6
range: 9
sound:
path: /Audio/Items/Toys/scaryswings.ogg
- type: PointLight
radius: 1.4
color: "#ff7a06"
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
rarePrototypes:
- FoamBlade
- PlushieGhost
- SkidAndPump
rareChance: 0.03
prototypes:
- PlushieBee
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions Resources/Textures/ADT/Objects/Fun/skidandpump.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprites made by Tamioki, OC made by SrPelo - https://www.youtube.com/@SrPelo",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon",
"delays": [
[
0.1,
0.1,
0.1,
0.1
]
]
}
]
}
Loading