From bf321a44196ebf26d17bcd4e4c3f90c33edd47c9 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Sat, 5 Jul 2025 15:21:55 +0100 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=81=D1=82=D0=B5?= =?UTF-8?q?=D0=B9=D1=82=D0=BE=D0=B2=20=D0=BA=D0=BE=D1=80=D0=BE=D0=B1=D0=BE?= =?UTF-8?q?=D1=87=D0=B5=D0=BA=20=D0=BF=D0=B0=D1=82=D1=80=D0=BE=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=20(#2517)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ammunition/cartridges/heavy_rifle.ftl | 22 +++ .../guns/ammunition/magazines/sniper.ftl | 4 - .../entities/objects/specific/syndicate.ftl | 4 + .../_sunrise/store/uplink-catalog.ftl | 3 +- .../ammunition/cartridges/heavy_rifle.ftl | 21 ++ .../guns/ammunition/magazines/sniper.ftl | 4 - .../entities/objects/specific/syndicate.ftl | 3 + .../_sunrise/store/uplink-catalog.ftl | 2 + .../Catalog/Fills/Backpacks/duffelbag.yml | 14 ++ .../Entities/Objects/Specific/syndicate.yml | 15 ++ .../Catalog/Fills/Boxes/syndicate.yml | 28 ++- .../_Sunrise/Catalog/uplink_catalog.yml | 17 +- .../Entities/Objects/Specific/NTUplink.yml | 2 + .../Cartridges/heavy_light_rifle.yml | 181 ++++++++++++++++++ .../Guns/Ammunition/Cartridges/rifle.yml | 2 +- .../Guns/Ammunition/Magazines/sniper.yml | 44 ----- .../Objects/Storage/boxes.rsi/incendiary.png | Bin 177 -> 176 bytes .../Objects/Storage/boxes.rsi/l6_base.png | Bin 208 -> 210 bytes .../Objects/Storage/boxes.rsi/l6_red.png | Bin 235 -> 238 bytes .../Objects/Storage/boxes.rsi/l6_uranium.png | Bin 233 -> 231 bytes .../Storage/boxes.rsi/shotgun_base.png | Bin 188 -> 186 bytes .../Objects/Storage/boxes.rsi/shotgun_red.png | Bin 293 -> 294 bytes .../Storage/boxes.rsi/shotgun_uranium.png | Bin 186 -> 185 bytes .../Objects/Storage/boxes.rsi/shrapnel.png | Bin 172 -> 172 bytes .../Objects/Storage/boxes.rsi/smg_base.png | Bin 168 -> 169 bytes .../Objects/Storage/boxes.rsi/smg_red.png | Bin 185 -> 186 bytes .../Objects/Storage/boxes.rsi/smg_uranium.png | Bin 200 -> 200 bytes .../Rifle/dragunov_mag.rsi/base-1.png | Bin 0 -> 355 bytes .../dragunov_mag.rsi/inhand-left-mag.png | Bin 0 -> 270 bytes .../dragunov_mag.rsi/inhand-left-stripe.png | Bin 0 -> 144 bytes .../dragunov_mag.rsi/inhand-right-mag.png | Bin 0 -> 283 bytes .../dragunov_mag.rsi/inhand-right-stripe.png | Bin 0 -> 145 bytes .../Rifle/dragunov_mag.rsi/mag-1.png | Bin 383 -> 158 bytes .../Rifle/dragunov_mag.rsi/meta.json | 23 +++ .../Rifle/dragunov_mag.rsi/stripe.png | Bin 0 -> 152 bytes 35 files changed, 318 insertions(+), 71 deletions(-) create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi/base-1.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi/inhand-left-mag.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi/inhand-left-stripe.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi/inhand-right-mag.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi/inhand-right-stripe.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi/stripe.png diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/cartridges/heavy_rifle.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/cartridges/heavy_rifle.ftl index 5b2b0c8315..f163e4aed1 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/cartridges/heavy_rifle.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/cartridges/heavy_rifle.ftl @@ -19,3 +19,25 @@ ent-MagazineBoxHeavyRifleIncendiary = ammunition box (7,62ммR incendiary) .desc = Cardboard box full of 7.62x54mmR full-power rifle rounds. Dated, but still widely used by marksman rifles and medium machine guns. Incendiary ammunition contains a self-igniting compound that sets the target ablaze. ent-MagazineBoxHeavyRifleUranium = ammunition box (7,62ммR uranium) .desc = Cardboard box full of 7.62x54mmR full-power rifle rounds. Dated, but still widely used by marksman rifles and medium machine guns. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating the target from the inside. + +## Magazines +ent-BaseMagazineDragunov = magazine (7,62mmR) + .desc = { ent-BaseItem.desc } +ent-MagazineDragunov = magazine (7,62mmR) + .suffix = Sunrise + .desc = { ent-BaseMagazineDragunov.desc } +ent-MagazineDragunovExtended = extended magazine (7,62mmR) + .suffix = Sunrise + .desc = { ent-MagazineDragunov.desc } +ent-MagazineDragunovEmpty = magazine (7,62mmR any) + .suffix = Sunrise, empty + .desc = { ent-MagazineDragunov.desc } +ent-MagazineDragunovIncendiary = magazine (7,62mmR incendiary) + .suffix = Sunrise + .desc = { ent-MagazineDragunov.desc } +ent-MagazineDragunovPractice = magazine (7,62mmR practice) + .suffix = Sunrise + .desc = { ent-MagazineDragunov.desc } +ent-MagazineDragunovUranium = magazine (7,62mmR uranium) + .suffix = Sunrise + .desc = { ent-MagazineDragunov.desc } diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl index 917ae0e668..2dd153b9a1 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl @@ -1,10 +1,6 @@ -ent-MagazineDragunov = Dragunov magazine - .desc = Standart USSP type of heavy magazines. ent-MagazineBR64 = BR64 magazine .desc = Standart EarthGov type of heavy magazines. ent-MagazineBauer127 = Bauer127 magazine .desc = Standart EarthGov type of heavy magazines. -ent-MagazineDragunovExtended = { ent-MagazineDragunov } - .desc = { ent-MagazineDragunov.desc } ent-MagazineBR64Extended = { ent-MagazineBR64 } .desc = { ent-MagazineBR64.desc } diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/specific/syndicate.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/specific/syndicate.ftl index c1aa8ac4e4..d83b6374db 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/specific/syndicate.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/specific/syndicate.ftl @@ -33,3 +33,7 @@ ent-BaseUplinkRadio0TC = { ent-BaseUplinkRadio } ent-BaseUplinkRadioDebug = { ent-BaseUplinkRadio } .suffix = DEBUG .desc = { ent-BaseUplinkRadio.desc } +ent-BaseUplinkRadioDebug999 = { ent-BaseUplinkRadio } + .suffix = DEBUG, NukeOps + .desc = { ent-BaseUplinkRadio.desc } + diff --git a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl index 206bdf398d..3e42b121a2 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl @@ -15,7 +15,8 @@ uplink-grenade-blast-name = Фугасная граната uplink-grenade-blast-desc = Фугасная граната. Совместима с "China-Lake". uplink-magazine-siar52-name = Магазин ПП (.25 безгильзовый) uplink-magazine-siar52-desc = Магазин ПП на 30 патронов. Совместим с SIAR-52. - +uplink-magazine-bulldog-uraniumslug-desc = Shotgun magazine with 8 shells filled with uranium slugs. Compatible with the Bulldog. +uplink-magazine-bulldog-uranium-desc = Shotgun magazine with 8 shells filled with uranium pellet. Compatible with the Bulldog. ## Misc uplink-music-boombox-name = Музыкальный набор синдиката diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/cartridges/heavy_rifle.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/cartridges/heavy_rifle.ftl index 129d9b8085..1cf031cff1 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/cartridges/heavy_rifle.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/cartridges/heavy_rifle.ftl @@ -19,3 +19,24 @@ ent-MagazineBoxHeavyRifleIncendiary = коробка патронов (7,62ммR .desc = Картонная коробка, полная полноразмерных винтовочных патронов 7.62x54ммR. Устаревшие, но всё ещё широко используемые стрелковыми винтовками и средними пулемётами. Зажигательные патроны содержат самовоспламеняющееся вещество, которое поджигает цель. ent-MagazineBoxHeavyRifleUranium = коробка патронов (7,62ммR урановые) .desc = Картонная коробка, полная полноразмерных винтовочных патронов 7.62x54ммR. Устаревшие, но всё ещё широко используемые стрелковыми винтовками и средними пулемётами. Урановые патроны заменяют свинцовый сердечник пули делящимся материалом, облучая цель изнутри. + +## Magazines +ent-BaseMagazineDragunov = магазин (7,62ммR) + .desc = { ent-BaseItem.desc } +ent-MagazineDragunov = магазин (7,62ммR) + .desc = { ent-BaseMagazineDragunov.desc } +ent-MagazineDragunovExtended = расширеный магазин (7,62ммR) + .suffix = Санрайз + .desc = { ent-MagazineDragunov.desc } +ent-MagazineDragunovEmpty = магазин (7,62ммR) + .suffix = Санрайз, Пустой + .desc = { ent-MagazineDragunov.desc } +ent-MagazineDragunovIncendiary = магазин (7,62ммR зажигательный) + .suffix = Санрайз + .desc = { ent-MagazineDragunov.desc } +ent-MagazineDragunovPractice = магазин (7,62ммR учебный) + .suffix = Санрайз + .desc = { ent-MagazineDragunov.desc } +ent-MagazineDragunovUranium = магазин (7,62ммR урановый) + .suffix = Санрайз + .desc = { ent-MagazineDragunov.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl index d37d2a95d1..66fca4bc4c 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl @@ -1,10 +1,6 @@ -ent-MagazineDragunov = магазин винтовки Драгунов - .desc = Использует патроны калибра 7.62x54R. ent-MagazineBR64 = магазин винтовки BR-64 .desc = Использует патроны калибра 7,62х51 NT ent-MagazineBauer127 = магазин Bauer-127 .desc = Использует патроны калибра .60 антиматериальные. -ent-MagazineDragunovExtended = Увеличеный магазин Dragunov - .desc = { ent-MagazineDragunov.desc } ent-MagazineBR64Extended = расширенный магазин BR64 .desc = { ent-MagazineBR64.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/specific/syndicate.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/specific/syndicate.ftl index 440f5e5865..d2ad80b55a 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/specific/syndicate.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/specific/syndicate.ftl @@ -33,3 +33,6 @@ ent-BaseUplinkRadio0TC = { ent-BaseUplinkRadio } ent-BaseUplinkRadioDebug = { ent-BaseUplinkRadio } .suffix = ДЕБАГ .desc = { ent-BaseUplinkRadio.desc } +ent-BaseUplinkRadioDebug999 = { ent-BaseUplinkRadio } + .suffix = ДЕБАГ, Ядерные оперативники + .desc = { ent-BaseUplinkRadio.desc } diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl index 3bdc528b38..b2672b40f4 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl @@ -26,6 +26,8 @@ uplink-magazine-dl6902-name = Короб-магазин DL6902 (7,62мм) uplink-magazine-dl6902-desc = Магазин для Dl6902. Содержит 200 патронов калибра 7,62х39мм. uplink-magazine-dragunov-desc = Магазин для Драгунова. Содержит 10 патронов калибра 7,62х54R. uplink-magazine-dragunov-extended-desc = Магазин для Драгунова. Содержит 20 патронов калибра 7,62х54R. +uplink-magazine-bulldog-uraniumslug-desc = Барабанный магазин на 8 урановых пулевых патронов. Совместим с "Бульдогом". +uplink-magazine-bulldog-uranium-desc = Барабанный магазин на 8 патронов урановой дроби. Совместим с "Бульдогом". ## Misc uplink-music-boombox-name = Музыкальный набор синдиката diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index e6421f8138..f26f109935 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -132,6 +132,12 @@ amount: 1 - id: LMGKit # Sunrise-edit amount: 1 + - id: MedkitCombatFilled # Sunrise-edit + amount: 1 + - id: MagazineRifle # Sunrise-edit + amount: 2 + - id: MagazineDragunov # Sunrise-edit + amount: 2 # Sunrise-Start - type: entity parent: ClothingBackpackDuffelSyndicateAmmo @@ -149,6 +155,10 @@ amount: 1 - id: MedkitBurnFilled amount: 1 + - id: MagazineRifleIncendiary + amount: 2 + - id: MagazineDragunovIncendiary + amount: 2 - type: entity parent: ClothingBackpackDuffelSyndicateAmmo @@ -166,6 +176,10 @@ amount: 1 - id: MedkitRadiationFilled amount: 1 + - id: MagazineRifleUranium + amount: 2 + - id: MagazineDragunovUranium + amount: 2 # Sunrise-End - type: entity parent: ClothingBackpackDuffelClown diff --git a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml index b92e21bdd2..4378addbbf 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml @@ -174,3 +174,18 @@ - type: Store balance: Telecrystal: 99999 + +# Sunrise-Start +- type: entity + parent: BaseUplinkRadio + id: BaseUplinkRadioDebug999 + suffix: DEBUG, NukeOps + categories: [ Debug ] # Sunrise added + components: + - type: Store + balance: + Telecrystal: 999 + - type: Tag + tags: + - NukeOpsUplink +# Sunrise-Start diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml index f234b8aa24..cec76c761d 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml @@ -44,6 +44,10 @@ id: CaselessAmmoKit name: Siar52 ammo kit components: + - type: Item + size: Large + shape: + - 0,0,2,1 - type: Storage grid: - 0,0,2,3 @@ -57,7 +61,7 @@ - id: MagazinePistolSubMachineGunSIAR52 - type: Sprite layers: - - state: box_of_doom_big + - state: box_of_doom - state: smg_base - type: entity @@ -166,10 +170,10 @@ - id: MagazineShotgunUranium - id: MagazineShotgunUranium - id: MagazineShotgunUranium - - id: MagazineShotgunUranium - - id: MagazineShotgunUranium - - id: MagazineShotgunUranium - - id: MagazineShotgunUranium + - id: MagazineShotgunUraniumSlug + - id: MagazineShotgunUraniumSlug + - id: MagazineShotgunUraniumSlug + - id: MagazineShotgunUraniumSlug - type: Sprite layers: - state: box_of_doom_big @@ -180,9 +184,13 @@ id: LMGKit name: L6 Saw ammo kit components: + - type: Item + size: Large + shape: + - 0,0,2,1 - type: Storage grid: - - 0,0,3,3 + - 0,0,3,2 - type: StorageFill contents: - id: MagazineLightRifleBox @@ -195,13 +203,13 @@ - state: l6_base - type: entity - parent: [BoxCardboard, BaseSyndicateContraband] + parent: LMGKit id: LMGIncendiaryKit name: L6 Saw Incendiary ammo kit components: - type: Storage grid: - - 0,0,3,3 + - 0,0,3,2 - type: StorageFill contents: - id: MagazineLightRifleBoxIncendiary @@ -214,13 +222,13 @@ - state: l6_red - type: entity - parent: [BoxCardboard, BaseSyndicateContraband] + parent: LMGKit id: LMGUraniumKit name: L6 Saw Uranium ammo kit components: - type: Storage grid: - - 0,0,3,3 + - 0,0,3,2 - type: StorageFill contents: - id: MagazineLightRifleBoxUranium diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml index d7d156a45b..aa7a99bbcd 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml @@ -130,8 +130,7 @@ - type: listing id: UplinkMagazineShotgunUranium - name: uplink-magazine-shotgun-name - description: uplink-magazine-shotgun-desc + description: uplink-magazine-bulldog-uranium-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi, state: uranium } productEntity: MagazineShotgunUranium cost: @@ -147,11 +146,11 @@ - type: listing id: UplinkMagazineShotgunUraniumSlug - description: uplink-magazine-shotgun-desc + description: uplink-magazine-bulldog-uraniumslug-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi, state: uranium } productEntity: MagazineShotgunUraniumSlug cost: - Telecrystal: 5 + Telecrystal: 6 categories: - UplinkAmmo conditions: @@ -164,7 +163,6 @@ # For the LMG - type: listing id: UplinkMagazineLightRifleBox - name: uplink-magazine-lmg-name description: uplink-magazine-lmg-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: icon } productEntity: MagazineLightRifleBox @@ -185,6 +183,7 @@ - type: listing id: UplinkMagazineLightRifleBoxIncendiary + description: uplink-magazine-lmg-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: red } productEntity: MagazineLightRifleBoxIncendiary cost: @@ -223,9 +222,9 @@ productEntity: CrateAmmokitBundle discountCategory: usualDiscounts discountDownTo: - Telecrystal: 50 + Telecrystal: 75 cost: - Telecrystal: 95 + Telecrystal: 115 categories: - UplinkAmmo conditions: @@ -234,6 +233,10 @@ tags: - NukeOpsUplink - LoneOpsUplink + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle # For the SIAR52 - type: listing diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/NTUplink.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/NTUplink.yml index aaf58584e1..c8c5cd8b40 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/NTUplink.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/NTUplink.yml @@ -140,6 +140,8 @@ - state: active shader: unshaded - type: Store + refundAllowed: false + ownerOnly: true balance: Bluecrystal: 999 Crystallite: 999 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_light_rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_light_rifle.yml index ec98586967..28658abc45 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_light_rifle.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_light_rifle.yml @@ -173,3 +173,184 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - state: uranium + +#Magazine +- type: entity + id: BaseMagazineDragunov + name: "magazine Dragunov (7,62mmR)" + parent: [ BaseItem, BaseSecurityContraband ] + abstract: true + components: + - type: Tag + tags: + - MagazineDragunov + - type: Item + size: Small + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - CartridgeHeavyRifle + capacity: 10 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + id: MagazineDragunovExtended + name: "magazine Dragunov (7,62mmR)" + suffix: Sunrise + parent: BaseMagazineDragunov + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyLightRifle + capacity: 20 + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi + layers: + - state: base-1 + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + right: + - state: inhand-right-mag + +- type: entity + id: MagazineDragunov + name: "magazine Dragunov (7,62mmR)" + suffix: Sunrise + parent: BaseMagazineDragunov + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyLightRifle + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + right: + - state: inhand-right-mag + +- type: entity + id: MagazineDragunovEmpty + name: "magazine (7,62mmR any)" + suffix: Sunrise, empty + parent: MagazineDragunov + components: + - type: BallisticAmmoProvider + proto: null + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + right: + - state: inhand-right-mag + +- type: entity + id: MagazineDragunovIncendiary + name: "magazine (7,62mmR incendiary)" + suffix: Sunrise + parent: MagazineDragunov + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyLightRifleIncendiary + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#ff6e52" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#ff6e52" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#ff6e52" + +- type: entity + id: MagazineDragunovPractice + name: "magazine (7,62mmR practice)" + suffix: Sunrise + parent: BaseMagazineDragunov + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyLightRiflePractice + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#dbdbdb" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#dbdbdb" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#dbdbdb" + +- type: entity + id: MagazineDragunovUranium + name: "magazine (7,62mmR uranium)" + suffix: Sunrise + parent: BaseMagazineDragunov + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyLightRifleUranium + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#00cd42" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#00cd42" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#00cd42" + diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml index 156554a333..a8c39213e9 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -102,7 +102,7 @@ map: [ "enum.AmmoVisualLayers.Tip" ] color: "#65fe08" -#Magasines +#Magazines - type: entity id: SunriseBaseMagazineRifle name: "magazine (5.56mm)" diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml index f118679880..e36ec41923 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml @@ -1,40 +1,3 @@ -- type: entity - id: MagazineDragunov - name: Dragunov magazine - description: Standart USSP type of heavy magazines. - parent: BaseItem - components: - - type: Tag - tags: - - MagazineDragunov - - type: BallisticAmmoProvider - mayTransfer: true - capacity: 10 - proto: CartridgeHeavyLightRifle # 762x54 - whitelist: - tags: - - CartridgeHeavyRifle # 762x54 - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Item - size: Small - sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi - - type: Sprite - netsync: false - sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 2 - zeroVisible: false - - type: Appearance - - - type: entity id: MagazineBR64 name: BR64 magazine @@ -137,13 +100,6 @@ - state: inhand-right-stripe color: "#9b0000" -- type: entity - parent: MagazineDragunov - id: MagazineDragunovExtended - components: - - type: BallisticAmmoProvider - capacity: 20 - - type: entity parent: MagazineBR64 id: MagazineBR64Extended diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/incendiary.png b/Resources/Textures/Objects/Storage/boxes.rsi/incendiary.png index 3bb9896bf860f761c669581ebcd310efcc82b6f5..d70678cc9f4381bda6e2243335df0e7cb1991ae5 100644 GIT binary patch delta 134 zcmdnUxPftkVSSdTi(^PcYjT1F>*55Fo~A$pF1Ldo>^)1e0s^o7=|8i-_`B7~v*55Fo~DU>5+|>&ShVJ+{LK32?@BkFQSuf(Q{-ot zxZ}om|NN6hEW(z24ULkUmP_)@yqB^xt z5nSE`ufQh3_4O@9cz$rU^YL&%L_|c^#LS43s2`V^1?}AUG{;HQr`HRg)&WpA6=m*t zW-qTjW4kFsbyERQ=5FfUumHT<;KPHh@4)c>^KrjSfL~i*fFkVvfYX6n(fuQjh{*iD Xxo9T)XE1I400000NkvXXu0mjf(B4%F delta 167 zcmV;Y09gOh0nh=EF@K6lL_t(oh3(L>3W9JH#o=Gk>e4F|Irt2&&5gZkO&8o-)FB82 z5nTQWK7ma_Ygb8x^T8d@;c!7jWR1*>B#npfGc#A$#uG}?c(`28yt@EE)7DgZpv;~> z_w76bMon7-Q02khF=+s=Zc-dz>kW?YKOLfF2Fzu>1G4)Ajv#w(ML*{r5fKsjzYk#7 VCi|Ubr_BHW002ovPDHLkV1jUKOB(OUcVf_kE7srr@*5m{U*2M`TJxzfITy6&gnArJb5-w~D{omiiFJs{_ac0jF zjcY)zyuia_AHLm{W&?sY_4D$EclQ5jd-&?%Y?YbKJP{sOFMLXrJN$Zeyrf)Ra@vni zFZ7-H)?4i?oBX^%s!^q_`~5cq5V-UFulvNOJV4-Mw t@a}Vl1}iuW-|YD`QS6;0*jY@!m>F1G^nI@;7}qlZfv2mV%Q~loCIGlCRvQ2S delta 194 zcmV;z06qWi0qX&fF@L2=L_t(oh3(Kk3c_FvhVjQg>j&Z$6g%_`U7a1Bojro1=kOki zL!i4L+M!di2oBbwpl(_x!PQuVLVl1jZ(ah%7*jSaQvhIko^gzB?CuS&>4UNJR5|Jblh%lJzB>dUaZhawb?xH&{k@J; wAOER9S*lwgT&$qmX1=|Y*~b`Tj4}WB0+Y8dP2$*5hX4Qo07*qoM6N<$g344|-2eap diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/l6_uranium.png b/Resources/Textures/Objects/Storage/boxes.rsi/l6_uranium.png index fdbf20160256aa816e7e043f5c6786fced999076..78ed9605b0da7e25614a2927d9dd5436682b4bf3 100644 GIT binary patch delta 190 zcmaFK_?&TqVf{i+7srr@*5m{U*2M`TJxzfITy6&gnArJb5-w~D{omiiFJs{_ac0jF zjcY)zyuia_AHLm{W&?sY_4D$EclQ5jd-&?%Y?YbKJTpA5UdSq(`f#Q#H}mSfHq9HR z>h1h?h>?4x)GGfB5F2Yzd8~rY3Kaf!| z9IO~b5M406AfjaoCYv(}R?i^}?gtm|xrYN|j42}#!9`*IIU=IUs%Vy66y~Gxkn1f2 z;B-0ScNuAN_&TquDF86-r<~(}THK;J=xJjJw2PCKV>?^oSvlh$PjvzH2j1`Rw(IKS uKNToSc?%?q4RjjJ_xB?E7-Nhv=Ko%Li7TgoXpu<(0000uvIPq diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shotgun_base.png b/Resources/Textures/Objects/Storage/boxes.rsi/shotgun_base.png index 07dd03bd10c9764fdce2bda25502437c0e60ed31..e945aff1e9529cc60661f87b9bed7b6b800fba64 100644 GIT binary patch delta 84 zcmdnPxQlT@uCIlsi(`mI@7r@1c^M2ioDOW=DxAZWL}{Wo6FCb9> diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shotgun_red.png b/Resources/Textures/Objects/Storage/boxes.rsi/shotgun_red.png index de38671d450dc4a0dd83d00bbd2ece862b05aa47..4e363ca81febbbed899cf7960f76c65c900abfcc 100644 GIT binary patch delta 88 zcmV-e0H^<@0;U3x)loc2L_t(IjbmUK1)~55U<5+EfQgX_uRIGYJ1Yx53z(SrnV9fc uA|@s#1H|~8z{<#q-w|R=`1FqgyZ`{9+5s2MWia9Z0000>wL_t(IjqT3a4FCWH15lcj?msaL=mcKl&lU0B0UIYlq-$Vr p+yS7s?gpu|96%)F8^^$xvarO#y;VxhrmmoH&d$_ ozTCU55IXgV){HOOtkdoL7_$NxCP#1l5zYVvp00i_>zopr0Ks%39RL6T diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shrapnel.png b/Resources/Textures/Objects/Storage/boxes.rsi/shrapnel.png index 8440434ae94a559f737af1d27df398ab0565857c..34a691cfd15b77d7f969f9c80d0be3916fcb5fbf 100644 GIT binary patch delta 114 zcmV-&0FD2w0jvR#L2FSk3P!<52aKd@P*K+WkIcVw_d3aDknI4N<(z!NaIx>7-csZU zCUP{*xOST1(Bm5nmn?M2wHFRp$kCLcWeQ=OxJRB!U=)l30BRu< UTx&^6U;qFB07*qoM6N<$f(&pld;kCd delta 114 zcmV-&0FD2w0jvR#L2Ho?7|GSBqOAEJnSbZ*b+XJNOB2j;PCj9{*!NFw$#Mh}ISzn< z8P`rT9D00%;gW?e*=Dd%;(!b-QwZb4WwOnnCk diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/smg_base.png b/Resources/Textures/Objects/Storage/boxes.rsi/smg_base.png index fbcd41177b56a071fb118859ed3d796dda5c2c6e..f8e05a043b1d89937ad6e43ddb1ed662ad318a82 100644 GIT binary patch delta 75 zcmZ3%xRP-~s*Ap-i(`mIZ*qbJ>tY7$gtSBY=Z_pa;d6k+%*`pyK-j3cbAjZU9G2Kq e9r1M{511J8a~PZ@8y{|C00K`}KbLh*2~7Y7!WyOk delta 74 zcmZ3lTJHK0lt$ydg1@bH;&V9w&IxoYD*gO`2!+F7TH8 ec)GvoArHgCFAUCG4z#~z00K`}KbLh*2~7ZHpB^g! diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/smg_red.png b/Resources/Textures/Objects/Storage/boxes.rsi/smg_red.png index a6d7f77eb455f1204173895cd94c1c161b80ca72..55daae8daa36d57f2d32d927e4fc512a0fe01267 100644 GIT binary patch delta 76 zcmdnVxQlT@sjGpfi(`mIZ*qbJ>tY7$gtSBY=Z_pa;d6k+%*`pyK-j3cbAjZUoH;Qp fXA~6dxe6E=dIK4vVvPCQ8Gyjk)z4*}Q$iB}3hNmp delta 75 zcmdnRxRY^0sf)g+i(`mIZ*qbJ>lTJHK0lt$ydg1@bH;&V9w&IxoYD*gO`2!+PVR1y fWO?F#uz-!>Vktw^?`O(47=Xaj)z4*}Q$iB}bt)Zt diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/smg_uranium.png b/Resources/Textures/Objects/Storage/boxes.rsi/smg_uranium.png index 359dcd18f93646a1de746553b36b515448935e3e..7689746f46200c8bc79307bb08f2070d74b1db13 100644 GIT binary patch delta 150 zcmV;H0BQfo0muQ6I)A$jLNN>lP(SK;fMkHXh9w$mhGQ%i@BmpL?oCUXAWJm&)c(sN zL_|bH2h1!1WM$3UZXke+2w7{1nUxK3odla%Muf~cMODS!kMc_ZNHfdcdsbZHrwst4 zs+L@0`v<LF@`)|Pm%Y%^f9*q$iFowBC7HMzcnoc<_~Uy?EnA(07*qoM6N<$ Ef}49l0{{R3 delta 150 zcmV;H0BQfo0muQ6I)AYZ12G5%P%gC@z&F5O<4b8$XSj@&1sK2!n4W9X+MJYz*YiPN zh?G)F*+4P?#2s0W)d2wE?lR{TlIbIkogtFp?lQ&@RTVSa%1HqbB%}8pnI=+~0|-@3 zHL?5yzs&4tt;uPx$9Z5t%R9J=Wl{;>PFc3f=Nkb$wqJ)OpEf+wd<8@u5sx(bQk|Y3BRYj5{ z#Bq$ZmT?@JrYR^TZ(BDmVRz2qoMRYb Bl&Amz literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi/inhand-left-mag.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi/inhand-left-mag.png new file mode 100644 index 0000000000000000000000000000000000000000..c81e69b22942c0bd64eba905f099c77e1a77972f GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|PI$UFhE&XX zdut=tAp;S&htYzy3`@&`T7q_2amdQl{8twcbXmDg?5?!vBL&&6$zR@=?NhzYsdBUE zEKoBLT=1QBq;B`gnpsEU?uLGoVlFM%ZqM>6ZT{VbRy$(O)V`f#`F+aQw1-DNWoQ0e zIzhha59^+L>#wbP_0_eG;pbA0tc!2Wv%bH1`i&7{9Eglv;;A!V;AJ-d&+ir6;(lt( zi4yU<`cmww+$YY7(O)-wtXOjHpT_FlGi%j7`j#7SW(I2cahW}PjeTMA!4nffCV0B~ KxvXPyz+WGeW7j`Kz>3P98hwXL9lZA7Z+Y-mdKI;Vst018@gfB*mh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi/inhand-right-stripe.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi/inhand-right-stripe.png new file mode 100644 index 0000000000000000000000000000000000000000..31f747ba362458b2998d5eba78f53f1c0b33e2f6 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|yggkULn`LH zy`{)^z<`I@AwB5d|N9eodBu54_8tz?kyK{{Dte%^mFvuzxhi+(u8MjF5&(g^=d}xN lY<>Rg(F?ymc?O1tVA~DK+z-BQ@kjv4db;|#taD0e0sw)DF24W( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi/mag-1.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi/mag-1.png index ff2b81b3acf5b68bdc04f01cddf746c7345987eb..b7dc416e6586cb8c916a29f5db714bd929d3a1b5 100644 GIT binary patch delta 129 zcmey*G>>tDN)=;qkh>GZx^prw85kHMJY5_^B3hFZBv=b<} delta 356 zcmV-q0h|7w0sjJ!B!3BTNLh0L01m_e01m_fl`9S#0003oNkl5dr6oqe< ztVJkNhip|QR+!U)l?O;9-XIT=r^t|Z=p3c$l%+fBRJKZFfDy5EayV9OQKU+jVuX-< zrelMAzI**Mr;%j=EPw@=9)ROG!gXEg%d({1%ainPUq9qMK7Z5e=f}ff00@ucnDRW= zbH~et4%-!-u5(%}XSAWU=mOCR0F@)W2@r-M?cWpW&*iu53P7u>VnMJ0uqYN!lH}KX zQ4})N^E^F=F;^@Agrib~M^U7^5CnntX`1T)xz)1)Ak}sih{~HDfXdeZ++}$HsHm<` zpMH~KcK{GIfL$0308)q0_kB73%hwWFmYKZ;Lupz7_vMdq%431umCr1hr%1^mi~4C0000