From c48ce9c66a04b19d62e088e5624921286a39b0cd Mon Sep 17 00:00:00 2001 From: RedBurningPhoenix <147742474+RedBurningPhoenix@users.noreply.github.com> Date: Sun, 11 Aug 2024 02:12:23 +0500 Subject: [PATCH] MAID AND BOMZH (#605) * First * Second * oops * translate --- .../Components/IdCardConsoleComponent.cs | 2 +- Resources/Locale/ru-RU/clothing/socks.ftl | 2 + .../Locale/ru-RU/job/job-description.ftl | 2 + Resources/Locale/ru-RU/job/job-names.ftl | 2 + .../ru-RU/locales-new/autotranslate-6.ftl | 4 + .../entities/clothing/outerclothing/coats.ftl | 3 + .../entities/clothing/shoes/boots.ftl | 3 + .../entities/clothing/uniforms/jumpsuits.ftl | 3 + .../entities/objects/devices/pda.ftl | 6 ++ .../objects/misc/identification_cards.ftl | 6 ++ .../Entities/Clothing/OuterClothing/coats.yml | 24 +++++ .../Entities/Clothing/Shoes/specific.yml | 14 +++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 26 +++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 14 +++ .../Entities/Markers/Spawners/jobs.yml | 28 ++++- .../Entities/Objects/Devices/pda.yml | 24 ++++- .../Objects/Misc/identification_cards.yml | 28 ++++- .../Loadouts/Jobs/Civilian/bomzh.yml | 51 +++++++++ .../Prototypes/Loadouts/Jobs/Command/maid.yml | 97 ++++++++++++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 80 +++++++++++++++ .../Prototypes/Loadouts/role_loadouts.yml | 26 +++++ Resources/Prototypes/Maps/box.yml | 8 +- .../Prototypes/Roles/Jobs/Civilian/bomzh.yml | 35 +++++++ .../Prototypes/Roles/Jobs/Command/maid.yml | 50 +++++++++ .../Prototypes/Roles/Jobs/departments.yml | 2 + .../Prototypes/Roles/play_time_trackers.yml | 6 ++ Resources/Prototypes/StatusEffects/job.yml | 17 +++ .../Prototypes/_White/Economy/salary.yml | 1 + .../Entities/Clothing/Underwear/Socks.yml | 9 ++ .../Interface/Misc/job_icons.rsi/Bomzh.png | Bin 0 -> 252 bytes .../Interface/Misc/job_icons.rsi/Maid.png | Bin 0 -> 201 bytes .../Interface/Misc/job_icons.rsi/meta.json | 6 ++ Resources/Textures/Markers/jobs.rsi/bomzh.png | Bin 0 -> 1000 bytes Resources/Textures/Markers/jobs.rsi/maid.png | Bin 0 -> 1218 bytes Resources/Textures/Markers/jobs.rsi/meta.json | 6 ++ .../Objects/Devices/pda.rsi/meta.json | 6 ++ .../Objects/Devices/pda.rsi/pda-bomzh.png | Bin 0 -> 767 bytes .../Objects/Devices/pda.rsi/pda-maid.png | Bin 0 -> 500 bytes .../Objects/Misc/id_cards.rsi/idbomzh.png | Bin 0 -> 631 bytes .../Objects/Misc/id_cards.rsi/idmaid.png | Bin 0 -> 233 bytes .../Objects/Misc/id_cards.rsi/meta.json | 6 ++ .../jacket.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 1191 bytes .../OuterClothing/Coats/jacket.rsi/icon.png | Bin 0 -> 496 bytes .../Coats/jacket.rsi/inhand-left.png | Bin 0 -> 422 bytes .../Coats/jacket.rsi/inhand-right.png | Bin 0 -> 416 bytes .../OuterClothing/Coats/jacket.rsi/meta.json | 26 +++++ .../maidshoes.rsi/equipped-FEET-body-slim.png | Bin 0 -> 314 bytes .../Shoes/maidshoes.rsi/equipped-FEET.png | Bin 0 -> 496 bytes .../Clothing/Shoes/maidshoes.rsi/icon.png | Bin 0 -> 298 bytes .../Shoes/maidshoes.rsi/inhand-left.png | Bin 0 -> 216 bytes .../Shoes/maidshoes.rsi/inhand-right.png | Bin 0 -> 220 bytes .../Clothing/Shoes/maidshoes.rsi/meta.json | 30 ++++++ .../equipped-SOCKS-body-slim.png | Bin 0 -> 325 bytes .../stockings_white.rsi/equipped-SOCKS.png | Bin 0 -> 468 bytes .../Socks/stockings_white.rsi/icon.png | Bin 0 -> 244 bytes .../Socks/stockings_white.rsi/meta.json | 22 ++++ .../equipped-INNERCLOTHING-body-slim.png | Bin 0 -> 1234 bytes .../maid.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1242 bytes .../Uniforms/Jumpskirt/maid.rsi/icon.png | Bin 0 -> 579 bytes .../Jumpskirt/maid.rsi/inhand-left.png | Bin 0 -> 806 bytes .../Jumpskirt/maid.rsi/inhand-right.png | Bin 0 -> 817 bytes .../Uniforms/Jumpskirt/maid.rsi/meta.json | 30 ++++++ .../equipped-INNERCLOTHING-body-slim.png | Bin 0 -> 1242 bytes .../maidmini.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1260 bytes .../Uniforms/Jumpskirt/maidmini.rsi/icon.png | Bin 0 -> 560 bytes .../Jumpskirt/maidmini.rsi/inhand-left.png | Bin 0 -> 805 bytes .../Jumpskirt/maidmini.rsi/inhand-right.png | Bin 0 -> 831 bytes .../Uniforms/Jumpskirt/maidmini.rsi/meta.json | 30 ++++++ .../bomzh.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1443 bytes .../Uniforms/Jumpsuit/bomzh.rsi/icon.png | Bin 0 -> 537 bytes .../Jumpsuit/bomzh.rsi/inhand-left.png | Bin 0 -> 402 bytes .../Jumpsuit/bomzh.rsi/inhand-right.png | Bin 0 -> 432 bytes .../Uniforms/Jumpsuit/bomzh.rsi/meta.json | 26 +++++ 73 files changed, 754 insertions(+), 7 deletions(-) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Civilian/bomzh.yml create mode 100644 Resources/Prototypes/Loadouts/Jobs/Command/maid.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Command/maid.yml create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/Bomzh.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/Maid.png create mode 100644 Resources/Textures/Markers/jobs.rsi/bomzh.png create mode 100644 Resources/Textures/Markers/jobs.rsi/maid.png create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-bomzh.png create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-maid.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idbomzh.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idmaid.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/Coats/jacket.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/Coats/jacket.rsi/icon.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/Coats/jacket.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/Coats/jacket.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Clothing/OuterClothing/Coats/jacket.rsi/meta.json create mode 100644 Resources/Textures/White/Clothing/Shoes/maidshoes.rsi/equipped-FEET-body-slim.png create mode 100644 Resources/Textures/White/Clothing/Shoes/maidshoes.rsi/equipped-FEET.png create mode 100644 Resources/Textures/White/Clothing/Shoes/maidshoes.rsi/icon.png create mode 100644 Resources/Textures/White/Clothing/Shoes/maidshoes.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Clothing/Shoes/maidshoes.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Clothing/Shoes/maidshoes.rsi/meta.json create mode 100644 Resources/Textures/White/Clothing/Underwear/Socks/stockings_white.rsi/equipped-SOCKS-body-slim.png create mode 100644 Resources/Textures/White/Clothing/Underwear/Socks/stockings_white.rsi/equipped-SOCKS.png create mode 100644 Resources/Textures/White/Clothing/Underwear/Socks/stockings_white.rsi/icon.png create mode 100644 Resources/Textures/White/Clothing/Underwear/Socks/stockings_white.rsi/meta.json create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/equipped-INNERCLOTHING-body-slim.png create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/icon.png create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/meta.json create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maidmini.rsi/equipped-INNERCLOTHING-body-slim.png create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maidmini.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maidmini.rsi/icon.png create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maidmini.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maidmini.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maidmini.rsi/meta.json create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpsuit/bomzh.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpsuit/bomzh.rsi/icon.png create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpsuit/bomzh.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpsuit/bomzh.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Clothing/Uniforms/Jumpsuit/bomzh.rsi/meta.json diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index 1583999971..702a7db02f 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -97,7 +97,7 @@ public sealed partial class IdCardConsoleComponent : Component [DataField("jobIcons")] public List> JobIcons = new() { - new List {"Captain", "HeadOfPersonnel", "HeadOfSecurity", "ChiefMedicalOfficer", "ChiefEngineer", "ResearchDirector", "QuarterMaster", "Inspector"}, + new List {"Captain", "HeadOfPersonnel", "HeadOfSecurity", "ChiefMedicalOfficer", "ChiefEngineer", "ResearchDirector", "QuarterMaster", "Inspector", "Maid"}, new List {"HeadOfPersonnel", "Lawyer", "Clown", "Bartender", "Reporter", "Chef", "Botanist", "ServiceWorker", "Zookeeper", "Musician", "Librarian", "Janitor", "Chaplain", "Mime", "Boxer", "Passenger", "Visitor", "Borg", "CustomId"}, new List {"HeadOfSecurity", "Warden", "SeniorOfficer", "SecurityOfficer", "Detective", "SecurityCadet", "Brigmedic", "Lawyer"}, new List {"ChiefMedicalOfficer", "SeniorPhysician", "Paramedic", "Chemist", "MedicalDoctor", "Virologist", "Geneticist", "MedicalIntern", "Psychologist"}, diff --git a/Resources/Locale/ru-RU/clothing/socks.ftl b/Resources/Locale/ru-RU/clothing/socks.ftl index 21aaf1928f..5b33995bc3 100644 --- a/Resources/Locale/ru-RU/clothing/socks.ftl +++ b/Resources/Locale/ru-RU/clothing/socks.ftl @@ -42,6 +42,8 @@ ent-ClothingUnderwearStockingsLightPurple = чулки .desc = Светло-фиолетовые. ent-ClothingUnderwearStockingsLightYellow = чулки .desc = Желтые. +ent-ClothingUnderwearStockingsLightWhite = чулки + .desc = Белые. ent-ClothingUnderwearSocksStripedKnee = носки .desc = Черно-белые. ent-ClothingUnderwearSocksStripedThigh = носки diff --git a/Resources/Locale/ru-RU/job/job-description.ftl b/Resources/Locale/ru-RU/job/job-description.ftl index 3f92748bc3..aa1cac41e5 100644 --- a/Resources/Locale/ru-RU/job/job-description.ftl +++ b/Resources/Locale/ru-RU/job/job-description.ftl @@ -50,3 +50,5 @@ job-description-senior-researcher = Обучайте новых ученых о job-description-senior-physician = Научите новых медиков основам ухода за ранеными, химии, диагностике больных и избавлению от мертвых. job-description-senior-officer = Научите новых офицеров основам обысков, предварительных арестов, тюремного заключения и тому, как правильно стрелять из огнестрельного оружия. job-description-senior-salvage-specialist = Покажите всем коллегам как профессионалы обчищают обломки и выполняют экспедиции. +job-description-maid = Поддерживайте чистоту и порядок, параллельно приглядывая за Капитаном. +job-description-bomzh = Доживайте свою жизнь, не в самых лучших для этого условиях. diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl index 04b71f03ba..4e8ec08c20 100644 --- a/Resources/Locale/ru-RU/job/job-names.ftl +++ b/Resources/Locale/ru-RU/job/job-names.ftl @@ -50,6 +50,8 @@ job-name-senior-researcher = ведущий исследователь job-name-senior-physician = медицинский офицер job-name-senior-officer = ветеран СБ job-name-senior-salvage-specialist = охотник карго +job-name-maid = прислуга +job-name-bomzh = бомж # Role timers - Make these alphabetical or I cut you JobAtmosphericTechnician = атмосферный техник diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-6.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-6.ftl index fea1222944..f39cbe2217 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-6.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-6.ftl @@ -38,3 +38,7 @@ ent-ClothingUniformJumpskirtGenetics = юбка генетика .desc = Она изготовлена из специального волокна, которое обеспечивает особую защиту от биологической опасности. На ней нашивка с присвоением звания генетика. ent-ClothingUniformJumpskirtBrigmedic = юбка бригмедика .desc = Данная униформа выдается квалифицированному персоналу, прошедшему обучение. Никого не волнует, что тренировка заняла полдня. +ent-ClothingUniformJumpskirtMaid = платье прислуги + .desc = Элегантное платье горничной. Позволяет чувствовать себя комфортно, безопасно и чисто вокруг. +ent-ClothingUniformJumpskirtMaidMini = платье прислуги + .desc = Элегантное укороченное платье служанки. Создает ощущение комфорта, безопасности и чистоты вокруг вас. Этот вид расширяет горизонт в ваших глазах. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl index 831478e85b..a389da93bc 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl @@ -61,3 +61,6 @@ ent-ClothingOuterJacketInspector = китель инспектора ent-ClothingOuterOverCoatInspector = шинель инспектора .desc = Строгая офицерская шинель инспектора. Пусть экипаж боится вас! .suffix = { "" } +ent-ClothingOuterOverCoatBomzh = потрёпанная куртка + .desc = Куртка прошедшая через многое, время не сохранило её и оставило свои шрамы. + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/boots.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/boots.ftl index 78fa46fb8a..fc80fd99e3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/boots.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/boots.ftl @@ -19,3 +19,6 @@ ent-ClothingShoesBootsLaceup = шнурованные туфли ent-ClothingShoesBootsInspector = сапоги инспектора .desc = Высокие, тяжёлые кожаные сапоги инспектора. Выглядят блестяще и мордонабивательно! .suffix = { "" } +ent-ClothingShoesMaid = туфли прислуги + .desc = Туфли прислуги. Блестят от чистоты. + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl index 66a7c2eed8..f7fa6e65c0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl @@ -262,3 +262,6 @@ ent-ClothingUniformJumpsuitWhiteInspector = свободная форма инс ent-ClothingUniformJumpsuitWhiteInspectorFormal = cтрогая форма инспектора .desc = Рубашка, жилетка, штаны со стрелками и яркий красный галстук. Это комплект строгой официальной формы возможно самого ужасающего человека на станции - инспектора. .suffix = { "" } +ent-ClothingUniformJumpsuitWhiteBomzh = обноски + .desc = Потрепанная форма человека, который прошел через многое. Вас поражают не столько дыры во всех местах, сколько ее запах. + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl index 983b175aa5..571794fa8d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl @@ -133,3 +133,9 @@ ent-CluwnePDA = ПДА клувна ent-ResearchAssistantPDA = ПДА научного ассистента .desc = Почему он не фиолетовый? .suffix = { "" } +ent-MaidPDA = ПДА прислуги + .desc = Сияет от собственной чистоты. + .suffix = { "" } +ent-BomzhPDA = убитый ПДА + .desc = Жизнь прошла, и все что остаётся делать - это двигаться вперед. + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl index 037ebdfc78..0dc4393fbe 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl @@ -139,3 +139,9 @@ ent-CluwneIDCard = ID карта клувна ent-ResearchAssistantIDCard = ID карта научного ассистента .desc = { ent-IDCardStandard.desc } .suffix = { "" } +ent-MaidIDCard = ID карта прислуги + .desc = { ent-IDCardStandard.desc } + .suffix = { "" } +ent-BomzhIDCard = грязная ID карта + .desc = Старая и грязная карта дожившая до нашего времени. + .suffix = { "" } diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index fa89480eea..27224827f2 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -481,6 +481,7 @@ - type: Clothing sprite: Clothing/OuterClothing/Coats/expensive_coat.rsi +#WHITE START - type: entity parent: ClothingOuterStorageBase id: ClothingOuterTrenchCoatInspector @@ -543,3 +544,26 @@ Slash: 0.80 Piercing: 0.80 Heat: 0.90 + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterOverCoatBomzh + name: bomzh's overcoat + description: The jacket has been through a lot, time has not been tolerant of it and has left its scars. + components: + - type: Sprite + sprite: White/Clothing/OuterClothing/Coats/jacket.rsi + - type: Clothing + sprite: White/Clothing/OuterClothing/Coats/jacket.rsi + - type: StorageFill + contents: + - id: SmokingPipeFilledTobacco + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.90 + Piercing: 0.90 + Heat: 0.75 + +#WHITE END diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index 69e08deaa2..961e0b01ad 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -272,3 +272,17 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepSkates + +#WHITE START +- type: entity + parent: ClothingShoesBaseButcherable + id: ClothingShoesMaid + name: maid shoes + description: The maid's shoes. Shiny. + components: + - type: Sprite + sprite: White/Clothing/Shoes/maidshoes.rsi + - type: Clothing + sprite: White/Clothing/Shoes/maidshoes.rsi + +#WHITE END diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index eff2b56be0..b7fc26cd54 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -767,6 +767,8 @@ - state: equipped-INNERCLOTHING-shirt color: "#b30000" + +#WHITE START - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtInspector @@ -789,6 +791,30 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/inspectorformal.rsi +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtMaid + name: maid's jumpskirt + description: Elegant maid's dress. Makes you feel comfortable, safe and clean around you. + components: + - type: Sprite + sprite: White/Clothing/Uniforms/Jumpskirt/maid.rsi + - type: Clothing + sprite: White/Clothing/Uniforms/Jumpskirt/maid.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtMaidMini + name: maid's mini jumpskirt + description: Elegant shortened maid's servant's dress. Makes you feel comfortable, safe and clean around you. This view expands your horizon in your eyes. + components: + - type: Sprite + sprite: White/Clothing/Uniforms/Jumpskirt/maidmini.rsi + - type: Clothing + sprite: White/Clothing/Uniforms/Jumpskirt/maidmini.rsi + +#WHITE END + - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtMusician diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 28370c1948..2af1570cd4 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1301,6 +1301,7 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi +#WHITE START - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitWhiteInspector @@ -1322,3 +1323,16 @@ sprite: Clothing/Uniforms/Jumpsuit/inspectorformal.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/inspectorformal.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitWhiteBomzh + name: bomzh uniform + description: The ragged form of a man who has been through a lot. It's not so much the holes in all the places that strike you as the smell of her. + components: + - type: Sprite + sprite: White/Clothing/Uniforms/Jumpsuit/bomzh.rsi + - type: Clothing + sprite: White/Clothing/Uniforms/Jumpsuit/bomzh.rsi + +#WHITE END diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 7bd215551d..eb25f54897 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -247,7 +247,7 @@ - state: green - state: lawyer -# WHITE INSPECTOR +#WHITE START - type: entity id: SpawnPointInspector parent: SpawnPointJobBase @@ -260,6 +260,32 @@ - state: green - state: lawyer +- type: entity + id: SpawnPointBomzh + parent: SpawnPointJobBase + name: bomzh + components: + - type: SpawnPoint + job_id: Bomzh + - type: Sprite + layers: + - state: green + - state: bomzh + +- type: entity + id: SpawnPointMaid + parent: SpawnPointJobBase + name: maid + components: + - type: SpawnPoint + job_id: Maid + - type: Sprite + layers: + - state: green + - state: maid + +#WHITE END + - type: entity id: SpawnPointJanitor parent: SpawnPointJobBase diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 58be5a46af..4b5e448d2d 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -414,7 +414,7 @@ - type: Icon state: pda-lawyer -#WHITE +#WHITE START - type: entity parent: BasePDA id: InspectorPDA @@ -425,6 +425,28 @@ id: InspectorIDCard state: pda-inspector +- type: entity + parent: BasePDA + id: BomzhPDA + name: bomzh PDA + description: Life has passed and all that's left to do is move forward. + components: + - type: Pda + id: BomzhIDCard + state: pda-bomzh + +- type: entity + parent: BasePDA + id: MaidPDA + name: maid PDA + description: Shining from her own purity. + components: + - type: Pda + id: MaidIDCard + state: pda-maid + +#WHITE END + - type: entity parent: BasePDA id: JanitorPDA diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index c09d205c97..630caf8aa2 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -417,7 +417,7 @@ - type: PresetIdCard job: Lawyer -#WHITE +#WHITE START - type: entity parent: IDCardStandard id: InspectorIDCard @@ -430,6 +430,32 @@ - type: PresetIdCard job: Inspector +- type: entity + parent: IDCardStandard + id: BomzhIDCard + name: Bomzh ID card + components: + - type: Sprite + layers: + - state: silver + - state: idbomzh + - type: PresetIdCard + job: Passenger + +- type: entity + parent: IDCardStandard + id: MaidIDCard + name: Maid ID card + components: + - type: Sprite + layers: + - state: silver + - state: idmaid + - type: PresetIdCard + job: Maid + +#WHITE END + - type: entity parent: IDCardStandard id: HoPIDCard diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/bomzh.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/bomzh.yml new file mode 100644 index 0000000000..4d25ba2b76 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/bomzh.yml @@ -0,0 +1,51 @@ +# Jumpsuit +- type: itemLoadout # WD + id: BomzhJumpsuit + equipment: BomzhJumpsuit +- type: startingGear + id: BomzhJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitWhiteBomzh + +# PDA +- type: itemLoadout # WD + id: BomzhPDA + equipment: BomzhPDA +- type: startingGear + id: BomzhPDA + equipment: + id: BomzhPDA + +# Outer clothing +- type: itemLoadout + id: BomzhOverCoat + equipment: BomzhOverCoat +- type: startingGear + id: BomzhOverCoat + equipment: + outerClothing: ClothingOuterOverCoatBomzh + +# Job Trinkets +- type: itemLoadout # WD + id: BomzhTrashBag + equipment: BomzhTrashBag +- type: startingGear + id: BomzhTrashBag + inhand: + - TrashBag + +- type: itemLoadout # WD + id: BomzhScalpelShiv + equipment: BomzhScalpelShiv +- type: startingGear + id: BomzhScalpelShiv + equipment: + pocket1: ScalpelShiv + +- type: itemLoadout # WD + id: BomzhLantern + equipment: BomzhLantern +- type: startingGear + id: BomzhLantern + equipment: + belt: Lantern diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/maid.yml b/Resources/Prototypes/Loadouts/Jobs/Command/maid.yml new file mode 100644 index 0000000000..b527726184 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Command/maid.yml @@ -0,0 +1,97 @@ +# Jumpsuit +- type: itemLoadout # WD + id: MaidJumpskirt + equipment: MaidJumpskirt +- type: startingGear + id: MaidJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtMaid + +- type: itemLoadout # WD + id: MaidJumpskirtMini + equipment: MaidJumpskirtMini +- type: startingGear + id: MaidJumpskirtMini + equipment: + jumpsuit: ClothingUniformJumpskirtMaidMini + +# Back +- type: itemLoadout # WD + id: MaidSatchel + equipment: MaidSatchel +- type: startingGear + id: MaidSatchel + equipment: + back: ClothingBackpackSatchelFilled + +# Gloves +- type: itemLoadout # WD + id: MaidGloves + equipment: MaidGloves +- type: startingGear + id: MaidGloves + equipment: + gloves: ClothingHandsGlovesColorWhite + +# PDA +- type: itemLoadout # WD + id: MaidPDA + equipment: MaidPDA +- type: startingGear + id: MaidPDA + equipment: + id: MaidPDA + +# Ears +- type: itemLoadout # WD + id: MaidEars + equipment: MaidEars +- type: startingGear + id: MaidEars + equipment: + id: ClothingHeadsetCommand + +# Shoes +- type: itemLoadout # WD + id: MaidShoes + equipment: MaidShoes +- type: startingGear + id: MaidShoes + equipment: + shoes: ClothingShoesMaid + +# Glasses +- type: itemLoadout # WD + id: MaidGlasses + equipment: MaidGlasses +- type: startingGear + id: MaidGlasses + equipment: + eyes: ClothingEyesGlassesSecurity + +# Job Trinkets +- type: itemLoadout # WD + id: MaidSpray + equipment: MaidSpray +- type: startingGear + id: MaidSpray + storage: + back: + - SprayBottleWater + +- type: itemLoadout # WD + id: MaidSoap + equipment: MaidSoap +- type: startingGear + id: MaidSoap + storage: + back: + - Soap + +- type: itemLoadout # WD + id: MaidMop + equipment: MaidMop +- type: startingGear + id: MaidMop + inhand: + - MopItem diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index f9e6c071b3..1608304140 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -2149,6 +2149,86 @@ loadouts: - InspectorBriefcaseInhand +# Maid +- type: loadoutGroup # WD + id: MaidGlasses + name: loadout-group-eyes + minLimit: 0 + loadouts: + - MaidGlasses + +- type: loadoutGroup # WD + id: MaidJumpsuit + name: loadout-group-jumpsuit + loadouts: + - MaidJumpskirt + - MaidJumpskirtMini + +- type: loadoutGroup # WD + id: MaidBackpack + name: loadout-group-backpack + loadouts: + - MaidSatchel + +- type: loadoutGroup # WD + id: MaidGloves + name: loadout-group-gloves + minLimit: 0 + loadouts: + - MaidGloves + +- type: loadoutGroup # WD + id: MaidShoes + name: loadout-group-shoes + loadouts: + - MaidShoes + +- type: loadoutGroup # WD + id: MaidPDA + name: loadout-group-pda + loadouts: + - MaidPDA + +- type: loadoutGroup # WD + id: MaidJobTrinkets + name: loadout-group-job-trinkets + minLimit: 0 + maxLimit: 2 + loadouts: + - MaidSpray + - MaidSoap + - MaidMop + +# Bomzh +- type: loadoutGroup # WD + id: BomzhJumpsuit + name: loadout-group-jumpsuit + loadouts: + - BomzhJumpsuit + +- type: loadoutGroup # WD + id: BomzhPDA + name: loadout-group-pda + loadouts: + - BomzhPDA + +- type: loadoutGroup # WD + id: BomzhOuterclothing + name: loadout-group-outerclothing + minLimit: 0 + loadouts: + - BomzhOverCoat + +- type: loadoutGroup # WD + id: BomzhJobTrinkets + name: loadout-group-job-trinkets + minLimit: 0 + maxLimit: 3 + loadouts: + - BomzhTrashBag + - BomzhScalpelShiv + - BomzhLantern + # Wildcards - type: loadoutGroup id: ReporterHat diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index d60bff8265..3004759a28 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -39,6 +39,22 @@ - CommonUnderwearBraHOP - CommonUnderwearSocks +- type: roleLoadout + id: JobMaid + groups: + - MaidGlasses # WD + - CommonCommandHeadset # WD + - MaidJumpsuit + - MaidGloves # WD + - MaidBackpack + - MaidShoes + - MaidPDA # WD + - SelfDefenceDevices # WD + - MaidJobTrinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks + # Civilian - type: roleLoadout id: JobPassenger @@ -233,6 +249,16 @@ - CommonUnderwearBra - CommonUnderwearSocks +- type: roleLoadout + id: JobBomzh + groups: + - BomzhJumpsuit + - BomzhPDA + - BomzhOuterclothing + - BomzhJobTrinkets + - CommonUnderwearBottom + - CommonUnderwearBra + # Cargo - type: roleLoadout id: JobQuartermaster diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml index ddf217580b..5347a40166 100644 --- a/Resources/Prototypes/Maps/box.yml +++ b/Resources/Prototypes/Maps/box.yml @@ -21,6 +21,7 @@ #service Captain: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] + Maid: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 3, 3 ] Chef: [ 2, 2 ] @@ -28,6 +29,7 @@ Chaplain: [ 1, 1 ] Librarian: [ 1, 1 ] ServiceWorker: [ 2, 2 ] + Bomzh: [ 1, 1] #engineering ChiefEngineer: [ 1, 1 ] SeniorEngineer: [ 1, 1 ] @@ -44,9 +46,9 @@ Psychologist: [ 1, 1 ] #science ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] + SeniorResearcher: [ 1, 1 ] Scientist: [ 4, 4 ] - ResearchAssistant: [ 4, 4 ] + ResearchAssistant: [ 4, 4 ] Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] @@ -65,4 +67,4 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - + diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml new file mode 100644 index 0000000000..eaf82401c4 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml @@ -0,0 +1,35 @@ +- type: job + id: Bomzh + name: job-name-bomzh + description: job-description-bomzh + playTimeTracker: JobBomzh + requirements: + - !type:DepartmentTimeRequirement + department: Civilian + time: 72000 # 20 ch + - !type:AgeRequirement + requiredAge: 60 + - !type:GenderRequirement + requiredGenders: + - Male + - !type:SexRequirement + requiredSex: + - Male + - !type:SpeciesRequirement + species: + - Human + weight: 20 + icon: "JobIconBomzh" + supervisors: job-supervisors-hop + whitelistedSpecies: + - Human + canBeAntag: true + accessGroups: + - Maintenance + +- type: startingGear + id: BomzhGear + equipment: + jumpsuit: ClothingUniformJumpsuitCaptain + outerClothing: ClothingOuterOverCoatBomzh + id: BomzhPDA diff --git a/Resources/Prototypes/Roles/Jobs/Command/maid.yml b/Resources/Prototypes/Roles/Jobs/Command/maid.yml new file mode 100644 index 0000000000..df925c0fca --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Command/maid.yml @@ -0,0 +1,50 @@ +- type: job + id: Maid + name: job-name-maid + description: job-description-maid + playTimeTracker: JobMaid + requirements: + - !type:DepartmentTimeRequirement + department: Medical + time: 72000 # 20 ch + - !type:DepartmentTimeRequirement + department: Command + time: 72000 # 20 ch + - !type:AgeRequirement + requiredAge: 20 + - !type:GenderRequirement + requiredGenders: + - Female + - !type:SexRequirement + requiredSex: + - Female + - !type:SpeciesRequirement + species: + - Human + - Felinid + - Harpy + weight: 20 + icon: "JobIconMaid" + supervisors: job-supervisors-hop + whitelistedSpecies: + - Human + - Felinid + - Harpy + canBeAntag: false + accessGroups: + - Maintenance + - Command + - Service + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + +- type: startingGear + id: MaidGear + equipment: + jumpsuit: ClothingUniformJumpskirtMaid + back: ClothingBackpackSatchelFilled + socks: ClothingUnderwearStockingsLightWhite + shoes: ClothingShoesMaid + ears: ClothingHeadsetCommand + id: MaidPDA diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index ea0f7d4b6a..becf6c87eb 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -14,6 +14,7 @@ - ResearchDirector - Quartermaster - Inspector + - Maid primary: false buttonStyle: ButtonColorCommandDepartment @@ -122,6 +123,7 @@ - Visitor - Zookeeper - Passenger + - Bomzh buttonStyle: ButtonColorCivilianDepartment - type: department diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 3e1b625f59..039c654f88 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -160,3 +160,9 @@ # WHITE - type: playTimeTracker id: JobInspector + +- type: playTimeTracker + id: JobBomzh + +- type: playTimeTracker + id: JobMaid diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml index b1c96df2bc..6f893f555c 100644 --- a/Resources/Prototypes/StatusEffects/job.yml +++ b/Resources/Prototypes/StatusEffects/job.yml @@ -369,6 +369,7 @@ sprite: /Textures/Interface/Misc/job_icons.rsi state: SeniorResearcher +#WHITE START - type: statusIcon parent: JobIcon id: JobIconInspector @@ -376,6 +377,22 @@ sprite: /Textures/Interface/Misc/job_icons.rsi state: Inspector +- type: statusIcon + parent: JobIcon + id: JobIconBomzh + icon: + sprite: /Textures/Interface/Misc/job_icons.rsi + state: Bomzh + +- type: statusIcon + parent: JobIcon + id: JobIconMaid + icon: + sprite: /Textures/Interface/Misc/job_icons.rsi + state: Maid + +#WHITE END + - type: statusIcon parent: JobIcon id: JobIconVisitor diff --git a/Resources/Prototypes/_White/Economy/salary.yml b/Resources/Prototypes/_White/Economy/salary.yml index e3aa60202f..f0d1af2198 100644 --- a/Resources/Prototypes/_White/Economy/salary.yml +++ b/Resources/Prototypes/_White/Economy/salary.yml @@ -44,3 +44,4 @@ Scientist: 300 ResearchAssistant: 200 SeniorResearcher: 400 + Maid: 300 diff --git a/Resources/Prototypes/_White/Entities/Clothing/Underwear/Socks.yml b/Resources/Prototypes/_White/Entities/Clothing/Underwear/Socks.yml index 313a40f504..ff971f753b 100644 --- a/Resources/Prototypes/_White/Entities/Clothing/Underwear/Socks.yml +++ b/Resources/Prototypes/_White/Entities/Clothing/Underwear/Socks.yml @@ -205,6 +205,15 @@ - type: Sprite sprite: White/Clothing/Underwear/Socks/stockings_yellow.rsi +- type: entity + parent: ClothingUnderwearSocksBase + id: ClothingUnderwearStockingsLightWhite + name: stockings + description: Standard Nanotrasen stockings for station employees. Dyed yellow. + components: + - type: Sprite + sprite: White/Clothing/Underwear/Socks/stockings_white.rsi + - type: entity parent: ClothingUnderwearSocksBase id: ClothingUnderwearSocksStripedKnee diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Bomzh.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Bomzh.png new file mode 100644 index 0000000000000000000000000000000000000000..7dbdff4a1eea7c35fe11b85b64213922b97b2e93 GIT binary patch literal 252 zcmVPx#wn;=mR2Y?Qk1-2DQ5?m8_r0rLiCMkHK#E0487#`kVvxb;YbYPaAcFy;vKW*P zK)nU^bZ1KR@Hf4i!EZX9bB1#iK%=U~&nRL-BLJ*-FQxnKgqVxMT%cCg07UmU`K*hd zQKI+3hn%mOtRDO_93%;i;G|QEeAcDc^laE`dIZNe*PGzhEAHqJ2=mR;7Eb4gBwG@m z;Dkn~l{L%R)D{ZGlGRSUzSZek^H-~XH)F<&NPPi9s5lN*!RXEa0000>P)Px&qDe$SR9J=8mrHCDR}_XnH@527GfpNpwq+dGqzD{EZ3Kc;futy^6jTCY(bB9U z)=1q}RjV$$>6T44-F1Pe1e>%AvPo&^18C`!CIL~!j$@4nzwnF`Cw7=F91pQf;~6(B zdNv;4bMN^-pL_1PWB5PX_~@8^;mmm*;KG^n`uOOW-fk?L)dk02KVpal_xX_@D~9jx z@4r}%_fk9J(QpK*s~Z5RtD9&z(ge5X0QKN?;V#jG{8*t&^ssZ>Duii(ox)ScT-ZB0 z`1tLE*gHCyI_7Eu*>ix|`8iuX_|`_1D>K&txH5B{t&OT7K07~WsSYen9v>ak-w9W_ zS@JjePPrAXCGD00EEVDG{G4s4__()dJl`z&EsF!#tu6p4YHAG#kMZmg#CAei%fN|P zSTAa7lbA;kDQYSwVqwe2&{PH{hGTj@uW|bHQ2_4#p*Hx7no1;8<@jqy0dz?c`1*%M zQ`^yU(!_8~9~wGDI;$CD+S)#Hg*-jolJWU!?>gzMM!+kO&T7OTrA$GX-hzx$B;XYQ z$QAPBHY?-`dA|Ai9=SrEbXFsy6b%ToW~m15FQf=~1w4XCT2Arfqbz=(ghvnwcm;fZ z4;iJ{I*?g_diw7#q(~-YeEwRutCr&gf+4D#WdLsf^``-sOvt3O8bd>em>7<=EXrMr zFrU}BapN8UlGK>iw44I$l*?tJ2Mz+NG4I!(9<@A z7(!WGhL>wF;Xcvu?OgZ$VscjiQ#BxXyEz;2HSBLK1F-eNqe50)Yw*8N ziv%V8?AizKHjG&@OBvYBKD+ohX0RLv6zV{{%;|k@?isiMY-wEse0N`Q#+265`P7MI?`TOTsU0MOq&7A+b znVL8~Iil}B+-rQVtXEJHGMBF2vQ1Bp=>A9$N2kN^uP&{aYC>Qk1KYpuxu*Pw^ZySs WV{mPh8b|X00000$t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Markers/jobs.rsi/maid.png b/Resources/Textures/Markers/jobs.rsi/maid.png new file mode 100644 index 0000000000000000000000000000000000000000..a928e05673a3fd1252ee4db8498406863b10d898 GIT binary patch literal 1218 zcmV;z1U>tSP)Px(d`Uz>R9J<@mTgQ^XB5YOC?FuVRE5#PZHrKm8DR{K%`#`GV>sWE&1A_m%jRCP z&x>33$++ypmbi^&e%Pl)&0<{UbS^~jHkofxGfiMl7L~%Vw3WhI6nnY06e!O=biKon z&|8@CBu$@t&w0-OfB)y)b02uZmNl16vW&1;{=2TNom-wc5$NhdjE#Z80Ezod3msODfIP0Zf?^5SP29I5Dq8T;V`Tz>L45jNlFq51TuxspaiM9=jJBm zUQ^Ve`Tl&cR=Xbz!sgBT^Jb(#US|vA*&kuYRRn;mQ30ULVqvPXp5hhd z7?+tSUQy0eWj!ZcO8~f$2}-4-7IA3ISl1%-ra_fj=9IEGa+Yv9+qyo6Li;I0pM>nThnC0Hdh`2~iw`Daz2=WvV28}7j> znK6}=U^JKj7zu?~y>b<$#YJ4}^77e%uK_R`Od5FJa1T9)Tjr<0AJ;v?Xk5e{?+_Cc zPHeW@G;iKPcH$v+$wGf1$WxMoQB_4z6x?zvK3@$vIagUxQA#8d=b8HISuxVS1rw9m z#N%-QoX>4|1blMgVn$V!z+Io_2Z+bxOib#VakECL4`UP*EMotsp8$<4TkO%m&zwE4 z#kpSG!ttYrFqM?h*Ed9YSt*D~)Q7S85s1gf*!|`nT$@~Yz5Oi78l^uFY4@&1_J=E@7_sd zWLVd?AZ^e(XQN2pE(v)k$M z^y1vGA*;vJOPSqHVrl{Tg#{Tuc}9oQ$6-&LfNr_0Hit+xUuynGMuxMDrsYB^w`p&| zKro2k*Q-0Pt~p?}ImE4-$%*&$>iQXeMNv=`g=sNDF9}^iM$_^coozIj@cVkRtTu;; gC?hlW=p97=0Gr4lVTB~h3IG5A07*qoM6N<$fPx%xk*GpR9J=Wl}&3CQ5c1vB%L-*nwWGVNs-+)D^altQH(d&XKS39w zxNze_1@RXM?pz8kRD@P2Qc0_=AhwCsF|AFV=Br7yF=;X`@?k?U6C+)jvl{L_^S)>9 zobz62p@kM2#Q5l_au9X32T}BIplN`kjEwl$SdRnXaEYXn82~I+Q+gf}xpg(~NOB&4G-hWAo3+wTF5~p z4cVO>4wuO1cVIMj67YlpaNC9Qn|Xq2#nl94cXGs&Mf8Ra22TzU+mf-lL^jvs*jyt1 zVK2U;gWS1(7fH_Z?NcXXF=CA zHx58dPVg!?UFApQ?do$n(^zQg3aFS3z+luf6d1r@)Uz}n#y{-EY&ButW5me`Jpdu8 zKsKi^dEu(62~}fQF`2_{C!NgTaNF?@djVLOc~5$e$k(%_KN?RKIe+n9BMGbT0gKf{ zNJ?NSe`)CL3ceGb>i$q*poSljx3NkBQlgv4!^;X98>pn9;S*>V1dfmTX%_^R=EK#s zc0s6eCnxm8lSSO!3C8+0HFKhA0Too5#^eNtdqiS#Vjt(p^U{ncnEP3d)_SNZ0jXq$ zkW?U*%;2*10yttth3C|Yu4c!H5SyjBAHY`>R x$DAt6GM39HUT*%+0)PhH)O`IGT4>=v$1gNZ^;6v1LR0_%002ovPDHLkV1i}AVN3u3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-maid.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-maid.png new file mode 100644 index 0000000000000000000000000000000000000000..39653a8263450c6d9bad456439058910b6a8c470 GIT binary patch literal 500 zcmVPx$u1Q2eR9J=Wm9a|#VHn1rB7-oaA{y=nw;SE=(7zy;n<8%VKxhlM8bk;Q#6c(j zgU$#JTFz^*ArJ}|2cgj|dzI3qA)C#Zo%_B0N^H@b=6&u#R(w*fX7M&xqRNU z$ClTGJkLW_W%T=lnHp7u}+ebF-+b5NAT!UL?-0cQoODl-qj?7(&)K+j~%!C8T(nK(N=XR6EWfW!DDJUTw4 z-#y!gq9mZ}<@Goqgd+fcY!B`4Qv0os4%Ij-Sh)ki;0_9z;@mv&yMjd=U>ZQvOqhm& zr)t$TFG-TC{vwrHegHxUqOlm{b{oxR(^aD;lT$Hkv<@%4UaMgyody7K95>T}lX!fp q@#rD)?7{RLGia8n@8je1&-n%^UzNR`J*h$f0000Px%F-b&0R9J=Wlrd-%Q5eU6$r&vbW8fqN!a*oxa5(E=q2QuWa50MoDI}SiHFhu{ zgpv}4PFX_MPNst$GR37-a5Rt(mKz+p2uGw2H&_uWt$hx8FFnIua_#EM2=0Kl@HwmdHa^Oo&Y=92NZH*duHz%tMQ7Ui9u zywkdr0MpR7E!!!$Nt7s=u;PAS3ebQwFpv?s#+ZyA(M=ejB7l+cb!5mCS*$zl3?IU z(+g6ZrvPd36ZQP%@Eko6VQ>F8Z?=B%?!(E*3DeNaQgqoxI&jBHGvMby5!lU@YHfh{ ztq9qS#>&zR04qx~9De=7@lSzeJFQ%)rU(`#S)l5D1-MbIH%X@=^gf@BDqnc?ifl&X zZgzNmb7Kt{4x4G{Wy^M2O30+@Cz4j{P2~iS7p{r*)mhQ)>B|rcG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmaid.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmaid.png new file mode 100644 index 0000000000000000000000000000000000000000..b2a9540f8890c46336d10953224707392a207184 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}i#=T&Ln2y} z6C_v{Cy4YkP2`j43_YEozz&efHh{hGZ*Gw)z|PlUHacS@H^SyInr60d|rAH^Uke WtDDk4Hf;tvm%-E3&t;ucLK6V51W_>n literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index 4c9a5dd68e..404d79385d 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -220,6 +220,12 @@ { "name": "idinspector" }, + { + "name": "idbomzh" + }, + { + "name": "idmaid" + }, { "name": "gold-inhand-left", "directions": 4 diff --git a/Resources/Textures/White/Clothing/OuterClothing/Coats/jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Clothing/OuterClothing/Coats/jacket.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..6496eadecb51bb34b1470ca294e8a6ecc3904e7c GIT binary patch literal 1191 zcmV;Y1X%ltP)Px(VM#m%%tr?IFgfQm|2p<*~dSlt+H`!}9y;Y?=1n4}=6u z(evo*=Y1aOeI7ueP$(1%h2kwm6Fu?iv*!SSi{k@!batslk6j!eu=|g{*1r4pn>o7} zwl9K=5AVr1adNoN$eE}S*Y)VQu&A<-{m-^HV3zdYb7$z`_4yS5;PkRDWnV~uy`366 zIo!wY?&ko2M#7D9PO)N9M>I;_1m1qLW#RSt6^g})0Iutyx?aZCW<}cm%#-$ZYOG%0 zfHU-h&&-mJ?~mH(cG}w0XU}o+>rZU=fdOae!7S-;h90iF)?7qLvOl=Fjh(l;wi5F1 z<;yD}`|pT4GPt=7g`HWh1b;iW1!w4CaB~}oun5S9)wPw_k6F?ag_(u0007WzSujgF znk@^CZ3Um3!Hzj1puL>10WUwz$iG6GV+@;%|3k* zly67`XXr`WPZfYKDWoQamszf$+iClTZ41?pjo_GUDU!7xz45gFn}u)=I6Ax3`1Ku+ zfXR8H*OZ}P=%H{=J5L6wB*+uZ0e3YxH~0kDY+0fFBtvEarbR$r&~giwWX94fEWpEB zmGOqAJqOTv^QPakQ$ru{%VSctNJIEtfX~9?k%!Z>a}5YyJhbb38Y>ujtXj+qx-NYI z(FZe%1X=r1OQ7GggR(U3_#&Bg{Vetu_U5)I(w5k~%CAD9P$(1%g+ifFDE{wAcZUJF z?rWZ8@lpEyIjK#(EJ5bsi?jew9&IyV(wz9<)31VSj%~W*5?s$^jS02kfIy!iH%R(tYO_nUx43@t=BhDF!WHLV9_|Xg@U1j8mCd8 zWRMcTb-iG%@tv5}wUu0(BWAf0vk&-D>AK>raUf#^P-C*XUY>Mla*hD0yW@gat@@urN#cKL@1MeVHdg=?LH_ubw>GW?P$;rA5Hj zW+iwxiTWmrR1ze3qrrfrJ<4*aOgOfM!TUzcA1cc-NDDygj*QXoZl|4FYr5NMYqfhd z#@}$k&`~gS=_f&H0m$g0rolu>D#^?8MWIkA6pH^S{{re)P^3sPYCQk|002ovPDHLk FV1m#sQGWmc literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/OuterClothing/Coats/jacket.rsi/icon.png b/Resources/Textures/White/Clothing/OuterClothing/Coats/jacket.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..720c725b04b6fdb860a68de9326d571602962d93 GIT binary patch literal 496 zcmVPx$s!2paR9J=Wl`(7EKp2J}7mrFn$n_bKsZgVkEd_)62R!H>dGnmfe<4eLfd_Ay znx&X7#!ice7;)%~g}}MY>X7OpY}YwKG6eKYLf^;fxzqbeP*YP=W65ARVlW&Lg+YF( z7KK4R7>+8h+o&RNdvlcoxURET&oT|bk40>~CP34sDGG!9_U4Ly{}O=7WO`8IUp;qS zhw+wCo=f?BSTVLsaJ3*xy;W?;O^RSdw5}#}=0XFL` z!h6}Z==fxr#&sQ3B2lSkv)&pBTdV~DW^;+~9A*H_PM|ze#cql)ijEJPKSt*4%ZaH~8Aa<1jPDkW^7}0^U}Q>twrf@r*kv~Z7w7(w z?spLQ-wC{%!1v%R2h5D`okM_q-PFd;PDV1&}&R)rAs+jmhc1{J$VP%V-e0^$auedWfn)BK&YGiWi zoQPX~*|Brsmnlmg{?@${J&C`n=v@ha2OQ)~oRuE2`>GG)yZQICw{8ErEAqJbbkm0I z?X$OT{`Xky#{1GsDccwxe0QomgiH+=aWy7|pg-OF9C&n{(PXg;VBt^Tp%<>%5(r?$NoEc$J-hOy+e zW0ov~!Q3+^tMls9XTD5%_c8o`!E1)eXT(%K-dLKdyLipFb|Ef?6xje)J@*4Obw?Of zKAK1USx0VkOn z?%OoIe)?ir#X04WZOlFwD_c&9GjyF*4*A3(alVpeqV88_f%5t3vnP0c2L?QYr>mdK II;Vst0M41e-v9sr literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/OuterClothing/Coats/jacket.rsi/inhand-right.png b/Resources/Textures/White/Clothing/OuterClothing/Coats/jacket.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..cdf432b4b1deafbd39d5abd30939a556e9163cdd GIT binary patch literal 416 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zqdZ+4Ln`LH zy|v%#aDd41kNHPDFKIe=brqY7v;St&5|R1M=V#aSgTrs1v%6zJyo07}$>hF8s+uo@ zb{~IvMC)hx@;kqN>+Gyom?LxUY!QD49Q;v^yP3BBwr9S4ysb3zjXf)??)vSjFM7tf z=T2<+v6vl&m36a@ZDwWo?k_JR|BgX`%}zYryw|tss4Sb^Hx{nsdncmb$jdG<<71w` zVej0%FTU4Z)~Vm3%Gi~B&X?gpfyKYNOp}wb<*t!uW>=2j1#~eo)-%UY9jYp%@pPgc1h-6)}_>OYIz57ZGk6uhpSv~da>@!I< za=kb2W?KtxhC9Eb!(_@=&Knh#?-otfvx;o9=_1>Xb>^uFQj>WBIW0-No@YmjTS9iHe^|~egRp|Nh^5o51zs~FXOYpM$U9@s7%gxK$ zcI(%lN0%5IcHfrHjSKg3)NHL=|N4%-&7zxGuiv*Ma2@ifUf1s_BOZ7D6?4P$UmS-# z4u5(Y#X4aX%iPziTiL(I)c>2kD&^javsI~2v)8QJUr=wfHR^U1ch2cex*Ix6yWUKR z``N$o7Sru5XV>#S5I?{m(NMyCiFBgwZo-ii>qo1s0yfTj@QnM0S?a&_U8}a5S;?7K z{`)uGm~o}o1hvb(y+^KJ{T?I#tdey~#lo4Vq7`PJlzz_k#lL-m?VnYjxl%)ZGZh*C p{Ij#ssQBlqO}9>;)1LB`^Ul1*`Ds4?=K-UT!PC{xWt~$(69AKxPx#KE0fn_L$H0yCf6nRe&j0hCfosWwm}k~@yHwWKdgVI)0w&Ed3hEQoKMHs0@S^}S}#>Hq)$07*qoM6N<$f@WWQs{jB1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Shoes/maidshoes.rsi/inhand-left.png b/Resources/Textures/White/Clothing/Shoes/maidshoes.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..208f74ac5ba22123ed211bd2d4daca50aad05ae1 GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|CV9FzhE&XX zdut=-VFLly3#XX`nXZ;SRSc>8AIqc`>9CR~Q~2b;w(o2|zVH0y4%EQFus16oXei`sfMTa2}g5s^HH+^wCf8BvgJM-=r-K^5tda|RVXszM>b#M?*sxN1fBl)mQnS|A z_%*z4+okokXzR7q7pk7q7hW&g8n&YQLixW#rgxTf{(7h5S@rer?w`fKo?AaN=e|FXPHI@c^AC+6_VyMC*hk6*mOdcx=pEb_68;?yWd7J(zxTK)iQ19;FiZw@;H9l1MsPfP%hP}B{WMZ@P zqQC#e9x?9w>^V>EJ);W}5EWZ(dZyp#sNjK%ua9Q+9?h!V{86yA@nmSuwxZ-k1_noO zh2{CIdvy4g>Cye=`_H~kn#*7)<;+pIM~&r3#+#hr={@Jw7rbl@l#s}Obv^E}Z|#>* z_FrB1H5gqB=B5YS7KwVj_;b|jzg6?TPHM4xY;Usj#mlFXAHQFpzxC0KQ!ES<64@0j z=M<;D_yKd1`O|f$&puT<^8C}{%V}*Fv>2c7(!V}~L+RK2HQf(ZGF7}hWd6eLlh-}9y%dhG5_t$e6@?R-W<(&5U=25PPMRvw3eG2m87Ia?Y z)cF1+c&0-5$CD~MeqHN&6mG7cu=rw)!_5n}KX+9!M(>|~#pWc?Ln2z= zUfRgjY#_k)V1AHaL6$YgquINDa@fU%Z4{9WF%T`1UFY1X&^oE1Y*)VJr+9_`0uGu> zr*s8`nLbH9>d!E{IP$8->R&sUVv~>DjC;0l>N>+mn=3Pp-mE*DH0Rs;$^u5OAc2c! z%1o*+>$%?O?r^v+aq`on=W})R1%C54as4=cQ+LB>mb80sX8xSKTXokF%O{tfmbw1l sQJ-4pcbJ1A;scApI_srVg0zlEtNX>Dx_Yss6zFmWPgg&ebxsLQ0Dbmkk^lez literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Underwear/Socks/stockings_white.rsi/meta.json b/Resources/Textures/White/Clothing/Underwear/Socks/stockings_white.rsi/meta.json new file mode 100644 index 0000000000..d8af9516e7 --- /dev/null +++ b/Resources/Textures/White/Clothing/Underwear/Socks/stockings_white.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "license": "CC-BY-SA-3.0", + "copyright": "Created by omsoyk (Discord)", + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-SOCKS", + "directions": 4 + }, + { + "name": "equipped-SOCKS-body-slim", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/equipped-INNERCLOTHING-body-slim.png b/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/equipped-INNERCLOTHING-body-slim.png new file mode 100644 index 0000000000000000000000000000000000000000..2f5becb6f0132a708a5995beab6a2e134c9cbeef GIT binary patch literal 1234 zcmV;@1TFiCP)Px(j7da6RCt{2n!#(^RvgE_9=mLW1%WK&gG`NKhQX#8U+RY5R^0BiCKPg6XL<>} zY^Rkrmyyc`8?59X7-@G2?9kD}(siRy1e-4|sDpwAV-O!K6oZKg_VMlD{*)(Gwx2Xf z@!0!-5sGDhe|q`7-;>|>2S_9mi9{liNEYKb4x5ZeEb6_JL zL(fCmD8X?Yc5nYtf!_OM^D+Z~q324bJ(XWg}SRa@U0)Slf;W!Rc)C#Mwt+S40 zvB`MkzdDx1>TByvQ7f4h!YKXv+InvKeh@~r$*AIXEQ?WPHmc2BRso~h^lzL$Ce;^S z1puH{s}&Tr!hmVoQ7Qt{6s^^2g_$2t0n%6X5)ONP0Pv4V^@VGI2-`cmX@1>Is37vk zr24T(%yAqx^gQrO5}jwA0ldE1Fmc%H`vowmeyk}#m<=;s1-({hrPc40$ygp%leQNidtbSt2$JDT7S%jiJ|8~)k|1e)f4H* zt^t(#R0OFIE_zB#liz;X!-Y$29QOJ!8zwZp2vsjF{$K>c17K8}>|CuLcpBpwdLGWz z>M*L!OtOIV-+BK%*j*c%UIYMq^zrBT@%wL}>BU6)!bO8mzy0sN@(UjwH*eg*!0qGY z*u`-0ck0EE*9WFqK*ewK#vK4iq%TwiC*u*byEd*|y$)3`;nVGJBd9sXhOYnTlaY2N%Sed5nQ ze#YDHwldfEgP`Z|S;tI-mqcG8kw_#Gi9{liNF@JT$PPQ}IKm{2E7rzASRk{FhnW1E zxP*NH+L57sK(k>68Wpl=ikJtvK-3(;$2J*{Qr(gR0FV(%=VXdHj>B3TTP!bI44B@0 zYh#P?G4OG9EGzvf8g^cdYSZ6_%5xCHH{Y==7TyZa#H9|8DsM?s0m|AQ2Tn7O^vEus z7wbHPjgj*gFTOIT$f5$Kb8wbvk|smXgWa_OOx>v{M<^=RS)^uaNeY)8EXn$xq3ZtesBL#p=^|Lb%qH= z(@-`_;2S1^S7Tg+@BolGNzj826~8>E0ddIO?j0Wdcn(O4GNfXR5o4j$Z}*@Q&xDdf#(`BRyXCFt6;mH+?% literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..2e10a61dacee63111f10a6acd8beb421725b88ed GIT binary patch literal 1242 zcmV<01SR{4P)Px(lu1NERCt{2nlWhORv5?sDP3AZgFzP3AVV6LT{nYtbBbqQp+PEC91atKl{9(08R6-prv79EXobLq6@C@o2~$$C-N0tm(fma?s<7l&mVrq0bsxwws-dN?KfX0@o{VV?}?mr^!x=csH)Hf3#y8v=PxoH z1yTL(%U7Z62fruPzp(?xqap8mE(VMV85l5zzUShm;VMd;KJ(7deff%0W8Rtnzohy? zBjDoPL$kF9yKAFl=&=S$h7P-HquJWS#krUCJ`?Gm9Jj%|Gryf2w{z8p<2byaEb{8| z2JcuFACHC;tz%idy1c;)%3|h$Fizhn*Lih$gB#^~?)tt75+y-u&p;D<#MCdGt>i_lUZ=uh$`obMR^gVa#@$H@cq?b&r zKVS@}Jr{k?#c9v=178~bM7`xW4j(XvxFwN}=QRR?`ZVfJdoD_b4gj#bcJBJ1023Dk zDNyAmex*rkP!{?8g66Nsr#;tiz~u;-U(k?OCy>6P>HbqM z89Fu_TR3d*Lecb8`a-Y5AtP7ApG*XgE1I7D8XV!|xQ(UN1{Cc-eY0jl)rtU+SYN0E zjB=eTnhsSf;^7xxRkb3Tt-XnJRILc+ouTi!xx5Jy&DI`Hj@$lsdizVOFZ5gB=-JbW zPKdUk*`sGqGyN?P)K|44mR1|EyEYU}4-Nk``a;8GJQ{MlYh$yq1puM>N669{V)`xu(O2 zj%7{U9Hpm%>9M?hMD>hveL^$N>vaf^fKTt=pXg;p)3LJN0B|`6gJmpvF<=aK*9HKr ztT$qJsN=j|N8;4jb(l5N&lBcJK~*Qxa<4<`81POKH@7;L#U01-Q`K+6!!*5IJ;bG+ zZ#xKzc$`M!`hX}D_$UbG*$Gr3LP0Pt=q9ZZNE8F^+`Eh5vSXC%eg!8LOqC2hmtokk zEM7A7P+?Xo{PiwZm3>hWxatc>jTKc@4vJ|H3^%I ztyLYdl&a}R_5Kbdwwa0=2*U+0Bt1VlWfst<@lH3C#3 zlVyEC)B`<)xSJ=Ecz7%717^a*Eac~B!GlC1k^Hat7ftMrGSg!#TmS$707*qoM6N<$ Eg7OAgwEzGB literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/icon.png b/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..cca7754bce01ef0c7747e223fcc41e9c6fe14989 GIT binary patch literal 579 zcmV-J0=)f+P)Px${YgYYR9J=Wm9cBvKorKmlq@ZwK_DN}AcOHB=up*oGX4iL8w%Od)lz_59Lv}zaE5|@@DRH9c=z${-8-P7 zqN3t|fpboIme97CJWGgkzBOi@LzAH4Xo6Tu)IArRbNcl8>%n@=+35)ZKrAJOqY2)> zd%HgY({JDD?DXWp{{{g70E;o@FNoa4lU)IMmQW-@#8T=t=F||0P#be<+80ZSNQBsR zTneKKq)UPRV2rEFa|G=GQY`S|)l2P{Vu8BnVtzMAe=tV66eelS;hd9YH>lO^(d}$T zd6pFHb~d9{w?~%UDBXz0BD`jYTHT)BP+6WO)av%gYjz&z765?n`v;cYAlq>P06{w_ z#H33B-}jB0PqDKJ*NH^9b$vLRl*(61E$5tKDPb{I@Tv8(6)1&juuV;<8ntXr<0G)_ z1|1zcdLI0~548b*D{yq|psWbvCe%XymA~$}g>~C;OV0qK^YWSYbt}f4E zF{aNwmJ+*=T?)j}ul>CR)0^uDrDaa7V2X4pFul1p zehZ9L=2=4XyE$IJxc~sDVYG^x17ALVK+q2G^x54O}=~GxT4~*`2!2gS4GWP R(<=Y~002ovPDHLkV1lXl5<~z1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/inhand-left.png b/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..de949333ec7fd41425be929a1af58e43ae69d6af GIT binary patch literal 806 zcmV+>1KIqEP)Px%;7LS5RCt{2nlWe^Q5eVnSK6T+3V}xAkYJ~S3<1ed!8q4$X*#FiR64Y&gNqP? z1Vj*u;&5ZIU7XTx%^nI}irAs>CPg6z6A&D9XyJ8e-u2W&@15TzwEcb{ocHPf-F@$S z?}PV!0K+g0!!QiPFbu;m48t)069%Q&XgH9E#UooYf3Szqa3JsAyRSXYq?T9m2YXt- zzok2X8`)eLLI?=}R;47>{iO#FB>>yDh?eu35|RiQ4F__2H-nGwi>`KM^AZWOw7f*b zjYL4Z(?#$60_{%M{_ebX+7{6Yg4+}#)!K<+71A;mPvWfIz}jlqw#DK}eERSXrfGVL zwpm*9(4BpNC<5{adx#|xM#PLx*&=2Xu|&f2Qk$g}1f*Hu%jv0H3Wdh*^?N-n2h7r{ z)=p;X_=y0LC7^in^f}Jj4gB~C+__SY#gk-OK|rzufZr)kg>AR{XXA>PQ9B(jsucvJ zz74G`1HjnE6+jR1w;lDH0& zJp}3*be&J;fWzXE@%7txI}=<-6j1adkY<6+jdjDSl%(I1xL2IBzrCB8vgPx%>q$gGRCt{2nm=gUKorJ5m3C-{f*~>SVB<`J4h7Mn2E}vTEp?YJY4KD#v}pz} zhG0y<1Og={gU66|$<%ghc2mewf;$v$a&RCDPQc*79$L5#&Z)9=vZY3{74m*yknicw zr*}_xvcCfef*=TjAP9mW2!bF8g1AX2Zh=9+$2Yci&3LuEib21}@7}xbdd##bRcaIW zSuYmGYQ7~qDPxQSKz(PMi}u*uA_ri`qKZ|s*k+7zw`4goGwApD@=6h3KW#}55V0s! zg6yW&iv>pqjnnL?fcA-j&e=KICx-dmx^0a`6+fD9+Z*=w50v`m8qerCoVJ@tB@<>W zqv!DL%SWiHI`iHihfMR{{()4pBLUU&Dyn5Dnx1!*Qd-rJ$z~&c^L8d_b`2ah8ax({ zkF<3=ok%4>HU_+UksIl_NtzuMAb9%hB~IH-{Qd*nx!fzG=l)ylv=HSlbWhUk7zBag zl$TaD0Dxiq8&J}!W=@AurhQ_-FuZA&CIA593-bVm85LO-ZBb@pYgh53+3{?M-gi5& zb9Rnnc7*OlYvyCYxHrKcKYy9MK2EdiO=x~=jcbg{0At1;qL#3cXys+1}<)9tD6Z1Xp7 z-v@dvS6{#`LbhhWi~oLA){6!HuJi!_aN2H4?eEYT^n3it^VfXP?@2!*7RI$1V_eho zoH51+{T>&|4l3cEDqxmt1}^P-)8k7e6VtDPQl&O@i{};{y&s!f%0U^TPrYPahrZT%e2z;GtR%-_A zc72d|PJm2ADw)7#8xPwpw%YYU;;RB=BH|14IA(!r8o`?Q<&`1;;L*befhF5h0%Rhr vgjogMi&~JjiPIjHv40z=)+7G<00000NkvXXu0mjfdc=Rp literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/meta.json b/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/meta.json new file mode 100644 index 0000000000..337ac3f4f0 --- /dev/null +++ b/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maidmini.rsi/equipped-INNERCLOTHING-body-slim.png b/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maidmini.rsi/equipped-INNERCLOTHING-body-slim.png new file mode 100644 index 0000000000000000000000000000000000000000..8c9d97b840ce13293370141bf5ef4cf9b16ce749 GIT binary patch literal 1242 zcmV<01SR{4P)Px(lu1NERCt{2n$K$+M-<1uD!nAgD;9*nvUYV6s#_aDmXPRRj2&A0&FSqvXRB4+ zG9Or$S*`Z_=FLy$JwPInNF)-8L?Ri==JpOcZHHNw#q@NBZEo+N_tMiDW?2^Nv>mp& zy%VZF>Cn~tTtxp1uNOLPhiz@FF)B|blW>;-U~6NIO(m0EVN6=LZw=Vu1)qma~oBu)(8G?6b#Z=6N$cOLG`cf0d6mnrvX6MCSjIMRH}8D zWs@62Ei>rhfh%be2&xOBi=$cZYrMN z528O2jrP5F*=hyS_Z$K@ZYmM-WK2;3psyvU98=VhR(_Da<2V3-iD(p;trovKjuS{< z*vOa~XE8;Eq9|SB7furw%|Av`>2d0Nt^&iTem>{jju`dwHx7Mak6D(*nvDk3M1nt~ zayFX{y$6tf&dBijzSoEp#gLY!$ zZ~|4n({}oHgfp{7AbsC+fS%4UEtN)g+Th&|0N)2>rwwSSH1u>P6eo~A?f9&-GIVW{ z?*=EL(LnmX$4pF(v#-DUhR?dzS(%T)?6kpW<&U2}gt8itK2fu69PaPp(dv5FHds{O zR}bj49d>$rgpZ#-U?LjDR5FR%cNXyA;S=1xvw*2&l2`up_~;++0I$*~6h%SK$U#vQ z{w#>TZ%=jF4l~Op9<8neK$q8RwhaI{+}}mc$c=0h9EGXRjp&{Id+(tL zUlVnWufo*b^wK`335Wswy}8c{#c!`wXwz)@7+huw)>JLD%HBs zsjz2w+zkaHh-RaK3#ZBFgQt&|*^B4m^NI*hA20LDT{z9YP`y{?NH4w}Ku67P?~-`U zwtZ!Ai~_eN;jVOON8)ZMD=eR%XZid*o0&COsaPD_5GWOkY-ZNr`jojAguwX$tLx7q zHQVMf`nz*;V_OdI&do(AKcHsYSY3Y>SX*cgC>4v$UD0=M-?(!Fg4z&>-%7u7?Y)DO zp*DIU)B~0ZD_!NigOfg8Y_E-8_;x@{jWaEk9{T$@!%|mi zX{j_s@&tT2fMW9iFf(f~04OZpV!g?dVdVz&+Tvb{w>H*TVeuAo+a{7H;A^Z<>r;MS z&9-@d0F6V+6AU|3jBI)R>Lu5v90l5s(8TP=7GH^yX4%A2VFi?+Kw)V&l%yDDc-n2t zpy5ajM0o;!Z1H92znvR!Eo`|?vH9y{i$o%kNdC+G33^e&XwR8&IRF3v07*qoM6N<$ Ef=^*rsQ>@~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maidmini.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maidmini.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..417ae4981e9a846e6d4d89317c71f52f70e1de02 GIT binary patch literal 1260 zcmVPx(rb$FWRCt{2n$K$+M-<1uF1;kIRtSv1vb1{=s#+Tz7USv=j1P%(2nM$$loBY; zKhTpe22*_LxxVC70)-GtNNO-W#O~3uK{3hXPYl(G9%Z+0UPNPmPz{EP6zcy zTYS2m4#MicKdVE%(T0^<7;BS_syEsbe-{Ol^i%2dSX)^AOP>JQi{xnluyPBiRcoj> z+Nf1)!Wf#FNxu)nH2rCW(Vq)q1c`5KZXuVo@#^LCkr}8r+W7RdFVJ{$ah$MB_orm zd7d;=Fimr07W$qC#u$36i(dENNCqB6Uv@xP{h3i<5{SazQ0vNj4uM?7vav==B89pth$EIS{m6G&g)?YXB_@i)c(gkdP_2Xa7K5#zBLeUXUcTcOhd+))>|5fy7?gNGc#%t9Y zHa55L;RhcfVHj9hT_5X5v-8*Af8zM)5GAL?quL0``T$^>CQ42TE351H?#Z_>O;hw& z)epQ8IzBqY!$*$+VB}FGnynT9ka*-9A;130>N*mJAtF*-`T}{ipYN~I$L(0|MK%s0L~L3 z4<9|oVkU$2`=5yWeDn2JDz{Wd&iwrP`bXYuweaHEQ*ktQ_ud0#Cj`cy2RNxzc)7eL z+O8ulM%5z20psQJnn;eww#6bmDJepU3E7ZX#3f|MPb-&Eal*_~VHwKB5#3G)J=Voy zCL?kM*FniC0XWYW_*3<>Do6YTb^skS%ibmNW~&vbf+GrKO+p^D>T&p$77NPPQ$*-{ z9{%{f8f#QoT6Q>Pftsz>m1`10)d%>QR3{J@a&1BsD0%LrQsE!pxibe`grhG%zt4f| zsSg0gYZSi!;q@GF5q@PGgP^nsZftIiwNb%>>f#d?E4LuD{8?&XvW=G!_!UT|=6Nn_ zkG0c^OvIU*^55I94FI{U4V4-JrTPHid=aAdy`63DpM`p(9eI5K+29YewQ6moV3TZ9 zsSybDuF&k$>Puy5j4`;URS^PH>9nX9jJjHkY literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maidmini.rsi/icon.png b/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maidmini.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ab815c8080423fb4165f9599b207edebf95aabe4 GIT binary patch literal 560 zcmV-00?+-4P)Px$>PbXFR9J=WmAz`*KoH0O4ry#0i3K6h*^;V5zQjhwK18}enpA1*cW`5H;YaWb zq)L@0;Lf$0Ypzg{k1c(&??42^?Fp$I7hxCO2iD3-ihzEwh?!l@jAmy>Ku=Fk&;P*1 z)ivr$k`RJ|a7aRkjivN;CF$bo+SvAswgYt~>GJ%PlzcE4An-jDd9GLBdpH;j^gEa5 zr&L#xwi;aHW!r&iHb>xl8@iasEAqDYOn5Q_&99hda};?F00?{!=_JK8n_BpyRoPAQ51Eu*$JCDR9BM5NwQLeO17Ev=T+b4e7ysj zo$#C>jA|eVhvXlIh(=t`fF^1dL?aIWFhmdzje}@yLjYLFLXX;L#36o6^k8DHi+X8^GB y<54`!W&nUMpFbHp??kiO+n#^baZgXrzvdAd4`8jn3Ss8}0000Px%-$_J4RCt{2+P`ZWVHgMSucb?ZQ3MH<`U47ukRJppNrd8%bg)YWsYB_Ink8$d zEJ6q(WXTc-*9M^!DQya!u2cSk430-ZP$Q902t7r|w}W|)6EF4dd@e2Y`GDZPr_bHJ zy!W2I&jT>V7-Nhv#u#IaF~Yz9x#tr+Unz!#xc8nwXjO**=b0tbCya{m-$xP4_&Ev>DS{mA@8~DDxUi&epDSkofM_IS zc_d7VMU7+xG+S2yfZ9b(-!^NTHkKPmMnI*ic+y+XL@J#@BpgF7w+jI1_IgOAGx+}P zD-y}1rFq~_u_m#5{{uuL;OKAC!UkVas$aN01O{fW+&Wf*T)`V zPGh-&tOEdG>%}WeZBAkte-xQ%YttlZv(q8@=XFL1EGBNi8y z01Q*&##A>Y%6bIS)R-}~y&7M2Ev-#ik3cp8&XqHf%kAnZ@!CZVm8wEof+JDZBan>% znZjrkDmxD$yOZ&uL)IE#qvsA_yfU_ j*YZkSsH!Tg{vY`b8E~Y35~B0600000NkvXXu0mjf>gRO) literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maidmini.rsi/inhand-right.png b/Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maidmini.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..29fb38b4bfd702970f924cc26e269b864a666316 GIT binary patch literal 831 zcmV-F1Hk-=P)Px%`AI}URCt{2nm=e0aTLeD5to+yArOkeTmph1+AbC~AQ`MfTnq#|h=aC^i$h(y z1VRagE-nq|T8R`XQY%Du?jD}5r;}wNc zSw3D`m{X05^Rxfde9q`(f*>#ec(uI9Bzq(pV*unizo1+!aI6zJ)-MPG(|%7v=b2tt zlus~q_dYhiebgNTfL|g(yRa>OgW1uni-1P+002pq_sp~A8 z%Y#d#Ff;QM0MPDqkj>@sx%vU=OvV>?--vdnW2m{h`NL4N=|YmJ%M1X*;V=L|6h#0) zqyE!Zi`V`IR##p!JDPP7An|T>1<|oFmF?*85a~?j67AvvptZlNddv(1gESjD0O&tLtl0d9a`OfZ)~rho zk!Xx@i4;P?AljXdYEH5>_v-k4^vf5?&}@TKU4O%X!J2hBptZk?M)LpP z*m|?;MbAK?RK}Bs_gIpP4>QnN;n$dgU65^Rtd#%d|A6 z6(JofMQrgK0Q%)9w<4j@JV26*yH=XF6ailL3{=+mKy9anY%VXCzPI=d$D+W}9V?W| zQ1%Rjfr}Zk6V3MS!;LOtQI&RIUer8@KKN=qEs@&Tq*9Mj|9a!65$5 zF*kY!wB>r`PVmg=bwwr!0vn&0WRYl0^%Px)T}ebiRCt{2nn6$7NEn7+ha`3;AptfDEETG{e_($?&)nMEBB9l)TdfvpMI^N1 zK!plI^iUzBaA}3qibJIy%dKaA#UA#sq7_}R(om9kGLGYT59th!lO-O<30ke6OTbCy z9e@7j8^_-ZL_|bHL_|bHMEpNdWImk9$=c+_42s`00uRs^?iRhlgm5W)LmrbRTz|ZP2gaE$0_8eQEg?xzMPIE2yXpq zD~pNdxp>b`&WYo)`Z2%ah5R&HO(q0+)ZMh242Ar(xKd%^)dzqyA+VEkNE0%Y{=i6O za(O44NdW+8I|~x4q8TrUOfaYkZR#$PEnU2?X&UtMWhj}zPo6Q>qhD=h#j9H%0IKzd zFa5ZmNobk|gHp8U1&~Q~u0*_(2?bI`g)$^#K#N|$CMtgT@i!stt`$L8UE5Ru;OKDA z@#=G0&2IfPA*j|HzQ(_C31o74Crwl^#$Zqr0ARP`5ovqC%K42HT?IJN2uw;y3z!@m6=Yp7(#Q zZ%`9yq7EGU#wFmc^!-xVwkXg?gQsm+c(+}kbH#0o!cMgNexCn5XbDQ+2V^rT)XX?Y zq6umx#p|Tn@?Cg>G75cP+n^W6s`Y&x7h&rA+66c>DH{ug1n6WNB&CAqKWzXcmB2^4 zj`~&Lxk%}M^61P?wh^~&X?^Joxc{K2u!aTN==?pkIE;#`3xkh1_7CzVLps$1qztUmp2P%TB zVL?kK@ZtPY(UJ))F0Ct-N`0t__=PV4w?1Ez%PU*bJ5Zni^yA^9CnMYb{IIyRuDp4% zC4C1PS^)UcxGmnl?frG?2dMzCriJ?tiptDPrtA2-*SljmdDiR{y)d&alni+I=!x>@ zsV*jX8!RrZD?#+7wn4p8SDrmBqTtE^UU>9MedIMjuhbR2QpX~IZ>9)7oL>t4ulM}7 zT8APcA|fIpA|fIpBK|uB`tjgyn0`9@c&k4^=I<;xfd6Kw7wIo#a(O3CW&w1Xk$_w$ zW>_}1OX6>C%5cwTWCjV~`pRpX1^}qgBxXnxdiioJLGYe@AwMnV0Cf74vY8+q0N$(D zGz}G+6#aVkPr?joiaE*p5~QC98T9%wG+zSTnPDgAWQUW+ zPR_yY7HQE7;YV=K%`br-iD{bF)0YRj{Q{$+pC{qyaL@Vam)`?rp6>v-*PmX#>~dhZ z{Q~2_>q+qX5!`bf#K5R|3y-_l9qjKoX`+hubj^&TR{m?GHDEG-&*54m(S$+G8~q4_ z3bND^;Cnx3b!}6bh;@c=FNIOVwI*V*o|Big=ST(M->fg=^a%{olC|eZ`vbhpPPTEc zkOgg+I5QbW-613s4D&e^WG*XO^n>Pj6VkhYy9;!3Tyl70^i03PC5 zaaTFhufUtJ?v`AT4wX~}EU#=SZ(eLU?_TdZS}Gx0)mkb6jMpV2JOU)8;{Ds_4r^F2 zOiQ{$ES&+%D_e?TTB0R=a$Iuw)t4PBC_D??#)u#%4}{Pg?6(fb$*>lkKmkar3Ggfc z04+IQiwxIXTv}In>ZjFUa|q2Ja9a%9DjzBUZgGCcHOl7!{WOL(W(=JHU2uZG*0@yDqic>^K>@DB@HL`L3Se>eaD002ovPDHLkV1j}qq@e%+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/bomzh.rsi/icon.png b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/bomzh.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0f3ada59c238e1353ba48a7e9480165c3bdee00f GIT binary patch literal 537 zcmV+!0_OdRP)Px$(@8`@R9J=WlTT~ZKp2OgludS$rn_AU!He{xc=o0@1@TZX3Z(@PJyb-C;6X%K zPa+6@1iykGMZMUvZQX1#ne60`hq`gMt0q|#6!KgK=AHNbz4M!Qprxgy<$uHNdxhKg zii5-9!v4YGu#7dSXEYTTn_Kic0g;s4y|-WHzk2z!@Vx;++CzQ)NH`wVs=d}k-1i2g zQw2a~UFPlU=S#OurwZR2P}hlCUAld*=(#okGVkH61x!1B=|m(G#O4-OdR)eZ5FC%r zDxIk9fDnQ#&q?JGz=9L=&ZP2)EYG=lXUEum@Tl^Fl?}LkuUL1wD5Z#GaxR+ZWqc+) zzaPnjcW++QdV6$c-Gw z?lSXV#^Bf{pRPx$Oi4sRRCt{2+PzA{P#DJXCsL70X|M!waZ$VuZ^5Z^$8PT3>K#2PLa7rg=qJDIzpU z(}m9atdIft#C!m5^z>z2w7l=kz5%uJtG2h+ln$iz^2d66m#W{j$-Bys^BdC>uzzqE zJP$^*)q-^%0000000000@Q+m=!Mq>v*YfreydQux+4!VKF#o+?55S_2uoS{ z``oh2E3SvloW0iU(x+X!+WqHNGd^H&*nV9+{`a@M7vFvb?c7`35L&0J{<2ZLrAS0h zY1Z!#cQZoc+4Cj(**afu)3ww+uKuH5iBkNG43{f9B390M{Or8R`fZHfW`BNI zP2N+Vb)bIQErywU|F7D8&LscQ&N$8bhhKKEm@@L6vj6(iHPPmjdXC^Kb=AdtR$4zu zHadLuYwzYYm2J9*s^XLo;MBQmGZ|$cOV>-Mvy~Vft*>~~@!pN$&z#3O^9q@hmKw}G z+jt=M&cXNfViU8IjpF-nn;B1N`OFw8cGJvwL2?P(4J+dXlQY?Gm>D~`bnat3S+nO) Uh@Z@JU=%QTy85}Sb4q9e02gPyi~s-t literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/bomzh.rsi/meta.json b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/bomzh.rsi/meta.json new file mode 100644 index 0000000000..e61e564c66 --- /dev/null +++ b/Resources/Textures/White/Clothing/Uniforms/Jumpsuit/bomzh.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}