diff --git a/Resources/Audio/Items/Toys/attributions.yml b/Resources/Audio/Items/Toys/attributions.yml index 162ee8c1c33..2bf5e86e70d 100644 --- a/Resources/Audio/Items/Toys/attributions.yml +++ b/Resources/Audio/Items/Toys/attributions.yml @@ -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" diff --git a/Resources/Audio/Items/Toys/scaryswings.ogg b/Resources/Audio/Items/Toys/scaryswings.ogg new file mode 100644 index 00000000000..e4cedebd6d1 Binary files /dev/null and b/Resources/Audio/Items/Toys/scaryswings.ogg differ diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/toys.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/toys.ftl index d623c59f058..971bee582fe 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/toys.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/toys.ftl @@ -2,3 +2,5 @@ ent-ADTPlushieUrs = плюшевый Урс .desc = Милая плюшевая игрушка Урса. ent-ADTBlackSharkPlushie = черная плюшевая акула .desc = Всего лишь от одного взгляда на неё вам становится не по себе, то ли от желания пожамкать её, то ли от страха. +ent-SkidAndPump = Скид и Тыковка + .desc = Это ЖУТКИЙ МЕСЯЦ! \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml index a2fac947a0b..6b07fa190bf 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml @@ -23,3 +23,24 @@ tags: - PlushieSharkBlack - Payload + +- 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" diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index 48e8b1a1782..a014376f33f 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -12,6 +12,7 @@ rarePrototypes: - FoamBlade - PlushieGhost + - SkidAndPump rareChance: 0.03 prototypes: - PlushieBee diff --git a/Resources/Textures/ADT/Objects/Fun/skidandpump.rsi/icon.png b/Resources/Textures/ADT/Objects/Fun/skidandpump.rsi/icon.png new file mode 100644 index 00000000000..6c3bd9ea9f2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/skidandpump.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/skidandpump.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/skidandpump.rsi/meta.json new file mode 100644 index 00000000000..e78caf965ee --- /dev/null +++ b/Resources/Textures/ADT/Objects/Fun/skidandpump.rsi/meta.json @@ -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 + ] + ] + } + ] +}