From 92d02babb783e22f17cc716e23779c82e58e7322 Mon Sep 17 00:00:00 2001 From: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com> Date: Sun, 22 Sep 2024 10:49:32 +0300 Subject: [PATCH 01/12] Yeeeeah (#702) --- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) 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 From 822911836a69d7de541906fabd5a6700d78b6864 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Sun, 22 Sep 2024 07:50:36 +0000 Subject: [PATCH 02/12] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index f503e29ec3..4f6edee220 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,12 +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\ @@ -8721,3 +8713,19 @@ 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 From 4a7217acf50d694968a64f4c8936a51189c2fe65 Mon Sep 17 00:00:00 2001 From: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com> Date: Sun, 22 Sep 2024 15:56:43 +0300 Subject: [PATCH 03/12] =?UTF-8?q?=D0=A1=D0=BF=D1=80=D0=B0=D0=B9=D1=82?= =?UTF-8?q?=D1=8B=20(#704)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Weapons/Guns/Shotguns/shotguns.yml | 9 +++--- .../sawn_shotgun-icons.rsi/bolt-open.png | Bin 0 -> 527 bytes .../Shotguns/sawn_shotgun-icons.rsi/icon.png | Bin 0 -> 1720 bytes .../Shotguns/sawn_shotgun-icons.rsi/meta.json | 17 +++++++++++ .../equipped-BACKPACK.png | Bin 0 -> 2086 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 2510 bytes .../sawn_shotgun-inhands.rsi/inhand-left.png | Bin 0 -> 559 bytes .../sawn_shotgun-inhands.rsi/inhand-right.png | Bin 0 -> 1836 bytes .../sawn_shotgun-inhands.rsi/meta.json | 27 ++++++++++++++++++ 9 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-icons.rsi/bolt-open.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Shotguns/sawn_shotgun-inhands.rsi/meta.json 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/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 0000000000000000000000000000000000000000..efc42b9f783477da4b8ed0b5b8c5a974319da03d GIT binary patch literal 527 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 AumAu6 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fb1c2d171358667fe60ebaa227aa46bb02a9aec0 GIT binary patch literal 1836 zcmbVN3s4kg9ABQ2A}~y2g^$@58*$=p_xA39+qeL4kw+~cFA*GJ+5I?nxZ7QK_q>Cq z8OFq^nNlg#$wv@ICT2EDHA9VxHa%=8h{{mHDRqDvWX#IS8vFJ*ZqzU*cV>70`+dLf z_kaKQxuSxc`EwKIA_y`+FPAQc?@axUiiFQ@Vf`q4-6!X+Q4z$LsNW&Ju8a)`5`I}I zt?7)$Nan$l=WpCL;Vn~!H#9=3egIt2z5vb zKy5~ofg=bLnhGUL3YliJC8H!knsFipC#?pOpa>IXwW5IwgX$E%jw+^C29&`sJ65l0 zGKJ$_uh-}`8zsewn`|~4PLMcB8X&@;Hi{bSGl**93}Q6Ag!nd;shgx`&bz_842AdKal5wIN77P{K|O_2QJ_SqNYNuDTtNpB~4Q6r8`gu zw{KAZW6Ll>9kbfvb_Z3cTJ{F$Mj#-wqSewy8Q{f0l{^XuvNu386LoK7%Ao*Olax|P za?NC_XvSoev>Hul(rQ8EC9k^trUQUxHDJeJ)+`3XW-z6ek|bp@Q;hG#YQu3(;{>LkU@LWc!6>jbzgIx#dDM#>?%Bn2vl)|vfQFbtI^ zsv0YDAdj|V&}X9{@D$0DW(z@B3~AOh)&NM0$zbEmWS5?P%Nicw;kj3v;rOrEDQG> zfoWQAJ%FVDk?v`jD%ELTRsmT~7_GaO6Aq2X^*)^T1Haux|K3eKI|GM_vYr9JzjOZ`HEM zzC3zo%tVdt<9CxD4oy9K?d50IEr~z*{SQf9;~7I)b23kb4ulN6jcAA^8Ci_XpO<<2 zQvXm?RM+9rbvfIs#k5|W4jn8xcj40md)|zI5>1D__XJJ<y5lhOYSi^yE{& zv<^DjKZstL|LnQXu5E4p>*7&I{)LI>zqv9xyrgi;q0|!%pVYi|#E~za-&Yk+9gj^Y zbha%nuI#t}_~BIlGI!L0&&Re^=RS15)S3~Vd@5q{#ZBc`ul623viIAMsL{uEk0-M` zm-a+I&~l-tJ?xe3`y1meEfF1I9c;)rQeS~kNWy~VnC8uQT7oCa6X)rCCwyRS`L7=JT1rKE#+fVE zca}Z<-N++o?3uPro!!SS-yjx1s)?_@c)h3W>xJ_M4z)AF!S1o9MgPh`b$0H7R%hhY QnEpS@%PyebT2Zs{AHrCA7XSbN literal 0 HcmV?d00001 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 + } + ] +} From 2645cd2d54ab7c660ffb0f3e17b3c49abe7ced73 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Sun, 22 Sep 2024 12:57:46 +0000 Subject: [PATCH 04/12] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 4f6edee220..e6c29a6c8b 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,11 +1,4 @@ Entries: -- 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\ @@ -8729,3 +8722,12 @@ 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 From 65ac3f85dbc556ab26745e63a42efaed1d9d427c Mon Sep 17 00:00:00 2001 From: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com> Date: Sun, 22 Sep 2024 15:59:41 +0300 Subject: [PATCH 05/12] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE?= =?UTF-8?q?=D0=B4=D1=8B=20=D0=B3=D0=BE=D1=81=D1=82=20=D1=80=D0=BE=D0=BB?= =?UTF-8?q?=D0=B5=D0=B9=20=D1=81=20=D1=88=D0=B0=D1=82=D1=82=D0=BB=D0=B0?= =?UTF-8?q?=D0=BC=D0=B8=20(#703)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Awawawa, но на русском * Правки --- Resources/Locale/ru-RU/ghost/ghost-gui.ftl | 13 ++++++++ .../ghost/roles/ghost-role-component.ftl | 33 +++++++++++++++++++ .../ghostrole-spawner-verb-selectable.ftl | 1 + .../station-events/events/unknown-shuttle.ftl | 1 + 4 files changed, 48 insertions(+) create mode 100644 Resources/Locale/ru-RU/ghost/roles/ghostrole-spawner-verb-selectable.ftl create mode 100644 Resources/Locale/ru-RU/station-events/events/unknown-shuttle.ftl 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 = Внимание! Около вашего сектора был замечен неопознанный космический шаттл. From 3177711dcd4288f1566c320fdcc077d23910a8fa Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Sun, 22 Sep 2024 13:00:44 +0000 Subject: [PATCH 06/12] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index e6c29a6c8b..6289d2d1d5 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,12 +1,4 @@ Entries: -- 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 @@ -8731,3 +8723,13 @@ 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 From ebd74441b038fccaea03bf631a8baca60070361d Mon Sep 17 00:00:00 2001 From: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com> Date: Sun, 22 Sep 2024 22:00:55 +0300 Subject: [PATCH 07/12] =?UTF-8?q?=D0=9C=D1=8B=20=D1=82=D0=B0=D0=BC=20?= =?UTF-8?q?=D0=BA=D0=BE=D1=80=D0=BE=D1=87=D0=B5=20=D0=BD=D0=B0=D1=83=D1=87?= =?UTF-8?q?=D0=B8=D0=BB=D0=B8=D1=81=D1=8C=20=D1=81=D0=BD=D0=B8=D0=BC=D0=B0?= =?UTF-8?q?=D1=82=D1=8C=20=D1=80=D1=83=D0=B1=D0=B0=D1=88=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B8=20=D0=BA=D1=83=D1=80=D1=82=D0=BA=D0=B8=20=D1=81=20=D1=81?= =?UTF-8?q?=D0=B5=D0=B1=D1=8F,=20=D0=B2=D0=BE=D0=BE=D0=BE=D0=BE=D1=82=20(#?= =?UTF-8?q?705)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Awawawa, но на русском * Правки * Damn, i just wasted 20 minutes of my life on this * Revert "Правки" This reverts commit 5566dc94155af49c830a6eb476f2752fa95fa710. * Revert "Awawawa, но на русском" This reverts commit 62d792e0cd5e613d25c98ed3e144b3eb8e7e80a0. --- .../components/foldable-component.ftl | 3 + .../components/foldable-component.ftl | 8 ++ .../Uniforms/base_clothinguniforms.yml | 13 ++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 119 ++++++++++-------- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 530 bytes .../Uniforms/Jumpsuit/atmos.rsi/meta.json | 68 +++++----- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 506 bytes .../Jumpsuit/atmos_casual.rsi/meta.json | 60 ++++----- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 408 bytes .../Uniforms/Jumpsuit/bartender.rsi/meta.json | 60 ++++----- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 436 bytes .../Uniforms/Jumpsuit/cargotech.rsi/meta.json | 60 ++++----- .../ce.rsi/folded-equipped-INNERCLOTHING.png | Bin 0 -> 547 bytes .../Uniforms/Jumpsuit/ce.rsi/meta.json | 90 ++++++------- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 497 bytes .../Uniforms/Jumpsuit/chemistry.rsi/meta.json | 68 +++++----- .../cmo.rsi/folded-equipped-INNERCLOTHING.png | Bin 0 -> 508 bytes .../Uniforms/Jumpsuit/cmo.rsi/meta.json | 68 +++++----- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 533 bytes .../Jumpsuit/engineering.rsi/meta.json | 68 +++++----- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 544 bytes .../Jumpsuit/engineering_hazard.rsi/meta.json | 68 +++++----- .../hop.rsi/folded-equipped-INNERCLOTHING.png | Bin 0 -> 475 bytes .../Uniforms/Jumpsuit/hop.rsi/meta.json | 68 +++++----- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 577 bytes .../Uniforms/Jumpsuit/hydro.rsi/meta.json | 60 ++++----- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 590 bytes .../Uniforms/Jumpsuit/janitor.rsi/meta.json | 68 +++++----- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 511 bytes .../Uniforms/Jumpsuit/medical.rsi/meta.json | 68 +++++----- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 457 bytes .../Jumpsuit/roboticist.rsi/meta.json | 58 +++++---- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 495 bytes .../Uniforms/Jumpsuit/salvage.rsi/meta.json | 60 ++++----- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 520 bytes .../Uniforms/Jumpsuit/scientist.rsi/meta.json | 68 +++++----- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 524 bytes .../Uniforms/Jumpsuit/security.rsi/meta.json | 68 +++++----- 38 files changed, 690 insertions(+), 581 deletions(-) create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-equipped-INNERCLOTHING.png 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/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/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index 777f1dc936..cac61da2be 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -72,3 +72,16 @@ - type: Clothing slots: [innerclothing] femaleMask: UniformTop + +# 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/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 0000000000000000000000000000000000000000..854df877c484bda9d31b905122b41e4ad2628cce GIT binary patch literal 530 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1!2l#}zE^1?Vc!7bTY2Egf4FBITFyu{USo(kS6o!cv42Kpl{Q1aqXbDqQ zEJH;qqqes8{&@^tMGOZPFwAaXnA-$2f}wDu^bsH>S`y?J{2vQo(7svw3aEgyz$3Dl zfq@UGnC}SVRBb+KpyRAPT^vIq+}}=1EN)idX=4`UTH6)%?|=SX>FHmO2*qx{{g%7` zd8WswDPOpQ{;B$2VDS+)VcaZQvv4B)o zM6;t$I&8A`td?G5dWWxZ6Ela^AC`xj+NxhP4UT0n-D6N|a0)A%@bKN~uUa3yG#M1j zPVp^i$n$$Nb?t#tLmAFHZ{>xC3ca@!KXQUKQ1ni?<4k>)+WYBuRwYQZ^+b#Q z=}^mHTE;o6A+u?}V1|3L?dI4;g+2{kkE@x5=ExskO|CQ6f5#4A35WfP{9&=Kv^PoLgk^zzuW;ina`v+!%rodpa1-*v@t#)VBTK+ zrVTbKD?UUV+PPr*cdfsj4D#&lf2VSl-h2P)e$yO#hCp529kIr<{6LZ5>FVdQ&MBb@ E0BR@O@Bjb+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..eb1b473ab0ae6c2b82b35eb65506b76d234721ce GIT binary patch literal 506 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e2l#}zR>z80q%tz(PGs2lilKA!fdvc<+dnO>m1l^q{Qr(&Vg*B0EW`R< zsm^TvtgI}CX~%&2;&a<(11Z6hAiv=MXn;X=?aU;gBxiv~WHAE+-vJP2%(~Xe33QCH zr;B4qg!|iRuk#Ko@VIdw%+8p6;J5u-J9ev?-JREbXPFdMvDVK~`?F%_QF$ZQ-~&Df zMGS&I{Q9T6l4tg-&5ulTbKi$cCJP*L7LM2x>Bh!&a8pFLI=i(*`y}Qi96oXX9{yrG z+&!~VLDPhB>C+`#?;@&>%dX3wx6%w)(J|X>+c0TvYY*!;G_- zX1$(w+(*%(PuZfKZLYdjK!Kiu%KAkDEdpXPMpM4Y1v*GBY-C`JagsBCz~pz>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0}1^9%xYG`O^X=!C;Wi>Q395`^m%E~G&EzRBCJuWWJ(9lptMMXzPM_pY# zC@4rlBSEK+1 z&w9EzhD5l(y>^kW$$-b^3=9umUSfE@m%pU*uc(0Y8ip<68OxYlo@aQmGljGN zFx1+xz1~E?p8E*Th1`h@D}HXf|8AezpAw*1k_imy2i7xIJbod&aEVBzWjwjC6VnzL3rdk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0Z1^9%xR>z93YEVc@N}7}>eQmSG%$YMA8X689IIw*A^4+_4-`Zt+F8*(;X08)Ggl-K{7?)N&wP%1nXg0{ zeW#ojN{C&p&(b)9+4%a7MmF8vQwbaa^S8tV-FI+ysO&i?^5Mjf7;Yy6)(QsAu3eWL z7_a_PGS!>IdPe24#&TKf+l-f-vtlgXiKhO3b@{Bc{Wn{^0>*+y?gpS`R!pl+zZttT zrg0~fJU^3p+T7LJjM81E04*mT>H|x zK;~c)uSVB0u{SFdABv>R4BIJo!fNjEcDDsL{wwuuoU1Q&kbj55b9KJMM=g~CIURt3 Oz~JfX=d#Wzp$P!arLaT* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..39a640b26d47254751dff869206c764da1467c57 GIT binary patch literal 547 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0p2l#}z2DUknWY86MtYC`!+|eCgoi$&=$_ zgD+h?SP;eC(9m$=#0e)$+x9%(sHmu}uC7fJ1cQTvUtSRfn%Ap!Fc3&dmIV0)|HlCs z7)`jg0~K)=ctjR6Fz_7!VaBX$ot!|&+IYG+hD5l(opv$rumX>(VdSKsux%IHp8Vfm za{bCg4%REHW_>%<>5`PgcTRZ4Ti;y^xM%3SU{Vu(b6?*xUf|7Tm!+;fK^z~iu(UMJ zSmp4#(d42+VVhHz$&VErZoY?GW@YM0Ut#e(5W;dJaTX`n*}Zm)c-Gs^%?(Z1@MZFg zM{~}kNMuW7tMtjRoZETvMz>_D+Tn!H`pM@@4{kSo&tWDg!z~oi@IQkiN5|q{vXkL_ zE|DGlsdWcxJywX?`-+z^US^FwP;yY7v*u}y{GOU6GA!3`ANuj>r`;L5W%=PVJ7icA zBWEt%Au2VwWJ0Hh+5@323WaP^9WS>jv^)^+G#2Ym3Er?!A!7eEtBAc%xj5g;u-1HY z3fQ^Of_1W=s*Af literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..aee5ab426e122f6a606f39d794feec6b59f049fa GIT binary patch literal 497 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e2l#}z_V)HpbYy5~XxO-M8c4 z(eiY042f`mJMCiGVFeBc#l(wl*?<49mzCJQO7L=Cdb<9-dCMFh%zMS{^hY(=fc21w zPh$YrzI*p4?Nj{W=e*wYfy=K9rpV{-CNc<$|9iHBF)UB@nX}*lrX33pp8dwV;og$D zCsr}N+X2cvGoE!ovO3XQi<|J$43UNA2v^y3o?2Zia6T{H`x-1SiSsqs@r z{nV{I$AeoBEN80w^75JY!MT=lwYw@)cds{Q4OZ|uD8do^!Mtff&oK$ZC)1mP1o~bc zH@4C@DNqtEcsSWh;X3=geLJ4Evc20r&D%lvfY#yp4)>XsG;Pf~wZDnuhkW0;hRe*3 zR!s6!xVf6mDpsCMT*Q^~C64pf!&)JmE!=$#zaIxZ*z$1Rj_uc*-7fI`H(uTq^?~_c cw7_F^8_7=>U0nssfI-RN>FVdQ&MBb@0I^rxT>t<8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ad71010b462251ec5825ab1a05b10d19fbcb1b85 GIT binary patch literal 508 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0}1^9%x_V)H>Wo0!qH0T%3+qiM#|Ns9R8yhpWUc7(*{)rPOEc^CHP21hu zH~GksBcY+8DJd!O@$o>dfBs570#ZUHL4LtNEvSIu(f<8HKv~WLkH}&M2EKzJ%(!D> z_FJHX3_V>OLn7SYPKzx+q`>1aImoTV;LZR4o7GHa*KFG*dp>SQm4HW)?w%zZ{!Y}K z!Ia3g%;5y<{m;{v=yTK^x}Ys&F~Lr`@lEm9i420`$pP0zHx#W*wPRz7IAGCyEbu!Y`{xid5-R5|^7<=4q^=c*ttYlE2hlf;s?ZdLbfdlm;Z{CL^?)%95OU#5dqvFb&Q z+Yicfs_gTOx!!3LF0{b!goSv^lmpK5^K8Ux41Zr(E-f$fy>eLsR}0uN_mn%_)Opoj zsVIvd+55Y&|5`5>-x3zTngEU`UmIs{FWeP)@T==WDh&)8M3z2oJc({Eh@%>PeQ iTP*UY>AzUcZP}PMrfs>r2j2rjl)=;0&t;ucLK6UAfZb34 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..95427cab2b7eb4c981d5bb462a32b7266e0b4af4 GIT binary patch literal 533 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~;1^9%xE^1?Vc!A-FFT?hg4FBIT{I6%&JcVKVbcV^+41Yc{^_ejoTEH-| zg5l5-rh*WLid4qkvlzOH7!E98nBBlIw+UzpgN3}(Js>4k666>B9~)p`yma6RPz7g! zM`SSr1K%MKW)#)%Y5+RW%G1R$B*Ojew2Nhj6nNU0n`SrYZu|6a{Vw|xG9gLN%gV|Q zKYy9&Jn8(U*$ywK^Bfc~a5iA^(fv_V=lQGY!MtU0!p$!KJelI$zZ)|Kf4NLg`tJ#&!W8j&U-TTeXYq(eNmD?A-o_d(U$weXetn7oJHUH1Xw}t})}e z`y`IG2FWJHgtiCyESECgq`y-2nmBQpasT_64Vk~1^e!gVxffamyWBd~tg_n{ksvB;Qf&gV+?E6Y~#r%x5@iak#*j(>Qly^t9Bin+~kg$Vh+R ztgz;~P|1#UiSY(gpX*)jV`y(){&y}{;r{zi_p@r&GCY>C%@k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0p2l#}zmK!ikbYz%p&2Zqr0V^x3nbYL{*E5_9XIQ>``IA!i|No8ucQCA3 zsdV`)!|vq_8X6jYett9S8MZHFNYiERGh;aD%TS=ma48dL90QO1B#Z_JR*x382Ao?FyoGi*>8c4we)mx42f`mJMCiLVFeynMdg&7vmBYXKK+lk zy1g;Pr(kK>t#5|{XCI3xo@FCBx!yy(gz*wfNr(ynM#{ zpy&<#+*y^H6`gu7n3izwVtCnfUod0w#<^3PIQ5U+n4Q#+U>_Zztjw}Ou#dqYv2r03 z(|hJWSxnW3g;`_-cGxj2XV2hx#F@?LSD`1J@XNtrr|{w3YF2L^HVH7Dn0vX+dg21d zf6XFGN_}q?sGGfc@LN{%z{B;t<&UZ?>^vN8|MbgPEqTEDFM7gf^ThqR=ba9GG6Y3~ Mr>mdKI;Vst0HV?1ZU6uP literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..edbe52e7597b4184a47bd491af69173bebf65435 GIT binary patch literal 475 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E1o(uwGPtKP=sGj_7d8Mz652KZ$&d;LhnOl+Q3g|g1~m(yz=qaTIUvPT z666>B9|0JI?w>mc6z44Ph%9Dc;5!V$jK}j=qyR0}@N{tuiEw{A?RL>&1s>K?#^as; z|JPTuWN}MadRoujw_)Z+M$hiU-3uO1*EuL8;k|*yP5Xz;e$`s%52DK=CpJ3#bY+Tm z|2nl{rt8#NJBOxAEJ}<*CfeE4b~d`Ku~Fq@4V(W#a5~e(0EZR#W^7-x&&VO^YNu7b z`h_`)H+RWOy<)tiD^eh&Htk4bL;j69$p;gg4zt+FSL#hr;y5QzI47vqq=YFzzIfTk z2k-Zt6Vhqi$l{%#bMQV##`lArwbS0_H)nspEF&^i|T2m4u%e`MsTUlRK?)`$lfkPM!#elF{r5}E)T COSZZI literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8bc0d303c3182da5296074d21c1e27d26fb6fa1b GIT binary patch literal 577 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 tebzbFyu{o7!{($wz&WR literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c919509adc83cf541183f99dfc84525035d5e12b GIT binary patch literal 495 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e2l#}zR>z7bGfbSv@T!7g^QoC?OBg=w?N?b^D}QaXMi4_~XEy)(Ua3eo z_N=U|Hil#UInqFV`B6_}fRtcKkYDhBG{B&`c4iV#lC!`gvY3H^?;r>>?wFYU7U&oa zPZ!6K2=}+s9%Ef)eDD3w{CmoPkxgfpyjq*_;g)UcJi^wW#3h>)1KJWe zri6U>^>5l2-hH1-djE2!>^Wa$9Zl!uJ>PYpm4&Bt z)yI$m_TK@^rTkgt4OyHQ@EjD-u-C8*X6>3 z$4-n)O45@yEvg8YyS>e~;$+5_@_vRx9#uzJmkKB_Mt6K>zTsf-h2>bpGz)u$oZgol zUnF|7+bFW%(e*-Q(+8gCO<~3Scl=pWKie0bIKe9aA-D0n|4EZi Vn_jt<2mu3k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0}1^9%x_5wlQeLB zp`oEEDJjXx$?@^=K&>@r{1kzdP)U$qFi;CBV0g5DzYtKCv%n*=n1O-sAP6(=n3(+* z=pb897srqY_qWsT7PTnwxG7KKiadSj_x>DVpXCpPw%_(!ZZ4BPb$(5H$=;5Dx|1S4 zjRvg23R{}afAqd2&a&Z!sGDM=`Kv_El)0C~nV#P{Wj}X5!}-9JdpwM59&8gh?3T>@ zWA+ijlOi7TlJo@k?#+A*r1NdweV^H+DX=Vot3~sNw4+f}vZmt8 z1q(&5yuGFP`U_*`+^ze*mN3mL_@36RH|K$kV9_z5hUw4x6KWPtd9*<6hu)HKN0vML zChK}!x|{3xm*GH4%>siyA+KIP?Ym3vM9x1^$35kT+IuT&3+|e-w0XRGzr7pPPemSg vE>insW%q)0=Ea2von7^RF#gxoc*-nU%J}=h4~9>`&}Hy+^>bP0l+XkKl{ezn literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d22e70dac460478ecddf0b98069a1c846e0807f4 GIT binary patch literal 524 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1!1o(uwh6?j{2uti$l+w`9(AL)W^YMA$DtFXIrbbNc1_Q%VdHG}si77Vv z2`pR{vNBVqOzGB9}_V6`#%>1%5xTYL>4nJ@ErnS zMo|r~2B5<%JzX3_BHZ6jyPJ1dfya$kN3*eY+LOQcOXqiLGdBKPGpp?I$|*@Xe9yQt z{!dVpU`pd?YdFdJ{bTecbC&O!OQX6alv;j#W#N)PTEZG7y);mvkhRdOd3_%PYns#9 zHMiMj9b~<+FTpJ9n4WCo)2q{uma>X@_Xc%;HwsRin>uHzMIgtX?m)hKl3@vswlQ0tm<_}c3P?rGX8HX6z?d- Date: Sun, 22 Sep 2024 19:01:58 +0000 Subject: [PATCH 08/12] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 6289d2d1d5..afef577952 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,10 +1,4 @@ Entries: -- 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!" @@ -8733,3 +8727,14 @@ 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 From b1461b3645aee6a003e0aec78e493b893a8b0856 Mon Sep 17 00:00:00 2001 From: Valtos Date: Mon, 23 Sep 2024 21:03:07 +0300 Subject: [PATCH 09/12] fix retard (#706) --- Content.Client/_White/MeatyOre/MeatyOreUIController.cs | 2 +- Resources/Prototypes/_White/Mobs/Species/harpy.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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/Prototypes/_White/Mobs/Species/harpy.yml b/Resources/Prototypes/_White/Mobs/Species/harpy.yml index 28e6f19ce7..24414817dc 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 From 7a3ac24f36788f24f45b39089af09bf2daf78ee0 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Mon, 23 Sep 2024 18:04:10 +0000 Subject: [PATCH 10/12] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index afef577952..aefe57b7a0 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,10 +1,4 @@ Entries: -- 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\ @@ -8738,3 +8732,13 @@ 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 From fcb4b12418abb278ef5e95b64d522bed535c5ec3 Mon Sep 17 00:00:00 2001 From: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com> Date: Wed, 25 Sep 2024 14:00:23 +0300 Subject: [PATCH 11/12] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B2=20=D0=B0=D0=B2=D1=82=D0=BE=D0=BF=D0=B5=D1=80=D0=B5=D0=B2?= =?UTF-8?q?=D0=BE=D0=B4=D0=B5=20(#707)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Awawawa, но на русском * Правки * Боримся с силой * Revert "Правки" This reverts commit 5566dc94155af49c830a6eb476f2752fa95fa710. * Revert "Awawawa, но на русском" This reverts commit 62d792e0cd5e613d25c98ed3e144b3eb8e7e80a0. --- .../Locale/ru-RU/_white/locales-new/autotranslate-102.ftl | 6 +++--- .../Locale/ru-RU/_white/locales-new/autotranslate-103.ftl | 6 +++--- .../Locale/ru-RU/_white/locales-new/autotranslate-104.ftl | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) 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 = локатор аномалий From 4de84b6fa351c176efac1d339e5d857a2b293d67 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Wed, 25 Sep 2024 11:01:27 +0000 Subject: [PATCH 12/12] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index aefe57b7a0..01e3bc3641 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,11 +1,4 @@ Entries: -- 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\ @@ -8742,3 +8735,12 @@ 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