diff --git a/.github/rsi-schema.json b/.github/rsi-schema.json index 050324755f4..9232b05f121 100644 --- a/.github/rsi-schema.json +++ b/.github/rsi-schema.json @@ -1,7 +1,7 @@ { "$schema":"http://json-schema.org/draft-07/schema", "default":{ - + }, "description":"JSON Schema for SS14 RSI validation.", "examples":[ @@ -104,7 +104,7 @@ "size":{ "$id":"#/properties/size", "default":{ - + }, "description":"The dimensions of the sprites inside the RSI. This is not the size of the PNG files that store the sprite sheet.", "examples":[ @@ -145,7 +145,7 @@ "title":"Icon States", "description":"Metadata for icon states. Includes name, directions, delays, etc.", "default":[ - + ], "examples":[ [ diff --git a/Resources/Audio/ADT/Friskis/blast.ogg b/Resources/Audio/ADT/Friskis/blast.ogg new file mode 100644 index 00000000000..93c2d7bfa70 Binary files /dev/null and b/Resources/Audio/ADT/Friskis/blast.ogg differ diff --git a/Resources/Audio/ADT/Friskis/pomehi.ogg b/Resources/Audio/ADT/Friskis/pomehi.ogg new file mode 100644 index 00000000000..fcba3242e06 Binary files /dev/null and b/Resources/Audio/ADT/Friskis/pomehi.ogg differ diff --git a/Resources/Audio/ADT/Friskis/trevoga.ogg b/Resources/Audio/ADT/Friskis/trevoga.ogg new file mode 100644 index 00000000000..dfa2de3ed32 Binary files /dev/null and b/Resources/Audio/ADT/Friskis/trevoga.ogg differ diff --git a/Resources/Audio/ADT/Friskis/trevoga2.ogg b/Resources/Audio/ADT/Friskis/trevoga2.ogg new file mode 100644 index 00000000000..c2e82ee6364 Binary files /dev/null and b/Resources/Audio/ADT/Friskis/trevoga2.ogg differ diff --git a/Resources/Audio/ADT/SoundGen/budilnik.ogg b/Resources/Audio/ADT/SoundGen/budilnik.ogg new file mode 100644 index 00000000000..5ae7282832d Binary files /dev/null and b/Resources/Audio/ADT/SoundGen/budilnik.ogg differ diff --git a/Resources/Audio/ADT/SoundGen/destruction_1.ogg b/Resources/Audio/ADT/SoundGen/destruction_1.ogg new file mode 100644 index 00000000000..4d49b272857 Binary files /dev/null and b/Resources/Audio/ADT/SoundGen/destruction_1.ogg differ diff --git a/Resources/Audio/ADT/SoundGen/destruction_2.ogg b/Resources/Audio/ADT/SoundGen/destruction_2.ogg new file mode 100644 index 00000000000..0da2ac18b71 Binary files /dev/null and b/Resources/Audio/ADT/SoundGen/destruction_2.ogg differ diff --git a/Resources/Audio/ADT/SoundGen/destruction_3.ogg b/Resources/Audio/ADT/SoundGen/destruction_3.ogg new file mode 100644 index 00000000000..2dfd0209eef Binary files /dev/null and b/Resources/Audio/ADT/SoundGen/destruction_3.ogg differ diff --git a/Resources/Audio/ADT/SoundGen/dungeon_ambient_scary.ogg b/Resources/Audio/ADT/SoundGen/dungeon_ambient_scary.ogg new file mode 100644 index 00000000000..187e625f3bb Binary files /dev/null and b/Resources/Audio/ADT/SoundGen/dungeon_ambient_scary.ogg differ diff --git a/Resources/Audio/ADT/SoundGen/factory_ambient.ogg b/Resources/Audio/ADT/SoundGen/factory_ambient.ogg new file mode 100644 index 00000000000..7c9088058fe Binary files /dev/null and b/Resources/Audio/ADT/SoundGen/factory_ambient.ogg differ diff --git a/Resources/Audio/ADT/SoundGen/hit.ogg b/Resources/Audio/ADT/SoundGen/hit.ogg new file mode 100644 index 00000000000..bf501cdda72 Binary files /dev/null and b/Resources/Audio/ADT/SoundGen/hit.ogg differ diff --git a/Resources/Audio/ADT/SoundGen/moving_objects_ambient_scary.ogg b/Resources/Audio/ADT/SoundGen/moving_objects_ambient_scary.ogg new file mode 100644 index 00000000000..9d59fb71d16 Binary files /dev/null and b/Resources/Audio/ADT/SoundGen/moving_objects_ambient_scary.ogg differ diff --git a/Resources/Audio/ADT/SoundGen/pianino_chord_sudden.ogg b/Resources/Audio/ADT/SoundGen/pianino_chord_sudden.ogg new file mode 100644 index 00000000000..8d5d9d7680f Binary files /dev/null and b/Resources/Audio/ADT/SoundGen/pianino_chord_sudden.ogg differ diff --git a/Resources/Audio/ADT/SoundGen/reverse_dissolve_scary.ogg b/Resources/Audio/ADT/SoundGen/reverse_dissolve_scary.ogg new file mode 100644 index 00000000000..583221c18a7 Binary files /dev/null and b/Resources/Audio/ADT/SoundGen/reverse_dissolve_scary.ogg differ diff --git a/Resources/Audio/ADT/SoundGen/shaft_water.ogg b/Resources/Audio/ADT/SoundGen/shaft_water.ogg new file mode 100644 index 00000000000..da7aacda489 Binary files /dev/null and b/Resources/Audio/ADT/SoundGen/shaft_water.ogg differ diff --git a/Resources/Audio/ADT/SoundGen/short_ambient_scary.ogg b/Resources/Audio/ADT/SoundGen/short_ambient_scary.ogg new file mode 100644 index 00000000000..205be1fa953 Binary files /dev/null and b/Resources/Audio/ADT/SoundGen/short_ambient_scary.ogg differ diff --git a/Resources/Audio/Lobby/The_Wrong_Party.ogg b/Resources/Audio/Lobby/The_Wrong_Party.ogg index 50ea834629f..ce4994eebe9 100644 Binary files a/Resources/Audio/Lobby/The_Wrong_Party.ogg and b/Resources/Audio/Lobby/The_Wrong_Party.ogg differ diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml index ae8c61b4fa6..03818ad9e6e 100644 --- a/Resources/Audio/Lobby/attributions.yml +++ b/Resources/Audio/Lobby/attributions.yml @@ -83,3 +83,8 @@ license: "CC-BY-NC-SA-3.0" copyright: "The Wrong Party by Leon Riskin." source: "https://gamemusicandsoundeffects.com/product/the-wrong-party/" + +- files: ["friday_night.ogg"] + license: "Custom" + copyright: "Friday Night by Leon Riskin. Royalty-free music. Purchased for the Space Station 14: Adventure Time project." + source: "https://gamemusicandsoundeffects.com/product/friday-night/" diff --git a/Resources/Audio/Lobby/friday_night.ogg b/Resources/Audio/Lobby/friday_night.ogg new file mode 100644 index 00000000000..a74e4a678df Binary files /dev/null and b/Resources/Audio/Lobby/friday_night.ogg differ diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 39c1da526c6..b1c524f9e0e 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -484,3 +484,21 @@ Entries: - {message: Небольшие исправления черт Таяранов, type: Fix} id: 55599 #костыль отображения в Обновлениях time: '2023-11-05T04:20:00.0000000+00:00' + +- author: Шрёдингер + changes: + - {message: Перчатки уборщика в УборМат., type: Add} + - {message: Ряса священика в БогоМат., type: Add} + - {message: Мантия священика в БогоМат., type: Add} + - {message: Респрайт комбинезона священика., type: Tweak} + - {message: Респрайт комбинезона ГП., type: Tweak} + - {message: Респрайт комбинезона Капитана., type: Tweak} + - {message: Изменил цвет радиоканала синдиката на ярко-красный., type: Tweak} + - {message: Новая куртка в ШефМат., type: Add} + - {message: Шейный бант повара в ШефМат., type: Add} + - {message: Чёрное платье с золотыми лентами.(Щитспавн), type: Add} + - {message: Золотые туфли под таяран.(Щитспавн), type: Add} + - {message: Чёрные дамские перчатки.(Щитспавн), type: Add} + - {message: Добавил заколку.(Щитспавн), type: Add} + id: 55595 #костыль отображения в Обновлениях + time: '2023-11-06T04:20:00.0000000+00:00' diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Hands/gloves.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Hands/gloves.ftl index 0751e27b1eb..971eed88e8c 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Hands/gloves.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Hands/gloves.ftl @@ -20,3 +20,9 @@ ent-ADTBrassKnucklesGloves = Кастет ent-ADTClothingHandsBlackLongGloves = черные дамские перчатки .desc = Лёгкие и шелковистые черные перчатки с золотыми кольцами. Производства компании "Modeling Agency Dar-Vaxed". + +ent-ADTClothingHandsGlovesJanitor = Хозяйственные перчатки + .desc = Латексные перчатки для работы с грязью. + +ent-ADTClothingHandsGlovesBlackDams = Черные дамские перчатки + .desc = Лёгкие и шелковистые черные перчатки с золотыми кольцами. Производство компании "Modeling Agency Dar-Vaxed". diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl index 48073718157..9068f8957a2 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl @@ -58,3 +58,9 @@ ent-ADTClothingHeadHatsBavarianHatRed = красная егерская шляп ent-ADTClothingHeadHairPin = золотая заколка .desc = Золотая заколка для волос с красными перьями. Производства "Modeling Agency Dar-Vaxed". + +ent-ADTClothingHeadPovar = Поварской колпак-берет шеф-повара + .desc = Обязательный головной убор уважающего себя шеф-повара, а так-же чтобы на еду не попали волосы. + +ent-ADTClothingHeadZakolka = Золотая заколка для волос с красными перьями + .desc = Подружка, это заколка! Производство "Modeling Agency Dar-Vaxed". diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Neck/cloak.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Neck/cloak.ftl index ea2ca0d5a61..cf11b7902c9 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Neck/cloak.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Neck/cloak.ftl @@ -28,4 +28,8 @@ ent-ADTClothingNeckSyndicateCloak = плащ Синдиката ent-ADTClothingNeckNukeOpsCloak = плащ Ядерных Оперативников .desc = Согреет вас холодными вечерами на базе Ядерных Оперативников. - .suffix = { "" } + .suffix = { "" } + +ent-ADTClothingNeckMantiesChaplain = Мантия священника + .desc = Черная мантия священника. + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Neck/scarf.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Neck/scarf.ftl index 252529096ac..0d30ffe0ee3 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Neck/scarf.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Neck/scarf.ftl @@ -13,3 +13,6 @@ ent-ADTClothingNeckPinkFur = розовая меховая лента ent-ADTClothingNeckBlackFur = черная меховая лента .desc = Эта меховая лента, идеально впишется в ваш праздничный образ. .suffix = { "" } + +ent-ADTClothingNeckChefPovarFio = Шейный бант повара + .desc = Модный аксессуар для поваров, имеющий не практическое значение, а скорее чисто эстетическое. diff --git a/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/furcoat.ftl b/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/furcoat.ftl index b9a5672dbc3..9fcc53c9512 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/furcoat.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/furcoat.ftl @@ -9,3 +9,9 @@ ent-ADTClothingOuterGraySweatshirtTop = серая толстовка-топка ent-ADTClothingOuterBlackSweatshirtTop = черная толстовка-топка .desc = Стильная белая толстовка-топка. Производства компании "Modeling Agency Dar-Vaxed". + +ent-ADTClothingOuterBaseChaplainRasy = Ряса священника + .desc = Верхнее одеяние лиц духовного звания. + +ent-ADTClothingOuterSuitChefPovar = Поварская китель Шеф-повара + .desc = Защищает повара от капель раскаленного масла, кипятка, а одежду - от загрязнения. Позволяет носителю называть своих подчиненных огузками, инвалидами и калеками. diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl index 5b662b29e31..665622dd29c 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl @@ -214,3 +214,7 @@ ent-ADTJumpsuitCamouflageTshirtDesert = пустынная камуфляжна ent-ADTJumpsuitSerious = серьезная форма .desc = Серая футболка, черные джинсы - выглядит серьезно, грубо и круто! .suffix = { "" } + +ent-ADTClothingUniformShortDressBlackGold = Чёрное короткое платье + .desc = Легкое платье с открытой спиной из чёрной шелковой ткани с золотыми лентами, для элегантных распутных дам. Производство компании "Modeling Agency Dar-Vaxed" + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ADT/Clothing/boots.ftl b/Resources/Locale/ru-RU/ADT/Clothing/boots.ftl index e87ea9b3607..7c8000502d6 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/boots.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/boots.ftl @@ -33,6 +33,6 @@ ent-ADTClothingAidanShoes = остроконечные туфли Эйдана .desc = Стильные туфли из натуральной кожи крупного рогатого скота. .suffix = { "Именное" } -ent-ADTClothingFootGoldenHeels = золотые туфли +ent-ADTClothingFootGoldenHeels = Золотые туфли .desc = Шикарная пара золотистых туфель. Благодаря особым свойствам ткани эти туфли могут носить даже представители тех видов, кому такая обувь обычно неудобна. Производства компании "Modeling Agency Dar-Vaxed". .suffix = { "" } diff --git a/Resources/Locale/ru-RU/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/ru-RU/reagents/meta/consumable/drink/drinks.ftl index 5761538d8ea..258da823ead 100644 --- a/Resources/Locale/ru-RU/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/consumable/drink/drinks.ftl @@ -54,3 +54,5 @@ reagent-name-the-martinez = Мартинес reagent-desc-the-martinez = Легенда среди киберпанков. Вспоминается по напитку, забывается по пьяни. reagent-name-white-gilgamesh = белый Гильгамеш reagent-desc-white-gilgamesh = Тошнотворная смесь молока и пива. Вызывает ощущение одеревенелости. +reagent-name-kvass = квас +reagent-desc-kvass = Традиционный славянский и балтский кислый напиток, который готовят на основе брожения из муки и солода. diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml index 74fe5350c75..6ba01549ec8 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml @@ -151,3 +151,32 @@ - type: Fiber fiberMaterial: fibers-synthetic - type: FingerprintMask + + # Перчатки уборщика +- type: entity + parent: ClothingHandsBase + id: ADTClothingHandsGlovesJanitor + name: latex gloves + description: Thin sterile latex gloves. Basic PPE for any doctor. + components: + - type: Sprite + sprite: ADT/Clothing/Hands/Gloves/janitor_groves.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/Gloves/janitor_groves.rsi + - type: Fiber + fiberMaterial: fibers-latex + - type: FingerprintMask + +- type: entity + parent: ClothingHandsGlovesBoxingRed + id: ADTClothingHandsGlovesBlackDams + name: red gloves for martial arts + description: red gloves for martial arts + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Hands/Gloves/blackdams_gloves.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/Gloves/blackdams_gloves.rsi + - type: Fiber + fiberMaterial: fibers-synthetic diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml index 806f9c18f37..9f5a3a192d9 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml @@ -233,3 +233,25 @@ sprite: ADT/Clothing/Head/Hats/Oktoberfest/bavarian_hatred.rsi #спрайты от SHIONE - type: Clothing sprite: ADT/Clothing/Head/Hats/Oktoberfest/bavarian_hatred.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadPovar + name: MarineLieutenantBeret + description: Marine beret + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/hat_povar.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/hat_povar.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadZakolka + name: MarineLieutenantBeret + description: Marine beret + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/hat_zakolka.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/hat_zakolka.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/manties_chaplain.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/manties_chaplain.yml new file mode 100644 index 00000000000..2388feed595 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Neck/manties_chaplain.yml @@ -0,0 +1,8 @@ +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckMantiesChaplain + name: MantiesChaplain + description: + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Cloaks/manties_chaplain.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/scarfs.yml index 7e92e8d38ac..0e692c5ed37 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/scarfs.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Neck/scarfs.yml @@ -41,3 +41,14 @@ sprite: ADT/Clothing/Neck/blackfurtape.rsi - type: Clothing sprite: ADT/Clothing/Neck/blackfurtape.rsi + +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckChefPovarFio + name: pink fur tape + description: This fur tape ideal set in your garderobe + components: + - type: Sprite + sprite: ADT/Clothing/Neck/chefpovarfio.rsi + - type: Clothing + sprite: ADT/Clothing/Neck/chefpovarfio.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/FunOuterClothing.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/FunOuterClothing.yml index bd1e494a310..ad800bbc474 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/FunOuterClothing.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/FunOuterClothing.yml @@ -19,3 +19,14 @@ sprite: ADT/Clothing/OuterClothing/Suits/fox.rsi - type: Clothing sprite: ADT/Clothing/OuterClothing/Suits/fox.rsi + +- type: entity + parent: ClothingOuterBase + id: ADTClothingOuterSuitChefPovar + name: fox suit + description: Snort snort snort! + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Suits/chefpovar_outer.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Suits/chefpovar_outer.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/rasy_chaplain.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/rasy_chaplain.yml new file mode 100644 index 00000000000..3b137ec7d5f --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/rasy_chaplain.yml @@ -0,0 +1,9 @@ +- type: entity + parent: ClothingOuterBase + id: ADTClothingOuterBaseChaplainRasy + name: OuterBaseChaplain + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml index 4cd01b29873..c0fbaef5979 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml @@ -500,3 +500,15 @@ sprite: ADT/Clothing/Uniforms/Jumpskirt/black_short_dress.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/black_short_dress.rsi + + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformShortDressBlackGold + name: Rose white wedding dress + description: Specially for a princess! + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi diff --git a/Resources/Prototypes/ADT/SoundGen/soundgenerators.yml b/Resources/Prototypes/ADT/SoundGen/soundgenerators.yml new file mode 100644 index 00000000000..49802faa60c --- /dev/null +++ b/Resources/Prototypes/ADT/SoundGen/soundgenerators.yml @@ -0,0 +1,191 @@ +- type: entity + parent: BaseItem + id: ADTSoundGenBase + name: ADTSoundGenBase + abstract: true + description: Sound Generator! Wowie! + components: + - type: Sprite + sprite: ADT/Objects/Misc/soundgen.rsi + state: icon + - type: Item + sprite: ADT/Objects/Misc/soundgen.rsi + - type: EmitSoundOnSpawn + sound: + path: /Audio/ADT/SoundGen/destruction_1.ogg + radius: 7 + + +- type: entity + parent: BaseItem + id: ADTSoundGenBaseAmb + name: ADTSoundGenBase + abstract: true + description: Sound Generator! Wowie! + components: + - type: Sprite + sprite: ADT/Objects/Misc/soundgen.rsi + state: icon + - type: Item + sprite: ADT/Objects/Misc/soundgen.rsi + - type: EmitSoundOnSpawn + sound: + path: /Audio/ADT/SoundGen/destruction_1.ogg + radius: 7 + + + +- type: entity + parent: ADTSoundGenBase + id: ADTSoundGenDestruction1 + name: ADTSoundGenDestruction1 + abstract: false + components: + - type: TimedDespawn + lifetime: 0.1 + - type: EmitSoundOnSpawn + sound: + path: /Audio/ADT/SoundGen/destruction_1.ogg + + +- type: entity + parent: ADTSoundGenBase + id: ADTSoundGenDestruction2 + name: ADTSoundGenDestruction2 + abstract: false + components: + - type: TimedDespawn + lifetime: 0.1 + - type: EmitSoundOnSpawn + sound: + path: /Audio/ADT/SoundGen/destruction_2.ogg + + +- type: entity + parent: ADTSoundGenBase + id: ADTSoundGenDestruction3 + name: ADTSoundGenDestruction3 + abstract: false + components: + - type: TimedDespawn + lifetime: 0.1 + - type: EmitSoundOnSpawn + sound: + path: /Audio/ADT/SoundGen/destruction_3.ogg + + +- type: entity + parent: ADTSoundGenBase + id: ADTSoundGenBudilnik + name: ADTSoundGenBudilnik + abstract: false + components: + - type: TimedDespawn + lifetime: 0.1 + - type: EmitSoundOnSpawn + sound: + path: /Audio/ADT/SoundGen/budilnik.ogg + + +- type: entity + parent: ADTSoundGenBase + id: ADTSoundGenHit + name: ADTSoundGenHit + abstract: false + components: + - type: TimedDespawn + lifetime: 0.1 + - type: EmitSoundOnSpawn + sound: + path: /Audio/ADT/SoundGen/hit.ogg + + +- type: entity + parent: ADTSoundGenBaseAmb + id: ADTSoundGenMovingObjects + name: ADTSoundGenMovingObjects + abstract: false + components: + - type: TimedDespawn + lifetime: 0.1 + - type: EmitSoundOnSpawn + sound: + path: /Audio/ADT/SoundGen/moving_objects_ambient_scary.ogg + + +- type: entity + parent: ADTSoundGenBaseAmb + id: ADTSoundGenFactory + name: ADTSoundGenFactory + abstract: false + components: + - type: TimedDespawn + lifetime: 0.1 + - type: EmitSoundOnSpawn + sound: + path: /Audio/ADT/SoundGen/factory_ambient.ogg + + +- type: entity + parent: ADTSoundGenBase + id: ADTSoundGenSuddenChord + name: ADTSoundGenSuddenChord + abstract: false + components: + - type: TimedDespawn + lifetime: 0.1 + - type: EmitSoundOnSpawn + sound: + path: /Audio/ADT/SoundGen/pianino_chord_sudden.ogg + + +- type: entity + parent: ADTSoundGenBaseAmb + id: ADTSoundGenShaftWater + name: ADTSoundGenShaftWater + abstract: false + components: + - type: TimedDespawn + lifetime: 0.1 + - type: EmitSoundOnSpawn + sound: + path: /Audio/ADT/SoundGen/shaft_water.ogg + + +- type: entity + parent: ADTSoundGenBaseAmb + id: ADTSoundGenShortScaryAmbient + name: ADTSoundGenShortScaryAmbient + abstract: false + components: + - type: TimedDespawn + lifetime: 0.1 + - type: EmitSoundOnSpawn + sound: + path: /Audio/ADT/SoundGen/short_ambient_scary.ogg + + +- type: entity + parent: ADTSoundGenBase + id: ADTSoundGenReverseDissolveScary + name: ADTSoundGenReverseDissolveScary + abstract: false + components: + - type: TimedDespawn + lifetime: 0.1 + - type: EmitSoundOnSpawn + sound: + path: /Audio/ADT/SoundGen/reverse_dissolve_scary.ogg + + +- type: entity + parent: ADTSoundGenBaseAmb + id: ADTSoundGenDungeonAmbientScary + name: ADTSoundGenDungeonAmbientScary + abstract: false + components: + - type: TimedDespawn + lifetime: 0.1 + - type: EmitSoundOnSpawn + sound: + path: /Audio/ADT/SoundGen/dungeon_ambient_scary.ogg diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index 9c16b89454a..1dc486da6e0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -3,8 +3,10 @@ startingInventory: ClothingUniformJumpsuitChaplain: 2 ClothingUniformJumpskirtChaplain: 2 - ClothingUniformJumpsuitMonasticRobeDark: 1 - ClothingUniformJumpsuitMonasticRobeLight: 1 + ClothingUniformJumpsuitMonasticRobeDark: 2 + ClothingUniformJumpsuitMonasticRobeLight: 2 + ADTClothingOuterBaseChaplainRasy: 2 + ADTClothingNeckMantiesChaplain: 2 ADTWoodenCross: 1 ADTSilverCross: 1 ADTGoldenCross: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml index 79862deec22..0e914611227 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml @@ -11,3 +11,7 @@ ClothingHeadHatChef: 2 ClothingShoesColorBlack: 2 ADTClothingUniformNewServiceSuit: 2 + ADTClothingHeadPovar: 2 + ADTClothingOuterSuitChefPovar: 2 + ADTClothingNeckChefPovarFio: 2 + diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml index 9e867e91b66..bd9625b7314 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml @@ -10,6 +10,7 @@ ClothingHeadsetService: 2 ClothingOuterWinterJani: 2 ClothingNeckScarfStripedPurple: 3 + ADTClothingHandsGlovesJanitor: 3 emaggedInventory: ClothingUniformJumpskirtJanimaid: 2 diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index 4ba7cd2d899..a514a19f0fb 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/Resources/Prototypes/SoundCollections/lobby.yml @@ -1,6 +1,7 @@ - type: soundCollection id: LobbyMusic files: + - /Audio/Lobby/friday_night.ogg - /Audio/Lobby/The_Wrong_Party.ogg - /Audio/Lobby/thunderdome.ogg - /Audio/Lobby/absconditus.ogg diff --git a/Resources/Prototypes/radio_channels.yml b/Resources/Prototypes/radio_channels.yml index d9026760980..9d247626049 100644 --- a/Resources/Prototypes/radio_channels.yml +++ b/Resources/Prototypes/radio_channels.yml @@ -67,7 +67,7 @@ name: chat-radio-syndicate keycode: 'т' # Corvax-Localization frequency: 1213 - color: "#8f4a4b" + color: "#ff144b" longRange: true - type: radioChannel diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/blackdams_gloves.rsi/equipped-HAND.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/blackdams_gloves.rsi/equipped-HAND.png new file mode 100644 index 00000000000..fa3347bc991 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/blackdams_gloves.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/blackdams_gloves.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/blackdams_gloves.rsi/icon.png new file mode 100644 index 00000000000..7cab5dc06ed Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/blackdams_gloves.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/blackdams_gloves.rsi/meta.json b/Resources/Textures/ADT/Clothing/Hands/Gloves/blackdams_gloves.rsi/meta.json new file mode 100644 index 00000000000..ce83a40e6a4 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Hands/Gloves/blackdams_gloves.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/janitor_groves.rsi/equipped-HAND.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/janitor_groves.rsi/equipped-HAND.png new file mode 100644 index 00000000000..337d159b1bc Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/janitor_groves.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/janitor_groves.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/janitor_groves.rsi/icon.png new file mode 100644 index 00000000000..06bc0e60f9a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/janitor_groves.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/janitor_groves.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/janitor_groves.rsi/inhand-left.png new file mode 100644 index 00000000000..8e8542213fa Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/janitor_groves.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/janitor_groves.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/janitor_groves.rsi/inhand-right.png new file mode 100644 index 00000000000..a99658a1936 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/janitor_groves.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/janitor_groves.rsi/meta.json b/Resources/Textures/ADT/Clothing/Hands/Gloves/janitor_groves.rsi/meta.json new file mode 100644 index 00000000000..d210e9fa2df --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Hands/Gloves/janitor_groves.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hat_povar.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/hat_povar.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..9680f0edd6f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/hat_povar.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hat_povar.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/hat_povar.rsi/icon.png new file mode 100644 index 00000000000..4da5745af13 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/hat_povar.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hat_povar.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/hat_povar.rsi/inhand-left.png new file mode 100644 index 00000000000..9c6a104dad7 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/hat_povar.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hat_povar.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/hat_povar.rsi/inhand-right.png new file mode 100644 index 00000000000..a99766d0d5d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/hat_povar.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hat_povar.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/hat_povar.rsi/meta.json new file mode 100644 index 00000000000..470c5ef47ad --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/hat_povar.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hat_zakolka.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/hat_zakolka.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..2c0a86ca22a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/hat_zakolka.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hat_zakolka.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/hat_zakolka.rsi/icon.png new file mode 100644 index 00000000000..e1138168d65 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/hat_zakolka.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/hat_zakolka.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/hat_zakolka.rsi/meta.json new file mode 100644 index 00000000000..5c89da759b7 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/hat_zakolka.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/manties_chaplain.rsi/equipped-NECK.png b/Resources/Textures/ADT/Clothing/Neck/Cloaks/manties_chaplain.rsi/equipped-NECK.png new file mode 100644 index 00000000000..e29212762fa Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/Cloaks/manties_chaplain.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/manties_chaplain.rsi/icon.png b/Resources/Textures/ADT/Clothing/Neck/Cloaks/manties_chaplain.rsi/icon.png new file mode 100644 index 00000000000..f7a3781a450 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/Cloaks/manties_chaplain.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/Cloaks/manties_chaplain.rsi/meta.json b/Resources/Textures/ADT/Clothing/Neck/Cloaks/manties_chaplain.rsi/meta.json new file mode 100644 index 00000000000..cb08957df85 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Neck/Cloaks/manties_chaplain.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Neck/chefpovarfio.rsi/equipped-NECK.png b/Resources/Textures/ADT/Clothing/Neck/chefpovarfio.rsi/equipped-NECK.png new file mode 100644 index 00000000000..3635309a76f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/chefpovarfio.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/chefpovarfio.rsi/icon.png b/Resources/Textures/ADT/Clothing/Neck/chefpovarfio.rsi/icon.png new file mode 100644 index 00000000000..69e087e5458 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/chefpovarfio.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/chefpovarfio.rsi/meta.json b/Resources/Textures/ADT/Clothing/Neck/chefpovarfio.rsi/meta.json new file mode 100644 index 00000000000..cb08957df85 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Neck/chefpovarfio.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/chefpovar_outer.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/chefpovar_outer.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..da9f7363a8c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/chefpovar_outer.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/chefpovar_outer.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/chefpovar_outer.rsi/icon.png new file mode 100644 index 00000000000..2d684fc32fb Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/chefpovar_outer.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/chefpovar_outer.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/chefpovar_outer.rsi/meta.json new file mode 100644 index 00000000000..47f701952b5 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/chefpovar_outer.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..4e3cb6673bb Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi/icon.png new file mode 100644 index 00000000000..b423fe43613 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi/inhand-left.png new file mode 100644 index 00000000000..5b25a50ef69 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi/inhand-right.png new file mode 100644 index 00000000000..f8da63bede8 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi/meta.json new file mode 100644 index 00000000000..6624d79f7cb --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/golden_heels.rsi/equipped-FEET-Tajaran.png b/Resources/Textures/ADT/Clothing/Shoes/Boots/golden_heels.rsi/equipped-FEET-Tajaran.png new file mode 100644 index 00000000000..2acf12b4c02 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Boots/golden_heels.rsi/equipped-FEET-Tajaran.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Boots/golden_heels.rsi/meta.json b/Resources/Textures/ADT/Clothing/Shoes/Boots/golden_heels.rsi/meta.json index a6bb6d3e254..66f6e629b78 100644 --- a/Resources/Textures/ADT/Clothing/Shoes/Boots/golden_heels.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Shoes/Boots/golden_heels.rsi/meta.json @@ -13,6 +13,10 @@ { "name": "equipped-FEET", "directions": 4 + }, + { + "name": "equipped-FEET-Tajaran", + "directions": 4 } ] } diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..7b10ee6ff3f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi/icon.png new file mode 100644 index 00000000000..17fea0ea755 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi/meta.json new file mode 100644 index 00000000000..440ab189f0b --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/soundgen.rsi/icon.png b/Resources/Textures/ADT/Objects/Misc/soundgen.rsi/icon.png new file mode 100644 index 00000000000..9b03c18504c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/soundgen.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/soundgen.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/soundgen.rsi/meta.json new file mode 100644 index 00000000000..1ecf95db8a8 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/soundgen.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Adventure Time MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png index 96272297f22..13a98cde920 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/inhand-left.png index 81c7dcb99f1..8d39756c56d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/inhand-right.png index 76dc0b2e757..2d23a92cccf 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png index efa8c60bd55..97ac2fbb53d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png index e0c9f86274a..a703a17249a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png index fdb9558af68..354e9b5487e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png index da40d32ba00..d6229322982 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png index 4482c7ecc3c..493c29f1c85 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png index 72cd698b807..b9f69c5cf7e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png differ