diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index f3e637ccf8..f52a67a40e 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,39 +1,4 @@ Entries: -- author: wCATw - changes: - - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u043E\ - \u0444\u043B\u044B \u0441 id \u043A\u0430\u0440\u0442\u0430\u043C\u0438, unicode\ - \ \u0440\u043E\u0444\u043B\u0430\u043C\u0438 \u0432 \u0440\u0435\u0434\u0430\ - \u043A\u0442\u043E\u0440\u0435 \u0438 \u043F\u0440\u043E\u0447\u0438\u043C." - type: Fix - id: 141 - time: '2023-04-11T16:55:01.0000000+00:00' -- author: HitPanda - changes: - - message: "\u0415\u0433\u0430\u043D\u0443 \u0438\u0437\u043C\u0435\u043D\u0451\u043D\ - \ \u0440\u0430\u0437\u043C\u0435\u0440 \u0441\u043E \u0441\u0442\u0430\u043D\ - \u0434\u0430\u0440\u0442\u043D\u043E\u0433\u043E \u0434\u043E \u043C\u0430\u043B\ - \u0435\u043D\u044C\u043A\u043E\u0433\u043E(\u043A\u0430\u043A \u0443 \u043F\u0438\ - \u0441\u0442\u043E\u043B\u0435\u0442\u043E\u0432). \u0422\u0435\u043F\u0435\u0440\ - \u044C \u0435\u0433\u043E \u043C\u043E\u0436\u043D\u043E \u043A\u043B\u0430\u0441\ - \u0442\u044C \u0432 \u043F\u043E\u044F\u0441\u0430. \u0412\u0435\u0441 \u0442\ - \u0430\u043A\u0436\u0435 \u0443\u043C\u0435\u043D\u044C\u0448\u0435\u043D \u0441\ - \ 50 \u0434\u043E 20." - type: Tweak - - message: "\u041C\u0435\u043B\u043A\u0438\u0435 \u043F\u0440\u0430\u0432\u043A\u0438\ - \ \u043F\u0435\u0440\u0435\u0432\u043E\u0434\u0430." - type: Fix - id: 142 - time: '2023-04-14T13:41:52.0000000+00:00' -- author: RavMorgan - changes: - - message: "\u041C\u044F\u0441\u043D\u0430\u044F \u043F\u0430\u043D\u0435\u043B\u044C\ - \ \u0442\u0435\u043F\u0435\u0440\u044C \u0440\u0430\u0431\u043E\u0442\u0430\u0435\ - \u0442 \u0438 \u043F\u043E\u0441\u043B\u0435 \u043F\u0435\u0440\u0435\u0437\u0430\ - \u0445\u043E\u0434\u0430!" - type: Add - id: 143 - time: '2023-04-25T06:47:43.0000000+00:00' - author: RavMorgan changes: - message: "\u041D\u043E\u0440\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043A\u0435\ @@ -8908,3 +8873,30 @@ id: 640 time: '2024-12-25T21:15:53.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/845 +- author: keslik + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0441\u043D\u0435\ + \u0433\u043E\u0432\u0438\u043A \u0438 \u0441\u0435\u0432\u0435\u0440\u043D\u044B\ + \u0439 \u043E\u043B\u0435\u043D\u044C" + type: Add + id: 641 + time: '2024-12-26T17:08:59.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/848 +- author: Hero_010 + changes: + - message: "\u041A\u0438\u043D\u0436\u0430\u043B-\u041A\u0440\u0443\u0448\u0438\u0442\ + \u0435\u043B\u044C \u043C\u043E\u0436\u0435\u0442 \u043D\u0430\u043D\u043E\u0441\ + \u0438\u0442\u044C \u0443\u0440\u043E\u043D \u043C\u0435\u0442\u0430\u043D\u0438\ + \u0435\u043C." + type: Tweak + id: 642 + time: '2024-12-26T17:33:31.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/846 +- author: BIG_Zi_348 + changes: + - message: "\u041F\u0440\u0430\u0432\u043A\u0438 \u043B\u043E\u043A\u0430\u043B\u0438\ + \u0437\u0430\u0446\u0438\u0438." + type: Tweak + id: 643 + time: '2024-12-26T21:17:49.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/850 diff --git a/Resources/Locale/ru-RU/_white/new-year.ftl b/Resources/Locale/ru-RU/_white/new-year.ftl new file mode 100644 index 0000000000..600c0197df --- /dev/null +++ b/Resources/Locale/ru-RU/_white/new-year.ftl @@ -0,0 +1,5 @@ +ent-MobReindeer = северный олень + .desc = А где Санта? + +ent-DecorationSnowman = снеговик + .desc = Кажется, он следит за тобой. diff --git a/Resources/Locale/ru-RU/_white/prototypes/entities/clothing/Belt/clothingBeltUtilityImproved.ftl b/Resources/Locale/ru-RU/_white/prototypes/entities/clothing/Belt/clothingBeltUtilityImproved.ftl new file mode 100644 index 0000000000..560fe1ca56 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/prototypes/entities/clothing/Belt/clothingBeltUtilityImproved.ftl @@ -0,0 +1,2 @@ +ent-ClothingBeltUtilityImproved = {ent-ClothingBeltUtility} + .desc = {ent-ClothingBeltUtility.desc} \ No newline at end of file diff --git a/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl b/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl index f4bebe19f0..9a09e505b9 100644 --- a/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl +++ b/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl @@ -10,7 +10,7 @@ petting-success-bird = Вы гладите { $target } по { POSS-ADJ($target) petting-success-cat = Вы гладите { $target } по { POSS-ADJ($target) } маленькой пушистой голове. petting-success-corrupted-corgi = В порыве самонадеянности, вы гладите { $target } по { POSS-ADJ($target) } маленькой проклятой голове. petting-success-crab = Вы гладите { $target } по { POSS-ADJ($target) } маленькой гладкой голове. -petting-success-dehydrated-carp = Вы гладите { $target } по { POSS-ADJ($target) } сухой маленькой голове. { CAPITALIZE(OBJECT($target)) } похоже теперь любит вас. +petting-success-dehydrated-carp = Вы гладите { $target } по { POSS-ADJ($target) } сухой маленькой голове. { CAPITALIZE(SUBJECT($target)) } похоже теперь любит вас. petting-success-dog = Вы гладите { $target } по { POSS-ADJ($target) } мягкой пушистой голове. petting-success-frog = Вы гладите { $target } по { POSS-ADJ($target) } маленькой скользкой голове. petting-success-goat = Вы гладите { $target } по { POSS-ADJ($target) } рогатой пушистой голове. diff --git a/Resources/Locale/ru-RU/nuke/nuke-component.ftl b/Resources/Locale/ru-RU/nuke/nuke-component.ftl index 78cfb5a644..d81993b372 100644 --- a/Resources/Locale/ru-RU/nuke/nuke-component.ftl +++ b/Resources/Locale/ru-RU/nuke/nuke-component.ftl @@ -41,3 +41,7 @@ nuke-codes-fax-paper-name = коды ядерной аутентификации # Nuke disk slot nuke-slot-component-slot-name-disk = Диск + +## Examine +nuke-examine-armed = Эй, а почему эта [color=red]красная лампочка[/color] мигает? +nuke-examine-exploding = Ага... Похоже, уже слишком поздно, приятель. diff --git a/Resources/Locale/ru-RU/robust-toolbox/_engine_lib.ftl b/Resources/Locale/ru-RU/robust-toolbox/_engine_lib.ftl index cf69936c9e..9301b9988b 100644 --- a/Resources/Locale/ru-RU/robust-toolbox/_engine_lib.ftl +++ b/Resources/Locale/ru-RU/robust-toolbox/_engine_lib.ftl @@ -13,12 +13,13 @@ zzzz-subject-pronoun = *[neuter] оно } # Used internally by the OBJECT() function. +# I know it's wrong, but I don't have gender studies degree and it's just works. zzzz-object-pronoun = { GENDER($ent) -> - [male] его - [female] её - [epicene] их - *[neuter] его + [male] него + [female] неё + [epicene] них + *[neuter] него } # Used internally by the POSS-PRONOUN() function. zzzz-possessive-pronoun = @@ -53,8 +54,8 @@ zzzz-conjugate-be = # Used internally by the CONJUGATE-HAVE() function. zzzz-conjugate-have = { GENDER($ent) -> - [epicene] have - *[other] has + [epicene] имеют + *[other] имеет } # Used internally by the CONJUGATE-BASIC() function. zzzz-conjugate-basic = diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl index 94a8bdf369..297dc7da08 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl @@ -1,51 +1,51 @@ -ent-ClothingBackpackDuffelSurgeryFilled = хирургический вещмешок - .desc = Большой вещевой мешок для хранения дополнительного медицинского снаряжения - похоже, этот мешок предназначен для хранения хирургических инструментов. -ent-ClothingBackpackDuffelSyndicateFilledMedical = хирургический вещмешок синдиката - .desc = Большой вещевой мешок с полным набором хирургических инструментов. -ent-ClothingBackpackDuffelSyndicateFilledShotgun = набор "Бульдог" - .desc = Простой и надежный: Содержит популярный дробовик Бульдог, барабан пуль и 3 барабана дроби. -ent-ClothingBackpackDuffelSyndicateFilledSMG = набор "C-20r" - .desc = Старый добрый: Классический пистолет-пулемет C-20r в комплекте с тремя магазинами. -ent-ClothingBackpackDuffelSyndicateFilledRevolver = набор "Питон" - .desc = Выступите громко и гордо с заряженным Магнум Питон и двумя спидлоадерами. -ent-ClothingBackpackDuffelSyndicateFilledLMG = набор "L6 Saw" - .desc = Еще больше дакки: культовый лёгкий пулемет L6 в комплекте с 2 коробами патронов. -ent-ClothingBackpackDuffelSyndicateFilledGrenadeLauncher = набор "Крайт" - .desc = Старый гранатомет Крайт, снабженный 11 гранатами различной поражающей способности. -ent-ClothingBackpackDuffelSyndicateFilledCarbine = набор "М-90gl" - .desc = Универсальная боевая винтовка с подствольным гранатометом, в комплекте с 3 магазинами и 6 гранатами различной мощности. -ent-ClothingBackpackDuffelSyndicateAmmoFilled = набор боеприпасов - .desc = Перезаряжаю! Содержит 4 магазина для C-20r, 4 барабана для Бульдога и 2 короба патронов для L6 SAW. -ent-ClothingBackpackDuffelSyndicateCostumeCentcom = вещмешок с костюмом представителя Центкома - .desc = Содержит полный комплект униформы представителя Центкома, гарнитуру и планшет. Гарнитура поставляется без ключа шифрования. +ent-ClothingBackpackDuffelSurgeryFilled = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор хирургических инструментов. +ent-ClothingBackpackDuffelSyndicateFilledMedical = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор хирургических инструментов. +ent-ClothingBackpackDuffelSyndicateFilledShotgun = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "Бульдог". +ent-ClothingBackpackDuffelSyndicateFilledSMG = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "C-20r". +ent-ClothingBackpackDuffelSyndicateFilledRevolver = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "Питон". +ent-ClothingBackpackDuffelSyndicateFilledLMG = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "L6 Saw". +ent-ClothingBackpackDuffelSyndicateFilledGrenadeLauncher = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "Крайт". +ent-ClothingBackpackDuffelSyndicateFilledCarbine = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор "М-90gl". +ent-ClothingBackpackDuffelSyndicateAmmoFilled = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор боеприпасов. +ent-ClothingBackpackDuffelSyndicateCostumeCentcom = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: костюм представителя Центкома. .suffix = НЕ МАППИТЬ ent-ClothingBackpackDuffelSyndicateCostumeClown = { ent-ClothingBackpackDuffelClown } .desc = { ent-ClothingBackpackDuffelClown.desc } .suffix = Синдикат -ent-ClothingBackpackDuffelSyndicateCarpSuit = вещмешок костюма карпа - .desc = Содержит костюм карпа и нескольких друзей для игр. -ent-ClothingBackpackDuffelSyndicatePyjamaBundle = вещмешок пижам синдиката - .desc = Содержит 3 пижамы синдиката и 3 плюшевые игрушки для самой лучшей ночёвки. -ent-ClothingBackpackDuffelSyndicateC4tBundle = набор C-4 синдиката - .desc = Содержит много зарядов взрывчатки С-4. +ent-ClothingBackpackDuffelSyndicateCarpSuit = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор костюма карпа. +ent-ClothingBackpackDuffelSyndicatePyjamaBundle = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор пижам. +ent-ClothingBackpackDuffelSyndicateC4tBundle = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор C-4. ent-ClothingBackpackChameleonFill = { ent-ClothingBackpackChameleon } .suffix = Заполненный, Хамелеон .desc = { ent-ClothingBackpackChameleon.desc } -ent-ClothingBackpackDuffelSyndicateEVABundle = набор EVA синдиката - .desc = Содержит одобренный Синдикатом костюм EVA. -ent-ClothingBackpackDuffelSyndicateHardsuitBundle = набор скафандра синдиката - .desc = Содержит фирменный кроваво-красный комбинезон Синдиката. -ent-ClothingBackpackDuffelZombieBundle = зомби набор синдиката - .desc = Универсальный набор для создания зомби на станции. -ent-ClothingBackpackDuffelSyndicateOperative = вещмешок оперативника +ent-ClothingBackpackDuffelSyndicateEVABundle = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор EVA синдиката. +ent-ClothingBackpackDuffelSyndicateHardsuitBundle = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор скафандра синдиката. +ent-ClothingBackpackDuffelZombieBundle = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: зомби набор синдиката. +ent-ClothingBackpackDuffelSyndicateOperative = { ent-ClothingBackpackDuffelSyndicate } .desc = { ent-ClothingBackpackDuffelSyndicateBundle.desc } -ent-ClothingBackpackDuffelSyndicateOperativeMedic = вещмешок оперативника-медика - .desc = Большой вещевой мешок для хранения дополнительного медицинского снаряжения. -ent-ClothingBackpackDuffelSyndicateMedicalBundleFilled = набор медикаментов - .desc = Все, что нужно для возвращения в строй ваших товарищей: главным образом, боевая аптечка, дефибриллятор и три боевых медипена. -ent-ClothingBackpackDuffelSyndicateDecoyKitFilled = набор приманок - .desc = Содержит отвлечения, как слуховые, так и визуальные. Скоро будет запах. -ent-ClothingBackpackDuffelSyndicateEliteHardsuitBundle = набор элитного скафандра синдиката - .desc = Содержит элитный скафандр синдиката, в который входит еще кое-что. -ent-ClothingBackpackDuffelSyndicateHardsuitExtrasBundle = набор принадлежностей для скафандра - .desc = Содержит вещи, которые вам непременно понадобятся при покупке скафандра. +ent-ClothingBackpackDuffelSyndicateOperativeMedic = { ent-ClothingBackpackDuffelSyndicate } + .desc = { ent-ClothingBackpackDuffelSyndicateBundle.desc } +ent-ClothingBackpackDuffelSyndicateMedicalBundleFilled = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор медикаментов. +ent-ClothingBackpackDuffelSyndicateDecoyKitFilled = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор приманок. +ent-ClothingBackpackDuffelSyndicateEliteHardsuitBundle = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор элитного скафандра синдиката. +ent-ClothingBackpackDuffelSyndicateHardsuitExtrasBundle = { ent-ClothingBackpackDuffelSyndicate } + .desc = Большой вещмешок для хранения дополнительных предательских предметов. Имеет этикетку: набор принадлежностей для скафандра. diff --git a/Resources/Locale/ru-RU/store/store.ftl b/Resources/Locale/ru-RU/store/store.ftl index 6bea8a60fe..c9ec4164c6 100644 --- a/Resources/Locale/ru-RU/store/store.ftl +++ b/Resources/Locale/ru-RU/store/store.ftl @@ -4,4 +4,7 @@ store-ui-balance-display = { $currency }: { $amount } store-ui-price-display = { $amount } { $currency } store-ui-traitor-flavor = Лицензия (C) НТ-30643 store-ui-traitor-warning = Оперативники должны блокировать свои восходящие каналы связи после использования, чтобы избежать обнаружения. + store-withdraw-button-ui = Вывести { $currency } +store-ui-button-out-of-stock = {""} (Нет в наличии) +store-not-account-owner = Этот {$store} не привязан к вам! diff --git a/Resources/Locale/ru-RU/wires/components/wires-panel-component.ftl b/Resources/Locale/ru-RU/wires/components/wires-panel-component.ftl deleted file mode 100644 index 66514f7731..0000000000 --- a/Resources/Locale/ru-RU/wires/components/wires-panel-component.ftl +++ /dev/null @@ -1,2 +0,0 @@ -wires-panel-component-on-examine-open = [color=lightgray]панель технического обслуживания[/color] [color=red]открыта[/color]. -wires-panel-component-on-examine-closed = The [color=lightgray]панель технического обслуживания[/color] [color=darkgreen]закрыта[/color]. diff --git a/Resources/Prototypes/Entities/Objects/Decoration/snowman.yml b/Resources/Prototypes/Entities/Objects/Decoration/snowman.yml new file mode 100644 index 0000000000..1b108d59f6 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Decoration/snowman.yml @@ -0,0 +1,43 @@ +- type: entity # WD + parent: BaseStructure + id: DecorationSnowman + name: snowman + description: It seems he is following you. + placement: + mode: AlignTileAny + components: + - type: Physics + bodyType: Static + - type: Transform + noRot: true + - type: Sprite + sprite: White/Objects/Decoration/NewYear/snowman.rsi + state: snowman + noRot: true + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.3 + density: 190 + mask: + - HighImpassable + - type: Damageable + damageContainer: StructuralInorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/Footsteps/snowstep3.ogg + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/star_hit.ogg" diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 3a6f430fe3..d785d1190c 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -129,9 +129,10 @@ state: icon - type: Item sprite: Objects/Tools/wrench.rsi - storedSprite: - sprite: Objects/Tools/wrench.rsi - state: storage + storedRotation: -44 # WD + # storedSprite: # WD removed + # sprite: Objects/Tools/wrench.rsi + # state: storage - type: MeleeWeapon wideAnimationRotation: 135 attackRate: 1.5 @@ -177,9 +178,10 @@ - type: Item sprite: Objects/Tools/crowbar.rsi size: Small - storedSprite: - sprite: Objects/Tools/crowbar.rsi - state: storage + storedRotation: -63 # WD + # storedSprite: # WD removed + # sprite: Objects/Tools/crowbar.rsi + # state: storage - type: MeleeWeapon wideAnimationRotation: -135 damage: @@ -213,9 +215,9 @@ state: red-icon - type: Item heldPrefix: red - storedSprite: - sprite: Objects/Tools/crowbar.rsi - state: red-storage + # storedSprite: # WD removed + # sprite: Objects/Tools/crowbar.rsi + # state: red-storage - type: entity name: multitool diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index 6652b98efe..04b5dbf346 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -42,10 +42,13 @@ - type: Item sprite: Objects/Weapons/Melee/kitchen_knife.rsi storedRotation: -45 + - type: EmbeddableProjectile # WD + sound: /Audio/Weapons/star_hit.ogg - type: DamageOtherOnHit # WD damage: types: - Piercing: 20 + Piercing: 10 + Slash: 10 - type: GuideHelp guides: - Chef @@ -73,6 +76,13 @@ damage: types: Slash: 13 # WD + - type: EmbeddableProjectile # WD + sound: /Audio/Weapons/star_hit.ogg + - type: DamageOtherOnHit # WD + damage: + types: + Piercing: 10 + Slash: 13 - type: Item size: Normal sprite: Objects/Weapons/Melee/cleaver.rsi @@ -104,7 +114,8 @@ - type: DamageOtherOnHit damage: types: - Piercing: 27 # WD + Piercing: 15 # WD + Slash: 12 # WD - type: Item sprite: Objects/Weapons/Melee/combat_knife.rsi storedRotation: -45 @@ -144,7 +155,8 @@ - type: DamageOtherOnHit # WD damage: types: - Piercing: 44 + Piercing: 32 + Slash: 12 - type: Item sprite: Objects/Weapons/Melee/kukri_knife.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index 947bc01bcc..d12de9dbe9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -85,6 +85,13 @@ damage: types: Slash: 15 + - type: EmbeddableProjectile # WD + sound: /Audio/Weapons/star_hit.ogg + - type: DamageOtherOnHit # WD + damage: + types: + Piercing: 17 + Slash: 15 - type: Tag tags: - Knife diff --git a/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml b/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml new file mode 100644 index 0000000000..66bc00f9a4 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Clothing/Belt/clothingBeltUtilityImproved.yml @@ -0,0 +1,13 @@ +- type: entity + id: ClothingBeltUtilityImproved + parent: ClothingBeltUtility + suffix: Brigadier + components: + - type: StorageFill + contents: + - id: ImprovedCrowbar + - id: ImprovedWrench + - id: ImprovedScrewdriver + - id: ImprovedWirecutter + - id: ImprovedWelder + - id: Multitool diff --git a/Resources/Prototypes/_White/Entities/Mobs/Animal/mobs.yml b/Resources/Prototypes/_White/Entities/Mobs/Animal/mobs.yml index 2da6687b4b..c34526928a 100644 --- a/Resources/Prototypes/_White/Entities/Mobs/Animal/mobs.yml +++ b/Resources/Prototypes/_White/Entities/Mobs/Animal/mobs.yml @@ -78,3 +78,59 @@ - type: FootstepModifier footstepSoundCollection: path: /Audio/Effects/hulk_step.ogg + +- type: entity + name: reindeer + parent: SimpleMobBase + id: MobReindeer + description: Where is Santa? + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: reindeer + sprite: White/Mobs/Animals/reindeer.rsi + - type: Tag + tags: + - DoorBumpOpener + - type: Physics + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.40 + density: 400 + mask: + - MobMask + layer: + - MobLayer + - type: DamageStateVisuals + states: + Alive: + Base: reindeer + Dead: + Base: dead + - type: Butcherable + spawned: + - id: FoodMeat + amount: 5 + - type: InteractionPopup + successChance: 0.7 + interactDelay: 2 # Avoids overlapping SFX due to spam - these SFX are a little longer than the typical 1 second. + interactSuccessString: petting-success-soft-floofy + interactFailureString: petting-failure-generic + interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: /Audio/Animals/kangaroo_grunt.ogg + - type: Perishable + molsPerSecondPerUnitMass: 0.0015 + - type: NpcFactionMember + factions: + - Passive + - type: Body + prototype: AnimalRuminant + - type: HTN + rootTask: + task: RuminantCompound diff --git a/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml index 96c5e8c83b..574f7abbf9 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml @@ -1,8 +1,22 @@ - type: entity parent: Medkit id: ExpandedMedkit - name: expanded medkit + name: расширенная аптечка components: - type: Sprite sprite: White/Specific/expmedkit.rsi state: icon + +- type: entity + id: ExpandedMedkitFilled + parent: ExpandedMedkit + suffix: Filled + components: + - type: StorageFill + contents: + - id: MedicatedSuture + amount: 2 + - id: RegenerativeMesh + amount: 2 + - id: PillCanisterDylovene + - id: PillCanisterKelotane \ No newline at end of file diff --git a/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml b/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml index 40f6ee17f2..d4a505c9cd 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml @@ -16,6 +16,9 @@ sprite: White/Objects/Tools/impcrowbar.rsi - type: Item sprite: White/Objects/Tools/impcrowbar.rsi + size: Small + storedSprite: null + storedRotation: -63 - type: entity parent: Wrench @@ -30,6 +33,9 @@ sprite: White/Objects/Tools/impwrench.rsi - type: Item sprite: White/Objects/Tools/impwrench.rsi + size: Small + storedSprite: null + storedRotation: -44 - type: MeleeWeapon attackRate: 1.5 damage: @@ -55,6 +61,7 @@ state: icon - type: Item sprite: White/Objects/Tools/impscrewdriver.rsi + storedRotation: -90 - type: UseDelay - type: MeleeWeapon attackRate: 1 @@ -72,6 +79,12 @@ - type: PhysicalComposition materialComposition: Steel: 100 + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/screwdriver_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/Items/screwdriver_drop.ogg - type: entity parent: BaseItem @@ -83,6 +96,7 @@ price: 500 - type: Item sprite: White/Objects/Tools/impwirecutter.rsi + storedRotation: -90 - type: Sprite sprite: White/Objects/Tools/impwirecutter.rsi state: icon @@ -110,6 +124,12 @@ - type: PhysicalComposition materialComposition: Steel: 100 + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/wirecutter_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/Items/wirecutter_drop.ogg - type: entity parent: BaseWelder diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml new file mode 100644 index 0000000000..b84452ede9 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Structures/Storage/CleanersLocker.yml @@ -0,0 +1,37 @@ +- type: entity + id: LockerCleaner + parent: BaseSeniorsLocker + name: шкаф уборщика + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: head_cleaner_locker + stateDoorOpen: head_cleaner_open + stateDoorClosed: head_cleaner_door + - type: AccessReader + access: [ [ "Janitor" ] ] + +- type: entity + id: LockerCleanerFilled + parent: LockerCleaner + suffix: Filled + components: + - type: StorageFill + contents: + - id: MopItem + amount: 2 + - id: BoxMousetrap + amount: 2 + - id: WetFloorSign + amount: 3 + - id: TrashBag + amount: 2 + - id: LightReplacer + - id: BoxLightMixed + - id: Holoprojector + - id: SoapNT + amount: 2 + - id: FlashlightLantern + amount: 2 + - id: Plunger + amount: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml new file mode 100644 index 0000000000..d35766275d --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml @@ -0,0 +1,207 @@ +- type: entity + id: BaseSeniorsLocker + parent: LockerBaseSecure + abstract: true + name: base senors locker + description: Стандартное хранилище НаноТрайзен. + components: + - type: Sprite + sprite: White/Structures/Storage/senor_lockers.rsi + noRot: true + +- type: entity + id: LockerVeteran + parent: BaseSeniorsLocker + name: шкаф ветерана + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: vet_locker + stateDoorOpen: vet_open + stateDoorClosed: vet_door + - type: AccessReader + access: [ [ "Security" ] ] + +- type: entity + id: LockerVeteranFilled + parent: LockerVeteran + suffix: Filled + components: + - type: StorageFill + contents: + - id: FlashlightSeclite + - id: ClothingUniformJumpsuitSecGrey + prob: 0.3 + - id: ClothingHeadHelmetBasic + - id: ClothingOuterArmorBasic + - id: ClothingBeltSeniorSecurityFilled + - id: Flash + prob: 0.5 + - id: ClothingEyesGlassesSecurity + - id: ClothingHeadsetAltSecurity + - id: ClothingHandsGlovesColorBlack + - id: ClothingShoesBootsJack + - id: WeaponMeleeNeedle + prob: 0.1 + - id: WeaponDisabler + - id: HoloprojectorSecurity + prob: 0.6 + - id: WeaponPistolMk58Nonlethal + - id: SurveillanceBodyCamera + - id: MagazinePistol + - id: ClothingHeadHatBeretSecurity + +- type: entity + id: LockerBrigadier + parent: BaseSeniorsLocker + name: шкаф бригадира + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: brigadier_locker + stateDoorOpen: brigadier_open + stateDoorClosed: brigadier_door + - type: AccessReader + access: [ [ "Engineering" ] ] + +- type: entity + id: LockerBrigadierFilled + parent: LockerBrigadier + suffix: Filled + components: + - type: StorageFill + contents: + - id: ClothingHandsGlovesColorYellow + - id: ClothingMaskGas + - id: ClothingShoesBootsMag + - id: ClothingBeltUtilityImproved + - id: ClothingEyesGlassesMeson + - id: ClothingHeadHatBeretEngineering + +- type: entity + id: LockerBrigadierFilledHurdsuit + parent: LockerBrigadier + suffix: Filled, Hardsuit + components: + - type: StorageFill + contents: + - id: ClothingOuterHardsuitEngineering + - id: ClothingHandsGlovesColorYellow + - id: ClothingMaskGas + - id: ClothingShoesBootsMag + - id: ClothingBeltUtilityImproved + - id: ClothingEyesGlassesMeson + - id: ClothingHeadHatBeretEngineering + +- type: entity + id: LockerMedicalOfficer + parent: BaseSeniorsLocker + name: шкаф медицинского офицера + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: mofficer_locker + stateDoorOpen: mofficer_open + stateDoorClosed: mofficer_door + - type: AccessReader + access: [ [ "Medical" ] ] + +- type: entity + id: LockerMedicalOfficerFilled + parent: LockerMedicalOfficer + suffix: Filled + components: + - type: StorageFill + contents: + - id: HandheldHealthAnalyzer + - id: ClothingHandsGlovesLatex + - id: ClothingHeadsetMedical + - id: ClothingEyesHudMedical + - id: ClothingBeltMedical + - id: ClothingHeadHatSurgcapGreen + prob: 0.1 + orGroup: Surgcaps + - id: ClothingHeadHatSurgcapPurple + prob: 0.05 + orGroup: Surgcaps + - id: ClothingHeadHatSurgcapBlue + prob: 0.90 + orGroup: Surgcaps + - id: ClothingUniformJumpsuitMedicalDoctor + - id: ClothingUniformJumpskirtMedicalDoctor + - id: UniformScrubsColorBlue + prob: 0.5 + orGroup: Surgshrubs + - id: UniformScrubsColorGreen + prob: 0.1 + orGroup: Surgshrubs + - id: UniformScrubsColorPurple + prob: 0.05 + orGroup: Surgshrubs + - id: ClothingMaskSterile + - id: ExpandedMedkitFilled + +- type: entity + id: LockerCargoHunter + parent: BaseSeniorsLocker + name: шкаф охотника карго + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: cargo_hunt_locker + stateDoorOpen: cargo_hunt_open + stateDoorClosed: cargo_hunt_door + - type: AccessReader + access: [ [ "Salvage" ] ] + +- type: entity + id: LockerCargoHunterFilled + parent: LockerCargoHunter + suffix: Filled + components: + - type: StorageFill + contents: + - id: ClothingBeltUtilityFilled + - id: SurvivalKnife + - id: HandheldGPSBasic + - id: RadioHandheld + - id: SeismicCharge + amount: 2 + - id: OreBag + prob: 0.5 + - id: Flare + prob: 0.3 + - id: Flare + prob: 0.3 + - id: Flare + prob: 0.3 + - id: ClothingOuterHardsuitImprovedSpatio + +- type: entity + id: LockerLeadResearcher + parent: BaseSeniorsLocker + name: шкаф ведущего исследователя + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: lead_res_locker + stateDoorOpen: lead_res_open + stateDoorClosed: lead_res_door + - type: AccessReader + access: [ [ "Research" ] ] + +- type: entity + id: LockerLeadResearcherFilled + parent: LockerLeadResearcher + suffix: Filled + components: + - type: StorageFill + contents: + - id: AnomalyLocator + - id: ClothingHandsGlovesLatex + - id: ClothingHeadsetScience + - id: ClothingMaskSterile + - id: ClothingOuterCoatRnd + - id: AnomalyScanner + - id: NodeScanner + - id: NetworkConfigurator diff --git a/Resources/Textures/White/Mobs/Animals/reindeer.rsi/dead.png b/Resources/Textures/White/Mobs/Animals/reindeer.rsi/dead.png new file mode 100644 index 0000000000..cda66cc285 Binary files /dev/null and b/Resources/Textures/White/Mobs/Animals/reindeer.rsi/dead.png differ diff --git a/Resources/Textures/White/Mobs/Animals/reindeer.rsi/meta.json b/Resources/Textures/White/Mobs/Animals/reindeer.rsi/meta.json new file mode 100644 index 0000000000..7748867d4b --- /dev/null +++ b/Resources/Textures/White/Mobs/Animals/reindeer.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from ParadiseSS13 at https://github.com/ss220club/Paradise-SS220/blob/master/icons/mob/winter_mob.dmi", + "states": [ + { + "name": "dead", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "reindeer", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Mobs/Animals/reindeer.rsi/reindeer.png b/Resources/Textures/White/Mobs/Animals/reindeer.rsi/reindeer.png new file mode 100644 index 0000000000..87b20f0dc8 Binary files /dev/null and b/Resources/Textures/White/Mobs/Animals/reindeer.rsi/reindeer.png differ diff --git a/Resources/Textures/White/Objects/Decoration/NewYear/snowman.rsi/meta.json b/Resources/Textures/White/Objects/Decoration/NewYear/snowman.rsi/meta.json new file mode 100644 index 0000000000..2d63ead19c --- /dev/null +++ b/Resources/Textures/White/Objects/Decoration/NewYear/snowman.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from ParadiseSS13 at https://github.com/ss220club/Paradise-SS220/blob/master/icons/obj/statue.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "snowman" + } + ] +} diff --git a/Resources/Textures/White/Objects/Decoration/NewYear/snowman.rsi/snowman.png b/Resources/Textures/White/Objects/Decoration/NewYear/snowman.rsi/snowman.png new file mode 100644 index 0000000000..85340cd3c3 Binary files /dev/null and b/Resources/Textures/White/Objects/Decoration/NewYear/snowman.rsi/snowman.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_door.png new file mode 100644 index 0000000000..78a6b907ee Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_door.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_locker.png new file mode 100644 index 0000000000..81d4739edf Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_locker.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_open.png new file mode 100644 index 0000000000..1a78a54a70 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/brigadier_open.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_door.png new file mode 100644 index 0000000000..f2739242e0 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_door.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_locker.png new file mode 100644 index 0000000000..107d957794 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_locker.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_open.png new file mode 100644 index 0000000000..7430d7dce2 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/cargo_hunt_open.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic.png new file mode 100644 index 0000000000..cd0c0ff2ea Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic_door.png new file mode 100644 index 0000000000..2649852777 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/generic_door.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_door.png new file mode 100644 index 0000000000..e85906d18c Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_door.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_locker.png new file mode 100644 index 0000000000..49da088992 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_locker.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_open.png new file mode 100644 index 0000000000..586a109186 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/head_cleaner_open.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_door.png new file mode 100644 index 0000000000..8bbc2353af Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_door.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_locker.png new file mode 100644 index 0000000000..029a4ac5b6 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_locker.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_open.png new file mode 100644 index 0000000000..bbcc1c2fc6 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/lead_res_open.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/locked.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/locked.png new file mode 100644 index 0000000000..d90218d19e Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/locked.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/meta.json b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/meta.json new file mode 100644 index 0000000000..ef5bcfe9de --- /dev/null +++ b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/meta.json @@ -0,0 +1,80 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "copyright": "Danza", + "license": "CC-BY-SA-3.0", + "states": [ + { + "name": "generic" + }, + { + "name": "generic_door" + }, + { + "name": "welded" + }, + { + "name": "unlocked" + }, + { + "name": "locked" + }, + { + "name": "vet_locker" + }, + { + "name": "vet_door" + }, + { + "name": "vet_open" + }, + { + "name": "brigadier_locker" + }, + { + "name": "brigadier_door" + }, + { + "name": "brigadier_open" + }, + { + "name": "mofficer_locker" + }, + { + "name": "mofficer_door" + }, + { + "name": "mofficer_open" + }, + { + "name": "lead_res_locker" + }, + { + "name": "lead_res_door" + }, + { + "name": "lead_res_open" + }, + { + "name": "cargo_hunt_locker" + }, + { + "name": "cargo_hunt_door" + }, + { + "name": "cargo_hunt_open" + }, + { + "name": "head_cleaner_locker" + }, + { + "name": "head_cleaner_door" + }, + { + "name": "head_cleaner_open" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_door.png new file mode 100644 index 0000000000..db05124b4e Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_door.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_locker.png new file mode 100644 index 0000000000..322cbcd1c3 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_locker.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_open.png new file mode 100644 index 0000000000..20afb09fda Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/mofficer_open.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/unlocked.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/unlocked.png new file mode 100644 index 0000000000..418607bfaf Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/unlocked.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_door.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_door.png new file mode 100644 index 0000000000..653b9eecc6 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_door.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_locker.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_locker.png new file mode 100644 index 0000000000..a1fac6067e Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_locker.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_open.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_open.png new file mode 100644 index 0000000000..c62d5a07de Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/vet_open.png differ diff --git a/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/welded.png b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/welded.png new file mode 100644 index 0000000000..5ba5dcc896 Binary files /dev/null and b/Resources/Textures/White/Structures/Storage/senor_lockers.rsi/welded.png differ