From 4691d9357634a06e37fd294eafcdf2e68fb96625 Mon Sep 17 00:00:00 2001 From: 1Stepka1 <131589665+1Stepka1@users.noreply.github.com> Date: Wed, 28 Aug 2024 03:17:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BD=D0=B0=D1=88?= =?UTF-8?q?=D0=B8=D1=85=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20=D0=B2=20?= =?UTF-8?q?=D1=80=D0=B0=D1=81=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B8=20(#356)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Убрал лишние папки с Entities и/или перемести в правильные папки(устранение дубликатов) Исправил ошибку в написании Turtleneck. Перенес действия от прыжковых ботинок в прыжковые ботинки(на подобии с магнитными, визарды черти как распределять action) Немного рассортировал фантома Переименование некоторых файлов в правильные названия Текстуры канистр в папке ADT Папка Catalog перенесена из Locate/ADT в prototypes no cl no fun --- .../Catalog/Fills/backpacks}/duffelbag.ftl | 0 ...{cargo-security.ftl => cargo_security.ftl} | 0 .../Catalog/store}/uplink-catalog.ftl | 0 .../Actions.yml => Actions/chaplain.yml} | 0 Resources/Prototypes/ADT/Actions/fill.txt | 1 - .../ADT/Catalog/Fills/Backpacks/duffelbag.yml | 4 +- .../Crates/{secutiy.yml => security.yml} | 0 .../ADT/Catalog/Fills/Lockers/centcomm.yml | 4 +- .../listenings.yml => boobr_catalog.yml} | 0 .../Entities/Clothing/Uniforms/Jumpsuits.yml | 46 ++++---- .../Entities/Clothing/Uniforms/jumpskirts.yml | 42 +++---- .../Circuitboards/Machine/production.yml | 0 .../Circuitboards/siliconchargers.yml | 0 .../Objects/{Device => Devices}/handheld.yml | 0 .../Clothing/personalization_clothing.yml | 0 .../Objects}/personalization_items.yml | 0 .../Storage/Canisters/gas_canisters.yml | 20 ++++ .../changeling.yml} | 0 .../ADT/Loadouts/Jobs/Command/blueshield.yml | 2 +- .../objectiveGroups.yml} | 0 .../ADT/Roles/Jobs/Security/brigmedic.yml | 2 +- .../phantom.yml} | 0 ...byScreens.yml => lobbyscreensanimated.yml} | 0 .../Inventories/clothesmate.yml | 68 ++++++------ .../equipped-INNERCLOTHING.png | Bin .../icon.png | Bin .../meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../icon.png | Bin .../meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../icon.png | Bin .../meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../icon.png | Bin .../meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../icon.png | Bin .../meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../icon.png | Bin .../meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../icon.png | Bin .../meta.json | 0 .../equipped-INNERCLOTHING.png | Bin 0 -> 1073 bytes .../turtleneck_salatblack.rsi/icon.png | Bin 0 -> 464 bytes .../meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../icon.png | Bin .../meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../icon.png | Bin .../meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../icon.png | Bin .../turtleneck_whitesleeveless.rsi/meta.json | 18 +++ .../Storage/canister.rsi/antinob-1.png | Bin .../Storage/canister.rsi/antinob.png | Bin .../Storage/canister.rsi/brown-1.png | Bin .../Structures/Storage/canister.rsi/brown.png | Bin .../Storage/canister.rsi/can-connector.png | Bin 0 -> 269 bytes .../Storage/canister.rsi/can-o0.png | Bin 0 -> 2319 bytes .../Storage/canister.rsi/can-o1.png | Bin 0 -> 114 bytes .../Storage/canister.rsi/can-o2.png | Bin 0 -> 1742 bytes .../Storage/canister.rsi/can-o3.png | Bin 0 -> 114 bytes .../Storage/canister.rsi/can-oa1.png | Bin 0 -> 186 bytes .../Storage/canister.rsi/can-open.png | Bin 0 -> 143 bytes .../Storage/canister.rsi/darkpurple-1.png | Bin .../Storage/canister.rsi/darkpurple.png | Bin .../Structures/Storage/canister.rsi/h2-1.png | Bin .../Structures/Storage/canister.rsi/h2.png | Bin .../Storage/canister.rsi/halon-1.png | Bin .../Structures/Storage/canister.rsi/halon.png | Bin .../Storage/canister.rsi/healium-1.png | Bin .../Storage/canister.rsi/healium.png | Bin .../Storage/canister.rsi/helium-1.png | Bin .../Storage/canister.rsi/helium.png | Bin .../Storage/canister.rsi/locked.png | Bin 0 -> 1744 bytes .../Structures/Storage/canister.rsi/meta.json | 105 ++++++++++++++++++ .../Structures/Storage/canister.rsi/nob-1.png | Bin .../Structures/Storage/canister.rsi/nob.png | Bin .../Storage/canister.rsi/proto_nitrate-1.png | Bin .../Storage/canister.rsi/proto_nitrate.png | Bin .../Storage/canister.rsi/purple-1.png | Bin .../Storage/canister.rsi/purple.png | Bin .../Storage/canister.rsi/unlocked.png | Bin 0 -> 1752 bytes .../Storage/canister.rsi/zauker-1.png | Bin .../Storage/canister.rsi/zauker.png | Bin .../Structures/Storage/canister.rsi/meta.json | 66 ----------- 90 files changed, 227 insertions(+), 151 deletions(-) rename Resources/Locale/ru-RU/ADT/{Catalog/Fills/Backpacks => prototypes/Catalog/Fills/backpacks}/duffelbag.ftl (100%) rename Resources/Locale/ru-RU/ADT/prototypes/Catalog/cargo/{cargo-security.ftl => cargo_security.ftl} (100%) rename Resources/Locale/ru-RU/ADT/{Catalog/Store => prototypes/Catalog/store}/uplink-catalog.ftl (100%) rename Resources/Prototypes/ADT/{Chaplain/Actions.yml => Actions/chaplain.yml} (100%) delete mode 100644 Resources/Prototypes/ADT/Actions/fill.txt rename Resources/Prototypes/ADT/Catalog/Fills/Crates/{secutiy.yml => security.yml} (100%) rename Resources/Prototypes/ADT/Catalog/{boobr/listenings.yml => boobr_catalog.yml} (100%) rename Resources/Prototypes/ADT/Entities/Objects/{Device => Devices}/Circuitboards/Machine/production.yml (100%) rename Resources/Prototypes/ADT/Entities/Objects/{Device => Devices}/Circuitboards/siliconchargers.yml (100%) rename Resources/Prototypes/ADT/Entities/Objects/{Device => Devices}/handheld.yml (100%) rename Resources/Prototypes/ADT/{ => Entities}/Personalization/Clothing/personalization_clothing.yml (100%) rename Resources/Prototypes/ADT/{Personalization/Entities => Entities/Personalization/Objects}/personalization_items.yml (100%) rename Resources/Prototypes/ADT/{changeling/hallucinations.yml => Hallucinations/changeling.yml} (100%) rename Resources/Prototypes/ADT/{Phantom/objective_groups.yml => Objectives/objectiveGroups.yml} (100%) rename Resources/Prototypes/ADT/{Phantom/sound_collections.yml => SoundCollections/phantom.yml} (100%) rename Resources/Prototypes/ADT/{AnimatedLobbyScreen/lobbyScreens.yml => lobbyscreensanimated.yml} (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/{turleneck_black_womensleeveless.rsi => turtleneck_black_womensleeveless.rsi}/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/{turleneck_black_womensleeveless.rsi => turtleneck_black_womensleeveless.rsi}/icon.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/{turleneck_black_womensleeveless.rsi => turtleneck_black_womensleeveless.rsi}/meta.json (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/{turleneck_salat_women.rsi => turtleneck_salat_women.rsi}/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/{turleneck_salat_women.rsi => turtleneck_salat_women.rsi}/icon.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/{turleneck_salat_women.rsi => turtleneck_salat_women.rsi}/meta.json (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/{turleneck_salatblack.rsi => turtleneck_salatblack.rsi}/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/{turleneck_salatblack.rsi => turtleneck_salatblack.rsi}/icon.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/{turleneck_salatblack.rsi => turtleneck_salatblack.rsi}/meta.json (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/{turleneck_white_womensleeveless.rsi => turtleneck_white_womensleeveless.rsi}/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/{turleneck_white_womensleeveless.rsi => turtleneck_white_womensleeveless.rsi}/icon.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/{turleneck_white_womensleeveless.rsi => turtleneck_white_womensleeveless.rsi}/meta.json (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_amerc.rsi => turtleneck_amerc.rsi}/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_amerc.rsi => turtleneck_amerc.rsi}/icon.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_amerc.rsi => turtleneck_amerc.rsi}/meta.json (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_blacksleeveless.rsi => turtleneck_blacksleeveless.rsi}/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_blacksleeveless.rsi => turtleneck_blacksleeveless.rsi}/icon.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_blacksleeveless.rsi => turtleneck_blacksleeveless.rsi}/meta.json (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_salat.rsi => turtleneck_salat.rsi}/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_salat.rsi => turtleneck_salat.rsi}/icon.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_salat.rsi => turtleneck_salat.rsi}/meta.json (100%) create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/icon.png rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_tactick.rsi => turtleneck_salatblack.rsi}/meta.json (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_tactick.rsi => turtleneck_tactick.rsi}/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_tactick.rsi => turtleneck_tactick.rsi}/icon.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_whiteblacksleeveless.rsi => turtleneck_tactick.rsi}/meta.json (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_whiteblacksleeveless.rsi => turtleneck_whiteblacksleeveless.rsi}/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_whiteblacksleeveless.rsi => turtleneck_whiteblacksleeveless.rsi}/icon.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_whitesleeveless.rsi => turtleneck_whiteblacksleeveless.rsi}/meta.json (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_whitesleeveless.rsi => turtleneck_whitesleeveless.rsi}/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/{turleneck_whitesleeveless.rsi => turtleneck_whitesleeveless.rsi}/icon.png (100%) create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi/meta.json rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/antinob-1.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/antinob.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/brown-1.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/brown.png (100%) create mode 100644 Resources/Textures/ADT/Structures/Storage/canister.rsi/can-connector.png create mode 100644 Resources/Textures/ADT/Structures/Storage/canister.rsi/can-o0.png create mode 100644 Resources/Textures/ADT/Structures/Storage/canister.rsi/can-o1.png create mode 100644 Resources/Textures/ADT/Structures/Storage/canister.rsi/can-o2.png create mode 100644 Resources/Textures/ADT/Structures/Storage/canister.rsi/can-o3.png create mode 100644 Resources/Textures/ADT/Structures/Storage/canister.rsi/can-oa1.png create mode 100644 Resources/Textures/ADT/Structures/Storage/canister.rsi/can-open.png rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/darkpurple-1.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/darkpurple.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/h2-1.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/h2.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/halon-1.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/halon.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/healium-1.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/healium.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/helium-1.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/helium.png (100%) create mode 100644 Resources/Textures/ADT/Structures/Storage/canister.rsi/locked.png create mode 100644 Resources/Textures/ADT/Structures/Storage/canister.rsi/meta.json rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/nob-1.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/nob.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/proto_nitrate-1.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/proto_nitrate.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/purple-1.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/purple.png (100%) create mode 100644 Resources/Textures/ADT/Structures/Storage/canister.rsi/unlocked.png rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/zauker-1.png (100%) rename Resources/Textures/{ => ADT}/Structures/Storage/canister.rsi/zauker.png (100%) diff --git a/Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/duffelbag.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/backpacks/duffelbag.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/duffelbag.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/backpacks/duffelbag.ftl diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/cargo/cargo-security.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/cargo/cargo_security.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/prototypes/Catalog/cargo/cargo-security.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Catalog/cargo/cargo_security.ftl diff --git a/Resources/Locale/ru-RU/ADT/Catalog/Store/uplink-catalog.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Catalog/Store/uplink-catalog.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl diff --git a/Resources/Prototypes/ADT/Chaplain/Actions.yml b/Resources/Prototypes/ADT/Actions/chaplain.yml similarity index 100% rename from Resources/Prototypes/ADT/Chaplain/Actions.yml rename to Resources/Prototypes/ADT/Actions/chaplain.yml diff --git a/Resources/Prototypes/ADT/Actions/fill.txt b/Resources/Prototypes/ADT/Actions/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Actions/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/duffelbag.yml index e2870113112..8b6f7829633 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/duffelbag.yml @@ -11,7 +11,7 @@ - id: ADTClothingOuterCoatBrigmedicWB - id: ClothingUniformJumpsuitBrigmedic - id: ClothingUniformJumpskirtBrigmedic - - id: ADTClothingUniformBrigmedicTurtleneck - - id: ADTClothingUniformSkirtBrigmedicTurtleneck + - id: ADTClothingUniformBrigmedicJumpsuitTurtleneck + - id: ADTClothingUniformSkirtBrigmedicJumpskirtTurtleneck - id: ClothingHeadHelmetSecurityMedic # Corvax-Resprite diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/secutiy.yml b/Resources/Prototypes/ADT/Catalog/Fills/Crates/security.yml similarity index 100% rename from Resources/Prototypes/ADT/Catalog/Fills/Crates/secutiy.yml rename to Resources/Prototypes/ADT/Catalog/Fills/Crates/security.yml diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/centcomm.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/centcomm.yml index 344abd1d7fc..5a94f789755 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/centcomm.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/centcomm.yml @@ -17,7 +17,7 @@ - id: ADTClothingNeckCloakBlueshield - id: ADTClothingOuterWinterBlueshield - id: ClothingShoesBootsJack - - id: ADTClothingUniformJumpskirtBlueshieldTurtleneck + - id: ADTClothingUniformJumpskirtBlueshieldJumpskirtTurtleneck - id: ADTClothingUniformJumpsuitBlueshieldTurtleneck - type: entity @@ -37,5 +37,5 @@ - id: ADTClothingNeckCloakBlueshield - id: ADTClothingOuterWinterBlueshield - id: ClothingShoesBootsJack - - id: ADTClothingUniformJumpskirtBlueshieldTurtleneck + - id: ADTClothingUniformJumpskirtBlueshieldJumpskirtTurtleneck - id: ADTClothingUniformJumpsuitBlueshieldTurtleneck diff --git a/Resources/Prototypes/ADT/Catalog/boobr/listenings.yml b/Resources/Prototypes/ADT/Catalog/boobr_catalog.yml similarity index 100% rename from Resources/Prototypes/ADT/Catalog/boobr/listenings.yml rename to Resources/Prototypes/ADT/Catalog/boobr_catalog.yml diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml index 87a418078b5..e2b5fadad64 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml @@ -35,7 +35,7 @@ # Водолазки. От prazat911, конечно же. - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckAquamarine + id: ADTClothingUniformJumpsuitTurtleneckAquamarine name: aquamarine turtleneck description: Too bright! components: @@ -48,7 +48,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckWhite + id: ADTClothingUniformJumpsuitTurtleneckWhite name: white turtleneck description: Warm and comfy. components: @@ -61,7 +61,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckAzure + id: ADTClothingUniformJumpsuitTurtleneckAzure name: azure turtleneck description: Brighter shade of blue. components: @@ -74,7 +74,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckYellow + id: ADTClothingUniformJumpsuitTurtleneckYellow name: yellow turtleneck description: Filled with happines. components: @@ -87,7 +87,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckGreen + id: ADTClothingUniformJumpsuitTurtleneckGreen name: green turtleneck description: Cheaper analog of CentComm turtleneck. components: @@ -100,7 +100,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckBrown + id: ADTClothingUniformJumpsuitTurtleneckBrown name: brown turtleneck description: -Ya know why i wear red? It hides blood well! -But that's brown color... components: @@ -113,7 +113,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckRed + id: ADTClothingUniformJumpsuitTurtleneckRed name: red turtleneck description: Hides blood of clowns well! components: @@ -126,7 +126,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckOrange + id: ADTClothingUniformJumpsuitTurtleneckOrange name: orange turtleneck description: I don't want to talk about it. components: @@ -139,7 +139,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckPink + id: ADTClothingUniformJumpsuitTurtleneckPink name: pink turtleneck description: Who would wear this? components: @@ -152,7 +152,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckGrey + id: ADTClothingUniformJumpsuitTurtleneckGrey name: grey turtleneck description: Grey style? components: @@ -165,7 +165,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckBlue + id: ADTClothingUniformJumpsuitTurtleneckBlue name: blue turtleneck description: Darker shade of azure. components: @@ -178,7 +178,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckPurple + id: ADTClothingUniformJumpsuitTurtleneckPurple name: purple turtleneck description: Feel yourself like a real scientist. components: @@ -191,7 +191,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckBlack + id: ADTClothingUniformJumpsuitTurtleneckBlack name: black turtleneck description: Favourite clothes of bookworms. components: @@ -204,40 +204,40 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurleneckBlackSleeveless + id: ADTClothingUniformJumpsuitTurtleneckBlackSleeveless name: ancient jumpsuit description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_blacksleeveless.rsi + sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_blacksleeveless.rsi + sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi - type: StaticPrice price: 15 - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurleneckWhiteSleeveless + id: ADTClothingUniformJumpsuitTurtleneckWhiteSleeveless name: ancient jumpsuit description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_whitesleeveless.rsi + sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_whitesleeveless.rsi + sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whitesleeveless.rsi - type: StaticPrice price: 15 - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurleneckWhiteBlackSleeveless + id: ADTClothingUniformJumpsuitTurtleneckWhiteBlackSleeveless name: ancient jumpsuit description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_whiteblacksleeveless.rsi + sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/turleneck_whiteblacksleeveless.rsi + sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_whiteblacksleeveless.rsi - type: StaticPrice price: 15 @@ -564,7 +564,7 @@ #Brigmed - type: entity parent: ClothingUniformBase - id: ADTClothingUniformBrigmedicTurtleneck + id: ADTClothingUniformBrigmedicJumpsuitTurtleneck name: brigmedic turtleneck description: Comfortable and warm turtleneck. Especially for the guardian angel. components: diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml index aeb96cf832a..07c3265440f 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml @@ -12,7 +12,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformJumpskirtBlueshieldTurtleneck + id: ADTClothingUniformJumpskirtBlueshieldJumpskirtTurtleneck name: blueshield's turtleneck skirt description: blueshield's turtleneck components: @@ -24,7 +24,7 @@ #Водолазки от prazat911. - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckAquamarineWomen + id: ADTClothingUniformJumpskirtTurtleneckAquamarine name: aquamarine turtleneck with skirt description: Too bright! components: @@ -37,7 +37,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckWhiteWomen + id: ADTClothingUniformJumpskirtTurtleneckWhite name: white turtleneck with skirt description: Warm and comfy. components: @@ -50,7 +50,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckAzureWomen + id: ADTClothingUniformJumpskirtTurtleneckAzure name: azure turtleneck with skirt description: Brighter shade of blue. components: @@ -63,7 +63,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckYellowWomen + id: ADTClothingUniformJumpskirtTurtleneckYellow name: yellow turtleneck with skirt description: Filled with happines. components: @@ -76,7 +76,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckGreenWomen + id: ADTClothingUniformJumpskirtTurtleneckGreen name: green turtleneck with skirt description: Cheaper analog of CentComm turtleneck. components: @@ -89,7 +89,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckBrownWomen + id: ADTClothingUniformJumpskirtTurtleneckBrown name: brown turtleneck with skirt description: -Ya know why i wear red? It hides blood well! -But that's brown color... components: @@ -102,7 +102,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckRedWomen + id: ADTClothingUniformJumpskirtTurtleneckRed name: red turtleneck with skirt description: Hides blood of clowns well! components: @@ -115,7 +115,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckOrangeWomen + id: ADTClothingUniformJumpskirtTurtleneckOrange name: orange turtleneck with skirt description: I don't want to talk about it. components: @@ -128,7 +128,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckPinkWomen + id: ADTClothingUniformJumpskirtTurtleneckPink name: pink turtleneck with skirt description: Who would wear this? components: @@ -141,7 +141,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckGreyWomen + id: ADTClothingUniformJumpskirtTurtleneckGrey name: grey turtleneck with skirt description: Grey style? components: @@ -154,7 +154,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckBlueWomen + id: ADTClothingUniformJumpskirtTurtleneckBlue name: blue turtleneck with skirt description: Darker shade of azure. components: @@ -167,7 +167,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckPurpleWomen + id: ADTClothingUniformJumpskirtTurtleneckPurple name: purple turtleneck with skirt description: Feel yourself like a real scientist. components: @@ -180,7 +180,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurtleneckBlackWomen + id: ADTClothingUniformJumpskirtTurtleneckBlack name: black turtleneck with skirt description: Favourite clothes of bookworms. components: @@ -193,27 +193,27 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurleneckBlackWomenSleeveless + id: ADTClothingUniformJumpskirtTurtleneckBlackSleeveless name: ancient jumpsuit description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpskirt/turleneck_black_womensleeveless.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpskirt/turleneck_black_womensleeveless.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi - type: StaticPrice price: 15 - type: entity parent: ClothingUniformBase - id: ADTClothingUniformTurleneckWhiteWomenSleeveless + id: ADTClothingUniformJumpskirtTurtleneckWhiteSleeveless name: ancient jumpsuit description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpskirt/turleneck_white_womensleeveless.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpskirt/turleneck_white_womensleeveless.rsi + sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi - type: StaticPrice price: 15 @@ -241,7 +241,7 @@ - type: entity parent: ClothingUniformBase - id: ADTClothingUniformSkirtBrigmedicTurtleneck + id: ADTClothingUniformSkirtBrigmedicJumpskirtTurtleneck name: brigmedic turtleneck description: Comfortable and warm turtleneck. Especially for the guardian angel. components: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/Machine/production.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/Circuitboards/Machine/production.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/Machine/production.yml rename to Resources/Prototypes/ADT/Entities/Objects/Devices/Circuitboards/Machine/production.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/siliconchargers.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/Circuitboards/siliconchargers.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/siliconchargers.yml rename to Resources/Prototypes/ADT/Entities/Objects/Devices/Circuitboards/siliconchargers.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/handheld.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/handheld.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Device/handheld.yml rename to Resources/Prototypes/ADT/Entities/Objects/Devices/handheld.yml diff --git a/Resources/Prototypes/ADT/Personalization/Clothing/personalization_clothing.yml b/Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml similarity index 100% rename from Resources/Prototypes/ADT/Personalization/Clothing/personalization_clothing.yml rename to Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml diff --git a/Resources/Prototypes/ADT/Personalization/Entities/personalization_items.yml b/Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml similarity index 100% rename from Resources/Prototypes/ADT/Personalization/Entities/personalization_items.yml rename to Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml diff --git a/Resources/Prototypes/ADT/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Canisters/gas_canisters.yml index 835502835ad..e45825ab332 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -3,6 +3,7 @@ id: ADTBZCanister components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi layers: - state: purple - type: GasCanister @@ -100,6 +101,7 @@ id: ADTHydrogenCanister components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi layers: - state: h2 - type: GasCanister @@ -150,6 +152,7 @@ id: ADTNitriumCanister components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi layers: - state: brown - type: GasCanister @@ -201,6 +204,7 @@ id: ADTHealiumCanister components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi layers: - state: healium - type: GasCanister @@ -259,6 +263,7 @@ id: ADTHyperNobliumCanister components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi layers: - state: nob - type: GasCanister @@ -317,6 +322,7 @@ id: ADTProtoNitrateCanister components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi layers: - state: proto_nitrate - type: GasCanister @@ -375,6 +381,7 @@ id: ADTZaukerCanister components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi layers: - state: zauker - type: GasCanister @@ -433,6 +440,7 @@ id: ADTHalonCanister components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi layers: - state: halon - type: GasCanister @@ -491,6 +499,7 @@ id: ADTHeliumCanister components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi layers: - state: helium - type: GasCanister @@ -549,6 +558,7 @@ id: ADTAntiNobliumCanister components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi layers: - state: antinob - type: GasCanister @@ -610,6 +620,7 @@ noSpawn: true components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi state: purple-1 - type: entity @@ -626,6 +637,7 @@ noSpawn: true components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi state: h2-1 - type: entity @@ -634,6 +646,7 @@ noSpawn: true components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi state: brown-1 - type: entity @@ -642,6 +655,7 @@ noSpawn: true components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi state: healium-1 - type: entity @@ -650,6 +664,7 @@ noSpawn: true components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi state: nob-1 - type: entity @@ -658,6 +673,7 @@ noSpawn: true components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi state: proto_nitrate-1 - type: entity @@ -666,6 +682,7 @@ noSpawn: true components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi state: zauker-1 - type: entity @@ -674,6 +691,7 @@ noSpawn: true components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi state: halon-1 - type: entity @@ -682,6 +700,7 @@ noSpawn: true components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi state: helium-1 - type: entity @@ -690,4 +709,5 @@ noSpawn: true components: - type: Sprite + sprite: ADT/Structures/Storage/canister.rsi state: antinob-1 diff --git a/Resources/Prototypes/ADT/changeling/hallucinations.yml b/Resources/Prototypes/ADT/Hallucinations/changeling.yml similarity index 100% rename from Resources/Prototypes/ADT/changeling/hallucinations.yml rename to Resources/Prototypes/ADT/Hallucinations/changeling.yml diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Command/blueshield.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Command/blueshield.yml index 8c79f7cae61..a37a9711905 100644 --- a/Resources/Prototypes/ADT/Loadouts/Jobs/Command/blueshield.yml +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Command/blueshield.yml @@ -28,7 +28,7 @@ - type: loadout id: ADTBlueshieldJumpskirtTurtleneck equipment: - jumpsuit: ADTClothingUniformJumpskirtBlueshieldTurtleneck + jumpsuit: ADTClothingUniformJumpskirtBlueshieldJumpskirtTurtleneck # Neck - type: loadout diff --git a/Resources/Prototypes/ADT/Phantom/objective_groups.yml b/Resources/Prototypes/ADT/Objectives/objectiveGroups.yml similarity index 100% rename from Resources/Prototypes/ADT/Phantom/objective_groups.yml rename to Resources/Prototypes/ADT/Objectives/objectiveGroups.yml diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/ADT/Roles/Jobs/Security/brigmedic.yml index f7068ba5aa3..461e00e4b90 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Security/brigmedic.yml @@ -27,7 +27,7 @@ - type: startingGear id: BrigmedicGear equipment: - jumpsuit: ADTClothingUniformBrigmedicTurtleneck + jumpsuit: ADTClothingUniformBrigmedicJumpsuitTurtleneck outerClothing: ADTClothingOuterCoatBrigmedicWB back: ClothingBackpackBrigmedicFilled shoes: ClothingShoesBootsJackSec diff --git a/Resources/Prototypes/ADT/Phantom/sound_collections.yml b/Resources/Prototypes/ADT/SoundCollections/phantom.yml similarity index 100% rename from Resources/Prototypes/ADT/Phantom/sound_collections.yml rename to Resources/Prototypes/ADT/SoundCollections/phantom.yml diff --git a/Resources/Prototypes/ADT/AnimatedLobbyScreen/lobbyScreens.yml b/Resources/Prototypes/ADT/lobbyscreensanimated.yml similarity index 100% rename from Resources/Prototypes/ADT/AnimatedLobbyScreen/lobbyScreens.yml rename to Resources/Prototypes/ADT/lobbyscreensanimated.yml diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 7d6d3e56292..b15911b899a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -127,40 +127,40 @@ ClothingHandsGlovesColorPurple: 2 ClothingEyesGlassesCheapSunglasses: 3 # ADT водолазки начало - ADTClothingUniformTurtleneckBlack: 1 - ADTClothingUniformTurtleneckBlackWomen: 1 - ADTClothingUniformTurtleneckGrey: 1 - ADTClothingUniformTurtleneckGreyWomen: 1 - ADTClothingUniformTurtleneckBrown: 1 - ADTClothingUniformTurtleneckBrownWomen: 1 - ADTClothingUniformTurtleneckBlue: 1 - ADTClothingUniformTurtleneckBlueWomen: 1 - ADTClothingUniformTurtleneckAzure: 1 - ADTClothingUniformTurtleneckAzureWomen: 1 - ADTClothingUniformTurtleneckAquamarine: 1 - ADTClothingUniformTurtleneckAquamarineWomen: 1 - ADTClothingUniformTurtleneckGreen: 1 - ADTClothingUniformTurtleneckGreenWomen: 1 - ADTClothingUniformTurtleneckOrange: 1 - ADTClothingUniformTurtleneckOrangeWomen: 1 - ADTClothingUniformTurtleneckYellow: 1 - ADTClothingUniformTurtleneckYellowWomen: 1 - ADTClothingUniformTurtleneckPurple: 1 - ADTClothingUniformTurtleneckPurpleWomen: 1 - ADTClothingUniformTurtleneckPink: 1 - ADTClothingUniformTurtleneckPinkWomen: 1 - ADTClothingUniformTurtleneckRed: 1 - ADTClothingUniformTurtleneckRedWomen: 1 -# ADTClothingUniformTurleneckSalat: 2 -# ADTClothingUniformTurleneckSalatBlack: 2 -# ADTClothingUniformTurleneckSalatWomen: 2 - ADTClothingUniformTurtleneckWhite: 1 - ADTClothingUniformTurtleneckWhiteWomen: 1 - ADTClothingUniformTurleneckBlackSleeveless: 1 - ADTClothingUniformTurleneckBlackWomenSleeveless: 1 - ADTClothingUniformTurleneckWhiteSleeveless: 1 - ADTClothingUniformTurleneckWhiteBlackSleeveless: 1 - ADTClothingUniformTurleneckWhiteWomenSleeveless: 1 + ADTClothingUniformJumpsuitTurtleneckBlack: 1 + ADTClothingUniformJumpskirtTurtleneckBlack: 1 + ADTClothingUniformJumpsuitTurtleneckGrey: 1 + ADTClothingUniformJumpskirtTurtleneckGrey: 1 + ADTClothingUniformJumpsuitTurtleneckBrown: 1 + ADTClothingUniformJumpskirtTurtleneckBrown: 1 + ADTClothingUniformJumpsuitTurtleneckBlue: 1 + ADTClothingUniformJumpskirtTurtleneckBlue: 1 + ADTClothingUniformJumpsuitTurtleneckAzure: 1 + ADTClothingUniformJumpskirtTurtleneckAzure: 1 + ADTClothingUniformJumpsuitTurtleneckAquamarine: 1 + ADTClothingUniformJumpskirtTurtleneckAquamarine: 1 + ADTClothingUniformJumpsuitTurtleneckGreen: 1 + ADTClothingUniformJumpskirtTurtleneckGreen: 1 + ADTClothingUniformJumpsuitTurtleneckOrange: 1 + ADTClothingUniformJumpskirtTurtleneckOrange: 1 + ADTClothingUniformJumpsuitTurtleneckYellow: 1 + ADTClothingUniformJumpskirtTurtleneckYellow: 1 + ADTClothingUniformJumpsuitTurtleneckPurple: 1 + ADTClothingUniformJumpskirtTurtleneckPurple: 1 + ADTClothingUniformJumpsuitTurtleneckPink: 1 + ADTClothingUniformJumpskirtTurtleneckPink: 1 + ADTClothingUniformJumpsuitTurtleneckRed: 1 + ADTClothingUniformJumpskirtTurtleneckRed: 1 +# ADTClothingUniformJumpsuitTurtleneckSalat: 2 +# ADTClothingUniformJumpsuitTurtleneckSalatBlack: 2 +# ADTClothingUniformJumpskirtTurtleneckSalat: 2 + ADTClothingUniformJumpsuitTurtleneckWhite: 1 + ADTClothingUniformJumpskirtTurtleneckWhite: 1 + ADTClothingUniformJumpsuitTurtleneckBlackSleeveless: 1 + ADTClothingUniformJumpskirtTurtleneckBlackSleeveless: 1 + ADTClothingUniformJumpsuitTurtleneckWhiteSleeveless: 1 + ADTClothingUniformJumpskirtTurtleneckWhiteSleeveless: 1 + ADTClothingUniformJumpsuitTurtleneckWhiteBlackSleeveless: 1 # ADT водолазки конец # DO NOT ADD MORE, USE UNIFORM DYING contrabandInventory: diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_black_womensleeveless.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_black_womensleeveless.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_black_womensleeveless.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_black_womensleeveless.rsi/icon.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_black_womensleeveless.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_black_womensleeveless.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_black_womensleeveless.rsi/meta.json diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_salat_women.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_salat_women.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_salat_women.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_salat_women.rsi/icon.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_salat_women.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_salat_women.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salat_women.rsi/meta.json diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_salatblack.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salatblack.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_salatblack.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salatblack.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_salatblack.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salatblack.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_salatblack.rsi/icon.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salatblack.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_salatblack.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salatblack.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_salatblack.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_salatblack.rsi/meta.json diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_white_womensleeveless.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_white_womensleeveless.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_white_womensleeveless.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_white_womensleeveless.rsi/icon.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_white_womensleeveless.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turleneck_white_womensleeveless.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/turtleneck_white_womensleeveless.rsi/meta.json diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_amerc.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_amerc.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_amerc.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_amerc.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_amerc.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_amerc.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_amerc.rsi/icon.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_amerc.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_amerc.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_amerc.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_amerc.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_amerc.rsi/meta.json diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_blacksleeveless.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_blacksleeveless.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_blacksleeveless.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_blacksleeveless.rsi/icon.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_blacksleeveless.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_blacksleeveless.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_blacksleeveless.rsi/meta.json diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_salat.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_salat.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_salat.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_salat.rsi/icon.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_salat.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turleneck_salat.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salat.rsi/meta.json diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..717fd13f69e53878d632fe5a2a7f996558187e12 GIT binary patch literal 1073 zcmV-11kU@3P)Px&>q$gGRCr$Pn$3z6K@i6)up}Y76G<>DM8Pi*^q_AbKEfUZ52B!`@32p>@1UZf zco017BZzOHcU=YD!v+$_7s(Qc{0C~Nv>}*u;Knw z01zTz!wG~G*zf=dMKGj*HU$n2u1v9JfB$C!Z{BCx`=*`GTJz>ho6_D-6#)?canz-| zcP`TJZZFZeRE_A%*FSXaYIO!oS|ifVllt{qncAHZ@vBuoH2{d;zTAjKAqEIioUgzA zYI%X+>buaa`l$d&ap^Q0Az|SAtRc+PcOyVvYxI`_fH*>Yk)RAko`)2%W%9 z)?Zo!r1991Gytp)FI(qBKLA)p-T8hRMG@6%HR^Oa^z`vVdh_l>a^362{|;49SJCIS zY>!1>Wo)C-nC|ZG(quBBt*tE@4u@2!RFdnHlM`ySTB>_$06@Q9uO~}RPfw{>EGF0O zc3Z8lGL{X1^MJqx@U_JNEr4pZ8pFrn4ZwTY)9rTs1K;12H3zkmCh_U=DW zK~?J0;ir$&M^Bz5XA<1?+A{(wW6=fL+1Z)t$+H3D@t6jKfx11d1pphix3{TOD*dw* zUE_Ygud+b}0E(^w=nBK}Je+5b*#>|>n;gTs0crpYfm`A*z;{n@UX-|pHLNxS0NNZ3 z5g_US=b$zGEbwI=;51yN2ANX;&SRh&A0HnRTIH)aq+N?vd9&G!iywxy2%C(~^Gv`Z rFj?4P0-)WkvphclILo_}hi!iWGe2^Dsht$#00000NkvXXu0mjfsWI{G literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtleneck_salatblack.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4525bf7786021c3ff452d9165440f75a677a0f69 GIT binary patch literal 464 zcmV;>0WbcEP)Px$ib+I4R9HvtmQPBH%|)T4%**RVc00Ox>n;Qu)= z7%b(uJ071#&7+^mY-oz((T;=)u1j*dGyHiP)-$L*gocJ@Wo7mE^q82~ ztXQ zxU>zd6+T9?xUxhDPh_1EDskg7>x3SI(3AviQHRijL2o*i96#FFxOOei)ikl^1}58= z%wE8mvScCWj;RY*XE+OcWIGBccsq(0D5xAb)ZpB(mcePWx&!N_vkE0fXJXer6WC?J zq;)}#Z=tvL0w&pjr7vX-L<96w4umW@7;>QIJZI_>-v-MJH7-{U28N%|AD)YzWkg3fO#%Pv~Lk^nxV=~P&WvCo1r?DR*MjSN9>1Ou!?R%f^ zug~}M-dj>qTrev6;ba6sM!5=|rSP2#A2cZu{=d8N#l;8`XO$g}k~~Qf09slw4V_4_ ztZfp4OkA~QMQ720k}=Jl8Tkh{%})B^Tqt{HiU0KeWv*wIqGfH4)gQPVYlQoQ?G1mW zEe~cs``rui*#-Oaejl+g;b7|`$KsL0UhBEMv4?%+c-&^8Yh%;QroOVanp3OVFC6V2 z>s=S$SiEj)OI1=+ zf~4HZ_Oa!8;Z3H7r_-N!<5%Hu=%LhJzTP8sSVOzxQg-L>n)}Kh4^ByKK=vJ)ajkFG z)FY6|5uw6z4M9>y8&4dv;q7z;N!%`b%Jee#bWT(PCf?xJ6b^(S8bPK^4TpHK3h1Z+ zD&?RZ>+R^oP+78Lb1ZJs9dZDlTv)GyS@p#pvA#-VC2Z=G=#(%A9Rz^Rqv3!*sBvLC z7V*o$u`x|xXau5H*|BIt%iJZXLs0>mVwB zXq=*P((Iuu9Ao1c@^RA4kz^F=RwUV5HyBFO9?Hs*6i2gzpinasuk-&2mPF30r~w`p zEC={XK!k#o7#gFIb0~gAg@Ivq<{Rf-@MKXHuk42lH=i((Y~60o71VS-C<2$$jzMlr zvMg~FDbT=1vbbn71Dv%mW?T>i7Pkq474WP?0t+=@?^MKULjeQ!l3_2gX4)cnafTvk zoTnHXx8;~A99S5^Yc*RXFD(t&&roH!1$qBn`!P1AAswzz)?icX`ghJOu%LhBm(hq? zI9@b%fgKZ#_5+wfbXp#Yfjg=oYG3OE(CKYt5rt`rSFhz&kXH%W8tBI@Wk=j9d5y2R zed++Pka3B}1)C(|l9wTI-ogs7jgWYYXl5iPR{G%74VmU}7Awcl12Vmv)ca`_eSEMI zz%!M=?!K5iQ{qs47-G-;f5i~SNg7ocakKa$Yd4&_u#u4|c$6E%*d+o#V%HD|LY`E3 z$+&*XtcDlVr!Hrn$M@22Yj=!VM2;EOvU%jWoD?ZOv0~Z9{YiS^w(}bTzV(eQT=JM* zE8EY_`Wc>0kVk@z5oCK literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/canister.rsi/can-o1.png b/Resources/Textures/ADT/Structures/Storage/canister.rsi/can-o1.png new file mode 100644 index 0000000000000000000000000000000000000000..bfb6cf367e545a1fc8af3b0fdb8273446ba8ba34 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*8>L*^vG!3*Rj|vyXyx~ zkg+7lFPOpM*^M+HN8HoJF+^f&a>4@rf(ApQ1Rh?i-3=xT44o?&E>4~xp$JsM;OXk; Jvd$@?2>`yu9a;bY literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/canister.rsi/can-o2.png b/Resources/Textures/ADT/Structures/Storage/canister.rsi/can-o2.png new file mode 100644 index 0000000000000000000000000000000000000000..7cfa2acd616ff472b31e76f52d986e42c50ee70b GIT binary patch literal 1742 zcmbVMZ%i9y7{3CWjIr4{BOoHT!w8FO?@wFGomA-B4oYY#P&b&GalLyBC+*#FchEv+ zXw+?P&MnL=ZpLM9Qxin_rVAkkhz=J=7B^jR#suRB{jdb0I6t^Je6Rm9%ye;0uJ^w0 z{odd6=l49%!GOPEL&2j32!d?zHoDv38`YouT=?&P@6arQ80><}6>#!W2%v2Z+tDhL zrfaq$NY%*kqfkGf1TA&}hY&aL1KefMg|8mFJz&9h~zg)Ur z6h4uY@Sk{pV5}c8R`z{Sys(s?nD6?{E)b#yJ6H}~%8 z7mW`lM*ZL0j4kz}Z`~>l6euf5(^oh58uuiwtB&%+^mL)J$Ix8%LT_UCv5nt$E(I@r z2s*DWKIweo=mRH@T((SgSBo$)i~;b)7Ve)C4?OSxp@5<3*+C++fi!}{}{Pj~P8?UCAz!^re(%U{dwbr)eK z3j@tT&-C>4+(~3*4%xELJaMD%3OqMxZT@zo{^#$)aI;Qs>{JnC{bv0!AaB1@j39Z7 zLa;;Y@HI1>6g9KD21iA&$fh|o=VW_}6uw6DE;gemUM`#>U zK>LtC$PM*!G>_FigVx3wNDu`Yi^ii7QDx!|EXm8jwSJ6aXcD6JIYDI>@4OC7MWKEDnRA*#EQorWFpsT4E zqH>m2RMUBa8N=hOjFVPs}5HKA&r0T@O)A$LWq!9f||Z9tX!6%Kd?pqmwXG&18-0INw#P?91U zr2-k3QHnBK(W+g7$V)MG>m3(>o7I2=gQ`&`k}?sNAZcT)HH?*bim)&Qk%IapUI-7a zhEi0JtY)kv)OZyX)(p>T>^;Fe$Al#%%EEw!DBBHiS?tEpY#JGt6p<8YSobdJh0n)$ zMO9-(4tU)T490901fH=|BxSSnz+@$BC=*?6wVP;~uQ6E&lB5A;x7k=abKfm-{kpQ5 z`~3gB-=YYxwb;mg^XLtymju%&s8FoIbVsyz$R7}i Ncs+ji`1Y=s{|3tzJ|O@A literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/canister.rsi/can-o3.png b/Resources/Textures/ADT/Structures/Storage/canister.rsi/can-o3.png new file mode 100644 index 0000000000000000000000000000000000000000..3f239fee795ffcccc50f8d068e6aea453dcfef4e GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*8>L*D7NY`+!KG2lP3oh zWGo5t3ubV5b|VeQ5%+X)43U_coUp(+p~cW7k%za+x>1CI!Q?GNu-ec1a-b3hPgg&e IbxsLQ0D0mZF#rGn literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/canister.rsi/can-oa1.png b/Resources/Textures/ADT/Structures/Storage/canister.rsi/can-oa1.png new file mode 100644 index 0000000000000000000000000000000000000000..8153aa5ae7d057f21bf09f3b504638ab038c44ca GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJMo$;Vkcv6U2@b#qnR z17ukD*0M`V06~$B_{6329|>^q2BsubeCf#f8{*xPYAk!=l6#<1O2UCNT}zfV0TDg*F$|urelF{r5}E)iNItXx literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Storage/canister.rsi/can-open.png b/Resources/Textures/ADT/Structures/Storage/canister.rsi/can-open.png new file mode 100644 index 0000000000000000000000000000000000000000..566fd445fd9ae4bc398a6ca36edb496f07085225 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{*8>L*xVZ%v6qIUf8~6A0 zgoVW${8M=Xlw~Xl@(X5gcy=QV$kFz6aSYLzn4BQN`h}?}qsC2@F@#ZBojHV2*xiIN m*tLo2RK_-g#hMDd3=Bn=nN`id@*DEiBk?R)S2 z-rw^)zvpAX-%ztU>;5bRK~{Tf-OcbHHJ{83_^bEzT|p2_x#V*BouU!~Xmiabw1jjx zD%K%L$$>*d6Lp{X@7^RlZCG-2sYH^c4JacNl_wjvbaMX41ZLjN4=q`CI{(H`# zT=2xDr_+jSPC0*FvD12bZhJDB}V>wIA9 zIA}dT_po#A(Cse`PSYm~_YBmnnK{>#dv@O1Miz$43r=o%@2!uo#{cB*ys!Y|qcxe; z>$%)kXKdIWe=Kjq3qOZGQ}4^3=lcTUc)5DQvhsxI{cXE`ySFksj!d3u{9~b|>MT@p zg<9LHBgo1%=3_x#el-t4(&wZ=&c(;R9@%;1{wk#lFVWA z;}aMvi5#}I)JOPK7wD8~`!vwf*ANi;x&()aRc%BoV=N?y0E0(kk+7_@F%C=cvT$u~ z;~1KN7+oB;n9!ilkGd2Mpk;Q#CJ;m!TJErme25o9q4g+5P$W(;ILX)uf~6fS!=T9v zgXT1`oo#k+P8x%69M)+VDvRUMXw)91?TXfc!)kHh1cg(S4I*rMuWax!o2(ZtF}Q&) zXp(A3ij10!d`RgwI1IYF7(+x&(aL&KC#V=6<5irr6J|^apeUqpYPS|n7#9T`gh2$z zh7Pf03afT1hN5>W|3aPmyvzX9*5^yvxS=nRNXmq6czR$MNkMLi)&spNz?*@tbZY|e z^guU@%xF~Br2*bhw1A?7monvFav7y4JA;;Nm1I$g>g%pM0NlI*I1FZuvXPXHpaWzn z%T%xo@hCyF1hEM9DWcTgyBtbU0g_=Uf+fjiP*^h}Z}2w-ivruOXb~O;EJgSZfU9x` zhNfg>T}oKdpke48o$$ivW4*F&@Uj5BZVrPn+a*b4%Lqq^V#rb($$&B&%`>#Ef-Wn! zk)+7bK%`6Iy>#BK2;F98m(Gj-^L(Qw!Per#x6ETUoLLfVt)#gF)POe+wvbfw*h@)~e3_1v*{n%|5& z_YOZ83=VRi7Y@v|FHHaRA!12O&&)xQ4}K8c){p9uZw%fU%zf&F`_#=Cd zod3jEPbC)B9(Vk@x<6@pbcgfljN6`@yL@ntx$jKEYy9lNolQFzTgQ4n+c*B>=?gg> z2NEL<2j1uz>qfGRwtbvCw~!i{^-RpuGgk+wg2VMmh3yl0;QnXQKAk)_nnEUj^6JQw z*|$eV8@?>fZmb@C@oJtoO}mEFpSseYy)|+{w-@YYrZTjx2^;dabVW7~XMNtb;5&T; zw4IxO(DA_DRWI#1V>?zbw5xv2`Lj(qCl`|1$$~(6{;`ekzV+difxql`%q{|Xq&Bs> z#GcdU2p_TzJeIre`Jed{>OENtT%S*zC|8drq#vz$Z}Z@9cUNW&AX77qe=fFEorFrR zR_oey1W8|G-U-OdujC>~^1S40HCjCzSV0L|Ia6P2IH*E2f>c(8RZi#v2Fim@Nw#AP z6O$M!iFRyLsfX~WPT-g7`ZUne*WeTSx&%hVsvbcr!z?5S0)s=t!GNr@VLKM(W#QV~ z#xXPsF}m#7QbJojUeu{*04=i;7J(qj&~nBqay%#Sd`u$r2mobC77;s7$Hsrj!vl7P0I;~&f{huF2#ZW zGsNh>>w0z>4hMm`jE^Ar5g%eehLcN!BdUA*s#!SRJZ_i6*E)FV3o>)6I>UK(8@#TjjwOt{x>RFO(y^V literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/canister.rsi/zauker-1.png b/Resources/Textures/ADT/Structures/Storage/canister.rsi/zauker-1.png similarity index 100% rename from Resources/Textures/Structures/Storage/canister.rsi/zauker-1.png rename to Resources/Textures/ADT/Structures/Storage/canister.rsi/zauker-1.png diff --git a/Resources/Textures/Structures/Storage/canister.rsi/zauker.png b/Resources/Textures/ADT/Structures/Storage/canister.rsi/zauker.png similarity index 100% rename from Resources/Textures/Structures/Storage/canister.rsi/zauker.png rename to Resources/Textures/ADT/Structures/Storage/canister.rsi/zauker.png diff --git a/Resources/Textures/Structures/Storage/canister.rsi/meta.json b/Resources/Textures/Structures/Storage/canister.rsi/meta.json index 7a18f5e629b..5c9dc185b71 100644 --- a/Resources/Textures/Structures/Storage/canister.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/canister.rsi/meta.json @@ -117,72 +117,6 @@ }, { "name": "scrubber-open" - }, - { - "name": "brown" - }, - { - "name": "brown-1" - }, - { - "name": "purple" - }, - { - "name": "purple-1" - }, - { - "name": "helium" - }, - { - "name": "helium-1" - }, - { - "name": "nob" - }, - { - "name": "nob-1" - }, - { - "name": "healium" - }, - { - "name": "healium-1" - }, - { - "name": "proto_nitrate" - }, - { - "name": "proto_nitrate-1" - }, - { - "name": "halon" - }, - { - "name": "halon-1" - }, - { - "name": "darkpurple" - }, - { - "name": "darkpurple-1" - }, - { - "name": "antinob" - }, - { - "name": "antinob-1" - }, - { - "name": "h2" - }, - { - "name": "h2-1" - }, - { - "name": "zauker" - }, - { - "name": "zauker-1" } ] }