diff --git a/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl b/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl index e7b42049d7..ee8f94301e 100644 --- a/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl +++ b/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl @@ -19,18 +19,18 @@ ent-MagazinePistol40FMJ = Pistol Magazine (.40 FMJ) ent-MagazinePistol40AP = Pistol Magazine (.40 AP) .desc = { ent-MagazinePistol40Base.desc } ent-BaseMagazinePistol40SubMachineGun = SMG magazine (.40) - .desc = 20-round double-stack magazine for submachine guns. + .desc = 24-round double-stack magazine for submachine guns. ent-MagazinePistol40SubMachineGunEmpty = SMG magazine (.40 any) .suffix = empty .desc = { ent-BaseMagazinePistol40SubMachineGun.desc } ent-MagazinePistol40SubMachineGunSP = SMG magazine (.40 SP) - .desc = 20-round double-stack magazine for submachine guns. Intended to hold general-purpose kinetic ammunition. + .desc = 24-round double-stack magazine for submachine guns. Intended to hold general-purpose kinetic ammunition. ent-MagazinePistol40SubMachineGunHP = SMG magazine (.40 HP) - .desc = 20-round double-stack magazine for submachine guns. Intended to hold hollow-point ammunition. + .desc = 24-round double-stack magazine for submachine guns. Intended to hold hollow-point ammunition. ent-MagazinePistol40SubMachineGunFMJ = SMG magazine (.40 FMJ) - .desc = 20-round double-stack magazine for submachine guns. Intended to hold full-metal-jacket ammunition. + .desc = 24-round double-stack magazine for submachine guns. Intended to hold full-metal-jacket ammunition. ent-MagazinePistol40SubMachineGunAP = SMG magazine (.40 AP) - .desc = 20-round double-stack magazine for submachine guns. Intended to hold armor-piercing ammunition. + .desc = 24-round double-stack magazine for submachine guns. Intended to hold armor-piercing ammunition. ent-MagazinePistolImprovised = Improvised Pistol Magazine (.35) .desc = { ent-BaseMagazinePistol.desc } ent-MagazinePistolImprovisedFilled = { ent-MagazinePistolImprovised } diff --git a/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/speedloaders/shotgun.ftl b/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/speedloaders/shotgun.ftl index 676c94575e..912d7de961 100644 --- a/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/speedloaders/shotgun.ftl +++ b/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/speedloaders/shotgun.ftl @@ -8,6 +8,8 @@ ent-SpeedLoaderShotgunBeanbag = speed loader (.50 beanbag) .desc = { ent-BaseSpeedLoaderShotgun.desc } ent-SpeedLoaderShotgunSlug = speed loader (.50 slug) .desc = { ent-BaseSpeedLoaderShotgun.desc } +ent-SpeedLoaderShotgunFlechette = speed loader (.50 flechette) + .desc = { ent-BaseSpeedLoaderShotgun.desc } ent-SpeedLoaderShotgunUranium = speed loader (.50 uranium) .desc = { ent-BaseSpeedLoaderShotgun.desc } ent-SpeedLoaderShotgunIncendiary = speed loader (.50 incendiary) diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl index 41977f5683..436a3fd870 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl @@ -2,3 +2,7 @@ ent-BaseMagazineAsh12 = ash-12 magazine (.50 slug) .desc = { ent-BaseItem.desc } ent-MagazineAsh12Slug = { ent-BaseMagazineAsh12 } .desc = { ent-BaseMagazineAsh12.desc } +ent-MagazineShotgunUranium = ammo drum (.50 Uranium) + .desc = { ent-BaseMagazineShotgun.desc } +ent-MagazineShotgunBreach = ammo drum (.50 Breach) + .desc = { ent-BaseMagazineShotgun.desc } diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/misc.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/misc.ftl new file mode 100644 index 0000000000..7c3e85cafb --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/_sunrise/misc.ftl @@ -0,0 +1,8 @@ +ent-CableDet = explosive cord + .desc = Spaghetti for people who hate walls. + +ent-CableDetStack = explosive cord + .desc = Explosive cord for removing whatever is in your way. + +ent-EmptyDetonator = detonator cap + .desc = A detonator cap. Requires a trigger and wire. diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl index 6d472c06a1..f08201244e 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl @@ -6,6 +6,10 @@ ent-BoxBeanbag = ammunition box (.50 beanbag) .desc = { ent-AmmoProviderShotgunShell.desc } ent-BoxLethalshot = ammunition box (.50 pellet) .desc = { ent-AmmoProviderShotgunShell.desc } +ent-BoxShotgunBreaching = ammunition box (.50 breaching) + .desc = { ent-AmmoProviderShotgunShell.desc } +ent-BoxShotgunFlechette = ammunition box (.50 flechette) + .desc = { ent-AmmoProviderShotgunShell.desc } ent-BoxShotgunSlug = ammunition box (.50 slug) .desc = { ent-AmmoProviderShotgunShell.desc } ent-BoxShotgunFlare = ammunition box (.50 flare) diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl index bfc6671fc4..0d1f45af0b 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl @@ -11,5 +11,3 @@ ent-MagazineShotgunSlug = ammo drum (.50 slug) .desc = { ent-BaseMagazineShotgun.desc } ent-MagazineShotgunIncendiary = ammo drum (.50 incendiary) .desc = { ent-BaseMagazineShotgun.desc } -ent-MagazineShotgunUranium = ammo drum (.50 Uranium) - .desc = { ent-BaseMagazineShotgun.desc } diff --git a/Resources/Locale/en-US/_strings/_sunrise/guidebook/guides.ftl b/Resources/Locale/en-US/_strings/_sunrise/guidebook/guides.ftl index 617ec77c41..3e190229ab 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/guidebook/guides.ftl @@ -50,3 +50,4 @@ guide-entry-sr-rule-excep-10 = Исключение/прецедент 10 guide-entry-sr-rule-cep = Политика эскалации конфликтов guide-entry-sr-rule-ccp = Политика создания персонажей guide-entry-sr-rule-pana = Препятствование аресту неантагонистами +guide-entry-improvised-grenade-casing = Improvised grenade casing diff --git a/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl b/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl index 3f20a5bbe6..e35ca67751 100644 --- a/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl @@ -19,18 +19,18 @@ ent-MagazinePistol40FMJ = Пистолетный магазин (.40 FMJ) ent-MagazinePistol40AP = Пистолетный магазин (.40 AP) .desc = { ent-MagazinePistol40Base.desc } ent-BaseMagazinePistol40SubMachineGun = магазин ПП (.40) - .desc = Двухрядный 20-зарядный магазин для пистолетов-пулемётов. + .desc = Двухрядный 24-зарядный магазин для пистолетов-пулемётов. ent-MagazinePistol40SubMachineGunEmpty = магазин ПП (.40 любые) .suffix = Пустой .desc = { ent-BaseMagazinePistol40SubMachineGun.desc } ent-MagazinePistol40SubMachineGunSP = магазин ПП (.40 SP) - .desc = Двухрядный 20-зарядный магазин для пистолетов-пулемётов. Предназначен для хранения кинетических боеприпасов общего назначения. + .desc = Двухрядный 24-зарядный магазин для пистолетов-пулемётов. Предназначен для хранения кинетических боеприпасов общего назначения. ent-MagazinePistol40SubMachineGunHP = магазин ПП (.40 HP) - .desc = Двухрядный 20-зарядный магазин для пистолетов-пулемётов. Предназначен для хранения экспансивных боеприпасов. + .desc = Двухрядный 24-зарядный магазин для пистолетов-пулемётов. Предназначен для хранения экспансивных боеприпасов. ent-MagazinePistol40SubMachineGunFMJ = магазин ПП (.40 FMJ) - .desc = Двухрядный 20-зарядный магазин для пистолетов-пулемётов. Предназначен для хранения боеприпасов с цельнометаллической оболочкой. + .desc = Двухрядный 24-зарядный магазин для пистолетов-пулемётов. Предназначен для хранения боеприпасов с цельнометаллической оболочкой. ent-MagazinePistol40SubMachineGunAP = магазин ПП (.40 AP) - .desc = Двухрядный 20-зарядный магазин для пистолетов-пулемётов. Предназначен для хранения бронебойных боеприпасов. + .desc = Двухрядный 24-зарядный магазин для пистолетов-пулемётов. Предназначен для хранения бронебойных боеприпасов. ent-MagazinePistolImprovised = Импровизированный пистолетный магазин (.35) .desc = { ent-BaseMagazinePistol.desc } ent-MagazinePistolImprovisedFilled = { ent-MagazinePistolImprovised } diff --git a/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/speedloaders/shotgun.ftl b/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/speedloaders/shotgun.ftl index 9f5f5e97d1..15e7ef9e6c 100644 --- a/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/speedloaders/shotgun.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/speedloaders/shotgun.ftl @@ -13,3 +13,5 @@ ent-SpeedLoaderShotgunUranium = спидлоадер урановых 12 кал .desc = { ent-BaseSpeedLoaderShotgun.desc } ent-SpeedLoaderShotgunIncendiary = спидлоадер зажигательных 12 калибра .desc = { ent-BaseSpeedLoaderShotgun.desc } +ent-SpeedLoaderShotgunFlechette = спидлоадер флешетт 12 калибра + .desc = { ent-BaseSpeedLoaderShotgun.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/catrtidges/shotguns.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/catrtidges/shotguns.ftl index 366432bb3e..4e5efb00d3 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/catrtidges/shotguns.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/catrtidges/shotguns.ftl @@ -13,5 +13,9 @@ ent-ShellShotgunBooze = резинавая пуля 12 калибра .desc = { ent-BaseShellShotgun.desc } ent-ShellShotgunHoly = святая пуля 12 калибра .desc = Во имя Света, Святых и 12-го калибра — аминь. -ent-ShellShotgunBreaching = прорывная пуля 12 калибра +ent-ShellShotgunBreaching = пробивная пуля 12 калибра .desc = { ent-BaseShellShotgun.desc } + +ent-ShellShotgunFlechette = флешетта 12 калибра + .desc = { ent-BaseShellShotgun.desc } + diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl index 49058944e6..c04069e957 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl @@ -6,4 +6,11 @@ ent-MagazineAsh12Beanbag = магазин АШ-12 травматический .desc = { ent-BaseMagazineAsh12.desc } ent-MagazineAsh12Flare = магазин АШ-12 фальшфейер .desc = { ent-BaseMagazineAsh12.desc } +ent-MagazineShotgunUranium = барабан урановых 12 калибра + .desc = { ent-BaseMagazineShotgun.desc } +ent-MagazineShotgunBreach = барабан пробивных 12 калибра + .desc = { ent-BaseMagazineShotgun.desc } + +ent-MagazineShotgunFlechette = барабан флешетты 12 калибра + .desc = { ent-BaseMagazineShotgun.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl index a4ca6bfe91..c9cd659549 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl @@ -23,4 +23,4 @@ ent-WeaponSubMachineGunDrozdMk2 = Дрозд Мк2 ent-WeaponSubMachineGunDrozdMk2Empty = Дрозд Мк2 .desc = { ent-WeaponSubMachineGunDrozdMk2.desc } ent-WeaponSubMachineGunC40r = C-40r - .desc = Ранняя модель классического буллпап-пистолет-пулемета на 20 патронов производства "Waffle Corp" под патроны .40 высокой останавливающей силы. Ранее широко использовался Gorlex Marauders. Эффективен на коротких и средних дистанциях, стреляет очередями по 2 выстрела или полностью автоматическим режимом. + .desc = Ранняя модель классического буллпап-пистолет-пулемета производства "Waffle Corp" под патроны .40 высокой останавливающей силы. Ранее широко использовался Gorlex Marauders. Эффективен на коротких и средних дистанциях, стреляет очередями по 2 выстрела или полностью автоматическим режимом. diff --git a/Resources/Locale/ru-RU/_prototypes/catalog/fills/boxes/ammunition.ftl b/Resources/Locale/ru-RU/_prototypes/catalog/fills/boxes/ammunition.ftl index 351a0b6d24..8e73e9336e 100644 --- a/Resources/Locale/ru-RU/_prototypes/catalog/fills/boxes/ammunition.ftl +++ b/Resources/Locale/ru-RU/_prototypes/catalog/fills/boxes/ammunition.ftl @@ -22,13 +22,13 @@ ent-BoxMagazinePistolSubMachineGun = коробка с магазинами .35 .desc = Коробка, полная магазинов .35 авто для ПП. ent-BoxMagazinePistolSubMachineGunPractice = коробка с учебными магазинами .35 авто для ПП .desc = Коробка, полная учебных магазинов .35 авто для ПП. -ent-BoxMagazineShotgun = коробка с барабанами дроби 12 калибра +ent-BoxMagazineShotgun = коробка барабанов дроби 12 калибра .desc = Коробка, полная барабанов дроби 12 калибра. -ent-BoxMagazineShotgunBeanbag = коробка с барабанами травматических 12 калибра +ent-BoxMagazineShotgunBeanbag = коробка барабанов травматических 12 калибра .desc = Коробка, полная барабанов травматических 12 калибра. -ent-BoxMagazineShotgunSlug = коробка с барабанами пуль 12 калибра +ent-BoxMagazineShotgunSlug = коробка барабанов пуль 12 калибра .desc = Коробка, полная барабанов пуль 12 калибра. -ent-BoxMagazineShotgunIncendiary = коробка с барабанами зажигательных 12 калибра +ent-BoxMagazineShotgunIncendiary = коробка барабанов зажигательных 12 калибра .desc = Коробка, полная барабанов зажигательных 12 калибра. ent-BoxMagazineRifle = коробка с магазинами 5,56 мм .desc = Коробка, полная винтовочных магазинов 5,56 мм. diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl index af272a43e0..0b9e9fc7dc 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl @@ -1,24 +1,28 @@ -ent-BaseAmmoProvider = { ent-BaseItem } +ent-BaseAmmoProvider = { ent-BaseItem } .desc = { ent-BaseItem.desc } ent-AmmoProviderShotgunShell = { ent-BaseAmmoProvider } .desc = { ent-BaseAmmoProvider.desc } -ent-BoxBeanbag = коробка ружейных патронов (травматические) - .desc = Полная коробка травматических ружейных патронов. -ent-BoxLethalshot = коробка ружейных патронов (летальные) - .desc = Полная коробка летальных ружейных патронов. -ent-BoxShotgunSlug = коробка ружейных патронов (пули) - .desc = Полная коробка пулевых ружейных патронов -ent-BoxShotgunFlare = коробка ружейных патронов (фальшфейеры) - .desc = Полная коробка ружейных патронов-фальшфейеров. -ent-BoxShotgunIncendiary = коробка ружейных патронов (зажигательные) - .desc = Полная коробка зажигательных ружейных патронов. -ent-BoxShotgunUranium = коробка ружейных патронов (урановые) - .desc = Полная коробка урановых ружейных патронов. -ent-BoxShotgunPractice = коробка ружейных патронов (учебные) - .desc = Полная коробка учебных ружейных патронов. -ent-BoxShellTranquilizer = коробка ружейных патронов (транквилизаторы) - .desc = Полная коробка ружейных патронов-транквилизаторов. -ent-MagazineBoxImprovisedShotgun = коробка ружейных патронов (.50 импровизированная картечь) - .desc = Выглядит как самодельная коробка для патронов .50 дробовика, с нарисованным от руки символом пули сверху. Смешивание калибров не рекомендовано. -ent-BoxShotgunHoly = коробка освященных ружейных патронов (святой) - .desc = Полная коробка освящённых ружейных патронов. Благословлены. Заряжены. Готовы очищать. Во имя Света, Святых и 12-калибра. +ent-BoxBeanbag = коробка травматических 12 калибра + .desc = { ent-AmmoProviderShotgunShell.desc } +ent-BoxLethalshot = коробка дроби 12 калибра + .desc = { ent-AmmoProviderShotgunShell.desc } +ent-BoxShotgunSlug = коробка пуль 12 калибра + .desc = { ent-AmmoProviderShotgunShell.desc } +ent-BoxShotgunFlare = коробка осветительных 12 калибра + .desc = { ent-AmmoProviderShotgunShell.desc } +ent-BoxShotgunIncendiary = коробка зажигательных 12 калибра + .desc = { ent-AmmoProviderShotgunShell.desc } +ent-BoxShotgunUranium = коробка урановых 12 калибра + .desc = { ent-AmmoProviderShotgunShell.desc } +ent-BoxShotgunPractice = коробка учебных 12 калибра + .desc = { ent-AmmoProviderShotgunShell.desc } +ent-BoxShellTranquilizer = коробка транквилизаторов 12 калибра + .desc = { ent-AmmoProviderShotgunShell.desc } +ent-MagazineBoxImprovisedShotgun = коробка самодельных 12 калибра + .desc = Это подозрительно похоже на коробку под патроны .20 с кривым рисунком пули сверху. Смешивать боеприпасы не стоит. +ent-BoxShotgunHoly = коробка освященных 12 калибра + .desc = { ent-AmmoProviderShotgunShell.desc } +ent-BoxShotgunBreaching = коробка бричинговых 12 калибра + .desc = { ent-AmmoProviderShotgunShell.desc } +ent-BoxShotgunFlechette = коробка флешетт 12 калибра + .desc = { ent-AmmoProviderShotgunShell.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl index 3095d18cdc..af8e1d0a50 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl @@ -3,7 +3,7 @@ ent-BaseMagazineRifle = магазин (5,56) ent-MagazineRifleEmpty = магазин (5,56 любые) .suffix = пустой .desc = { ent-MagazineRifle.desc } -ent-MagazineRifle = магазин (5,56) +ent-MagazineRifle = магазин (5,56 SP) .desc = { ent-BaseMagazineRifle.desc } ent-MagazineRifleSP = магазин (5,56 SP) .desc = { ent-BaseMagazineRifle.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl index 5526a56b81..3204d5d189 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl @@ -11,5 +11,3 @@ ent-MagazineShotgunSlug = барабан пуль 12 калибра .desc = { ent-BaseMagazineShotgun.desc } ent-MagazineShotgunIncendiary = барабан зажигательных 12 калибра .desc = { ent-BaseMagazineShotgun.desc } -ent-MagazineShotgunUranium = барабан урановых 12 калибра - .desc = { ent-BaseMagazineShotgun.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/structures/storage/glass_box.ftl b/Resources/Locale/ru-RU/_prototypes/entities/structures/storage/glass_box.ftl index efb5d0e76e..d46973702d 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/structures/storage/glass_box.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/structures/storage/glass_box.ftl @@ -1,7 +1,7 @@ ent-BaseGlassBox = { ent-BaseStructureDynamic } .desc = { ent-BaseStructureDynamic.desc } ent-GlassBox = стеклянный короб - .desc = Прочная витрина для дорогостоящего экспоната. + .desc = Прочная витрина для дорогостоящего экспоната. Имеет автоматический замок и предполагает изъятие экспоната в зеленый код. ent-GlassBoxLaser = { ent-GlassBox } .desc = { ent-GlassBox.desc } .suffix = Антикварный лазер diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/guidebook/guides.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/guidebook/guides.ftl index 82341eda33..137d991880 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/guidebook/guides.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/guidebook/guides.ftl @@ -1,6 +1,7 @@ ## SUNRISE guides guide-entry-ammunition = Боеприпасы +guide-entry-improvised-grenade-casing = Самодельная граната (корпус) guide-entry-disease = Разумная болезнь guide-entry-expeditions = Экспедиции diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/reagents/meta/consumable/drink/soda.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/reagents/meta/consumable/drink/soda.ftl index d48fc42ab5..fcb3b34e8c 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/reagents/meta/consumable/drink/soda.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/reagents/meta/consumable/drink/soda.ftl @@ -7,7 +7,7 @@ reagent-name-cola-sunrise = Свежая космо кола reagent-name-changeling-sting-sunrise = Свежее жало генокрада reagent-name-dr-gibb-sunrise = Свежий доктор Гибб reagent-name-energy-drink-sunrise = Грей бул -reagent-name-pwr-game-sunrise = Свежая PWR игра +reagent-name-pwr-game-sunrise = Свежая PWR гейм reagent-name-root-beer-sunrise = Свежий рутбир reagent-name-root-beer-float-sunrise = Свежий рутбир с мороженым reagent-name-sol-dry-sunrise = Свежий Sol Dry 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 7393c338d9..80d193d80d 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl @@ -1,4 +1,4 @@ -## Targets +## Targets uplink-core-extraction-toolbox-name = Набор инструментов для извлечения ядра uplink-core-extraction-toolbox-desc = Ящик с инструментами, в котором есть все необходимое для извлечения плутониевого сердечника ядерной бомбы. Инструкции в комплект не входят. @@ -7,6 +7,9 @@ uplink-core-extraction-toolbox-desc = Ящик с инструментами, в uplink-magazine-shotgun-name = Барабан (.50 ружейный). uplink-magazine-shotgun-desc = Барабан на 8 выстрелов для дробовика. Совместим с "Бульдогом". +uplink-magazine-shotgun-flechette-desc = Барабан с бронебойными флешеттами, пробивающими стены и укрытия, но с меньшей кучностью. +uplink-breaching-magazine-desc = Барабанный магазин, заряженный пробивными-патронами для пробития шлюзов, окон и стен. Менее эффективен против людей. +uplink-magazine-bulldog-incendiary-desc = Барабанный магазин на 8 патронов зажигательной дроби, легко превращает гражданских в горящие спички. uplink-magazine-lmg-name = Коробка патронов (.30 винтовочные) uplink-magazine-lmg-desc = Коробка патронов на 100 выстрелов. Совместим с "L6-SAW". uplink-grenade-frag-timer-name = безконтактная Осколочная граната @@ -32,14 +35,14 @@ uplink-magazine-dl6902-desc = Магазин для Dl6902. Содержит 200 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 патронов урановой дроби. Совместим с "Бульдогом". +uplink-magazine-bulldog-uranium-desc = Барабанный магазин на 8 патронов урановой дроби, легко поражает экипаж нанотрейзен лучевой болезнью. uplink-pistol-magnum-magazine-name = Магазин (.45 магнум SP) uplink-pistol-magnum-magazine-desc = 7-зарядный однорядный магазин для пистолета. Содержит патроны SP. Совместим с "Диглом". uplink-pistol-magnum-magazine-ap-name = Магазин (.45 магнум бронебойные) uplink-pistol-magnum-magazine-ap-desc = 7-зарядный однорядный магазин для пистолета. Содержит бронебойные патроны. Совместим с "Диглом". uplink-pistoltec9-magazine-name = Tac-Tec (.20 безгильзовый) uplink-pistoltec9-magazine-desc = Кустарный пистолетный магазин под распространённый патрон, используемый агентами синдиката. - +uplink-pistol-magazine-c40r-desc = Магазин ПП на 24 патрона. Совместим с C-40r. uplink-magazine-127-desc = Магазин Bauer SR-127 на 7 патронов предназначеных для уничтожения мехов, киборгов или стркутур таких как решетки и окна, пары попаданий достаточно для пролома стены. uplink-magazine-127pen-desc = Магазин Bauer SR-127 на 7 патронов предназначеных для ликвидации защищенных противников а так же целей за укрытиями и стенами, прекрасно сочетаются с термальным зрением. diff --git a/Resources/Locale/ru-RU/_strings/reagents/meta/consumable/drink/soda.ftl b/Resources/Locale/ru-RU/_strings/reagents/meta/consumable/drink/soda.ftl index 0c6b6f241b..f986b8895a 100644 --- a/Resources/Locale/ru-RU/_strings/reagents/meta/consumable/drink/soda.ftl +++ b/Resources/Locale/ru-RU/_strings/reagents/meta/consumable/drink/soda.ftl @@ -14,7 +14,7 @@ reagent-name-ice-cream = мороженое reagent-desc-ice-cream = Ешьте скорее, пока не превратилось в суп-мороженое! reagent-name-lemon-lime = Смит reagent-desc-lemon-lime = Терпкий лайм и лимонная содовая. -reagent-name-pwr-game = PWR игра +reagent-name-pwr-game = PWR Гейм reagent-desc-pwr-game = Единственный напиток, обладающий СИЛОЙ, которую жаждут настоящие геймеры. Когда геймеры говорят о геймерском топливе, они имеют в виду именно это. reagent-name-root-beer = рутбир reagent-desc-root-beer = Очень сладкий, газированный напиток, напоминающий сарсапариллу. Хорошо сочетается с мороженым. diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml index 410e64c945..85e96c75f1 100644 --- a/Resources/Prototypes/Atmospherics/gases.yml +++ b/Resources/Prototypes/Atmospherics/gases.yml @@ -50,7 +50,7 @@ gasOverlayState: tritium color: 13FF4B reagent: Tritium - pricePerMole: 0.2 #Sunrise-edit + pricePerMole: 0.04 #Sunrise-edit - type: gas id: WaterVapor @@ -86,7 +86,7 @@ molarMass: 44 color: 8F00FF reagent: NitrousOxide - pricePerMole: 1 #Sunrise-edit + pricePerMole: 0.5 # Sunrise-Edit - type: gas id: Frezon @@ -99,4 +99,4 @@ gasMolesVisible: 0.6 color: 3a758c reagent: Frezon - pricePerMole: 3 #Sunrise-edit + pricePerMole: 0.25 # Sunrise-Edit diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index c33df9d5d3..57ae7489b3 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -329,6 +329,7 @@ whitelist: tags: - NukeOpsUplink + - LoneOpsUplink #Sunrise-end # Explosives @@ -628,7 +629,7 @@ # For the C20R - type: listing id: UplinkMagazinePistolSubMachineGun - name: uplink-pistol-magazine-c20r-name + # name: uplink-pistol-magazine-c20r-name # Sunrise-Edit description: uplink-pistol-magazine-c20r-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: red-icon } productEntity: MagazinePistolSubMachineGunSP # Sunrise-Edit @@ -647,7 +648,7 @@ # For the Bulldog - type: listing id: UplinkMagazineShotgunPellet - name: uplink-magazine-bulldog-pellet-name + #name: uplink-magazine-bulldog-pellet-name # Sunrise-Edit description: uplink-magazine-bulldog-pellet-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi, state: pellets } productEntity: MagazineShotgun @@ -658,21 +659,14 @@ - type: listing id: UplinkMagazineShotgunSlug - name: uplink-magazine-bulldog-slug-name + #name: uplink-magazine-bulldog-slug-name # Sunrise-Edit description: uplink-magazine-bulldog-slug-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi, state: slug } productEntity: MagazineShotgunSlug cost: - Telecrystal: 3 + Telecrystal: 2 # Sunrise-Edit categories: - UplinkAmmo - # Sunrise-Start - conditions: - - !type:StoreWhitelistCondition - blacklist: - tags: - - AssaultOpsUplink - # Sunrise-End # For the Cobra - type: listing @@ -719,11 +713,11 @@ # For the Estoc - type: listing id: UplinkEstocAmmo - name: uplink-estoc-ammo-name + #name: uplink-estoc-ammo-name # Sunrise-edit description: uplink-estoc-ammo-desc productEntity: MagazineRifle cost: - Telecrystal: 2 + Telecrystal: 1 # Sunrise-Edit categories: - UplinkAmmo diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index f7f1d142e8..dfa789eb71 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -159,6 +159,7 @@ 250: Critical showOverlays: false allowRevives: true + - type: ZombieImmune - type: HealthExaminable examinableTypes: - Blunt diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml index 29ccee5d8f..6584058c25 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml @@ -186,25 +186,3 @@ - state: mag-tranq-1 map: ["enum.GunVisualLayers.Mag"] - state: tranquilizer - -# Sunrise-start -- type: entity - name: ammunition box (.50 holy) - parent: AmmoProviderShotgunShell - id: BoxShotgunHoly - components: - - type: BallisticAmmoProvider - proto: ShellShotgunHoly - - type: MagazineVisuals - magState: mag-practice - steps: 5 - zeroVisible: false - - type: Sprite - sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-practice-1 - map: ["enum.GunVisualLayers.Mag"] - - state: holy -# Sunrise-end diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml index f47a2cb242..bcfe2ae792 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml @@ -12,7 +12,7 @@ whitelist: tags: - ShellShotgun - capacity: 12 # Sunrise-Edit + capacity: 8 soundRack: path: /Audio/Weapons/Guns/Cock/smg_cock.ogg - type: Item @@ -30,7 +30,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi + sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi # Sunrise-Edit layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -38,7 +38,7 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 2 + steps: 9 # Sunrise-Edit zeroVisible: false - type: Appearance @@ -151,19 +151,3 @@ - state: inhand-right-mag - state: inhand-right-stripe color: "#72382d" - -#Sunrise-Start -- type: entity - id: MagazineShotgunUranium - name: ammo drum (.50 Uranium) - parent: BaseMagazineShotgun - components: - - type: BallisticAmmoProvider - proto: ShellShotgunUranium - - type: Sprite - layers: - - state: uranium - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] -#Sunrise-End diff --git a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml index 4ecfb2e811..51242ac1ce 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml @@ -121,7 +121,13 @@ suffix: AntiqueLaser components: - type: AccessReader - access: [["Captain"]] + # Sunrise-start + access: [["CentralCommand"]] # базово только ЦК + alertAccesses: + blue: CaptainAlertAccesses + red: CaptainAlertAccesses + gamma: CaptainAlertAccesses + # Sunrise-end - type: Construction graph: GlassBox node: glassBox diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml index cbe9df32a1..954ca6650f 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml @@ -128,8 +128,8 @@ - MagazinePistolSubMachineGunUranium - MagazineRifleIncendiary - MagazineRifleUranium - - MagazineShotgunBeanbag - - MagazineShotgunIncendiary + #- MagazineShotgunBeanbag # Sunrise-Edit + #- MagazineShotgunIncendiary # Sunrise-Edit - SpeedLoaderMagnumIncendiary - SpeedLoaderMagnumUranium diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml index 9f52ab5392..b3d260b08f 100644 --- a/Resources/Prototypes/Species/human.yml +++ b/Resources/Prototypes/Species/human.yml @@ -74,10 +74,10 @@ points: 2 required: false Legs: - points: 2 + points: 4 # Sunrise-Edit required: false Arms: - points: 2 + points: 4 # Sunrise-Edit required: false - type: humanoidBaseSprite diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index ef9b6d55d2..2ed4dccb6e 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -293,7 +293,7 @@ whitelist: tags: - CartridgePistolDP - capacity: 20 + capacity: 24 - type: Item size: Small - type: ContainerContainer @@ -317,7 +317,7 @@ name: SMG magazine (.40 any) suffix: empty parent: BaseMagazinePistol40SubMachineGun - description: 20-round double stack magazine for submachine guns. + description: 24-round double stack magazine for submachine guns. components: - type: BallisticAmmoProvider proto: null @@ -338,10 +338,9 @@ id: MagazinePistol40SubMachineGunSP name: SMG magazine (.40 SP) parent: BaseMagazinePistol40SubMachineGun - description: 20-round double stack magazine for submachine guns. Intended to hold general-purpose kinetic ammunition. + description: 24-round double stack magazine for submachine guns. Intended to hold general-purpose kinetic ammunition. components: - type: BallisticAmmoProvider - capacity: 20 proto: CartridgePistol40SP whitelist: tags: @@ -371,10 +370,9 @@ id: MagazinePistol40SubMachineGunHP name: SMG magazine (.40 HP) parent: BaseMagazinePistol40SubMachineGun - description: 20-round double stack magazine for submachine guns. Intended to hold hollow-point ammunition. + description: 24-round double stack magazine for submachine guns. Intended to hold hollow-point ammunition. components: - type: BallisticAmmoProvider - capacity: 20 proto: CartridgePistol40HP whitelist: tags: @@ -404,10 +402,9 @@ id: MagazinePistol40SubMachineGunFMJ name: SMG magazine (.40 FMJ) parent: BaseMagazinePistol40SubMachineGun - description: 20-round double stack magazine for submachine guns. Intended to hold full-metal-jacket ammunition. + description: 24-round double stack magazine for submachine guns. Intended to hold full-metal-jacket ammunition. components: - type: BallisticAmmoProvider - capacity: 20 proto: CartridgePistol40FMJ whitelist: tags: @@ -437,7 +434,6 @@ parent: BaseMagazinePistol40SubMachineGun components: - type: BallisticAmmoProvider - capacity: 20 proto: CartridgePistol40AP whitelist: tags: diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/shotgun.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/shotgun.yml index 48f60b6464..6147a178d8 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/shotgun.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/shotgun.yml @@ -109,6 +109,24 @@ map: [ "enum.GunVisualLayers.Tip" ] color: "#232323" +- type: entity + id: SpeedLoaderShotgunFlechette + name: "speed loader (.50 flechette)" + parent: [ BaseSpeedLoaderShotgun, BaseSecurityContraband ] + components: + - type: BallisticAmmoProvider + proto: ShellShotgunFlechette + - type: Sprite + sprite: _Starlight/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Shotgun/shotgun_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-7 + map: [ "enum.GunVisualLayers.Mag" ] + - state: base-tip-7 + map: [ "enum.GunVisualLayers.Tip" ] + color: "#5da0b5" + - type: entity id: SpeedLoaderShotgunUranium name: "speed loader (.50 uranium)" diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index d194f20174..efd9fbb811 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -1185,6 +1185,40 @@ count: 10 spread: 6 +- type: entity + id: PelletShotgunFlechetteTrace + parent: BulletTrace + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: 0.4 + damage: + types: + Piercing: 4 + Structural: 4 + - type: HitscanStaminaDamage + staminaDamage: 3 + - type: HitscanPierce + chance: 0.7 + pierceLevel: HardenedMetal + - type: HitscanRicochet + chance: 0.4 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: _Sunrise/Objects/Weapons/Projectiles/shrapnel.rsi + state: shrapnelshot_bit + +- type: entity + id: PelletShotgunFlechetteSpreadTrace + parent: PelletShotgunFlechetteTrace + categories: [ HideSpawnMenu ] + components: + - type: ProjectileSpread + proto: PelletShotgunFlechetteTrace + count: 8 + spread: 10 + - type: entity id: PelletShotgunBreachTrace parent: BulletTrace diff --git a/Resources/Prototypes/_Sunrise/Access/AccessGroup/access_group.yml b/Resources/Prototypes/_Sunrise/Access/AccessGroup/access_group.yml index bb6a30231d..4df7cbcbcc 100644 --- a/Resources/Prototypes/_Sunrise/Access/AccessGroup/access_group.yml +++ b/Resources/Prototypes/_Sunrise/Access/AccessGroup/access_group.yml @@ -33,3 +33,8 @@ - Armory - Detective +# Captain antique locker emergency groups +- type: accessGroup + id: CaptainAlertAccesses + tags: + - Captain diff --git a/Resources/Prototypes/_Sunrise/Atmospherics/gases.yml b/Resources/Prototypes/_Sunrise/Atmospherics/gases.yml index 8a0159dc38..10c4ea5823 100644 --- a/Resources/Prototypes/_Sunrise/Atmospherics/gases.yml +++ b/Resources/Prototypes/_Sunrise/Atmospherics/gases.yml @@ -6,7 +6,7 @@ molarMass: 10 color: 9370db reagent: BZ - pricePerMole: 1 + pricePerMole: 0.3 gasOverlaySprite: /Textures/_Sunrise/Effects/atmospherics.rsi gasOverlayState: bz @@ -18,7 +18,7 @@ molarMass: 10 color: 8b0000 reagent: Healium - pricePerMole: 12 + pricePerMole: 0.32 gasOverlaySprite: /Textures/_Sunrise/Effects/atmospherics.rsi gasOverlayState: healium @@ -30,7 +30,7 @@ molarMass: 30 color: 8B4513 reagent: Nitrium - pricePerMole: 2 + pricePerMole: 0.26 gasOverlaySprite: /Textures/_Sunrise/Effects/atmospherics.rsi gasOverlayState: nitriumGas diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml index 7daec9c433..fd90fb977e 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml @@ -169,10 +169,77 @@ categories: - UplinkAmmo +- type: listing + id: UplinkMagazinePistolSMGHP + description: uplink-pistol-magazine-c20r-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: red-icon } + productEntity: MagazinePistolSubMachineGunHP + cost: + Telecrystal: 2 + categories: + - UplinkAmmo + +- type: listing + id: UplinkMagazinePistolSMGFMJ + description: uplink-pistol-magazine-c20r-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: red-icon } + productEntity: MagazinePistolSubMachineGunFMJ + cost: + Telecrystal: 2 + categories: + - UplinkAmmo + +- type: listing + id: UplinkMagazinePistol40SMGSP + description: uplink-pistol-magazine-c40r-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: red-icon } + productEntity: MagazinePistol40SubMachineGunSP + cost: + Telecrystal: 2 + categories: + - UplinkAmmo + +- type: listing + id: UplinkMagazinePistol40SMGHP + description: uplink-pistol-magazine-c40r-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: red-icon } + productEntity: MagazinePistol40SubMachineGunHP + cost: + Telecrystal: 2 + categories: + - UplinkAmmo + +- type: listing + id: UplinkMagazinePistol40SMGFMJ + description: uplink-pistol-magazine-c40r-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: red-icon } + productEntity: MagazinePistol40SubMachineGunFMJ + cost: + Telecrystal: 2 + categories: + - UplinkAmmo + +- type: listing + id: UplinkMagazineRifleHP + description: uplink-estoc-ammo-desc + productEntity: MagazineRifleHP + cost: + Telecrystal: 1 + categories: + - UplinkAmmo + +- type: listing + id: UplinkMagazineRifleFMJ + description: uplink-estoc-ammo-desc + productEntity: MagazineRifleFMJ + cost: + Telecrystal: 1 + categories: + - UplinkAmmo + # For the LMG - type: listing id: UplinkMagazineLightRifleBox - description: uplink-magazine-lmg-desc icon: { sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: icon } productEntity: MagazineRifleBoxSP discountCategory: usualDiscounts @@ -189,6 +256,18 @@ - NukeOpsUplink - LoneOpsUplink +- type: listing + id: UplinkMagazineRifleBoxFMJ + icon: { sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: icon } + productEntity: MagazineRifleBoxFMJ + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 3 + cost: + Telecrystal: 4 + categories: + - UplinkAmmo + # For the SIAR52 - type: listing id: UplinkMagazinePistolSubMachineGunCaselessExtended @@ -421,13 +500,11 @@ Telecrystal: 1 categories: - UplinkAmmo - #Sunrise-start conditions: - !type:StoreWhitelistCondition blacklist: tags: - AssaultOpsUplink - #Sunrise-end - type: listing id: UplinkAmmoBundleSuper @@ -460,13 +537,11 @@ Telecrystal: 5 categories: - UplinkExplosives - #Sunrise-start conditions: - !type:StoreWhitelistCondition blacklist: tags: - AssaultOpsUplink - #Sunrise-end # For the China-Lake - type: listing @@ -589,6 +664,69 @@ - NukeOpsUplink - LoneOpsUplink +- type: listing + id: UplinkShotgunBreachingMagazine + description: uplink-breaching-magazine-desc + icon: + { + sprite: /Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi, + state: breach, + } + productEntity: MagazineShotgunBreach + cost: + Telecrystal: 1 + categories: + - UplinkAmmo + +- type: listing + id: UplinkMagazineShotgunFlechette + description: uplink-magazine-shotgun-flechette-desc + icon: { sprite: /Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi, state: flechette } + productEntity: MagazineShotgunFlechette + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 1 + cost: + Telecrystal: 3 + categories: + - UplinkAmmo + +- type: listing + id: UplinkMagazineShotgunBeanbag + description: uplink-magazine-bulldog-slug-desc + icon: { sprite: /Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi, state: beanbag } + productEntity: MagazineShotgunBeanbag + cost: + Telecrystal: 1 + categories: + - UplinkAmmo + +- type: listing + id: UplinkMagazineShotgunIncendiary + description: uplink-magazine-bulldog-incendiary-desc + icon: { sprite: /Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi, state: base } + productEntity: MagazineShotgunIncendiary + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 3 + cost: + Telecrystal: 4 + categories: + - UplinkAmmo + +- type: listing + id: UplinkMagazineShotgunUranium + description: uplink-magazine-bulldog-uranium-desc + icon: { sprite: /Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi, state: uranium } + productEntity: MagazineShotgunUranium + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 3 + cost: + Telecrystal: 4 + categories: + - UplinkAmmo + - type: listing id: UplinkBoomboxBundle name: uplink-music-boombox-name @@ -1308,9 +1446,9 @@ productEntity: CrateCybersunDarkGygaxBundle discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 40 + Telecrystal: 35 cost: - Telecrystal: 70 + Telecrystal: 60 categories: - UplinkMechs conditions: @@ -1377,26 +1515,6 @@ # Mechs equipment -- type: listing - id: UplinkMechImmolationGun - name: uplink-mech-equipment-immolation-gun-name - description: uplink-mech-equipment-immolation-gun-desc - icon: { sprite: Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_laser } - productEntity: WeaponMechCombatImmolationGun - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 5 - cost: - Telecrystal: 10 - categories: - - UplinkMechs - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - NukeOpsUplink - - LoneOpsUplink - - type: listing id: UplinkMechTeslaCannon name: uplink-mech-equipment-tesla-cannon-name @@ -1405,9 +1523,9 @@ productEntity: WeaponMechCombatTeslaCannon discountCategory: rareDiscounts discountDownTo: - Telecrystal: 10 + Telecrystal: 3 cost: - Telecrystal: 16 + Telecrystal: 5 categories: - UplinkMechs conditions: @@ -1416,6 +1534,9 @@ tags: - NukeOpsUplink - LoneOpsUplink + blacklist: + components: + - SurplusBundle - type: listing id: UplinkMechShotgun @@ -1425,9 +1546,9 @@ productEntity: WeaponMechCombatShotgun discountCategory: rareDiscounts discountDownTo: - Telecrystal: 5 + Telecrystal: 2 cost: - Telecrystal: 10 + Telecrystal: 4 categories: - UplinkMechs conditions: @@ -1436,6 +1557,9 @@ tags: - NukeOpsUplink - LoneOpsUplink + blacklist: + components: + - SurplusBundle - type: listing id: UplinkMechShotgunIncendiary @@ -1445,9 +1569,9 @@ productEntity: WeaponMechCombatShotgunIncendiary discountCategory: rareDiscounts discountDownTo: - Telecrystal: 5 + Telecrystal: 4 cost: - Telecrystal: 10 + Telecrystal: 6 categories: - UplinkMechs conditions: @@ -1456,26 +1580,32 @@ tags: - NukeOpsUplink - LoneOpsUplink + blacklist: + components: + - SurplusBundle -# - type: listing -# id: UplinkMechUltraRifle -# name: uplink-mech-equipment-ultra-rifle-name -# description: uplink-mech-equipment-ultra-rifle-desc -# icon: { sprite: Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_uac2 } -# productEntity: WeaponMechCombatUltraRifle -# discountCategory: rareDiscounts -# discountDownTo: -# Telecrystal: 2 -# cost: -# Telecrystal: 4 -# categories: -# - UplinkMechs -# conditions: -# - !type:StoreWhitelistCondition -# whitelist: -# tags: -# - NukeOpsUplink -# - LoneOpsUplink +- type: listing + id: UplinkMechUltraRifle + name: uplink-mech-equipment-ultra-rifle-name + description: uplink-mech-equipment-ultra-rifle-desc + icon: { sprite: Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_uac2 } + productEntity: WeaponMechCombatUltraRifle + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 2 + cost: + Telecrystal: 3 + categories: + - UplinkMechs + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - LoneOpsUplink + blacklist: + components: + - SurplusBundle - type: listing id: UplinkMechIon @@ -1485,9 +1615,9 @@ productEntity: WeaponMechCombatIon discountCategory: rareDiscounts discountDownTo: - Telecrystal: 5 + Telecrystal: 3 cost: - Telecrystal: 10 + Telecrystal: 5 categories: - UplinkMechs conditions: @@ -1496,6 +1626,9 @@ tags: - NukeOpsUplink - LoneOpsUplink + blacklist: + components: + - SurplusBundle - type: listing id: UplinkMechChainSword @@ -1503,9 +1636,9 @@ productEntity: WeaponMechChainSword discountCategory: rareDiscounts discountDownTo: - Telecrystal: 4 + Telecrystal: 1 cost: - Telecrystal: 8 + Telecrystal: 2 categories: - UplinkMechs conditions: @@ -1514,6 +1647,9 @@ tags: - NukeOpsUplink - LoneOpsUplink + blacklist: + components: + - SurplusBundle - type: listing id: UplinkMechAMLG90 @@ -1523,9 +1659,9 @@ productEntity: WeaponMechCombatAMLG90 discountCategory: rareDiscounts discountDownTo: - Telecrystal: 4 + Telecrystal: 2 cost: - Telecrystal: 8 + Telecrystal: 3 categories: - UplinkMechs conditions: @@ -1534,6 +1670,9 @@ tags: - NukeOpsUplink - LoneOpsUplink + blacklist: + components: + - SurplusBundle - type: listing id: UplinkMechVindictor @@ -1541,11 +1680,8 @@ description: uplink-mech-equipment-vindictor-desc icon: { sprite: _Sunrise/Objects/Specific/Mech/mecha_vindictor.rsi, state: mecha_vindictor } productEntity: WeaponMechCombatVindictor - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 15 cost: - Telecrystal: 30 + Telecrystal: 15 categories: - UplinkMechs conditions: @@ -1561,11 +1697,8 @@ - type: listing id: UplinkMechMaxim productEntity: WeaponMechCombatMaxim - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 14 cost: - Telecrystal: 18 + Telecrystal: 12 categories: - UplinkMechs conditions: @@ -1581,11 +1714,8 @@ - type: listing id: UplinkMechHeavyRifle productEntity: WeaponMechCombatHeavyRifle - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 20 cost: - Telecrystal: 22 + Telecrystal: 13 categories: - UplinkMechs conditions: @@ -1598,18 +1728,14 @@ components: - SurplusBundle - - type: listing id: UplinkMechUVM31 name: uplink-mech-equipment-uvm31-name description: uplink-mech-equipment-uvm31-desc icon: { sprite: _Sunrise/Objects/Specific/Mech/mecha_uvm31.rsi, state: mecha_uvm31 } productEntity: WeaponMechCombatUVM31 - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 15 cost: - Telecrystal: 25 + Telecrystal: 14 categories: - UplinkMechs conditions: @@ -1849,11 +1975,8 @@ - type: listing id: UplinkSyringePistol productEntity: LauncherSyringePistol - discountCategory: usualDiscounts - discountDownTo: - Telecrystal: 1 cost: - Telecrystal: 2 + Telecrystal: 1 categories: - UplinkJob conditions: @@ -1875,9 +1998,9 @@ productEntity: LauncherSyringeRapid discountCategory: rareDiscounts discountDownTo: - Telecrystal: 3 + Telecrystal: 2 cost: - Telecrystal: 4 + Telecrystal: 3 categories: - UplinkJob conditions: @@ -2036,9 +2159,9 @@ productEntity: CrateCybersunDarkGygaxBundle discountCategory: rareDiscounts discountDownTo: - Telecrystal: 25 + Telecrystal: 20 cost: - Telecrystal: 37 + Telecrystal: 35 categories: - UplinkJob restockTime: 3600 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml index a0a6de5a6f..663188a518 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml @@ -17,7 +17,7 @@ soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/HMGs/minigun_shot.ogg - type: BatteryAmmoProvider - proto: CartridgeRifleSP + proto: CartridgeRifleFMJ fireCost: 5 - type: Appearance - type: AmmoCounter diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml index af855d837d..2332ceead4 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml @@ -19,6 +19,9 @@ - type: CanMoveInAir - type: Reactive - type: MobMover + - type: NpcFactionMember + factions: + - NanoTrasen - type: Mech entryDelay: 1 - type: MechAir @@ -90,6 +93,7 @@ 300: Critical showOverlays: false allowRevives: true + - type: ZombieImmune - type: HealthExaminable examinableTypes: - Blunt diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml new file mode 100644 index 0000000000..d0dd6dccf2 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml @@ -0,0 +1,53 @@ +- type: entity + name: ammunition box (.50 holy) + parent: AmmoProviderShotgunShell + id: BoxShotgunHoly + components: + - type: BallisticAmmoProvider + proto: ShellShotgunHoly + - type: MagazineVisuals + magState: mag-practice + steps: 5 + zeroVisible: false + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-practice-1 + map: ["enum.GunVisualLayers.Mag"] + - state: holy + +- type: entity + parent: [BoxShotgunHoly, BaseSyndicateContraband] + id: BoxShotgunBreaching + name: ammunition box (.50 breaching) + description: A cardboard box of .50 shotgun shells. Packed with breaching buckshot for forced entry. + components: + - type: BallisticAmmoProvider + proto: ShellShotgunBreaching + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + color: "#0096FF" + map: ["enum.GunVisualLayers.Mag"] + - state: breaching + +- type: entity + parent: [BoxShotgunHoly, BaseSecurityContraband ] + id: BoxShotgunFlechette + name: ammunition box (.50 flechette) + description: A cardboard box of .50 shotgun shells. Holds armor-piercing flechette. + components: + - type: BallisticAmmoProvider + proto: ShellShotgunFlechette + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + color: "#5da0b5" + map: ["enum.GunVisualLayers.Mag"] + - state: flechette diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Catrtidges/shotguns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Catrtidges/shotguns.yml index 76ef45a535..188b1b8f64 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Catrtidges/shotguns.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Catrtidges/shotguns.yml @@ -222,3 +222,48 @@ - Cartridge - ShellShotgun - ShellShotgunLight + +- type: entity + id: ShellShotgunFlechette + name: shell (.50 flechette) + parent: [ BaseShellShotgun, BaseSyndicateContraband ] + components: + - type: Sprite + layers: + - state: slug + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip-long + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#5da0b5" + - state: holy + color: "#07252eb5" + - state: spent-long + map: [ "enum.AmmoVisualLayers.Spent" ] + visible: false + - type: CartridgeAmmo + soundEject: + collection: ShellEject + proto: PelletShotgunFlechetteSpreadTrace + - type: Tag + tags: + - ShellShotgun + +- type: entity + id: ShellShotgunBreaching + name: shell (.50 breaching) + parent: [ BaseShellShotgun, BaseSyndicateContraband ] + components: + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#0096FF" + - state: spent + map: [ "enum.AmmoVisualLayers.Spent" ] + visible: false + - type: CartridgeAmmo + soundEject: + collection: ShellEject + proto: PelletShotgunBreachSpreadTrace diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml index 97218eb919..6fa7090f7b 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml @@ -8,6 +8,7 @@ tags: - MagazineAsh12 - type: Sprite + scale: 0.8,0.8 sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi layers: - state: base @@ -16,11 +17,6 @@ map: ["enum.GunVisualLayers.Mag"] - type: Item size: Small - shape: - - 0,0,0,2 - storedSprite: - state: storage - sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi - type: BallisticAmmoProvider mayTransfer: true whitelist: @@ -33,7 +29,7 @@ ballistic-ammo: !type:Container - type: MagazineVisuals magState: mag - steps: 2 + steps: 9 zeroVisible: false - type: Appearance @@ -50,10 +46,6 @@ map: ["enum.GunVisualLayers.Mag"] - state: stripe color: "#780606" - - type: Item - storedSprite: - state: storage_slug - sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi - type: entity id: MagazineAsh12Beanbag @@ -70,10 +62,6 @@ color: "#149A1E" - type: BallisticAmmoProvider proto: ShellShotgunBeanbag - - type: Item - storedSprite: - state: storage_rubber - sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi - type: entity id: MagazineAsh12Flare @@ -90,7 +78,76 @@ color: "#FFFF0B" - type: BallisticAmmoProvider proto: ShellShotgunFlare + +# region Bulldog +- type: entity + id: MagazineShotgunBreach + name: ammo drum (.50 breaching) + parent: BaseMagazineShotgun + components: + - type: BallisticAmmoProvider + proto: ShellShotgunBreaching + - type: Sprite + layers: + - state: breach + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] - type: Item - storedSprite: - state: storage_flare - sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#0096FF" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#0096FF" + +- type: entity + parent: BaseMagazineShotgun + id: MagazineShotgunFlechette + name: ammo drum (.50 flechette) + components: + - type: BallisticAmmoProvider + proto: ShellShotgunFlechette + - type: Sprite + layers: + - state: flechette + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#5da0b5" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#5da0b5" + +- type: entity + id: MagazineShotgunUranium + name: ammo drum (.50 Uranium) + parent: BaseMagazineShotgun + components: + - type: BallisticAmmoProvider + proto: ShellShotgunUranium + - type: Sprite + layers: + - state: uranium + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#40F57A" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#40F57A" diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml index c9a3cae458..cff57d802f 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml @@ -321,6 +321,9 @@ - type: Tag tags: - ImprovisedGrenadeEmpty + - type: GuideHelp + guides: + - SunriseImprovisedGrenadeCasing - type: entity id: ImprovisedGrenadeFirebomb diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 4979a8cb82..5c6d9755b3 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -531,7 +531,7 @@ - type: entity name: ASH-12 - parent: BaseWeaponRifleSunrise + parent: [GunLight, BaseWeaponRifle] id: WeaponRifleAsh12 components: - type: Sprite @@ -552,11 +552,14 @@ storedSprite: state: icon sprite: _Sunrise/Objects/Weapons/Guns/Rifles/ash12/big.rsi + - type: GunWieldBonus + minAngle: -14 + maxAngle: -20 - type: Gun - minAngle: 3 - maxAngle: 24 - angleIncrease: 2 - angleDecay: 12 + minAngle: 15 + maxAngle: 30 + angleIncrease: 3 + angleDecay: 15 fireRate: 3 soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/Rifles/ash12/fire.ogg diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Shuttles/thrusters.yml index 3d1a65d4a8..b41ca67b78 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Shuttles/thrusters.yml @@ -1,6 +1,6 @@ - type: entity id: ThrusterSyndicate - parent: [ BaseThruster, ConstructibleMachine ] + parent: [ ThrusterXenoborg, ConstructibleMachine ] # ThrusterXenoborg Никакого саботажа двигателей, не выключить не открутить и не повернуть components: - type: Thruster baseThrust: 150 @@ -24,7 +24,7 @@ - type: entity id: BigThruster name: big thruster - parent: [ BaseThruster] + parent: [ ThrusterXenoborg] placement: mode: AlignTileAny components: @@ -109,7 +109,7 @@ - type: entity id: HugeThruster name: huge thruster - parent: [ BaseThruster ] + parent: [ ThrusterXenoborg ] components: - type: Anchorable flags: diff --git a/Resources/Prototypes/_Sunrise/Guidebook/improvised_grenade.yml b/Resources/Prototypes/_Sunrise/Guidebook/improvised_grenade.yml new file mode 100644 index 0000000000..c80f3c1baf --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Guidebook/improvised_grenade.yml @@ -0,0 +1,5 @@ +- type: guideEntry + id: SunriseImprovisedGrenadeCasing + name: guide-entry-improvised-grenade-casing + text: "/ServerInfo/Guidebook/_Sunrise/ImprovisedGrenadeCasing.xml" + priority: 6 diff --git a/Resources/Prototypes/_Sunrise/Recipes/Crafting/Graphs/Improvised/improvisedgrenade.yml b/Resources/Prototypes/_Sunrise/Recipes/Crafting/Graphs/Improvised/improvisedgrenade.yml index fd13cb56b4..3d47a03488 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Crafting/Graphs/Improvised/improvisedgrenade.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Crafting/Graphs/Improvised/improvisedgrenade.yml @@ -68,12 +68,6 @@ sprite: Objects/Materials/Shards/shard.rsi state: shard2 doAfter: 0.5 - - tag: GlassShard - name: construction-graph-tag-glass-shard - icon: - sprite: Objects/Materials/Shards/shard.rsi - state: shard1 - doAfter: 0.5 - node: firebomb entity: ImprovisedGrenadeFirebomb - node: pipebomb diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/security.yml index 7288f0d034..ccbaa07fd3 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/security.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/security.yml @@ -265,6 +265,7 @@ - BoxShotgunIncendiary - BoxShotgunUranium - BoxShellTranquilizer + - BoxShotgunFlechette #####################MAGAZINE####################### # LMG - MagazineLightRifleBeltBoxIncendiary @@ -310,6 +311,7 @@ # Shotgun - SpeedLoaderShotgunIncendiary - SpeedLoaderShotgunUranium + - SpeedLoaderShotgunFlechette # Grenade - MagazineGrenadeEmpty #################################################### diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/ammo.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/ammo.yml index 5f037423e8..4243ed805f 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/ammo.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/ammo.yml @@ -979,6 +979,25 @@ Plasteel: 425 Uranium: 140 +#Box .50 Shotgun +- type: latheRecipe + parent: BaseAmmoBoxRecipe + id: BoxShotgunBreaching + result: BoxShotgunBreaching + materials: + Steel: 250 + Plastic: 100 + Plasma: 50 + +- type: latheRecipe + parent: BaseAmmoBoxRecipe + id: BoxShotgunFlechette + result: BoxShotgunFlechette + materials: + Steel: 80 + Plasteel: 300 + Plastic: 50 + #Speedloaders .50 Shotgun - type: latheRecipe parent: BaseEmptyAmmoRecipe @@ -1010,6 +1029,15 @@ Steel: 225 Plastic: 25 +- type: latheRecipe + parent: BaseAmmoRecipe + id: SpeedLoaderShotgunFlechette + result: SpeedLoaderShotgunFlechette + materials: + Steel: 60 + Plasteel: 200 + Plastic: 25 + - type: latheRecipe parent: BaseAmmoRecipe id: SpeedLoaderShotgunIncendiary diff --git a/Resources/Prototypes/_Sunrise/Research/arsenal.yml b/Resources/Prototypes/_Sunrise/Research/arsenal.yml index 881ca8fb71..0ef4ad184d 100644 --- a/Resources/Prototypes/_Sunrise/Research/arsenal.yml +++ b/Resources/Prototypes/_Sunrise/Research/arsenal.yml @@ -39,6 +39,8 @@ - MagazinePistolHighCapacityAP - MagazineBoxHeavyRifleAP - MagazineRifleHeavyAP + - BoxShotgunFlechette + - SpeedLoaderShotgunFlechette radioChannels: - Security diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/Ammunition.xml b/Resources/ServerInfo/Guidebook/_Sunrise/Ammunition.xml index 152433577e..f35ac2e558 100644 --- a/Resources/ServerInfo/Guidebook/_Sunrise/Ammunition.xml +++ b/Resources/ServerInfo/Guidebook/_Sunrise/Ammunition.xml @@ -36,6 +36,22 @@ - [color=#65fe08]Урановые[/color] + + + Тяжёлый пистолетный (.40) + + + + + + + - [color=#3F47DB]SP[/color] + - [color=#F5514C]HP[/color] (экспансивные) + - [color=#B68F0E]FMJ[/color] + - [color=#540000]AP[/color] (бронебойные) + + + @@ -151,6 +167,9 @@ 12-й калибр + + + @@ -160,12 +179,14 @@ - [color=#149A1E]Травматический[/color] - [color=#FFFF0B]Фальшфейер[/color] - [color=#FFFF0B]Зажигательный[/color] + - [color=#0096FF]Пробивной[/color] + - [color=#5da0b5]Флешетта[/color] - [color=#dbdbdb]Учебный[/color] - [color=#49CECE]Транквилизатор[/color] - - [color=#65fe08]Урановые[/color] + - [color=#65fe08]Урановый[/color] - Самодельная [color=#555555]картечь[/color] - Самодельный [color=#FFFF0B]Зажигательный[/color] - - Самодельный [color=#65fe08]Урановые[/color] + - Самодельный [color=#65fe08]Урановый[/color] - Самодельный ([color=#caa44a]монетная пуля[/color]) - [color=#149A1E]Алкогольный[/color] - [color=#e4e4e4]Святой[/color] diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/ImprovisedGrenadeCasing.xml b/Resources/ServerInfo/Guidebook/_Sunrise/ImprovisedGrenadeCasing.xml new file mode 100644 index 0000000000..5db3783ada --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/ImprovisedGrenadeCasing.xml @@ -0,0 +1,14 @@ + # Самодельная граната: пустой корпус + + Пустая гильза — основа для самодельных гранат. Заполните её и выберите ветку в графе, чтобы получить один из вариантов. + + ## Что можно собрать и как + ### Для создания Трубчатой бомбы + - Трубчатая бомба с контактным тригером и дополнительными осколочными частями. + + ### Для создания Зажигательная бомбы + - Зажигательная бомба с контактным тригером и дополнительными зажигательными частями. + + ### Для создания Стеклянной картечи + - Стеклянная картечь: много мелких поражений в месте попадании. + 5 единиц diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json index c95d52803d..eaa0f484ad 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json @@ -19,9 +19,6 @@ { "name": "slug" }, - { - "name": "uranium" - }, { "name": "mag-1" }, diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/breaching.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/breaching.png new file mode 100644 index 0000000000..e78f1630f0 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/breaching.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flechette.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flechette.png new file mode 100644 index 0000000000..ceb436d5db Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flechette.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json index 5c7a5a05b9..f1298012ce 100644 --- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json @@ -24,6 +24,12 @@ }, { "name": "base" + }, + { + "name": "flechette" + }, + { + "name": "breaching" } ] } diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/base.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/base.png new file mode 100644 index 0000000000..e2a9b2bf56 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/base.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/beanbag.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/beanbag.png new file mode 100644 index 0000000000..83fa6f15e5 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/beanbag.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/breach.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/breach.png new file mode 100644 index 0000000000..a5dab755eb Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/breach.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/flechette.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/flechette.png new file mode 100644 index 0000000000..adf6375056 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/flechette.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/inhand-left-mag.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/inhand-left-mag.png new file mode 100644 index 0000000000..248486fa6e Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/inhand-left-mag.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/inhand-left-stripe.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/inhand-left-stripe.png new file mode 100644 index 0000000000..5ff0b2222f Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/inhand-left-stripe.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/inhand-right-mag.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/inhand-right-mag.png new file mode 100644 index 0000000000..a022bff12e Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/inhand-right-mag.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/inhand-right-stripe.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/inhand-right-stripe.png new file mode 100644 index 0000000000..488d7d1bee Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/inhand-right-stripe.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-1.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-1.png new file mode 100644 index 0000000000..fcc131fadb Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-1.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-2.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-2.png new file mode 100644 index 0000000000..92b29122a8 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-2.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-3.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-3.png new file mode 100644 index 0000000000..632c300f27 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-3.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-4.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-4.png new file mode 100644 index 0000000000..ce6a070dfe Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-4.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-5.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-5.png new file mode 100644 index 0000000000..6edf0e7d54 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-5.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-6.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-6.png new file mode 100644 index 0000000000..ad67fa13f9 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-6.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-7.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-7.png new file mode 100644 index 0000000000..fa140ed3ff Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-7.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-8.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-8.png new file mode 100644 index 0000000000..6dfb9d06b3 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/mag-8.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/meta.json new file mode 100644 index 0000000000..6dc264710b --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/meta.json @@ -0,0 +1,72 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github). breach state by PubliclyExecutedPig for Starlight. uranium state by KaiserMaus for Sunrise", + "states": [ + { + "name": "base" + }, + { + "name": "beanbag" + }, + { + "name": "pellets" + }, + { + "name": "slug" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, + { + "name": "mag-6" + }, + { + "name": "mag-7" + }, + { + "name": "mag-8" + }, + { + "name": "breach" + }, + { + "name": "uranium" + }, + { + "name": "flechette" + }, + { + "name": "inhand-left-mag", + "directions": 4 + }, + { + "name": "inhand-left-stripe", + "directions": 4 + }, + { + "name": "inhand-right-mag", + "directions": 4 + }, + { + "name": "inhand-right-stripe", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/pellets.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/pellets.png new file mode 100644 index 0000000000..6832620ac6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/pellets.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/slug.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/slug.png new file mode 100644 index 0000000000..19c80df80c Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/slug.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/uranium.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/uranium.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/uranium.png rename to Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Shotgun/m12.rsi/uranium.png diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/base.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/base.png index 073643d9df..00edb56188 100644 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/base.png and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/base.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-1.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-1.png index a0536bb202..3d2efeda65 100644 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-1.png and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-1.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-2.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-2.png new file mode 100644 index 0000000000..c3b961b94d Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-2.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-3.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-3.png new file mode 100644 index 0000000000..36dfa8b637 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-3.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-4.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-4.png new file mode 100644 index 0000000000..3fc462af2a Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-4.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-5.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-5.png new file mode 100644 index 0000000000..b246fee2ed Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-5.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-6.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-6.png new file mode 100644 index 0000000000..72f3f4559c Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-6.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-7.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-7.png new file mode 100644 index 0000000000..c1651645b6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-7.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-8.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-8.png new file mode 100644 index 0000000000..b64121e049 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/mag-8.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/meta.json index ba1c67007f..04a1b08937 100644 --- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/meta.json @@ -13,25 +13,37 @@ { "name": "mag-1" + }, + { + "name": "mag-2" + + }, + { + "name": "mag-3" + + }, + { + "name": "mag-4" + + }, + { + "name": "mag-5" + + }, + { + "name": "mag-6" + + }, + { + "name": "mag-7" + + }, + { + "name": "mag-8" + }, { "name": "stripe" - }, - { - "name": "storage" - - }, - { - "name": "storage_slug" - - }, - { - "name": "storage_flare" - - }, - { - "name": "storage_rubber" - } ] } diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/storage.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/storage.png deleted file mode 100644 index 9e711e29c3..0000000000 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/storage.png and /dev/null differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/storage_flare.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/storage_flare.png deleted file mode 100644 index e2d4fa03da..0000000000 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/storage_flare.png and /dev/null differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/storage_rubber.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/storage_rubber.png deleted file mode 100644 index 1dfd544d9f..0000000000 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/storage_rubber.png and /dev/null differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/storage_slug.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/storage_slug.png deleted file mode 100644 index 061ca3244c..0000000000 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/storage_slug.png and /dev/null differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/stripe.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/stripe.png index 1cc30b016d..596aa3f349 100644 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/stripe.png and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/stripe.png differ