From fd3f77f69fe6e8611738ebc12b50b95d3453dd45 Mon Sep 17 00:00:00 2001 From: Jabak <163307958+Jabaks@users.noreply.github.com> Date: Sun, 3 Nov 2024 21:39:14 +0300 Subject: [PATCH] Aaaaaa (#157) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Мелочёчки (#761) * optimized network stack (#763) * [Add] Pouches (#762) * Add: Pouches base and sprites * Add: Micro-resprite, pouches in secdrobe * Minus suffix * Я как всегда кучу хуйни в один пакет сую (#766) * а (#767) * fix (#768) --------- Co-authored-by: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com> Co-authored-by: Valtos Co-authored-by: keslik <114428094+keslik1313@users.noreply.github.com> --- .../Systems/AdminVerbSystem.Antags.cs | 6 +- .../Locale/ru-RU/_white/object/candies.ftl | 12 +- .../Locale/ru-RU/_white/wizard/wizard.ftl | 3 + .../engineer-painter/engineer-painter.ftl | 13 ++ Resources/Locale/ru-RU/markings/shark.ftl | 2 + .../entities/clothing/pouches/pouches.ftl | 10 ++ .../Locale/ru-RU/store/uplink-catalog.ftl | 2 +- Resources/Prototypes/Actions/changeling.yml | 80 ++++++--- .../VendingMachines/Inventories/secdrobe.yml | 5 + .../Clothing/Pouches/base_clothingpouch.yml | 57 ++++++ .../Entities/Clothing/Pouches/pouches.yml | 169 ++++++++++++++++++ .../Structures/Doors/airlock_groups.yml | 6 +- .../Markings/feda_plevajecki.yml | 9 + .../Pouches/cartridge_belt.rsi/base.png | Bin 0 -> 218 bytes .../Pouches/cartridge_belt.rsi/mag-1.png | Bin 0 -> 173 bytes .../Pouches/cartridge_belt.rsi/mag-2.png | Bin 0 -> 180 bytes .../Pouches/cartridge_belt.rsi/mag-3.png | Bin 0 -> 180 bytes .../Pouches/cartridge_belt.rsi/mag-4.png | Bin 0 -> 184 bytes .../Pouches/cartridge_belt.rsi/meta.json | 26 +++ .../Clothing/Pouches/grenade.rsi/icon.png | Bin 0 -> 288 bytes .../Clothing/Pouches/grenade.rsi/meta.json | 14 ++ .../Pouches/handcuff_holder.rsi/fill-1.png | Bin 0 -> 196 bytes .../Pouches/handcuff_holder.rsi/icon.png | Bin 0 -> 325 bytes .../Pouches/handcuff_holder.rsi/meta.json | 17 ++ .../Clothing/Pouches/magazine.rsi/icon.png | Bin 0 -> 306 bytes .../Clothing/Pouches/magazine.rsi/meta.json | 14 ++ .../Clothing/Pouches/medical.rsi/icon.png | Bin 0 -> 311 bytes .../Clothing/Pouches/medical.rsi/meta.json | 14 ++ .../Actions/changeling.rsi/hive_head.png | Bin 570 -> 723 bytes .../White/Actions/changeling.rsi/meta.json | 2 +- .../feda.rsi/m_waggingtail_shark_primary.png | Bin 0 -> 2516 bytes .../Mobs/Customization/feda.rsi/meta.json | 89 +++++++++ 32 files changed, 518 insertions(+), 32 deletions(-) create mode 100644 Resources/Locale/ru-RU/markings/shark.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/pouches/pouches.ftl create mode 100644 Resources/Prototypes/Entities/Clothing/Pouches/base_clothingpouch.yml create mode 100644 Resources/Prototypes/Entities/Clothing/Pouches/pouches.yml create mode 100644 Resources/Prototypes/_White/Mobs/Customization/Markings/feda_plevajecki.yml create mode 100644 Resources/Textures/Clothing/Pouches/cartridge_belt.rsi/base.png create mode 100644 Resources/Textures/Clothing/Pouches/cartridge_belt.rsi/mag-1.png create mode 100644 Resources/Textures/Clothing/Pouches/cartridge_belt.rsi/mag-2.png create mode 100644 Resources/Textures/Clothing/Pouches/cartridge_belt.rsi/mag-3.png create mode 100644 Resources/Textures/Clothing/Pouches/cartridge_belt.rsi/mag-4.png create mode 100644 Resources/Textures/Clothing/Pouches/cartridge_belt.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Pouches/grenade.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Pouches/grenade.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Pouches/handcuff_holder.rsi/fill-1.png create mode 100644 Resources/Textures/Clothing/Pouches/handcuff_holder.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Pouches/handcuff_holder.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Pouches/magazine.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Pouches/magazine.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Pouches/medical.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Pouches/medical.rsi/meta.json create mode 100644 Resources/Textures/White/Mobs/Customization/feda.rsi/m_waggingtail_shark_primary.png create mode 100644 Resources/Textures/White/Mobs/Customization/feda.rsi/meta.json diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs index 69fd4529d4..5c25a79684 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs @@ -160,7 +160,7 @@ public sealed partial class AdminVerbSystem { Text = "Сделать культистом", Category = VerbCategory.Antag, - Icon = new SpriteSpecifier.Rsi(new ("/Textures/White/Cult/interface.rsi"), "icon"), + Icon = new SpriteSpecifier.Rsi(new("/Textures/White/Cult/interface.rsi"), "icon"), Act = () => { _antag.ForceMakeAntag(target, DefaultCultRule); @@ -174,7 +174,7 @@ public sealed partial class AdminVerbSystem { Text = Loc.GetString("admin-verb-text-make-changeling"), Category = VerbCategory.Antag, - Icon = new SpriteSpecifier.Texture(new ("/Textures/White/Actions/changeling.rsi/absorb.png")), + Icon = new SpriteSpecifier.Rsi(new("/Textures/White/Actions/changeling.rsi"), "absorb"), Act = () => { _antag.ForceMakeAntag(target, DefaultChangelingRule); @@ -188,7 +188,7 @@ public sealed partial class AdminVerbSystem { Text = Loc.GetString("admin-verb-text-make-wizard"), Category = VerbCategory.Antag, - Icon = new SpriteSpecifier.Texture(new ("/Textures/Clothing/Head/Hats/wizardhat.rsi/icon.png")), + Icon = new SpriteSpecifier.Rsi(new("/Textures/Clothing/Head/Hats/wizardhat.rsi"), "icon"), Act = () => { _antag.ForceMakeAntag(target, DefaultWizardRule); diff --git a/Resources/Locale/ru-RU/_white/object/candies.ftl b/Resources/Locale/ru-RU/_white/object/candies.ftl index 0b9c22a9f6..dd296dc24b 100644 --- a/Resources/Locale/ru-RU/_white/object/candies.ftl +++ b/Resources/Locale/ru-RU/_white/object/candies.ftl @@ -8,9 +8,9 @@ ent-FoodSnackCandyTurquoise = { ent-FoodSnackCandyBlack } .desc = { ent-FoodSnackCandyBlack.desc } ent-FoodPacketCandyBlackTrash = обёртка от конфеты .desc = Фантик от конфеты, самой конфеты нигде нет. -ent-FoodPacketCandyGreenTrash = { ent-FoodSnackCandyBlackTrash } - .desc = { ent-FoodSnackCandyBlackTrash.desc } -ent-FoodPacketCandyRedTrash = { ent-FoodSnackCandyBlackTrash } - .desc = { ent-FoodSnackCandyBlackTrash.desc } -ent-FoodPacketCandyTurquoiseTrash = { ent-FoodSnackCandyBlackTrash } - .desc = { ent-FoodSnackCandyBlackTrash.desc } +ent-FoodPacketCandyGreenTrash = { ent-FoodPacketCandyBlackTrash } + .desc = { ent-FoodPacketCandyBlackTrash.desc } +ent-FoodPacketCandyRedTrash = { ent-FoodPacketCandyBlackTrash } + .desc = { ent-FoodPacketCandyBlackTrash.desc } +ent-FoodPacketCandyTurquoiseTrash = { ent-FoodPacketCandyBlackTrash } + .desc = { ent-FoodPacketCandyBlackTrash.desc } diff --git a/Resources/Locale/ru-RU/_white/wizard/wizard.ftl b/Resources/Locale/ru-RU/_white/wizard/wizard.ftl index 53c65e230b..06778c0d4a 100644 --- a/Resources/Locale/ru-RU/_white/wizard/wizard.ftl +++ b/Resources/Locale/ru-RU/_white/wizard/wizard.ftl @@ -69,3 +69,6 @@ store-category-spells-attack = Атакующие заклинания store-category-spells-defence = Защитные заклинания store-category-spells-utility = Вспомогательные заклинания store-category-magic-items = Магические предметы + +ent-MobHulk = Халк + .desc = Зелёный. diff --git a/Resources/Locale/ru-RU/engineer-painter/engineer-painter.ftl b/Resources/Locale/ru-RU/engineer-painter/engineer-painter.ftl index 4c2329283f..05a7712914 100644 --- a/Resources/Locale/ru-RU/engineer-painter/engineer-painter.ftl +++ b/Resources/Locale/ru-RU/engineer-painter/engineer-painter.ftl @@ -12,3 +12,16 @@ spray-painter-color-cyan = голубой spray-painter-color-blue = синий spray-painter-color-white = белый spray-painter-color-black = чёрный + +pipe-painter-color-red = красный +pipe-painter-color-yellow = жёлтый +pipe-painter-color-brown = коричневый +pipe-painter-color-green = зелёный +pipe-painter-color-cyan = голубой +pipe-painter-color-blue = синий +pipe-painter-color-white = белый +pipe-painter-color-black = чёрный +pipe-painter-color-waste = вытяжка +pipe-painter-color-distro = вентиляция +pipe-painter-color-air = воздух +pipe-painter-color-mix = смеситель diff --git a/Resources/Locale/ru-RU/markings/shark.ftl b/Resources/Locale/ru-RU/markings/shark.ftl new file mode 100644 index 0000000000..11c4c8c5fd --- /dev/null +++ b/Resources/Locale/ru-RU/markings/shark.ftl @@ -0,0 +1,2 @@ +marking-CatTailFeda = Акулий хвост +marking-CatTailFeda-m_waggingtail_shark_primary = Хвост diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/pouches/pouches.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/pouches/pouches.ftl new file mode 100644 index 0000000000..c0e2e5a49a --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/pouches/pouches.ftl @@ -0,0 +1,10 @@ +ent-ClothingPouchMedical = медицинский подсумок + .desc = Прочный и вместительный подсумок, который предоставляет быстрый доступ к медикаментам. Белый крест призывает вас помогать окружающим. +ent-ClothingPouchGrenade = гранатный подсумок + .desc = Подсумок для переноски гранат, который надёжно защищает содержимое от погодных условий. Не очень актуально в космосе. +ent-ClothingPouchMagazine = подсумок для магазинов + .desc = Рассчитан на 4 винтовочных магазина, но способен переносить любые необходимые виды. +ent-ClothingPouchHandcuffHolder = чехол для наручников + .desc = Износостойкий чехол для переноски стяжек или наручников. Арестуй их всех! +ent-ClothingPouchCartridgeBelt = поясной патронташ + .desc = Складной патронташ для патронов пятидесятого калибра. diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl index bfeb467ea4..30bf40b08e 100644 --- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl @@ -364,7 +364,7 @@ uplink-snack-box-name = Коробка закусок Синдиката uplink-snack-box-desc = Коробка с вкусными закусками и напитками, которые можно съесть в одиночку или разделить с командой. Включает одну нежеланную игрушку. uplink-eshield-name = Энергетический щит -uplink-eshield-desc = Экзотический энергетический щит, отражающий лазерны, а также немного защищающий от пуль и других физических атак. +uplink-eshield-desc = Экзотический энергетический щит, отражающий лазеры, а также немного защищающий от пуль и других физических атак. uplink-soap-name = Мыло uplink-soap-desc = Не вызывающий доверия кусок мыла. Пахнет страхом. diff --git a/Resources/Prototypes/Actions/changeling.yml b/Resources/Prototypes/Actions/changeling.yml index 15f1271913..04edd39eef 100644 --- a/Resources/Prototypes/Actions/changeling.yml +++ b/Resources/Prototypes/Actions/changeling.yml @@ -18,7 +18,9 @@ components: - type: EntityTargetAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/absorb.png + icon: + sprite: White/Actions/changeling.rsi + state: absorb event: !type:AbsorbDnaActionEvent canTargetSelf: false useDelay: 1 @@ -32,7 +34,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/transform.png + icon: + sprite: White/Actions/changeling.rsi + state: transform event: !type:TransformActionEvent useDelay: 1 @@ -44,7 +48,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/reviving_stasis.png + icon: + sprite: White/Actions/changeling.rsi + state: reviving_stasis event: !type:RegenerateActionEvent checkCanInteract: false checkConsciousness: false @@ -58,7 +64,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/lesser_form.png + icon: + sprite: White/Actions/changeling.rsi + state: lesser_form event: !type:LesserFormActionEvent useDelay: 1 checkCanInteract: false @@ -72,7 +80,9 @@ components: - type: EntityTargetAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/sting_extract.png + icon: + sprite: White/Actions/changeling.rsi + state: sting_extract event: !type:ExtractionStingActionEvent canTargetSelf: false useDelay: 1 @@ -88,7 +98,9 @@ components: - type: EntityTargetAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/sting_transform.png + icon: + sprite: White/Actions/changeling.rsi + state: sting_transform event: !type:TransformStingActionEvent canTargetSelf: false useDelay: 1 @@ -104,7 +116,9 @@ components: - type: EntityTargetAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/sting_blind.png + icon: + sprite: White/Actions/changeling.rsi + state: sting_blind event: !type:BlindStingActionEvent canTargetSelf: false useDelay: 1 @@ -121,7 +135,9 @@ components: - type: EntityTargetAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/sting_mute.png + icon: + sprite: White/Actions/changeling.rsi + state: sting_mute event: !type:MuteStingActionEvent canTargetSelf: false useDelay: 1 @@ -137,7 +153,9 @@ components: - type: EntityTargetAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/sting_hallucination.png + icon: + sprite: White/Actions/changeling.rsi + state: sting_hallucination event: !type:HallucinationStingActionEvent canTargetSelf: false useDelay: 1 @@ -153,7 +171,9 @@ components: - type: EntityTargetAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/sting_cryo.png + icon: + sprite: White/Actions/changeling.rsi + state: sting_cryo event: !type:CryoStingActionEvent canTargetSelf: false useDelay: 1 @@ -170,7 +190,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/adrenaline_sacs.png + icon: + sprite: White/Actions/changeling.rsi + state: adrenaline_sacs event: !type:AdrenalineSacsActionEvent useDelay: 1 checkConsciousness: false @@ -185,7 +207,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/fleshmend.png + icon: + sprite: White/Actions/changeling.rsi + state: fleshmend event: !type:FleshmendActionEvent useDelay: 1 checkConsciousness: false @@ -200,7 +224,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/arm_blade.png + icon: + sprite: White/Actions/changeling.rsi + state: arm_blade event: !type:ArmbladeActionEvent useDelay: 1 - type: LesserFormRestricted @@ -213,7 +239,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/shield.png + icon: + sprite: White/Actions/changeling.rsi + state: shield event: !type:OrganicShieldActionEvent useDelay: 1 - type: LesserFormRestricted @@ -226,7 +254,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/armor.png + icon: + sprite: White/Actions/changeling.rsi + state: armor event: !type:ChitinousArmorActionEvent useDelay: 1 - type: LesserFormRestricted @@ -239,7 +269,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/hive_head.png + icon: + sprite: White/Actions/changeling.rsi + state: hive_head event: !type:HiveHeadActionEvent useDelay: 1 checkCanInteract: false @@ -253,7 +285,9 @@ components: - type: InstantAction itemIconStyle: NoItem - icon: White/Actions/changeling.rsi/tentacle_arm.png + icon: + sprite: White/Actions/changeling.rsi + state: tentacle_arm event: !type:TentacleArmActionEvent useDelay: 1 - type: LesserFormRestricted @@ -267,7 +301,9 @@ - type: InstantAction itemIconStyle: NoItem checkCanInteract: false - icon: White/Actions/changeling.rsi/biodegrade.png + icon: + sprite: White/Actions/changeling.rsi + state: biodegrade event: !type:BiodegradeActionEvent useDelay: 1 @@ -280,7 +316,9 @@ - type: InstantAction itemIconStyle: NoItem checkCanInteract: false - icon: White/Actions/changeling.rsi/augmented_eyesight.png + icon: + sprite: White/Actions/changeling.rsi + state: augmented_eyesight event: !type:AugmentedEyesightActionEvent - type: entity @@ -292,7 +330,9 @@ - type: InstantAction itemIconStyle: NoItem checkCanInteract: false - icon: White/Actions/changeling.rsi/dissonant_shriek.png + icon: + sprite: White/Actions/changeling.rsi + state: dissonant_shriek event: !type:DissonantShriekActionEvent useDelay: 1 - type: LesserFormRestricted diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index bbb485afd5..a9b01ba045 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -4,6 +4,11 @@ ClothingBackpackSecurity: 4 ClothingBackpackSatchelSecurity: 4 ClothingBackpackDuffelSecurity: 4 + ClothingPouchHandcuffHolder: 4 + ClothingPouchMedical: 3 + ClothingPouchCartridgeBelt: 3 + ClothingPouchMagazine: 2 + ClothingPouchGrenade: 2 ClothingHeadHatBeret: 4 ClothingHeadHatSecsoft: 4 ClothingHeadBandRed: 4 diff --git a/Resources/Prototypes/Entities/Clothing/Pouches/base_clothingpouch.yml b/Resources/Prototypes/Entities/Clothing/Pouches/base_clothingpouch.yml new file mode 100644 index 0000000000..5c845561ae --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/Pouches/base_clothingpouch.yml @@ -0,0 +1,57 @@ +- type: entity # WD feature + abstract: true + parent: Clothing + id: ClothingPouchBase + components: + - type: Sprite + state: icon + - type: Item + size: Normal + - type: Clothing + slots: [pocket, belt] + quickEquip: false + - type: PhysicalComposition + materialComposition: + Cloth: 35 + - type: StaticPrice + price: 200 + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Web/walk1.ogg + +- type: entity + abstract: true + parent: ClothingPouchBase + id: ClothingPouchStorageBase + components: + - type: Storage + maxItemSize: Small + defaultStorageOrientation: Horizontal + grid: + - 0,0,3,1 + - type: Item + size: Normal + shape: + - 0, 0, 1, 2 + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: UserInterface + interfaces: + enum.StorageUiKey.Key: + type: StorageBoundUserInterface + +- type: entity + abstract: true + parent: ClothingPouchBase + id: ClothingPouchAmmoProviderBase + components: + - type: BallisticAmmoProvider + mayTransfer: true + - type: Item + size: Ginormous + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + diff --git a/Resources/Prototypes/Entities/Clothing/Pouches/pouches.yml b/Resources/Prototypes/Entities/Clothing/Pouches/pouches.yml new file mode 100644 index 0000000000..ebc399e942 --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/Pouches/pouches.yml @@ -0,0 +1,169 @@ +- type: entity # WD feature + parent: ClothingPouchStorageBase + id: ClothingPouchMedical + name: medical pouch + description: Medical pouch. + components: + - type: Sprite + sprite: Clothing/Pouches/medical.rsi + - type: Clothing + sprite: Clothing/Pouches/medical.rsi + - type: Storage + grid: + - 0,0,1,4 + whitelist: + tags: + - Brutepack + - Bloodpack + - Gauze + - Ointment + - CigPack + - PillCanister + - DiscreteHealthAnalyzer + components: + - Hypospray + - Injector + - Pill + - Patch + - Healing + - type: StaticPrice + price: 250 + - type: Appearance + +- type: entity + parent: ClothingPouchStorageBase + id: ClothingPouchGrenade + name: grenade pouch + description: Grenade pouch. + components: + - type: Sprite + sprite: Clothing/Pouches/grenade.rsi + - type: Clothing + sprite: Clothing/Pouches/grenade.rsi + - type: Storage + defaultStorageOrientation: Vertical + grid: + - 0,0,2,1 + whitelist: + components: + - FlashOnTrigger + - SmokeOnTrigger + - ClusterGrenade + - ExplodeOnTrigger + - type: StaticPrice + price: 125 + - type: Appearance + +- type: entity + parent: ClothingPouchStorageBase + id: ClothingPouchMagazine + name: magazine pouch + description: Magazine pouch. + components: + - type: Sprite + sprite: Clothing/Pouches/magazine.rsi + - type: Clothing + sprite: Clothing/Pouches/magazine.rsi + - type: Storage + defaultStorageOrientation: Vertical + grid: + - 0,0,3,1 + whitelist: + tags: + - MagazinePistol + - MagazineMagnum + - MagazineHeavyRifle + - MagazineCaselessRifle + - MagazineLightRifle + - MagazinePistolHighCapacity + - MagazinePistolCaselessRifle + - MagazineRifle + - MagazinePistolSubMachineGunTopMounted + - MagazineShotgun + - MagazineMagnumSubMachineGun + - MagazinePistolSubMachineGun + - Cartridge + - type: Appearance + +- type: entity + parent: ClothingPouchStorageBase + id: ClothingPouchHandcuffHolder + name: handcuff holder + description: Handcuff holder. + components: + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Object/Tools/Key/pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Object/Tools/Key/drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Object/Tools/Key/drop.ogg + - type: Sprite + sprite: Clothing/Pouches/handcuff_holder.rsi + layers: + - state: icon + - map: [ "enum.StorageContainerVisualLayers.Fill" ] + visible: false + - type: Clothing + sprite: Clothing/Pouches/handcuff_holder.rsi + - type: Storage + grid: + - 0,0,2,2 + whitelist: + components: + - Handcuff + - type: StorageContainerVisuals + maxFillLevels: 1 + fillBaseName: fill- + - type: StaticPrice + price: 110 + - type: Appearance + +- type: entity + parent: BaseItem + id: ClothingPouchCartridgeBelt + name: cartridge belt + description: Cartridge belt. + components: + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/component_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/component_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/component_drop.ogg + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - ShellShotgun + capacity: 12 + soundRack: + path: /Audio/White/Gun/Modules/insertmodule.ogg + - type: Item + size: Small + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Clothing/Pouches/cartridge_belt.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Clothing + sprite: Clothing/Pouches/cartridge_belt.rsi + slots: [pocket, belt] + quickEquip: false + - type: StaticPrice + price: 150 + - type: Appearance diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml index 09ce1a05d9..93abaccc65 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml @@ -13,6 +13,7 @@ science: Structures/Doors/Airlocks/Standard/science.rsi security: Structures/Doors/Airlocks/Standard/security.rsi virology: Structures/Doors/Airlocks/Standard/virology.rsi + syndicate: Structures/Doors/Airlocks/Standard/syndicate.rsi - type: AirlockGroup id: Glass @@ -20,14 +21,16 @@ stylePaths: atmospherics: Structures/Doors/Airlocks/Glass/atmospherics.rsi basic: Structures/Doors/Airlocks/Glass/basic.rsi + cargo: Structures/Doors/Airlocks/Glass/cargo.rsi command: Structures/Doors/Airlocks/Glass/command.rsi science: Structures/Doors/Airlocks/Glass/science.rsi - cargo: Structures/Doors/Airlocks/Glass/cargo.rsi engineering: Structures/Doors/Airlocks/Glass/engineering.rsi + glass: Structures/Doors/Airlocks/Glass/glass.rsi maintenance: Structures/Doors/Airlocks/Glass/maint.rsi medical: Structures/Doors/Airlocks/Glass/medical.rsi security: Structures/Doors/Airlocks/Glass/security.rsi virology: Structures/Doors/Airlocks/Glass/virology.rsi + syndicate: Structures/Doors/Airlocks/Glass/syndicate.rsi - type: AirlockGroup id: Windoor @@ -69,6 +72,7 @@ command: Command engineering: Engineering freezer: Civilian + glass: Civilian maintenance: Civilian medical: Medical science: Science diff --git a/Resources/Prototypes/_White/Mobs/Customization/Markings/feda_plevajecki.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/feda_plevajecki.yml new file mode 100644 index 0000000000..43c98003be --- /dev/null +++ b/Resources/Prototypes/_White/Mobs/Customization/Markings/feda_plevajecki.yml @@ -0,0 +1,9 @@ +- type: marking + id: CatTailFeda + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Human, Felinid] + sponsorOnly: true + sprites: + - sprite: White/Mobs/Customization/feda.rsi + state: m_waggingtail_shark_primary diff --git a/Resources/Textures/Clothing/Pouches/cartridge_belt.rsi/base.png b/Resources/Textures/Clothing/Pouches/cartridge_belt.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..b8294fae23477662487a4f38b2d0f5fb4c3e9556 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJg`O^sArbD$DG~_>EDn4#?y*WR zVd>ywOiq6Me~H?S&FSZbOy)0Onz2-Y{l|}=%{$BU?xyT0e9YFoXN^smxoyoK0Uh>5 zoR&>0>@LTSH0s*aKNGpZsPON(zr3N$#?;GhY!i|lzkDb<(BRIvvQuEmyj6h)4-^e% zaj@HPxd}haP?GU&VU}ZB+*xp7al@5K69PhcjQU@wNv@nGyt?iR<6=by2A2RG1Eq!6 R_X8cv;OXk;vd$@?2>>{mPsacN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Pouches/cartridge_belt.rsi/mag-1.png b/Resources/Textures/Clothing/Pouches/cartridge_belt.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..2c31b35f660c7055d1fde046ee124d0ebd4755b9 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ5>FS$kO=qW6p4fb76-l=_gE#E zu(XA7oOzh~ga5Rt=KPQ95B{&c^IvlHexWZ4j;tqciacSMd0vR8Uh;^<9!b52SAW;H zAFg-nXJ$F8z9Qj*WrD-v2C=1To`D9h8ZHV*@HV0miIPkVT2mDi_il4L3bdcW)78&q Iol`;+0BWi{y#N3J literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Pouches/cartridge_belt.rsi/mag-2.png b/Resources/Textures/Clothing/Pouches/cartridge_belt.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..c4b7a73160d2aafb4124bd3c449a4004fb34c84f GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJYEKu(kO=qW6p4fb76-l=_gE#E zu(XA7oOzh~ga5Rt=KPQ95B{&c^IvlHexWZ4j;tqciacSMd0vR8Uh;^<9!b52SAW;H zAFg-nXJ$F8z9Qj*WrD-v2C=1TCj$)@C>qS-VBaGn@xjI7Rl`LA3EoCH!5G!Tz%Wh6 WL2+a6g6BYIFnGH9xvXqS-VBaGn;oGvfv%o}3v^gsqjPaBZ9 bpv1xuE1aO%@%B*&&>0M#u6{1-oD!MqS-VBaGn;oGvfv%o}I0p^;OXk;vd$@?2>=vTKh*#L literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Pouches/cartridge_belt.rsi/meta.json b/Resources/Textures/Clothing/Pouches/cartridge_belt.rsi/meta.json new file mode 100644 index 0000000000..21e8020409 --- /dev/null +++ b/Resources/Textures/Clothing/Pouches/cartridge_belt.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Keslik", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + } + ] + } diff --git a/Resources/Textures/Clothing/Pouches/grenade.rsi/icon.png b/Resources/Textures/Clothing/Pouches/grenade.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8ad34a3961b3a90f3a88ccdc955619298b674137 GIT binary patch literal 288 zcmV+*0pI?KP)|QVixc=ZYG4R_2=$>g3?4XW*%^983C`Yk-3g{!6gd=`NTg7Sb m^FBsLocx_Vgn$rmPT&sp^{XNDAKC%{0000aO6?qYvOI3WDgdBM6F4K7dD$g5E2HVuX=Z)|`-B} z`0*C*4+@|Pr~;~hDlkidG)+IYD?H0GaXoPYH4lQI$57XG`!0nL0gN>#k~t78fH;mj z$&)1c`2o%Iyjw4dVzT~Z09HeQFbvzmRaLs${#OkP^1jz?u4C-YfvlQRK!bfGY3> X((I@qC>^A$00000NkvXXu0mjfpeTzD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Pouches/handcuff_holder.rsi/meta.json b/Resources/Textures/Clothing/Pouches/handcuff_holder.rsi/meta.json new file mode 100644 index 0000000000..f17bc2de6b --- /dev/null +++ b/Resources/Textures/Clothing/Pouches/handcuff_holder.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Keslik", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "fill-1" + } + ] + } diff --git a/Resources/Textures/Clothing/Pouches/magazine.rsi/icon.png b/Resources/Textures/Clothing/Pouches/magazine.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..632dde4e5e663181c356fa3f9c24a832c4afb93e GIT binary patch literal 306 zcmV-20nPr2P)(wF4{YeGqCTD9cQ+HYOgt^#GNl;eW| zSOzQumH{>cUDth_bEkf_t}DbCD^BMcT@e7Cql3Qh4?p|9LtWR$dRdmAZ_@K%q$6Yr zf(7v2L)*3|fRqx15Fpp{K%|QS@N`YnoDQ*V+mQuMAIA}NOyK1>8I5bTNRm2EXO|U#p-JF!0%5LjV8(07*qoM6N<$ Ef-N3-fdBvi literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Pouches/magazine.rsi/meta.json b/Resources/Textures/Clothing/Pouches/magazine.rsi/meta.json new file mode 100644 index 0000000000..21471c4507 --- /dev/null +++ b/Resources/Textures/Clothing/Pouches/magazine.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Keslik", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] + } diff --git a/Resources/Textures/Clothing/Pouches/medical.rsi/icon.png b/Resources/Textures/Clothing/Pouches/medical.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c60a97b55b3fdf18d792414bbdbd45374042c312 GIT binary patch literal 311 zcmV-70m%M|P)AjSb8bs$Gj-2sFwhXoBR6sYb1QqllTLI4)GFo(dR1)Dh49RRabU0of_ zym|8`N`PP!r)m`F>gtjb0}PihU#4y%1UZ18pPwj4eEj%v7(3v`jT?AFK|@1>fuB1)B&R*0004A_95si&-(xX002ov JPDHLkV1l9UcHjU2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Pouches/medical.rsi/meta.json b/Resources/Textures/Clothing/Pouches/medical.rsi/meta.json new file mode 100644 index 0000000000..21471c4507 --- /dev/null +++ b/Resources/Textures/Clothing/Pouches/medical.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Keslik", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] + } diff --git a/Resources/Textures/White/Actions/changeling.rsi/hive_head.png b/Resources/Textures/White/Actions/changeling.rsi/hive_head.png index 510f56bd4245578b2fad2fc4e8fecf590dbca6f3..f1c0abf800c8396038b66d118aa25818d153bac4 100644 GIT binary patch delta 679 zcmV;Y0$BaJ1k(kOIDZ0#NklY+|t3|@D>FYo=o$OI&k-sY+6W1iqVbz>Y^snQB5W;s%r0xnK1nS1TSgI@wy{L-q z*+~I-j_uh=p%+!LR9P14#=NlR2aSO(aPE9+K?b0)(*WS%$6o;KuihY4NZE5b2Rbh@ zGojis5y&2ZRDU6bQJ_cACu)0nfW&X(R5Or z)tk0``IR}l1y1a*{;{9Oa(fuNkH`b%Q1k%;&g#ubG@TT;o?Hcb9dN?w26X%XUmUPR zSVzjw0Vj;zZoS`uem9*M>Yp%{+as3S^L*}yAaWQognt&CmILTT)fS-_)t(jvkq;#x zzcR1KT08A~&LxnKZT@Xzt#e+B3$vpoam<20<<@fjb_UiY*-9tzRoMH4k z4OR`{q-NUWgEHW9z?$H7wZ=7xmmhurU@UF{5UZ9j7Pp91O8~rmddKs&JY1_qyu`R1 zIIA}!nSW|lJnm#&izvr3P@Ykb}Q(s+|lWztTMGi&S53f0jBHJSRG4^*tmjiK4LOC97_kJ+V zHi{w>pOIX(u{#h-fFw<07^k5ZHH=fwFpezXA|Nr;YxzZB><(NC_zM~?SWAtlAZh>r N002ovPDHLkV1g@NMQi{7 delta 525 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