Conflicts:

Resources/Changelog/ChangelogADT.yml

Resources/Locale/ru-RU/ADT/Clothing/Hardsuits/Hardsuits.ftl

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/paintings.ftl

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl

Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml

Resources/Prototypes/Catalog/Fills/Lockers/medical.yml

Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml

Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml

Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/icon-flash.png

Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/icon.png

Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/off-equipped-HELMET.png

Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/on-equipped-HELMET.png

Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png

Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png

Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png

Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png

Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json

no cl

github-actions[bot] commented 3 months ago

RSI Diff Bot; head commit d096f1cf3a47252ec475bac23488b1e8ce704c15 merging into fd0389c34c395be73adb9f4fc7c0662579ebb2ce This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Structures/Wallmounts/paintings.rsi

| State | Old | New | Status | --- | --- | --- | --- | | painting_gagarin | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/d096f1cf3a47252ec475bac23488b1e8ce704c15/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting_gagarin.png) | Added | painting_somewhereelse | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/d096f1cf3a47252ec475bac23488b1e8ce704c15/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting_somewhereelse.png) | Added

Resources/Textures/Structures/Wallmounts/posters.rsi

| State | Old | New | Status | --- | --- | --- | --- | | poster_adtfearthem_contraband | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/d096f1cf3a47252ec475bac23488b1e8ce704c15/Resources/Textures/Structures/Wallmounts/posters.rsi/poster_adtfearthem_contraband.png) | Added | poster_adtgreatfood_legit | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/d096f1cf3a47252ec475bac23488b1e8ce704c15/Resources/Textures/Structures/Wallmounts/posters.rsi/poster_adtgreatfood_legit.png) | Added | poster_adtlusttayaran_contraband | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/d096f1cf3a47252ec475bac23488b1e8ce704c15/Resources/Textures/Structures/Wallmounts/posters.rsi/poster_adtlusttayaran_contraband.png) | Added | poster_adtoktoberfest_legit | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/d096f1cf3a47252ec475bac23488b1e8ce704c15/Resources/Textures/Structures/Wallmounts/posters.rsi/poster_adtoktoberfest_legit.png) | Added | poster_adtsilence_contraband | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/d096f1cf3a47252ec475bac23488b1e8ce704c15/Resources/Textures/Structures/Wallmounts/posters.rsi/poster_adtsilence_contraband.png) | Added | poster_adtturnonsensors_legit | ![]() | ![](https://raw.githubusercontent.com/themanyfaceddemon/space_station_ADT/d096f1cf3a47252ec475bac23488b1e8ce704c15/Resources/Textures/Structures/Wallmounts/posters.rsi/poster_adtturnonsensors_legit.png) | Added

Edit: diff updated after d096f1cf3a47252ec475bac23488b1e8ce704c15

github-actions[bot] commented 2 months ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.