diff --git a/Content.Client/_White/MeatyOre/MeatyOreUIController.cs b/Content.Client/_White/MeatyOre/MeatyOreUIController.cs index 0833003f1f..738a467ea2 100644 --- a/Content.Client/_White/MeatyOre/MeatyOreUIController.cs +++ b/Content.Client/_White/MeatyOre/MeatyOreUIController.cs @@ -61,7 +61,7 @@ public sealed class MeatyOreUIController : UIController var controlledEntity = _playerManager.LocalPlayer!.ControlledEntity; - if (controlledEntity == null) + if (!controlledEntity.HasValue) return false; if (!_entityManager.HasComponent(controlledEntity)) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index f503e29ec3..01e3bc3641 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,46 +1,4 @@ Entries: -- author: RavMorgan - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u043E\u0432\ - \u044B\u0435 \u043A\u0430\u0440\u0442\u0438\u043D\u043E\u0447\u043A\u0438 \u0432\ - \ \u043B\u043E\u0431\u0431\u0438!" - type: Add - id: 48 - time: '2023-01-24T12:32:14.0000000+00:00' -- author: HitPanda - changes: - - message: "\u0424\u0438\u043A\u0441 \u0430\u0434\u043C\u0438\u043D \u0434\u043E\ - \u0441\u0442\u0443\u043F\u043E\u0432" - type: Fix - id: 49 - time: '2023-01-24T16:54:45.0000000+00:00' -- author: BronyUraj - changes: - - message: "\u041E\u0442\u0441\u043A\u0430\u043A\u0438\u0432\u0430\u043D\u0438\u0435\ - \ \u0441\u0438\u043D\u0433\u0443\u043B\u044F\u0440\u043D\u043E\u0441\u0442\u0438\ - \ \u043E\u0442 \u0441\u0442\u0435\u043D\u043E\u043A." - type: Remove - id: 50 - time: '2023-01-25T12:36:41.0000000+00:00' -- author: rhailrake - changes: - - message: new parallax - type: Add - id: 51 - time: '2023-01-25T12:45:32.0000000+00:00' -- author: rhailrake - changes: - - message: "\u041A\u0438\u0431\u043E\u0440\u0433\u0438!" - type: Add - id: 52 - time: '2023-01-25T17:03:38.0000000+00:00' -- author: HitPanda - changes: - - message: "\u041F\u0435\u0440\u0435\u0432\u043E\u0434 \u0438\u043C\u0451\u043D\ - \ \u0431\u043E\u0440\u0433\u043E\u0432" - type: Add - id: 53 - time: '2023-01-25T22:15:42.0000000+00:00' - author: RavMorgan changes: - message: "\u041F\u0435\u0434\u0430\u043B\u044F\u043C \u0431\u044B\u043B\u0430\ @@ -8721,3 +8679,68 @@ id: 547 time: '2024-09-17T18:00:13.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/700 +- author: BIG_Zi_348 + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043A\u043E\u043C\ + \u043F\u043E\u043D\u0435\u043D\u0442\u044B \u0420\u041D\u0414 \u0432 \u0448\u043A\ + \u0430\u0444\u0447\u0438\u043A\u0438 \u0442\u0435\u0445. \u0442\u0443\u043D\u043D\ + \u0435\u043B\u0435\u0439." + type: Add + - message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u043E \u043A\u043E\u043B\ + \u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043F\u043B\u044E\u0448\u0435\u0432\ + \u044B\u0445 \u043A\u0430\u0440\u043F\u043E\u0432 \u0432 \u0448\u043A\u0430\u0444\ + \u0447\u0438\u043A\u0430\u0445 \u0442\u0435\u0445. \u0442\u0443\u043D\u043D\u0435\ + \u043B\u0435\u0439." + type: Tweak + id: 548 + time: '2024-09-22T07:49:32.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/702 +- author: BIG_Zi_348 + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u043E\u0432\ + \u044B\u0435 \u0441\u043F\u0440\u0430\u0439\u0442\u044B \u0434\u0440\u043E\u0431\ + \u043E\u0432\u0438\u043A\u0443-\u043E\u0431\u0440\u0435\u0437\u0443." + type: Add + id: 549 + time: '2024-09-22T12:56:43.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/704 +- author: BIG_Zi_348 + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u0435\u0434\ + \u043E\u0441\u0442\u0430\u044E\u0449\u0438\u0435 \u043F\u0435\u0440\u0435\u0432\ + \u043E\u0434\u044B \u043F\u0440\u0438\u0437\u0440\u0430\u0447\u043D\u044B\u0445\ + \ \u0440\u043E\u043B\u0435\u0439." + type: Add + id: 550 + time: '2024-09-22T12:59:41.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/703 +- author: BIGZi0348 + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0437\ + \u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0441\u043D\u044F\u0442\u044C\ + \ \u0441 \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u043A\u043E\ + \u043C\u0431\u0438\u043D\u0435\u0437\u043E\u043D\u043E\u0432 \u043A\u0443\u0440\ + \u0442\u043A\u0443." + type: Add + id: 551 + time: '2024-09-22T19:00:55.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/705 +- author: Valtosin + changes: + - message: "\u0413\u0430\u0440\u043F\u0438\u0438 \u0441\u043D\u043E\u0432\u0430\ + \ \u043C\u043E\u0433\u0443\u0442 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\ + \u0442\u044C\u0441\u044F \u0434\u043E\u043D\u0430\u0442\u043D\u044B\u043C \u043C\ + \u0430\u0433\u0430\u0437\u0438\u043D\u043E\u043C." + type: Fix + id: 552 + time: '2024-09-23T18:03:07.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/706 +- author: BIG_Zi_348 + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0441\u043C\ + \u0435\u0448\u043D\u044B\u0435 \u043F\u0435\u0440\u0435\u0432\u043E\u0434\u044B\ + ." + type: Fix + id: 553 + time: '2024-09-25T11:00:23.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/707 diff --git a/Resources/Locale/en-US/foldable/components/foldable-component.ftl b/Resources/Locale/en-US/foldable/components/foldable-component.ftl index 525820920b..fc06fb4ac1 100644 --- a/Resources/Locale/en-US/foldable/components/foldable-component.ftl +++ b/Resources/Locale/en-US/foldable/components/foldable-component.ftl @@ -8,3 +8,6 @@ fold-flip-verb = Flip fold-zip-verb = Zip up fold-unzip-verb = Unzip + +fold-verb-clothing-jacket = Take off jacket +unfold-verb-clothing-jacket = Put on jacket diff --git a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-102.ftl b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-102.ftl index f5a8a7b01b..85e15ce513 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-102.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-102.ftl @@ -35,9 +35,9 @@ ent-PillCanisterDexalin = контейнер с таблетками (декса ent-PillCanisterDylovene = контейнер с таблетками (диловена 10u) .desc = "контейнер с таблетками (диловена 10u)" .suffix = Диловена, 5 -ent-PillCanisterHyronalin = контейнер с таблетками (гиронал 10u) - .desc = "контейнер с таблетками (гиронал 10u)" - .suffix = Гиронал, 5 +ent-PillCanisterHyronalin = контейнер с таблетками (хироналин 10u) + .desc = "контейнер с таблетками (хироналин 10u)" + .suffix = Хироналин, 5 ent-PillPotassiumIodide = таблетка (йодид калия 10u) .desc = "таблетка (йодид калия 10u)" ent-PillCanisterPotassiumIodide = контейнер с таблетками (йодид калия 10u) diff --git a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-103.ftl b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-103.ftl index 99c6ac18d5..707cbe044b 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-103.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-103.ftl @@ -15,9 +15,9 @@ ent-PillCanisterDermaline = контейнер с таблетками (дерм ent-PillCanisterTricordrazine = контейнер с таблетками (трикордазин 10 ед.) .desc = "контейнер с таблетками (трикордазин 10 ед.)" .suffix = Трикордазин, 5 -ent-PillCanisterBicaridine = контейнер с таблетками (бикардидин 10 ед.) - .desc = "контейнер с таблетками (бикардидин 10 ед.)" - .suffix = Бикардидин, 5 +ent-PillCanisterBicaridine = контейнер с таблетками (бикаридин 10 ед.) + .desc = "контейнер с таблетками (бикаридин 10 ед.)" + .suffix = Бикаридин, 5 ent-PillCharcoal = таблетка (уголь 10 ед.) .desc = "таблетка (уголь 10 ед.)" ent-PillCanisterCharcoal = контейнер с таблетками (уголь 10 ед.) diff --git a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-104.ftl b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-104.ftl index 493e27f41d..fa564ae653 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-104.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-104.ftl @@ -1,9 +1,9 @@ -ent-BruteAutoInjector = автоинъектор для борьбы с силой - .desc = Быстрая доза бикардина и транексамовой кислоты, предназначенная для боевых действий +ent-BruteAutoInjector = автоинъектор от мех. повреждений + .desc = Быстрая доза бикаридина и транексамовой кислоты, предназначенная для боевых действий ent-BurnAutoInjector = автоинъектор от ожогов .desc = Быстрая доза дермалина и лепоразина, предназначенная для боевых действий ent-RadAutoInjector = автоинъектор от радиации - .desc = Быстрая доза антирадиации. Содержит аритразин и бикардин. + .desc = Быстрая доза антирадиации. Содержит аритразин и бикаридин. ent-BodyBag = мешок для тел .desc = Пластиковый мешок, предназначенный для хранения и транспортировки трупов, чтобы остановить разложение тела. ent-AnomalyLocatorUnpowered = локатор аномалий diff --git a/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl b/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl index 3e279ba907..56c6140804 100644 --- a/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl +++ b/Resources/Locale/ru-RU/foldable/components/foldable-component.ftl @@ -3,3 +3,11 @@ foldable-deploy-fail = Вы не можете разложить { $object } здесь. fold-verb = Сложить unfold-verb = Разложить + +fold-flip-verb = Перевернуть + +fold-zip-verb = Застегнуть +fold-unzip-verb = Расстегнуть + +fold-verb-clothing-jacket = Снять куртку +unfold-verb-clothing-jacket = Надеть куртку diff --git a/Resources/Locale/ru-RU/ghost/ghost-gui.ftl b/Resources/Locale/ru-RU/ghost/ghost-gui.ftl index 074860a264..a1b9590db3 100644 --- a/Resources/Locale/ru-RU/ghost/ghost-gui.ftl +++ b/Resources/Locale/ru-RU/ghost/ghost-gui.ftl @@ -23,6 +23,19 @@ ghost-target-window-title = Телепорт призрака ghost-target-window-current-button = Телепорт в: { $name } ghost-roles-window-title = Роли призраков + +ghost-roles-window-join-raffle-button = Начать лотерею +ghost-roles-window-raffle-in-progress-button = + Участвовать ({$time} осталось, { $players -> + [one] {$players} игрок + *[other] {$players} игроков + }) +ghost-roles-window-leave-raffle-button = + Покинуть ({$time} осталось, { $players -> + [one] {$players} игрок + *[other] {$players} игроков + }) + ghost-roles-window-request-role-button = Запросить ghost-roles-window-request-role-button-timer = Запросить ({ $time }сек.) ghost-roles-window-follow-role-button = Следовать diff --git a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl index 2374a29b98..298d3807a2 100644 --- a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl @@ -224,3 +224,36 @@ ghost-role-information-syndicate-reinforcement-rules = Действуют обы ghost-role-information-syndicate-monkey-reinforcement-name = Агент-обезьяна Синдиката ghost-role-information-syndicate-monkey-reinforcement-description = Кому-то нужно подкрепление. Вы, специально обученная обезьяна, поможете им. ghost-role-information-syndicate-monkey-reinforcement-rules = Действуют обычные правила антагонистов Синдиката. Работайте с тем, кто вас вызвал, и не причиняйте ему вреда. + +ghost-role-information-lost-cargo-technical-name = Потерянный Грузчик +ghost-role-information-lost-cargo-technical-description = Что-то пошло не так и ваш грузовой шаттл с товарами был переправлен в сектор другой станции. +ghost-role-information-lost-cargo-technical-rules = Вы обычный грузчик с другой станции. Делай то, что делают обычные грузчики. + +ghost-role-information-clown-troupe-name = Космический Клоун +ghost-role-information-clown-troupe-description = Вы и ваша труппа прилетели поднять настроение этой станции своими лучшими шутками. Хонк! +ghost-role-information-clown-troupe-rules = Действуют обычные правила для персонала станции. + +ghost-role-information-traveling-chef-name = Путешествующий Повар +ghost-role-information-traveling-chef-description = Вы шеф-повар на путешествующем шаттле экзотической кухни. Порадуйте станцию ​​вкусной едой! +ghost-role-information-traveling-chef-rules = Действуют обычные правила для персонала станции. + +ghost-role-information-disaster-victim-name = Потерпевший Бедствие +ghost-role-information-disaster-victim-description = Вы спаслись в эвакуационной капсуле с другой станции, потерпевшей ужасную трагедию. Возможно, вас найдут и спасут. +ghost-role-information-disaster-victim-rules = Действуют обычные правила для персонала станции. + +ghost-role-information-syndie-disaster-victim-name = Потерпевший Бедствие Синдикат +ghost-role-information-syndie-disaster-victim-description = Вы обычный рабочий со станции синдиката. К сожалению, эвакуационная капсула забросила вас во вражеский сектор... +ghost-role-information-syndie-disaster-victim-rules = Действуют обычные правила для персонала станции. Вы [color=red]НЕ[/color] антагонист. + +ghost-role-information-syndicate-kobold-reinforcement-name = Агент-кобольд Синдиката +ghost-role-information-syndicate-kobold-reinforcement-description = Кому-то нужно подкрепление. Вы, специально обученный кобольд, поможете им. +ghost-role-information-syndicate-kobold-reinforcement-rules = Действуют обычные правила антагонистов Синдиката. Работайте с тем, кто вас вызвал, и не причиняйте ему вреда. + +ghost-role-information-artifact-name = Разумный Артефакт +ghost-role-information-artifact-description = + Воплотите в жизнь свои сверхъестественные прихоти. + Принудительно активируйте свои узлы во благо или во зло. + + +ghost-role-information-gnome-name = Садовый Гном +ghost-role-information-gnome-description = Вы — доверенный хранитель сада станции, следите за безопасностью своих владений. diff --git a/Resources/Locale/ru-RU/ghost/roles/ghostrole-spawner-verb-selectable.ftl b/Resources/Locale/ru-RU/ghost/roles/ghostrole-spawner-verb-selectable.ftl new file mode 100644 index 0000000000..74d1092ab7 --- /dev/null +++ b/Resources/Locale/ru-RU/ghost/roles/ghostrole-spawner-verb-selectable.ftl @@ -0,0 +1 @@ +ghostrole-spawner-select = Выбран: {$mode} diff --git a/Resources/Locale/ru-RU/station-events/events/unknown-shuttle.ftl b/Resources/Locale/ru-RU/station-events/events/unknown-shuttle.ftl new file mode 100644 index 0000000000..ccd5c48e27 --- /dev/null +++ b/Resources/Locale/ru-RU/station-events/events/unknown-shuttle.ftl @@ -0,0 +1 @@ +station-event-unknown-shuttle-incoming = Внимание! Около вашего сектора был замечен неопознанный космический шаттл. diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 11784b4fb9..9dd4c37ca2 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -139,6 +139,9 @@ prob: 0.05 - id: Soap prob: 0.10 + - id: null # WD tweak to decrease this plushie spawn + prob: 0.65 + orGroup: carp - id: PlushieCarp prob: 0.2 orGroup: carp @@ -220,6 +223,19 @@ - id: WeaponSniperMosin prob: 0.0010 orGroup: syndiemaintloot + # StockParts - WD Edit + - id: null + prob: 0.65 + orGroup: stockparts + - id: MatterBinStockPart + prob: 0.15 + orGroup: stockparts + - id: MicroManipulatorStockPart + prob: 0.15 + orGroup: stockparts + - id: CapacitorStockPart + prob: 0.15 + orGroup: stockparts # Materials - WD Edit - id: null prob: 0.88 @@ -615,6 +631,19 @@ - id: WeaponSniperMosin prob: 0.0010 orGroup: syndiemaintloot + # StockParts - WD Edit + - id: null + prob: 0.65 + orGroup: stockparts + - id: MatterBinStockPart + prob: 0.15 + orGroup: stockparts + - id: MicroManipulatorStockPart + prob: 0.15 + orGroup: stockparts + - id: CapacitorStockPart + prob: 0.15 + orGroup: stockparts # Materials - WD Edit - id: null prob: 0.88 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index 31a5e74691..dc313255ab 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -73,3 +73,16 @@ slots: [innerclothing] femaleMask: UniformTop - type: VisibleHole # AMOUR EDIT + +# WD Start +- type: entity + abstract: true + id: ClothingUniformFoldableBase + components: + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: unfold-verb-clothing-jacket + foldVerbText: fold-verb-clothing-jacket + - type: FoldableClothing + foldedEquippedPrefix: folded +# WD End diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 9d6da88f0b..617f34cca9 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -21,15 +21,16 @@ sprite: Clothing/Uniforms/Jumpsuit/ancient.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitBartender name: bartender's uniform description: A nice and tidy uniform. Shame about the bar though. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/bartender.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/bartender.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/bartender.rsi - type: entity parent: ClothingUniformBase @@ -69,37 +70,40 @@ sprite: Clothing/Uniforms/Jumpsuit/captain.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitCargo name: cargo tech jumpsuit description: A sturdy jumpsuit, issued to members of the Cargo department. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitSalvageSpecialist name: salvage specialist's jumpsuit description: It's a snappy jumpsuit with a sturdy set of overalls. It's very dirty. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitChiefEngineer name: chief engineer's jumpsuit description: It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/ce.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/ce.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/ce.rsi - type: entity parent: ClothingUniformBase @@ -168,15 +172,16 @@ sprite: Clothing/Uniforms/Jumpsuit/chef.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitChemistry name: chemistry jumpsuit description: There's some odd stains on this jumpsuit. Hm. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/chemistry.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/chemistry.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/chemistry.rsi - type: entity parent: ClothingUniformBase @@ -254,15 +259,16 @@ sprite: White/Clothing/Uniforms/Jumpsuit/jester2.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitCMO name: chief medical officer's jumpsuit description: It's a jumpsuit worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi - type: entity parent: ClothingUniformBase @@ -298,37 +304,40 @@ sprite: Clothing/Uniforms/Jumpsuit/detective_grey.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitEngineering name: engineering jumpsuit description: If this suit was non-conductive, maybe engineers would actually do their damn job. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/engineering.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/engineering.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/engineering.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitEngineeringHazard name: hazard jumpsuit description: Woven in a grungy, warm orange. Lets others around you know that you really mean business when it comes to work. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitHoP name: head of personnel's jumpsuit description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/hop.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/hop.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/hop.rsi - type: entity parent: ClothingUniformBase @@ -386,26 +395,28 @@ sprite: Clothing/Uniforms/Jumpsuit/hos_parade.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitHydroponics name: hydroponics jumpsuit description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitJanitor name: janitor jumpsuit description: The jumpsuit for the poor sop with a mop. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi - type: entity parent: ClothingUniformBase @@ -419,15 +430,16 @@ sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitMedicalDoctor name: medical doctor jumpsuit description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/medical.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/medical.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/medical.rsi - type: entity parent: ClothingUniformBase @@ -546,15 +558,16 @@ sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitScientist name: scientist jumpsuit description: It's made of a special fiber that increases perceived intelligence and decreases personal ethics. It has markings that denote the wearer as a scientist. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/scientist.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/scientist.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/scientist.rsi - type: entity parent: ClothingUniformBase @@ -568,26 +581,28 @@ sprite: Clothing/Uniforms/Jumpsuit/scientist_formal.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitRoboticist name: roboticist jumpsuit description: It's a slimming black with reinforced seams; great for industrial work. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/roboticist.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/roboticist.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/roboticist.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitSec name: security jumpsuit description: A jumpsuit made of strong material, providing robust protection. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/security.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/security.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/security.rsi - type: entity parent: ClothingUniformBase @@ -836,26 +851,28 @@ sprite: Clothing/Uniforms/Jumpsuit/ninja.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitAtmos name: atmospheric technician jumpsuit description: I am at work. I can't leave work. Work is breathing. I am testing air quality. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/atmos.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/atmos.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/atmos.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] # WD added ClothingUniformFoldableBase id: ClothingUniformJumpsuitAtmosCasual name: atmospheric technician's casual jumpsuit description: Might as well relax with a job as easy as yours. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/atmos_casual.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/atmos_casual.rsi + # WD edit for ClothingUniformFoldableBase + # - type: Clothing + # sprite: Clothing/Uniforms/Jumpsuit/atmos_casual.rsi - type: entity parent: ClothingUniformBase diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index adb3cae442..86d5db19b0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -196,13 +196,14 @@ description: Groovy! Uses .50 shotgun shells. components: - type: Sprite - sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi + sprite: White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-icons.rsi - type: Clothing - sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi + sprite: White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi - type: Item size: Small - sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi - heldPrefix: sawn + shape: # WD + - 0,0,1,0 + sprite: White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi - type: Gun fireRate: 2 - type: BallisticAmmoProvider diff --git a/Resources/Prototypes/_White/Mobs/Species/harpy.yml b/Resources/Prototypes/_White/Mobs/Species/harpy.yml index c567844406..ebf4dfaedc 100644 --- a/Resources/Prototypes/_White/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/_White/Mobs/Species/harpy.yml @@ -44,6 +44,8 @@ type: SpellSelectorBUI enum.CultEmpowerRemoveUiKey.Key: type: SpellRemoverBUI + enum.StoreUiKey.Key: + type: StoreBoundUserInterface # WD-EDIT END - type: Sprite scale: 0.9, 0.9 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..854df877c4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json index 09f9d12590..cef19eef90 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8, monkey made by brainfood1183 (github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8, monkey made by brainfood1183 (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-body-slim", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..eb1b473ab0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json index 7cd0cba745..12d2ac6f2e 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Sprited by KingFroozy (github) for space station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by KingFroozy (github) for space station 14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..091f6582b9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json index b02e5f4b8a..3d5ca11c2c 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github), monkey made by brainfood1183 (github) for ss14, default suit edit by Skarletto (github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github), monkey made by brainfood1183 (github) for ss14, default suit edit by Skarletto (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..dcdcaeb83a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json index 12bdb72c4a..f09b05eaee 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..39a640b26d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json index c405753804..8aa6b59320 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json @@ -1,45 +1,49 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "s" - }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-body-slim", - "directions": 4 - }, - { - "name": "s-equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "s-equipped-INNERCLOTHING-body-slim", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "s" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "s-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "s-equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..aee5ab426e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json index f2706e7fb6..c199979003 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-body-slim", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..ad71010b46 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json index f2706e7fb6..c199979003 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-body-slim", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..95427cab2b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json index 10e90d2bf0..4f36804739 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-body-slim", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..0774a27010 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json index 10e90d2bf0..4f36804739 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-body-slim", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..edbe52e759 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json index f2706e7fb6..c199979003 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-body-slim", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..8bc0d303c3 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json index 3f72fb4460..cd14a5023b 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..77eb214a55 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json index 10e90d2bf0..4f36804739 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-body-slim", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..a495f1d167 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json index f2706e7fb6..c199979003 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-body-slim", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..2d89552421 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json index 16b45eec87..13378f1bd0 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5da269bf8615c7d645ab85556a0a658c20baa74, monkey derivative made by brainfood1183 (github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5da269bf8615c7d645ab85556a0a658c20baa74, monkey derivative made by brainfood1183 (github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..c919509adc Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json index da8e85d0a1..a992c05edb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0a1ae39f0fb7353b0704f27d1599a567891f727c, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0a1ae39f0fb7353b0704f27d1599a567891f727c, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..885809cdc3 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json index f2706e7fb6..c199979003 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-body-slim", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..d22e70dac4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json index 4432a45ec0..dc51b3834f 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json @@ -1,34 +1,38 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14. equipped-INNERCLOTHING edited by Dutch-VanDerLinde (github).", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14. equipped-INNERCLOTHING edited by Dutch-VanDerLinde (github).", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-body-slim", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-icons.rsi/bolt-open.png new file mode 100644 index 0000000000..efc42b9f78 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-icons.rsi/bolt-open.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-icons.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-icons.rsi/icon.png new file mode 100644 index 0000000000..a192629077 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-icons.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-icons.rsi/meta.json new file mode 100644 index 0000000000..09b3691bc9 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-icons.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-NC-4.0", + "copyright": "Modification from - https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", + "size": { + "x": 48, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..813139fbb5 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..a828918c09 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000..9cdead52c7 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000..fb1c2d1713 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/meta.json new file mode 100644 index 0000000000..f722d6c6f3 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-NC-4.0", + "copyright": "Modification from - https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +}