diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 248fd131976..75d09ec9187 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1889,3 +1889,10 @@ Entries: - { message: "Добавлена фигурка Офицера Синего Щита.", type: Add} id: 55760 #костыль отображения в Обновлениях time: '2024-06-09T18:59:00.0000000+00:00' + +- author: Torgovec + changes: + - {message: Добавлено 4 новых плаката, type: Add} + - {message: Теперь нианы могут сьесть берет СИ, type: Fix} + id: 55761 #костыль отображения в Обновлениях + time: '2024-06-23T04:19:00.0000000+00:00' \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl index 6483eb204fe..7fb33f90dcd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl @@ -337,3 +337,15 @@ ent-ADTPosterPlasmaMan = Плазма(мены) ent-ADTPosterContrabandRoza = Роза .desc = Символ Атмосии. + +ent-ADTPosterError = Что-то здесь не так + .desc = Кажется кто-то забыл добавить сюда осмысленное изображение + +ent-ADTPosterNoBad = Где-то, но не здесь + .desc = Вы могли бы быть там, если бы не работали на НТ + +ent-ADTPosterNoGood = Где-то, но не тут + .desc = Вы могли бы быть там, если бы вы не работали на НТ + +ent-ADTPosterGasAttack = Газовая атака! + .desc = НТ предупреждает о тритиевых гранатах у синдиката, а так же о саботаже атмоса от вражеских агентов! \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml index 05fb28b87d4..196d63a15f4 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml @@ -787,3 +787,45 @@ sprite: ADT/Structures/Wallmounts/128x128posters.rsi state: roza scale: 0.25, 0.25 + +# Странные постеры + +- type: entity + parent: PosterBase + id: ADTPosterError + name: Error Poster + description: This is an error poster. + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_syndycat.rsi + state: error + +- type: entity + parent: PosterBase + id: ADTPosterNoBad + name: No Bad + description: This poster promotes good behavior. + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_syndycat.rsi + state: nobad + +- type: entity + parent: PosterBase + id: ADTPosterNoGood + name: No Good + description: This poster warns against bad behavior. + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_syndycat.rsi + state: nogood + +- type: entity + parent: PosterBase + id: ADTPosterGasAttack + name: Gas Attack + description: This poster warns about gas attacks. + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_syndycat.rsi + state: gasattack diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 9e7caea8eab..da59e5a6c4d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -103,6 +103,8 @@ - ADTPosterLustyMoth - ADTPosterWatchOutChem - ADTPosterPanem + - ADTPosterGasAttack + - ADTPosterNoGood chance: 1 - type: entity @@ -172,4 +174,6 @@ - ADTPosterDontTalkToArty - ADTPosterWorkUnderWay - ADTPosterPlasmaMan + - ADTPosterError + - ADTPosterNoBad chance: 1 diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/error.png b/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/error.png new file mode 100644 index 00000000000..c19ea8e9c06 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/error.png differ diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/gasattack.png b/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/gasattack.png new file mode 100644 index 00000000000..495df75ae34 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/gasattack.png differ diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/meta.json b/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/meta.json new file mode 100644 index 00000000000..8bf90e1fb15 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:Schrodinger для Времени Приключений МРП сервер", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "error" + }, + { + "name": "nobad" + }, + { + "name": "nogood" + }, + { + "name": "gasattack" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/nobad.png b/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/nobad.png new file mode 100644 index 00000000000..94f2a5a7ee3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/nobad.png differ diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/nogood.png b/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/nogood.png new file mode 100644 index 00000000000..d2ab25c1d23 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/nogood.png differ