rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Фиксы прошлый Пров и апстримов (#3444)

Browse source
This commit is contained in:
KaiserMaus 2025-12-06 16:59:03 +00:00 • committed by GitHub
parent 047f2eb9ef
commit 94cbb081ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
279 changed files with 1835 additions and 12761 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Content.IntegrationTests/Tests/PostMapInitTest.cs
View file

@ -121,7 +121,7 @@ namespace Content.IntegrationTests.Tests
private static readonly string[] SunriseGameMaps =
{
"SunriseDev",
// "SunriseDev",
"SunriseBox",
"SunriseDelta",
"SunriseFland",

2
Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/rifles/rifles.ftl
View file

@ -2,3 +2,5 @@ ent-WeaponGunLaserCarbineSemi = IK-30 laser carbine
.desc = A semi-automatic battery laser carbine.
ent-WeaponGunLaserCarbineAutomatic = IK-60 laser carbine
.desc = A burst automatic battery laser carbine.
ent-WeaponRifleLeikha = Leikha
.desc = A high end military grade assault rifle. This one has been retrofitted with a scope and a burst receiver. Uses .20 rifle ammo.

2
Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/smgs/smgs.ftl
View file

@ -1,7 +1,5 @@
ent-WeaponSubMachineGunSP91RC = SP-91-RC
.desc = Compact submachine gun designed for riot control.
ent-WeaponSubMachineGunPPSH = PPSH 59 SMG
.desc = Beloved by USSP veterans and feared by friendly fire protocols everywhere. Uses .35 ammo.
ent-WeaponSubMachineGunMakeshift = makeshift SMG
.desc = Held together with cloth and dreams, it rattles ominously with every shot.
ent-WeaponSubMachineGunImprovised = improvised SMG

1
Resources/Locale/en-US/_prototypes/_sunrise/boss/ents.ftl
View file

@ -1,4 +1,5 @@
ent-MobHellspawnBoss = { ent-MobHellspawn }
.suffix = Boss
.desc = { ent-MobHellspawn.desc }
ent-ComputerBossTravel = boss battle altar
.desc = { ent-AltarFangs.desc }

3
Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/items/medical.ftl
View file

@ -1,3 +1,6 @@
ent-MedkitUniversalFilled = universal medkit
.desc = Contains all types of medicine that you need.
.suffix = Filled
ent-CoalpenKitFilled = first aid kit
.desc = It's an emergency medical kit for those serious boo-boos.
.suffix = Filled

13
Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/lockers/security.ftl
View file

@ -49,7 +49,7 @@ ent-GunSafeRifleM16A4 = safe
ent-GunSafeRifleAKMU = safe
.suffix = AKMU
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeRifleLecterMk2 = safe
ent-GunSafeRifleLecterMk2 = safe lecter Mk2
.suffix = Lecter Mk2
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeRifleAR18 = safe
@ -77,17 +77,14 @@ ent-GunSafeDoubleBarreled = safe
.desc = According to the paperwork — state-of-the-art tactical shotguns. In reality — antique double-barrels.
.suffix = Shotgun Double-Barreled
ent-SpawnerSafeSmallArms = Armory Safe Spawner
.suffix = Spawner Safe Pistols
.suffix = Armory, Pistols
.desc = { ent-MarkerBase.desc }
ent-SpawnerSafeShotguns = Armory Safe Spawner
.suffix = Spawner Safe ShotGuns
.suffix = Armory, Shotguns
.desc = { ent-MarkerBase.desc }
ent-SpawnerSafeRifle = Armory Safe Spawner
.suffix = Spawner Safe Rifle
.suffix = Armory, Rifle
.desc = { ent-MarkerBase.desc }
ent-SpawnerSafeSMG = Armory Safe Spawner
.suffix = Spawner Safe SMG
.suffix = Armory, SMG
.desc = { ent-MarkerBase.desc }
ent-GunSafeShotgunPaladin = safe
.suffix = Paladin 12
.desc = { ent-GunSafe.desc }

6
Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/NTUplink.ftl
View file

@ -10,12 +10,12 @@ ent-BaseUplinkNTERTRed = Bluespace ERT visionary
ent-BaseUplinkNTERTGamma = Bluespace ERT visionary
.desc = Ultra-innovative portable bluespace teleporter.
.suffix = 200BC, 200C, Gamma
ent-BaseUplinkNTERTBlueShield = Bluespace ERT visionary
.desc = Ultra-innovative portable bluespace teleporter.
.suffix = 8BC, 10C, BlueShield
ent-BaseUplinkNTERTDebug = Bluespace ERT visionary
.desc = Ultra-innovative portable bluespace teleporter.
.suffix = 999, Debug
ent-ClothingHandsPowerGlovesNoUplink = ERT Power Gloves
.desc = Now I'm playin' with power! A solid argument made of duraplastalloy fibers in any brawl.
.suffix = No uplink
ent-BaseClothingHandsPowerGlovesUplinkNTERT = ERT Power Gloves
.desc = A solid argument made of duraplastalloy fibers in any brawl — just hope the other guy doesn’t bring a gun. Comes with a built-in ERT-standard uplink.
.suffix = Uplink, Empty

2
Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
View file

@ -18,8 +18,6 @@ ent-MagazineHIBrowning = HI Browning magazine
.desc = { ent-BaseItem.desc }
ent-MagazineACP14 = ACP14 magazine
.desc = { ent-BaseItem.desc }
ent-MagazineSTG44 = STG44 magazine
.desc = { ent-BaseItem.desc }
ent-MagazineDl6902 = box-magazine DL6902
.desc = { ent-BaseMagazineLightRifle.desc }
ent-MagazinePistolSubMachineGunSIAR52 = extended magazine (caseless)

4
Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl
View file

@ -4,10 +4,8 @@ ent-MagazineMP7 = MP7 magazine
.desc = { ent-BaseItem.desc }
ent-MagazineMP5 = MP5 magazine
.desc = { ent-BaseItem.desc }
ent-MagazinePPSH41 = PPSH magazine
ent-MagazinePistolSubMachineGunPPSHExtended = PPSH drum magazine
.desc = { ent-BaseItem.desc }
ent-MagazinePPSH41Extended = { ent-MagazinePPSH41 }
.desc = { ent-MagazinePPSH41.desc }
ent-MagazineMP5Extended = { ent-MagazineMP5 }
.desc = { ent-MagazineMP5.desc }
ent-MagazineMP7Extended = { ent-MagazineMP7 }

4
Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl
View file

@ -1,7 +1,3 @@
ent-MagazineV31 = { ent-BaseItem }
.desc = { ent-BaseItem.desc }
ent-MagazineV31Extended = { ent-MagazineV31 }
.desc = { ent-MagazineV31.desc }
ent-MagazineAR18 = magazine (7,62mm NT)
.desc = { ent-BaseItem.desc }
ent-MagazineAR18Extended = { ent-MagazineAR18 }

4
Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl
View file

@ -16,10 +16,6 @@ ent-WeaponRifleAR18 = AR-18
.desc = { ent-BaseWeaponRifle.desc }
ent-WeaponRifleM16A4 = M16A4
.desc = { ent-BaseWeaponRifle.desc }
ent-WeaponSTG44 = STG 44
.desc = { ent-BaseWeaponRifle.desc }
ent-WeaponRifleV31 = V-31 assault rifle
.desc = { ent-BaseWeaponRifle.desc }
ent-WeaponRifleScarH = scar-h
.desc = { ent-BaseWeaponRifle.desc }
ent-WeaponRifleLecterMk2 = Lecter Mk2

4
Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl
View file

@ -10,8 +10,8 @@ ent-WeaponSubMachineGunSkorpion = Scorpion VZ-61
.desc = { ent-BaseWeaponSubMachineGun.desc }
ent-WeaponSubMachineGunNewVector = New Vector
.desc = { ent-BaseWeaponSubMachineGun.desc }
ent-WeaponSubMachineGunPPSH41 = PPSH-41
.desc = { ent-BaseWeaponSubMachineGun.desc }
ent-WeaponSubMachineGunPPSH = PPSH 59 SMG
.desc = Beloved by USSP veterans and feared by friendly fire protocols everywhere. Uses .35 ammo.
ent-WeaponAMS-42 = MS-42
.desc = A more advanced version of Lecter.
ent-WeaponAJ100 = AJ-100

3
Resources/Locale/en-US/_prototypes/entities/mobs/player/humanoid.ftl
View file

@ -77,6 +77,9 @@ ent-RandomHumanoidSpawnerERTJanitorVeteran = ERT janitor
ent-RandomHumanoidSpawnerCBURNVeteran = CBURN Agent
.suffix = ERTRole, Veteran
.desc = { ent-RandomHumanoidSpawnerCBURNUnit.desc }
ent-RandomHumanoidSpawnerCBURNUnitEVA = CBURN Agent
.suffix = ERTRole, Heavy
.desc = { ent-RandomHumanoidSpawnerCBURNUnit.desc }
ent-RandomHumanoidSpawnerERTLeaderEVAVeteran = ERT leader
.suffix = ERTRole, Armored EVA, Veteran
.desc = { ent-RandomHumanoidSpawnerERTLeaderEVA.desc }

2
Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl
View file

@ -19,7 +19,7 @@ ent-MagazineRiflePractice = magazine (.20 rifle practice)
.desc = { ent-BaseMagazineRifle.desc }
ent-MagazineRifleUranium = magazine (.20 rifle uranium)
.desc = { ent-BaseMagazineRifle.desc }
ent-MagazineLightRifleBoxSP = L6 SAW magazine box (.20 rifle SP)
ent-MagazineRifleBoxSP = L6 SAW magazine box (.20 rifle SP)
.desc = Box containing a 150-round belt of linked .20 rifle rounds, used by light machine guns such as the L6. Intended to hold general-purpose kinetic ammunition.
ent-MagazineLightRifleBoxIncendiary = L6 SAW magazine box (.30 rifle incendiary)
.desc = { ent-MagazineLightRifleBox.desc }

3
Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
View file

@ -506,5 +506,8 @@ uplink-coal-auto-injector-desc = A specialized auto-injector containing coal-bas
uplink-coalpen-kit-name = Coalpen Kit
uplink-coalpen-kit-desc = A medical kit containing 6 coal auto-injectors for treating poison damage and clearing blood toxins.
uplink-stimkit-nt-name = Stim Kit
uplink-stimkit-nt-desc = A medical kit containing 6 ephedrine auto-injectors.
uplink-acolyte-armor-name = Acolyte Armor
uplink-acolyte-armor-desc = The must have of any self respecting cult leader. An evil looking piece of armor, made of bones, and surprisingly resistant to damage.

16
Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
View file

@ -1,17 +1,19 @@
ent-LightRifleHeavyBase = { ent-BaseItem }
.desc = { ent-BaseItem.desc }
ent-LightRifleMagazineEmpty = Коробка магазина (7.62 любой)
ent-MagazineLightRifleBeltBoxEmpty = пулемётный короб (7,62 любые)
.suffix = Пустой
.desc = { ent-LightRifleHeavyBase.desc }
ent-LightRifleMagazineSP = Коробка магазина (7.62 SP)
ent-MagazineLightRifleBeltBox = пулемётный короб (7,62 SP)
.desc = { ent-LightRifleHeavyBase.desc }
ent-LightRifleMagazineHP = Коробка магазина (7.62 HP)
ent-MagazineLightRifleBeltBoxHP = пулемётный короб (7,62 HP)
.desc = { ent-LightRifleHeavyBase.desc }
ent-LightRifleMagazineFMJ = Коробка магазина (7.62 FMJ)
ent-MagazineLightRifleBeltBoxFMJ = пулемётный короб (7,62 FMJ)
.desc = { ent-LightRifleHeavyBase.desc }
ent-LightRifleMagazineIncendiary = Коробка магазина (7.62 зажигательный)
ent-MagazineLightRifleBeltBoxIncendiary = пулемётный короб (7,62 зажигательные)
.desc = { ent-LightRifleHeavyBase.desc }
ent-LightRifleMagazineUranium = Коробка магазина (7.62 урановый)
ent-MagazineLightRifleBeltBoxUranium = пулемётный короб (7,62 урановые)
.desc = { ent-LightRifleHeavyBase.desc }
ent-LightRifleMagazineAP = Коробка магазина (7.62 AP)
ent-MagazineLightRifleBeltBoxAP = пулемётный короб (7,62 AP)
.desc = { ent-LightRifleHeavyBase.desc }
ent-MagazineLightRifleBeltBoxPractice = пулемётный короб (7,62 учёбные)
.desc = { ent-LightRifleHeavyBase.desc }

4
Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/lmgs/lmgs.ftl
View file

@ -1,4 +1,4 @@
ent-WeaponLightMachineGunM492 = М492 Умный легкий пулемет
.desc = Высокотехнологичный легкий пулемет нестандартной конструкции, созданный специально для борьбы с крупными угрозами среди нас. Использует патроны калибра .30.
.desc = Высокотехнологичный легкий пулемет нестандартной конструкции, созданный специально для борьбы с крупными угрозами среди нас. Использует патроны калибра 7,62мм.
ent-WeaponLightMachineGunDP28 = Легкий пулемет ДП-28
.desc = С любовью, РА-ТА-ТА-ТА. Использует патроны калибра .30.
.desc = С любовью, РА-ТА-ТА-ТА. Использует патроны калибра 7,62ммR.

2
Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/rifles/rifles.ftl
View file

@ -2,3 +2,5 @@ ent-WeaponGunLaserCarbineSemi = лазерный карабин ИК-30
.desc = Лазерный полуавтоматический карабин используемый батарейки как источник питания.
ent-WeaponGunLaserCarbineAutomatic = лазерный карабин ИК-60
.desc = Лазерный карабин ведущий огонь очередями и используемый батарейки как источник питания.
ent-WeaponRifleLeikha = Лейха
.desc = Первоклассная армейская штурмовая винтовка. Этот экземпляр был модернизирован заменой ресивера и установкой прицела. Использует патроны калибра 5,56мм.

2
Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/smgs/smgs.ftl
View file

@ -1,7 +1,5 @@
ent-WeaponSubMachineGunSP91RC = SP-91-RC
.desc = Компактный пистолет-пулемет, предназначенный для контроля беспорядков.
ent-WeaponSubMachineGunPPSH = PPSH 59 SMG
.desc = Любимец ветеранов КССР и повсюду внушает страх протоколам дружественного огня. Использует патроны калибра .35.
ent-WeaponSubMachineGunMakeshift = самодельный ПП
.desc = Скрепленный тканью и мечтами, он зловеще дребезжит при каждом выстреле.
ent-WeaponSubMachineGunImprovised = импровизированный ПП

2
Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/backpacks/duffelbag.ftl
View file

@ -16,6 +16,8 @@ ent-ClothingBackpackDuffelWeaponAMS42Filled = Набор AMS-42
.desc = AMS-42 c 3мя магазинами.
ent-ClothingBackpackDuffelWeaponRifleG36Filled = Набор G36
.desc = G36 c 2мя магазинами.
ent-ClothingBackpackDuffelWeaponRifleM52Filled = Набор М-52
.desc = Премиумная штурмовая винтовка вместе с 3мя FMJ магазинами, 2мя SP и одним HP магазином
ent-ClothingBackpackDuffelWeaponShotgunCycler = Набор Штурмовой дробовик
.desc = Штурмовой дробовик c 6мя спидлоудерами дроби.
ent-ClothingBackpackDuffelWeaponShotgun4034Filled = Набор L4034

2
Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl
View file

@ -22,3 +22,5 @@ ent-BoxErtBaseKit = Аварийный набор ОБР
.desc = Набор снаряжения ОБР, имеет все, что необходимо члену ОБР.
ent-BoxMagazineRifleNanotrasen = коробка с магазинами 7.62 NT
.desc = коробка с магазинами 7.62х51 NT для винтовки.
ent-BoxMagazineRifleM52 = коробка с магазинами М-52
.desc = коробка с магазинами 5,56мм для М-52.

5
Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/items/medical.ftl
View file

@ -1,3 +1,6 @@
ent-MedkitUniversalFilled = универсальный медкит
.desc = Содержит все виды медикаментов, которые могут вам потребоваться.
.suffix = Наполненный
.suffix = Заполненная
ent-CoalpenKitFilled = аптечка первой помощи
.desc = Это экстренная аптечка для серьёзных бо-бо.
.suffix = Заполненная

92
Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/lockers/security.ftl
View file

@ -1,93 +1,91 @@
ent-GunSafeEnergyGunMini = сейф миниатюрных энергетических пушек
.suffix = Санрайз
.desc = { ent-GunSafe.desc }
ent-GunSafeEnergyGunPistolSecurity = сейф энергетических пистолетов "Судья"
.suffix = Санрайз
.desc = { ent-GunSafe.desc }
ent-GunSafeEnergyPistolDominator = сейф
ent-GunSafeEnergyGunMini = сейф миниатюрных пистолетов
.suffix = Энергетический мини-пистолет
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeEnergyGunPistolSecurity = сейф судья
.suffix = Энергетический пистолет «Судья»
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeEnergyPistolDominator = сейф доминаторы
.suffix = Энергетический пистолет «Доминатор»
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeEnergyGun = сейф Тактических энергетических пушек
ent-GunSafeEnergyGun = сейф тактических энерго пушек
.suffix = Санрайз
.desc = { ent-GunSafe.desc }
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafePistolG22 = сейф Глоков-22
.suffix = Санрайз
.desc = { ent-GunSafe.desc }
ent-GunSafePistolM1984 = сейф
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafePistolM1984 = сейф М1984
.suffix = М1984
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeSnubRevolver = сейф
ent-GunSafeSnubRevolver = сейф револьверов
.suffix = Укороченный револьвер
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafePistolVP78 = сейф
ent-GunSafePistolVP78 = сейф ВП-78
.suffix = ВП-78
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafePistolACP14 = сейф
ent-GunSafePistolACP14 = сейф АЦП-14
.suffix = АЦП-14
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeSubMachineGunVector = сейф векторов
.suffix = Санрайз
.desc = { ent-GunSafe.desc }
ent-GunSafeSubMachineGunMP7 = сейф с MP7
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeSubMachineGunMP7 = сейф MP7
.suffix = Санрайз
.desc = { ent-GunSafe.desc }
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeSubMachineGunSkorpion = сейф скорпионов
.suffix = Скорпион, Санрайз
.desc = { ent-GunSafe.desc }
ent-GunSafeSubMachineGunMP5 = сейф
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeSubMachineGunMP5 = сейф MP5
.suffix = MP5, Санрайз
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeSubMachineGunDrozdMk2 = сейф
ent-GunSafeSubMachineGunDrozdMk2 = сейф дрозд Mk2
.suffix = Дрозд Mk2, Санрайз
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeSubMachineGunSP91RC = сейф
ent-GunSafeSubMachineGunSP91RC = сейф СП91РК
.suffix = СП91РК, Санрайз
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeRifleM16A4 = сейф с M16A4
ent-GunSafeRifleM16A4 = сейф M16A4
.suffix = Санрайз
.desc = { ent-GunSafe.desc }
ent-GunSafeRifleAKMU = сейф
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeRifleAKMU = сейф АКМУ
.suffix = АКМУ
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeRifleLecterMk2 = сейф
ent-GunSafeRifleLecterMk2 = сейф лектер Mk2
.suffix = Лектер Mk2
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeRifleAR18 = сейф
ent-GunSafeRifleAR18 = сейф АР-18
.suffix = АР-18
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeRifleFamas = сейф
ent-GunSafeRifleFamas = сейф Фамас
.suffix = Фамас
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeWeaponRifleG36 = сейф
ent-GunSafeWeaponRifleG36 = сейф Г-36
.suffix = Г-36
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeShotgunTrenchgun4034 = сейф Тренчганов 4034
.suffix = Санрайз
.desc = { ent-GunSafe.desc }
ent-GunSafeShotgunRiot = сейф
ent-GunSafeShotgunTrenchgun4034 = сейф Тренчганов
.suffix = Тренчган
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeShotgunRiot = сейф дробовик «Бунт»
.suffix = Дробовик «Бунт»
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeShotgunSPAS12 = сейф LAW-12
.suffix = Санрайз
.desc = { ent-GunSafe.desc }
ent-GunSafeShotgunCombat = сейф
.suffix = LAW-12
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeShotgunCombat = сейф боевой дробовик
.suffix = Боевой дробовик
.desc = { ent-GunSafeBaseSecure.desc }
ent-GunSafeDoubleBarreled = сейф
ent-GunSafeDoubleBarreled = сейф тактические дробовики
.desc = Согласно документам — ультрасовременные тактические дробовики. На самом деле — старинные двустволки.
.suffix = Двуствольный дробовик
ent-SpawnerSafeSmallArms = Спавнер оружейного сейфа
.suffix = Спавнер сейфа пистолетов
ent-SpawnerSafeSmallArms = Спавнер сейфа пистолетов
.suffix = Оружейная, пистолеты
.desc = { ent-MarkerBase.desc }
ent-SpawnerSafeShotguns = Спавнер оружейного сейфа
.suffix = Спавнер сейфа дробовиков
ent-SpawnerSafeShotguns = Спавнер сейфа дробовик
.suffix = Оружейная, дробовики
.desc = { ent-MarkerBase.desc }
ent-SpawnerSafeRifle = Спавнер оружейного сейфа
.suffix = Спавнер сейфа винтовок
ent-SpawnerSafeRifle = Спавнер сейфа автоматы
.suffix = Оружейная, Автоматы
.desc = { ent-MarkerBase.desc }
ent-SpawnerSafeSMG = Спавнер оружейного сейфа
.suffix = Спавнер сейфа ПП
ent-SpawnerSafeSMG = Спавнер сейфа пистолет-пулемётов
.suffix = Оружейная, ПП
.desc = { ent-MarkerBase.desc }
ent-GunSafeShotgunPaladin = сейф Паладинов 12
.suffix = Санрайз
.desc = { ent-GunSafe.desc }

15
Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/NTUplink.ftl
View file

@ -1,24 +1,27 @@
ent-BaseUplinkNTERT = Блюспейс Визионер ОБР
.desc = Сверхинновационный портативный блюспейс-телепортатор.
.suffix = Пустой, ERT
ent-BaseUplinkNTERTAmber = { ent-BaseUplinkNTERT }
ent-UplinkNTERTAmber = { ent-BaseUplinkNTERT }
.suffix = 75 БК, 75К, ERT, Amber
.desc = { ent-BaseUplinkNTERT.desc }
ent-BaseUplinkNTERTRed = { ent-BaseUplinkNTERT }
ent-UplinkNTERTRed = { ent-BaseUplinkNTERT }
.suffix = 100 БК, 100К, ERT, Red
.desc = { ent-BaseUplinkNTERT.desc }
ent-BaseUplinkNTERTGamma = { ent-BaseUplinkNTERT }
ent-UplinkNTERTGamma = { ent-BaseUplinkNTERT }
.suffix = 200 БК, 200К, ERT, Gamma
.desc = { ent-BaseUplinkNTERT.desc }
ent-BaseUplinkNTERTEpsilon = { ent-BaseUplinkNTERT }
ent-UplinkNTERTEpsilon = { ent-BaseUplinkNTERT }
.suffix = 150 БК, 150К, Эпсилон
.desc = { ent-BaseUplinkNTERT.desc }
ent-BaseUplinkNTERTBlueShield = блюспейс визионер синего щита
ent-UplinkNTERTBlueShield = блюспейс визионер синего щита
.desc = Ультрасовременный портативный блюспейс телепортер.
.suffix = 8BC, 10C, Синий щит
ent-BaseUplinkNTERTDebug = { ent-BaseUplinkNTERT }
ent-UplinkNTERTDebug = { ent-BaseUplinkNTERT }
.suffix = 999, ДЕБАГ
.desc = { ent-BaseUplinkNTERT.desc }
ent-ClothingHandsPowerGlovesNoUplink = силовые перчатки
.desc = Поиграем в полную силу! Весомый аргумент из дюрапласталевых волокон в любой потасовке.
.suffix = Без аплика
ent-BaseClothingHandsPowerGlovesUplinkNTERT = силовые перчатки ОБР
.desc = Весомый аргумент из дюрапласталевых волокон в любой потасовке — главное, чтобы у противника не было пистолета. Встроенный аплинк стандарта ОБР прилагается.
.suffix = Аплик, Пустой

36
Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/boxes/heavy_rifle.ftl
View file

@ -1,36 +1,36 @@
ent-BaseMagazineBoxHeavyRifle = коробка с патронами (.308)
ent-BaseMagazineBoxHeavyRifle = коробка патронов (.308)
.desc = { ent-BaseItem.desc }
ent-MagazineBoxHeavyRifleBig = коробка с патронами (.308 SP)
ent-MagazineBoxHeavyRifleBig = коробка патронов (.308 SP)
.desc = { ent-BaseMagazineBoxHeavyRifle.desc }
ent-MagazineBoxHeavyRifleSP = коробка с патронами (.308 SP)
ent-MagazineBoxHeavyRifleSP = коробка патронов (.308 SP)
.desc = { ent-BaseMagazineBoxHeavyRifle.desc }
ent-MagazineBoxHeavyRifleHP = коробка с патронами (.308 HP)
ent-MagazineBoxHeavyRifleHP = коробка патронов (.308 HP)
.desc = { ent-BaseMagazineBoxHeavyRifle.desc }
ent-MagazineBoxHeavyRifleFMJ = коробка с патронами (.308 FMJ)
ent-MagazineBoxHeavyRifleFMJ = коробка патронов (.308 FMJ)
.desc = { ent-BaseMagazineBoxHeavyRifle.desc }
ent-MagazineBoxHeavyRifleAP = коробка с патронами (.308 AP)
ent-MagazineBoxHeavyRifleAP = коробка патронов (.308 AP)
.desc = { ent-BaseMagazineBoxHeavyRifle.desc }
ent-MagazineBoxHeavyRiflePractice = коробка с патронами (.308 учебные)
ent-MagazineBoxHeavyRiflePractice = коробка патронов (.308 учебные)
.desc = Картонная коробка с патронами .308 калибра. Предназначена для хранения безвредных меловых боеприпасов.
ent-MagazineBoxHeavyRifleIncendiary = коробка с патронами (.308 зажигательные)
ent-MagazineBoxHeavyRifleIncendiary = коробка патронов (.308 зажигательные)
.desc = Картонная коробка с патронами .308 калибра. Предназначена для хранения самовоспламеняющихся зажигательных боеприпасов.
ent-MagazineBoxHeavyRifleUranium = коробка с патронами (.308 урановые)
ent-MagazineBoxHeavyRifleUranium = коробка патронов (.308 урановые)
.desc = Картонная коробка с патронами .308 калибра. Предназначена для хранения экзотических боеприпасов с урановым сердечником.
ent-BaseMagazineBoxRifleMachine = коробка с патронами (7.62mmR)
ent-BaseMagazineBoxRifleMachine = коробка патронов (7.62mmR)
.desc = { ent-BaseItem.desc }
ent-MagazineBoxRifleMachineBig = коробка с патронами (7.62mmR SP)
ent-MagazineBoxRifleMachineBig = коробка патронов (7.62mmR SP)
.desc = { ent-BaseMagazineBoxRifleMachine.desc }
ent-MagazineBoxRifleMachineSP = коробка с патронами (7.62mmR SP)
ent-MagazineBoxRifleMachineSP = коробка патронов (7.62mmR SP)
.desc = { ent-BaseMagazineBoxRifleMachine.desc }
ent-MagazineBoxRifleMachineHP = коробка с патронами (7.62mmR HP)
ent-MagazineBoxRifleMachineHP = коробка патронов (7.62mmR HP)
.desc = { ent-BaseMagazineBoxRifleMachine.desc }
ent-MagazineBoxRifleMachineFMJ = коробка с патронами (7.62mmR FMJ)
ent-MagazineBoxRifleMachineFMJ = коробка патронов (7.62mmR FMJ)
.desc = { ent-BaseMagazineBoxRifleMachine.desc }
ent-MagazineBoxRifleMachineAP = коробка с патронами (7.62mmR AP)
ent-MagazineBoxRifleMachineAP = коробка патронов (7.62mmR AP)
.desc = { ent-BaseMagazineBoxRifleMachine.desc }
ent-MagazineBoxRifleMachinePractice = коробка с патронами (7.62mmR учебные)
ent-MagazineBoxRifleMachinePractice = коробка патронов (7.62mmR учебные)
.desc = Картонная коробка с патронами 7.62mmR. Предназначена для хранения безвредных меловых боеприпасов.
ent-MagazineBoxRifleMachineIncendiary = коробка с патронами (7.62mmR зажигательные)
ent-MagazineBoxRifleMachineIncendiary = коробка патронов (7.62mmR зажигательные)
.desc = Картонная коробка с патронами 7.62mmR. Предназначена для хранения самовоспламеняющихся зажигательных боеприпасов.
ent-MagazineBoxRifleMachineUranium = коробка с патронами (7.62mmR урановые)
ent-MagazineBoxRifleMachineUranium = коробка патронов (7.62mmR урановые)
.desc = Картонная коробка с патронами 7.62mmR. Предназначена для хранения экзотических боеприпасов с урановым сердечником.

2
Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
View file

@ -18,8 +18,6 @@ ent-MagazineHIBrowning = магазин HIBrowning-88 М4
.desc = Использует патроны калибра .35 мм
ent-MagazineACP14 = магазин пистолета ACP-14
.desc = Использует патроны калибра .40.
ent-MagazineSTG44 = магазин STG44
.desc = { ent-BaseItem.desc }
ent-MagazineDl6902 = короб-магазин DL6902
.desc = { ent-BaseMagazineLightRifle.desc }
ent-MagazinePistolSubMachineGunSIAR52 = Расширенный магазин (безгильзовые)

4
Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl
View file

@ -4,10 +4,8 @@ ent-MagazineMP7 = магазин ПП MP7
.desc = Использует патроны калибра .35 авто.
ent-MagazineMP5 = магазин ПП MP5
.desc = Использует патроны калибра .35 авто.
ent-MagazinePPSH41 = магазин ППШ
ent-MagazinePistolSubMachineGunPPSHExtended = барабан ППШ
.desc = Использует патроны калибра .35 авто.
ent-MagazinePPSH41Extended = расширенный магазин ППШ
.desc = { ent-MagazinePPSH41.desc }
ent-MagazineMP5Extended = расширенный магазин MP5
.desc = { ent-MagazineMP5.desc }
ent-MagazineMP7Extended = расширенный магазин MP7

4
Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl
View file

@ -1,7 +1,3 @@
ent-MagazineV31 = магазин для рельсотрона
.desc = Стандартный тяжёлый магазин типа EarthGov.
ent-MagazineV31Extended = расширенный магазин V31
.desc = { ent-MagazineV31.desc }
ent-MagazineAR18 = магазин (7,62мм NT)
.desc = Использует патроны калибра 7,62х51 NT
ent-MagazineAR18Extended = расширенный магазин AR18

4
Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl
View file

@ -17,10 +17,6 @@ ent-WeaponRifleAR18 = Карабин AR-18
.desc = Укороченный вариант M-28 с телескопическим прикладом. Стреляет теми же патронами 7.62×51мм NT. Легче и компактнее, подходит для разведки и боёв в ограниченном пространстве.
ent-WeaponRifleM16A4 = M16A4
.desc = Легкая, универсальная штурмовая винтовка. До сих пор сохраняет актуальность среди наемников и ополченцев. Заряжается патронами калибра 5,56х45мм.
ent-WeaponSTG44 = STG 44
.desc = { ent-BaseWeaponRifle.desc }
ent-WeaponRifleV31 = Штурмовая винтовка V-31
.desc = V-31 была основной винтовкой Сынов Марса до появления более совершенного энергетического оружия. Тем не менее, V-31 продолжает находить широкое применение из-за его сравнительной простоты производства и обслуживания, а также из-за встроенного низкоскоростного рельсотрона, предназначенного для так называемых "микро" гранат. Обладает хорошей управляемостью благодаря компактной конструкции bullpup и, как правило, эффективен на всех дистанциях.
ent-WeaponRifleScarH = scar-h
.desc = { ent-BaseWeaponRifle.desc }
ent-WeaponRifleLecterMk2 = Лектер Мк2

4
Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl
View file

@ -10,8 +10,8 @@ ent-WeaponSubMachineGunSkorpion = Скорпион VZ-61
.desc = Надёжное огнестрельное оружие, представляющее собой комбинацию пистолета и пистолет-пулемёта. Использует патрон калибра .35 авто.
ent-WeaponSubMachineGunNewVector = Вектор
.desc = Вектор, используемый полицейским спецназом. Использует патрон калибра .35 авто.
ent-WeaponSubMachineGunPPSH41 = ППШ-71
.desc = ППШ-71 или /"Папаша"/ - это пистолет-пулемёт СССП. Несмотря на малую поражающую способность, его надёжность, исключительная долговечность и высокая огневая мощь оказываются полезными для рук пользователя.
ent-WeaponSubMachineGunPPSH = PPSH 59 SMG
.desc = Любимец ветеранов КССР и повсюду внушает страх протоколам дружественного огня. Использует патроны калибра .35.
ent-WeaponAMS-42 = AMS-42
.desc = Более совершенная версия Лектера.
ent-WeaponAJ100 = AJ-100

2
Resources/Locale/ru-RU/_prototypes/catalog/fills/boxes/ammunition.ftl
View file

@ -24,7 +24,7 @@ ent-BoxMagazinePistolSubMachineGunPractice = коробка с учебными
.desc = Коробка, полная учебных магазинов .35 авто для ПП.
ent-BoxMagazineShotgun = коробка с барабанами (.50 дробь)
.desc = Коробка, полная барабанов (.50 дробь).
ent-BoxMagazineShotgunBeanbag = коробка с барабанами (.50 дробь)
ent-BoxMagazineShotgunBeanbag = коробка с барабанами (.50 травматические)
.desc = Коробка, полная барабанов (.50 травматические).
ent-BoxMagazineShotgunSlug = коробка с барабанами (.50 пуля)
.desc = Коробка, полная барабанов (.50 пуля).

16
Resources/Locale/ru-RU/_prototypes/catalog/fills/lockers/security.ftl
View file

@ -16,27 +16,27 @@ ent-LockerDetectiveFilled = { ent-LockerDetective }
ent-ClosetBombFilled = { ent-ClosetBomb }
.suffix = Заполненный
.desc = { ent-ClosetBomb.desc }
ent-GunSafeDisabler = оружейный сейф станнеров
ent-GunSafeDisabler = сейф станнеров
.suffix = Станнер
.desc = { ent-GunSafe.desc }
ent-GunSafePistolMk58 = оружейный сейф MK58
ent-GunSafePistolMk58 = сейф MK58
.suffix = MK58
.desc = { ent-GunSafe.desc }
ent-GunSafeRifleLecter = оружейный сейф Лектеров
ent-GunSafeRifleLecter = сейф лектеров
.suffix = Лектер
.desc = { ent-GunSafe.desc }
ent-GunSafeSubMachineGunDrozd = оружейный сейф Дроздов
ent-GunSafeSubMachineGunDrozd = сейф дроздов
.suffix = Дрозд
.desc = { ent-GunSafe.desc }
ent-GunSafeShotgunEnforcer = оружейный сейф Силовиков
ent-GunSafeShotgunEnforcer = сейф силовиков
.suffix = Силовик
.desc = { ent-GunSafe.desc }
ent-GunSafeShotgunKammerer = оружейный сейф Каммереров
ent-GunSafeShotgunKammerer = сейф каммереров
.suffix = Каммерер
.desc = { ent-GunSafe.desc }
ent-GunSafeSubMachineGunWt550 = оружейный сейф WT550
ent-GunSafeSubMachineGunWt550 = сейф WT550
.suffix = WT550
.desc = { ent-GunSafe.desc }
ent-GunSafeLaserCarbine = оружейный сейф лазерных карабинов
ent-GunSafeLaserCarbine = сейф лазерных карабинов
.suffix = Лазерный карабин
.desc = { ent-GunSafe.desc }

3
Resources/Locale/ru-RU/_prototypes/entities/mobs/player/humanoid.ftl
View file

@ -77,6 +77,9 @@ ent-RandomHumanoidSpawnerERTJanitorVeteran = ОБР уборщик
ent-RandomHumanoidSpawnerCBURNVeteran = Агент РХБЗЗ
.suffix = Роль ОБР, Ветеран
.desc = { ent-RandomHumanoidSpawnerCBURNUnit.desc }
ent-RandomHumanoidSpawnerCBURNUnitEVA = Агент РХБЗЗ
.suffix = Роль ОБР, Тяжелый
.desc = { ent-RandomHumanoidSpawnerCBURNUnit.desc }
ent-RandomHumanoidSpawnerERTLeaderEVAVeteran = ОБР лидер
.suffix = Роль ОБР, EVA, Ветеран
.desc = { ent-RandomHumanoidSpawnerERTLeaderEVA.desc }

24
Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl
View file

@ -1,22 +1,22 @@
ent-BaseMagazineBoxLightRifle = коробка патронов (7,62мм)
ent-BaseMagazineBoxLightRifle = коробка патронов (7,62)
.desc = { ent-BaseItem.desc }
ent-MagazineBoxLightRifleBig = ящик патронов (7,62мм)
ent-MagazineBoxLightRifleBig = ящик патронов (7,62)
.desc = { ent-BaseMagazineBoxLightRifle.desc }
ent-MagazineBoxLightRifleSP = ammunition box (.30 rifle SP)
ent-MagazineBoxLightRifleSP = коробка патронов (7,62 SP)
.desc = { ent-BaseMagazineBoxLightRifle.desc }
ent-MagazineBoxLightRifleHP = ammunition box (.30 rifle HP)
ent-MagazineBoxLightRifleHP = коробка патронов (7,62 HP)
.desc = { ent-BaseMagazineBoxLightRifle.desc }
ent-MagazineBoxLightRifleFMJ = ammunition box (.30 rifle FMJ)
ent-MagazineBoxLightRifleFMJ = коробка патронов (7,62 FMJ)
.desc = { ent-BaseMagazineBoxLightRifle.desc }
ent-MagazineBoxLightRifleAP = ammunition box (.30 rifle AP)
ent-MagazineBoxLightRifleAP = коробка патронов (7,62 AP)
.desc = { ent-BaseMagazineBoxLightRifle.desc }
ent-MagazineBoxLightRiflePractice = коробка патронов (7,62мм учебные)
ent-MagazineBoxLightRiflePractice = коробка патронов (7,62 учебные)
.desc = { ent-BaseMagazineBoxLightRifle.desc }
ent-MagazineBoxLightRifleIncendiary = коробка патронов (7,62мм зажигательные)
ent-MagazineBoxLightRifleIncendiary = коробка патронов (7,62 зажигательные)
.desc = { ent-BaseMagazineBoxLightRifle.desc }
ent-MagazineBoxLightRifleUranium = коробка патронов (7,62мм урановые)
ent-MagazineBoxLightRifleUranium = коробка патронов (7,62 урановые)
.desc = { ent-BaseMagazineBoxLightRifle.desc }
ent-MagazineBoxLightRifle = коробка патронов (7,62мм)
ent-MagazineBoxLightRifle = коробка патронов (7,62)
.desc = { ent-BaseMagazineBoxLightRifle.desc }
ent-MagazineBoxImprovisedRifle = коробка патронов (7,62мм импровизированные)
.desc = Примерно собранная коробка для патронов 7,62мм, с нарисованным от руки символом пули сверху. Смешивание калибров не рекомендовано.
ent-MagazineBoxImprovisedRifle = коробка патронов (7,62 импровизированные)
.desc = Примерно собранная коробка для патронов 7,62, с нарисованным от руки символом пули сверху. Смешивание калибров не рекомендовано.

18
Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl
View file

@ -1,20 +1,20 @@
ent-BaseMagazineBoxRifle = { ent-BaseItem }
.desc = { ent-BaseItem.desc }
ent-MagazineBoxRifleBig = ящик патронов (5,56мм)
ent-MagazineBoxRifleBig = ящик патронов (5,56)
.desc = { ent-BaseMagazineBoxRifle.desc }
ent-MagazineBoxRifleSP = ammunition box (5,56мм SP)
ent-MagazineBoxRifleSP = коробка патронов (5,56 SP)
.desc = { ent-BaseMagazineBoxRifle.desc }
ent-MagazineBoxRifleHP = ammunition box (5,56мм HP)
ent-MagazineBoxRifleHP = коробка патронов (5,56 HP)
.desc = { ent-BaseMagazineBoxRifle.desc }
ent-MagazineBoxRifleFMJ = ammunition box (5,56мм FMJ)
ent-MagazineBoxRifleFMJ = коробка патронов (5,56 FMJ)
.desc = { ent-BaseMagazineBoxRifle.desc }
ent-MagazineBoxRifleAP = ammunition box (5,56мм AP)
ent-MagazineBoxRifleAP = коробка патронов (5,56 AP)
.desc = { ent-BaseMagazineBoxRifle.desc }
ent-MagazineBoxRiflePractice = коробка патронов (5,56мм учебные)
ent-MagazineBoxRiflePractice = коробка патронов (5,56 учебные)
.desc = { ent-BaseMagazineBoxRifle.desc }
ent-MagazineBoxRifleIncendiary = коробка патронов (5,56мм зажигательные)
ent-MagazineBoxRifleIncendiary = коробка патронов (5,56 зажигательные)
.desc = { ent-BaseMagazineBoxRifle.desc }
ent-MagazineBoxRifleUranium = коробка патронов (5,56мм урановые)
ent-MagazineBoxRifleUranium = коробка патронов (5,56 урановые)
.desc = { ent-BaseMagazineBoxRifle.desc }
ent-MagazineBoxRifle = коробка патронов (5,56мм)
ent-MagazineBoxRifle = коробка патронов (5,56)
.desc = { ent-BaseMagazineBoxRifle.desc }

22
Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
View file

@ -1,27 +1,27 @@
ent-BaseMagazineLightRifle = магазин (5,56мм)
.desc = { ent-BaseItem.desc }
ent-MagazineLightRifleEmpty = магазин (7,62мм любые)
ent-MagazineLightRifleEmpty = магазин (7,62 любые)
.suffix = Пустой
.desc = { ent-MagazineLightRifle.desc }
ent-MagazineLightRifleSP = магазин (.30 винтовочный SP)
ent-MagazineLightRifleSP = магазин (7,62 SP)
.desc = { ent-BaseMagazineLightRifle.desc }
ent-MagazineLightRifleHP = магазин (.30 винтовочный HP)
ent-MagazineLightRifleHP = магазин (7,62 HP)
.desc = Изогнутый двухрядный 30-зарядный магазин для боевых винтовок. Предназначен для хранения кинетических боеприпасов общего назначения.
ent-MagazineLightRifleFMJ = магазин (.30 винтовочный FMJ)
ent-MagazineLightRifleFMJ = магазин (7,62 FMJ)
.desc = { ent-BaseMagazineLightRifle.desc }
ent-MagazineLightRifleAP = магазин (.30 винтовочный AP)
ent-MagazineLightRifleAP = магазин (7,62 AP)
.desc = { ent-BaseMagazineLightRifle.desc }
ent-MagazineLightRiflePractice = магазин (7,62мм учебные)
ent-MagazineLightRiflePractice = магазин (7,62 учебные)
.desc = { ent-BaseMagazineLightRifle.desc }
ent-MagazineLightRifleUranium = магазин (7,62мм урановые)
ent-MagazineLightRifleUranium = магазин (7,62 урановые)
.desc = { ent-BaseMagazineLightRifle.desc }
ent-MagazineLightRifleIncendiary = магазин (7,62мм зажигательные)
ent-MagazineLightRifleIncendiary = магазин (7,62 зажигательные)
.desc = { ent-MagazineLightRifle.desc }
ent-MagazineLightRifleMaxim = дисковый магазин (7,62мм)
ent-MagazineLightRifleMaxim = дисковый магазин (7,62)
.desc = { ent-BaseMagazineLightRifle.desc }
ent-MagazineLightRiflePkBox = короб патронов ПК (7,62мм)
ent-MagazineLightRiflePkBox = короб патронов ПК (7,62)
.desc = { ent-BaseMagazineLightRifle.desc }
ent-MagazineLightRifleBox = короб патронов L6 SAW (5,56мм)
.desc = { ent-BaseMagazineLightRifle.desc }
ent-MagazineLightRifle = магазин (7,62мм)
ent-MagazineLightRifle = магазин (7,62)
.desc = { ent-BaseMagazineLightRifle.desc }

6
Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl
View file

@ -5,7 +5,7 @@ ent-MagazineMagnumEmpty = пистолетный магазин (.45 магну
.desc = { ent-BaseMagazineMagnum.desc }
ent-MagazineMagnumRubber = пистолетный магазин (.45 магнум резиновые)
.desc = Однорядный пистолетный магазин на 7 патронов. Предназначен для несмертельных кинетических боеприпасов.
ent-MagazineMagnum = пистолетный магазин (.45 магнум)
ent-MagazineMagnum = пистолетный магазин (.45 магнум SP)
.desc = { ent-BaseMagazineMagnum.desc }
ent-MagazineMagnumPractice = пистолетный магазин (.45 магнум учебные)
.desc = { ent-BaseMagazineMagnum.desc }
@ -13,6 +13,10 @@ ent-MagazineMagnumUranium = пистолетный магазин (.45 магн
.desc = { ent-BaseMagazineMagnum.desc }
ent-MagazineMagnumAP = пистолетный магазин (.45 магнум бронебойные)
.desc = { ent-BaseMagazineMagnum.desc }
ent-MagazineMagnumFMJ = пистолетный магазин (.45 магнум FMJ)
.desc = { ent-BaseMagazineMagnum.desc }
ent-MagazineMagnumHP = пистолетный магазин (.45 магнум HP)
.desc = { ent-BaseMagazineMagnum.desc }
ent-BaseMagazineMagnumSubMachineGun = магазин Вектора (.45 магнум)
.desc = { ent-BaseItem.desc }
ent-MagazineMagnumSubMachineGunEmpty = магазин Вектора (.45 магнум любые)

44
Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl
View file

@ -1,29 +1,45 @@
ent-BaseMagazineRifle = магазин (5,56мм)
ent-BaseMagazineRifle = магазин (5,56)
.desc = { ent-BaseItem.desc }
ent-MagazineRifleEmpty = магазин (5,56мм любые)
ent-MagazineRifleEmpty = магазин (5,56 любые)
.suffix = Пустой
.desc = { ent-MagazineRifle.desc }
ent-MagazineRifle = магазин (5,56мм)
ent-MagazineRifle = магазин (5,56)
.desc = { ent-BaseMagazineRifle.desc }
ent-MagazineRifleSP = магазин (5,56мм SP)
ent-MagazineRifleSP = магазин (5,56 SP)
.desc = { ent-BaseMagazineRifle.desc }
ent-MagazineRifleHP = магазин (5,56мм HP)
ent-MagazineRifleHP = магазин (5,56 HP)
.desc = { ent-BaseMagazineRifle.desc }
ent-MagazineRifleFMJ = магазин (5,56мм FMJ)
ent-MagazineRifleFMJ = магазин (5,56 FMJ)
.desc = { ent-BaseMagazineRifle.desc }
ent-MagazineRifleAP = магазин (5,56мм AP)
ent-MagazineRifleAP = магазин (5,56 AP)
.desc = { ent-BaseMagazineRifle.desc }
ent-MagazineRifleIncendiary = магазин (5,56мм зажигательные)
ent-MagazineRifleIncendiary = магазин (5,56 зажигательные)
.desc = { ent-MagazineRifle.desc }
ent-MagazineRiflePractice = магазин (5,56мм учебные)
ent-MagazineRiflePractice = магазин (5,56 учебные)
.desc = { ent-BaseMagazineRifle.desc }
ent-MagazineRifleUranium = магазин (5,56мм урановые)
ent-MagazineRifleUranium = магазин (5,56 урановые)
.desc = { ent-BaseMagazineRifle.desc }
ent-MagazineRifleBoxSP = короб магазина L6 SAW (5,56мм SP)
##
ent-MagazineRifleBoxSP = короб магазина L6 SAW (5,56 SP)
.desc = Коробка, содержащая ленту из 150 патронов калибра .20, используемая легкими пулеметами, такими как L6. Предназначена для хранения кинетических боеприпасов общего назначения.
ent-MagazineRifleBoxFMJ = короб магазина L6 SAW (5,56мм FMJ)
ent-MagazineRifleBoxFMJ = короб магазина L6 SAW (5,56 FMJ)
.desc = Коробка, содержащая ленту из 150 патронов калибра .20, используемая легкими пулеметами, такими как L6.
ent-MagazineLightRifleBoxIncendiary = короб патронов L6 SAW (5,56мм зажигательные)
ent-MagazineLightRifleBoxIncendiary = короб патронов L6 SAW (5,56 зажигательные)
.desc = { ent-BaseMagazineLightRifle.desc }
ent-MagazineLightRifleBoxUranium = короб патронов L6 SAW (5,56мм урановые)
ent-MagazineLightRifleBoxUranium = короб патронов L6 SAW (5,56 урановые)
.desc = { ent-BaseMagazineLightRifle.desc }
ent-MagazineRifleM52SP = магазин М-52 (5,56 SP)
.desc = { ent-BaseMagazineRifle.desc }
ent-MagazineRifleM52HP = магазин М-52 (5,56 HP)
.desc = { ent-BaseMagazineRifle.desc }
ent-MagazineRifleM52FMJ = магазин М-52 (5,56 FMJ)
.desc = { ent-BaseMagazineRifle.desc }
ent-MagazineRifleM52AP = магазин М-52 (5,56 AP)
.desc = { ent-BaseMagazineRifle.desc }
ent-MagazineRifleM52Incendiary = магазин М-52 (5,56 зажигательные)
.desc = { ent-MagazineRifle.desc }
ent-MagazineRifleM52Practice = магазин М-52 (5,56 учебные)
.desc = { ent-BaseMagazineRifle.desc }
ent-MagazineRifleM52Uranium = магазин М-52 (5,56 урановые)
.desc = { ent-BaseMagazineRifle.desc }

4
Resources/Locale/ru-RU/_prototypes/entities/structures/wallmounts/storage/cabinets/extinguisher_cabinet.ftl
View file

@ -4,8 +4,8 @@ ent-ExtinguisherCabinetOpen = { ent-ExtinguisherCabinet }
.suffix = Открытый
.desc = { ent-ExtinguisherCabinet.desc }
ent-ExtinguisherCabinetFilled = { ent-ExtinguisherCabinet }
.suffix = Наполненный
.suffix = Заполненный
.desc = { ent-ExtinguisherCabinet.desc }
ent-ExtinguisherCabinetFilledOpen = { ent-ExtinguisherCabinetFilled }
.suffix = Открытый, Наполненный
.suffix = Открытый, Заполненный
.desc = { ent-ExtinguisherCabinetFilled.desc }

4
Resources/Locale/ru-RU/_prototypes/entities/structures/wallmounts/storage/cabinets/fireaxe_cabinet.ftl
View file

@ -4,8 +4,8 @@ ent-FireAxeCabinetOpen = { ent-FireAxeCabinet }
.suffix = Открытый
.desc = { ent-FireAxeCabinet.desc }
ent-FireAxeCabinetFilled = { ent-FireAxeCabinet }
.suffix = Наполненный
.suffix = Заполненный
.desc = { ent-FireAxeCabinet.desc }
ent-FireAxeCabinetFilledOpen = { ent-FireAxeCabinetFilled }
.suffix = Открытый, Наполненный
.suffix = Открытый, Заполненный
.desc = { ent-FireAxeCabinetFilled.desc }

1
Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl
View file

@ -24,6 +24,7 @@ ntuplink-gun-bundlep90-name = Набор P-90
ntuplink-gun-bundleams42-name = Набор AMS-42
ntuplink-gun-bundleg36-name = Набор G36
ntuplink-gun-bundlemg342-name = Набор MG-342
ntuplink-gun-bundlem52-name = Набор М-52
ntuplink-gun-bundlebr64-name = Набор BR-64
ntuplink-gun-bundlezauer-name = Набор Zauer
ntuplink-gun-bundlehristov-name = Набор Христов

2
Resources/Locale/ru-RU/_strings/store/uplink-catalog.ftl
View file

@ -236,6 +236,8 @@ uplink-coal-auto-injector-desc = Специализированный автои
uplink-coalpen-kit-name = Набор угольных автоинъекторов
uplink-coalpen-kit-desc = Медицинский набор, содержащий 8 угольных автоинъекторов для лечения отравления и очистки крови от токсинов (включая злостный Пакс).
uplink-stimkit-nt-name = Набор инъекторов эфедрина
uplink-stimkit-nt-desc = Аптечка, содержащая 6 микроинъекторов эфедрина, каждый из которых содержит дозу эфедрина на 15 секунд.
uplink-revolver-cap-gun-fake-desc = Одурачьте своих врагов! Использует как пистоны, так и патроны калибра .45 магнум. Последними и будет заряжен при покупке.
uplink-banana-peel-explosive-name = Взрывная банановая кожура
uplink-banana-peel-explosive-desc = Они взорвутся от смеха, когда поскользнутся на ней!

10786
Resources/Maps/_Sunrise/Station/dev_map.yml
View file

File diff suppressed because it is too large Load diff

4
Resources/Prototypes/Catalog/Fills/Crates/antag.yml
View file

@ -89,9 +89,7 @@
prob: 0.25
- id: WeaponSubMachineGunSkorpion
prob: 0.15
- id: WeaponSubMachineGunPPSH41
prob: 0.10
- id: WeaponSTG44
- id: WeaponSubMachineGunPPSH
prob: 0.10
- id: WeaponIONRifle
prob: 0.05

7
Resources/Prototypes/Catalog/Fills/Lockers/security.yml
View file

@ -249,8 +249,13 @@
children:
- id: WeaponRifleLecter
amount: 2
- id: MagazineRifleFMJ
- id: WeaponRifleLeikha
- id: MagazineRifleSP
amount: 4
- id: MagazineRifleFMJ
amount: 2
- id: MagazineRifleHP
amount: 2
- type: entity
parent: [GunSafeBaseSecure, BaseSecurityContraband]

6
Resources/Prototypes/Entities/Clothing/Back/duffel.yml
View file

@ -272,7 +272,13 @@
components:
- type: Storage
maxItemSize: Huge
grid:
- 0,0,9,4
- type: ClothingSpeedModifier
walkModifier: 1
sprintModifier: 1
- type: HeldSpeedModifier
- type: Sprite
sprite: Clothing/Back/Duffels/cburn.rsi
- type: ExplosionResistance
damageCoefficient: 0.5

16
Resources/Prototypes/Entities/Markers/Spawners/Random/Department/security.yml
View file

@ -85,10 +85,10 @@
- ClothingOuterArmorBulletproof
- WeaponRifleM16A4 # Sunrise-Edit
- WeaponDisabler
# - WeaponPistolMk58
# - WeaponRifleLecter
# - WeaponSubMachineGunDrozd
# - WeaponLaserCarbine
- WeaponPistolMk58
- WeaponRifleLecter
- WeaponSubMachineGunDrozd
- WeaponLaserCarbine
- WeaponShotgunTrenchgun4034 # Sunrise-Edit
chance: 0.95
offset: 0.0
@ -112,10 +112,10 @@
prototypes:
- WeaponRifleM16A4 # Sunrise-Edit
- WeaponDisabler
# - WeaponPistolMk58
# - WeaponRifleLecter
# - WeaponSubMachineGunDrozd
# - WeaponLaserCarbine
- WeaponPistolMk58
- WeaponRifleLecter
- WeaponSubMachineGunDrozd
- WeaponLaserCarbine
- WeaponShotgunTrenchgun4034 # Sunrise-Edit
chance: 0.95
offset: 0.0

6
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
View file

@ -7,8 +7,6 @@
- type: Tag
tags:
- CartridgeLightRifle
- type: HitScanCartridgeAmmo
hitscan: BulletLightRifleTraceSP
- type: Sprite
sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Casings/7.62x39.rsi # Sunrise-Edit
scale: 0.60, 0.60 # Sunrise-Added
@ -98,8 +96,8 @@
name: cartridge (.30 rifle incendiary)
parent: BaseCartridgeLightRifleSP
components:
- type: HitScanCartridgeAmmo
hitscan: BulletLightRifleTraceIncendiary
- type: CartridgeAmmo
proto: BulletLightRifleIncendiary
- type: Sprite
layers:
- state: base

6
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
View file

@ -7,8 +7,6 @@
- type: Tag
tags:
- CartridgeMagnum
- type: HitScanCartridgeAmmo
hitscan: BulletMagnumTraceSP
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
layers:
@ -116,8 +114,8 @@
parent: BaseCartridgeMagnum
description: Heavy magnum cartridge mostly used by revolvers. Armor piercing ammunition is renowned for its ability to cut straight through body armor.
components:
- type: HitScanCartridgeAmmo
hitscan: BulletMagnumTraceIncendiary
- type: CartridgeAmmo
proto: BulletMagnumIncendiary
- type: Sprite
layers:
- state: base

6
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
View file

@ -7,8 +7,6 @@
- type: Tag
tags:
- CartridgePistol
- type: HitScanCartridgeAmmo
hitscan: BulletPistolTraceSP
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
layers:
@ -114,8 +112,8 @@
description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Incendiary ammunition contains a self-igniting compound that sets the target ablaze.
parent: BaseCartridgePistol
components:
- type: HitScanCartridgeAmmo
hitscan: BulletPistolTraceIncendiary
- type: CartridgeAmmo
proto: BulletPistolIncendiary
- type: Sprite
layers:
- state: base

6
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
View file

@ -7,8 +7,6 @@
- type: Tag
tags:
- CartridgeRifle
- type: HitScanCartridgeAmmo
hitscan: BulletRifleTrace
- type: Sprite
sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Casings/5.56x45.rsi # Sunrise-Edit
scale: 0.60, 0.60 # Sunrise-Added
@ -101,8 +99,8 @@
parent: BaseCartridgeRifle
description: A modern intermediate cartridge for combat rifles. Incendiary ammunition contains a self-igniting compound that sets the target ablaze.
components:
- type: HitScanCartridgeAmmo
hitscan: BulletRifleTraceIncendiary
- type: CartridgeAmmo
proto: BulletLightRifleIncendiary
- type: Sprite
layers:
- state: base

6
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
View file

@ -122,10 +122,8 @@
- state: spent
map: [ "enum.AmmoVisualLayers.Spent" ]
visible: false
- type: HitScanCartridgeAmmo
soundEject:
collection: ShellEject
hitscan: ShellShotgunIncendiaryTrace
- type: CartridgeAmmo
proto: PelletShotgunIncendiarySpread
- type: entity
id: ShellShotgunPractice

425
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
View file

@ -245,212 +245,227 @@
- state: inhand-right-stripe
color: "#40F57A"
# # M-52
# - type: entity
# id: BaseMagazineRifleM52
# parent: BaseMagazineRifle
# abstract: true
# components:
# - type: BallisticAmmoProvider
# capacity: 40
# - type: Tag
# tags:
# - MagazineRifleM52
# - type: Sprite
# sprite: _Starlight/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m-52.rsi
# - type: MagazineVisuals
# magState: mag
# steps: 7
# zeroVisible: false
# - type: entity
# id: MagazineRifleM52SP
# name: "magazine (.20 rifle SP)"
# parent: BaseMagazineRifleM52
# components:
# - type: BallisticAmmoProvider
# proto: CartridgeRifleSP
# - type: Sprite
# layers:
# - state: sp
# map: ["enum.GunVisualLayers.Base"]
# - state: mag-1
# map: ["enum.GunVisualLayers.Mag"]
# - type: Item
# inhandVisuals:
# left:
# - state: inhand-left-mag
# - state: inhand-left-stripe
# color: "#575EF5"
# right:
# - state: inhand-right-mag
# - state: inhand-right-stripe
# color: "#575EF5"
# - type: entity
# id: MagazineRifleM52HP
# name: "magazine (.20 rifle HP)"
# parent: BaseMagazineRifleM52
# components:
# - type: BallisticAmmoProvider
# proto: CartridgeRifleHP
# - type: Sprite
# layers:
# - state: red
# map: ["enum.GunVisualLayers.Base"]
# - state: mag-1
# map: ["enum.GunVisualLayers.Mag"]
# - type: Item
# inhandVisuals:
# left:
# - state: inhand-left-mag
# - state: inhand-left-stripe
# color: "#F5514C"
# right:
# - state: inhand-right-mag
# - state: inhand-right-stripe
# color: "#F5514C"
# - type: entity
# id: MagazineRifleM52FMJ
# name: "magazine (.20 rifle FMJ)"
# parent: BaseMagazineRifleM52
# components:
# - type: BallisticAmmoProvider
# proto: CartridgeRifleFMJ
# - type: Sprite
# layers:
# - state: fmj
# map: ["enum.GunVisualLayers.Base"]
# - state: mag-1
# map: ["enum.GunVisualLayers.Mag"]
# - type: Item
# inhandVisuals:
# left:
# - state: inhand-left-mag
# - state: inhand-left-stripe
# color: "#080706"
# right:
# - state: inhand-right-mag
# - state: inhand-right-stripe
# color: "#080706"
# - type: entity
# id: MagazineRifleM52AP
# name: "magazine (.20 rifle AP)"
# parent: BaseMagazineRifleM52
# components:
# - type: BallisticAmmoProvider
# proto: CartridgeRifleAP
# - type: Sprite
# layers:
# - state: ap
# map: ["enum.GunVisualLayers.Base"]
# - state: mag-1
# map: ["enum.GunVisualLayers.Mag"]
# - type: Item
# inhandVisuals:
# left:
# - state: inhand-left-mag
# - state: inhand-left-stripe
# color: "#72E374"
# right:
# - state: inhand-right-mag
# - state: inhand-right-stripe
# color: "#72E374"
# - type: entity
# id: MagazineRifleM52Empty
# name: "magazine (.20 rifle any)"
# suffix: empty
# parent: BaseMagazineRifleM52
# components:
# - type: BallisticAmmoProvider
# proto: null
# - type: Sprite
# layers:
# - state: base
# map: ["enum.GunVisualLayers.Base"]
# - type: Item
# inhandVisuals:
# left:
# - state: inhand-left-mag
# right:
# - state: inhand-right-mag
# - type: entity
# id: MagazineRifleM52Incendiary
# name: "magazine (.20 rifle incendiary)"
# parent: BaseMagazineRifleM52
# components:
# - type: BallisticAmmoProvider
# proto: CartridgeRifleIncendiary
# - type: Sprite
# layers:
# - state: incendiary
# map: ["enum.GunVisualLayers.Base"]
# - type: Item
# inhandVisuals:
# left:
# - state: inhand-left-mag
# - state: inhand-left-stripe
# color: "#E7EEEE"
# right:
# - state: inhand-right-mag
# - state: inhand-right-stripe
# color: "#E7EEEE"
# - type: entity
# id: MagazineRifleM52Practice
# name: "magazine (.20 rifle practice)"
# parent: BaseMagazineRifleM52
# components:
# - type: BallisticAmmoProvider
# proto: CartridgeRiflePractice
# - type: Sprite
# layers:
# - state: practice
# map: ["enum.GunVisualLayers.Base"]
# - state: mag-1
# map: ["enum.GunVisualLayers.Mag"]
# - type: Item
# inhandVisuals:
# left:
# - state: inhand-left-mag
# - state: inhand-left-stripe
# color: "#F08B4B"
# right:
# - state: inhand-right-mag
# - state: inhand-right-stripe
# color: "#F08B4B"
# - type: entity
# id: MagazineRifleM52Uranium
# name: "magazine (.20 rifle uranium)"
# parent: BaseMagazineRifleM52
# components:
# - type: BallisticAmmoProvider
# proto: CartridgeRifleUranium
# - 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"
#Sunrise-start
# M-52
- type: entity
id: BaseMagazineRifleM52
parent: BaseMagazineRifle
abstract: true
components:
- type: BallisticAmmoProvider
capacity: 40
- type: Tag
tags:
- MagazineRifleM52
- type: Sprite
sprite: _Starlight/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m-52.rsi
- type: MagazineVisuals
magState: mag
steps: 7
zeroVisible: false
- type: entity
id: MagazineRifleM52SP
name: "magazine (.20 rifle SP)"
parent: BaseMagazineRifleM52
components:
- type: BallisticAmmoProvider
proto: CartridgeRifleSP
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#575EF5"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#575EF5"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#575EF5"
- type: entity
id: MagazineRifleM52HP
name: "magazine (.20 rifle HP)"
parent: BaseMagazineRifleM52
components:
- type: BallisticAmmoProvider
proto: CartridgeRifleHP
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#F5514C"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#F5514C"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#F5514C"
- type: entity
id: MagazineRifleM52FMJ
name: "magazine (.20 rifle FMJ)"
parent: BaseMagazineRifleM52
components:
- type: BallisticAmmoProvider
proto: CartridgeRifleFMJ
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#080706"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#080706"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#080706"
- type: entity
id: MagazineRifleM52AP
name: "magazine (.20 rifle AP)"
parent: BaseMagazineRifleM52
components:
- type: BallisticAmmoProvider
proto: CartridgeRifleAP
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#540000"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#540000"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#540000"
- type: entity
id: MagazineRifleM52Empty
name: "magazine (.20 rifle any)"
suffix: empty
parent: BaseMagazineRifleM52
components:
- type: BallisticAmmoProvider
proto: null
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
right:
- state: inhand-right-mag
- type: entity
id: MagazineRifleM52Incendiary
name: "magazine (.20 rifle incendiary)"
parent: BaseMagazineRifleM52
components:
- type: BallisticAmmoProvider
proto: CartridgeRifleIncendiary
- 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: MagazineRifleM52Practice
name: "magazine (.20 rifle practice)"
parent: BaseMagazineRifleM52
components:
- type: BallisticAmmoProvider
proto: CartridgeRiflePractice
- 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: MagazineRifleM52Uranium
name: "magazine (.20 rifle uranium)"
parent: BaseMagazineRifleM52
components:
- type: BallisticAmmoProvider
proto: CartridgeRifleUranium
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#40F57A"
- 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"
# Magazines L6 SAW
- type: entity
id: MagazineRifleBoxSP

14
Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
View file

@ -19,12 +19,12 @@
- type: AmmoCounter
- type: GunWieldBonus # Sunrise-start
minAngle: -20
maxAngle: -30
maxAngle: -45
- type: Gun
minAngle: 23
maxAngle: 90
angleIncrease: 1.75
angleDecay: 15 # Sunrise-end
angleIncrease: 1.25
angleDecay: 20 # Sunrise-end
fireRate: 5
selectedMode: FullAuto
availableModes:
@ -78,8 +78,8 @@
knockback: 0.1
- type: CursorOffsetRequiresWield
- type: EyeCursorOffset
maxOffset: 4.5
pvsIncrease: 0.45
maxOffset: 3
pvsIncrease: 0.3
# Sunrise end
- type: entity
@ -239,8 +239,8 @@
sprite: Objects/Weapons/Guns/Rifles/XL8.rsi
- type: CursorOffsetRequiresWield
- type: EyeCursorOffset
maxOffset: 2
pvsIncrease: 0.2
maxOffset: 5 # Sunrise-Edit
pvsIncrease: 0.5 # Sunrise-Edit
- type: StaticPrice
price: 1500 #3x lecter
- type: Gun

4
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
View file

@ -76,8 +76,8 @@
collection: RiflesDrop
- type: CursorOffsetRequiresWield
- type: EyeCursorOffset
maxOffset: 3
pvsIncrease: 0.35
maxOffset: 2
pvsIncrease: 0.2
# Sunrise end
- type: entity

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
View file

@ -215,7 +215,7 @@
sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
- type: GunRequiresWield #remove when inaccuracy on spreads is fixed
- type: Gun
fireRate: 1
fireRate: 1.5 # Sunrise-edit
- type: GunSpreadModifier
spread: 0.6
- type: Tag

6
Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
View file

@ -50,8 +50,8 @@
collection: SnipersDrop
- type: CursorOffsetRequiresWield
- type: EyeCursorOffset
maxOffset: 3
pvsIncrease: 0.35
maxOffset: 4
pvsIncrease: 0.4
- type: KnockbackByUserTag
doestContain:
Resomi:
@ -154,7 +154,7 @@
- type: CursorOffsetRequiresWield
- type: EyeCursorOffset
maxOffset: 14 # Sunrise-Edit
pvsIncrease: 1.5 # Sunrise-Edit
pvsIncrease: 1.4 # Sunrise-Edit
- type: StaticPrice
price: 3500

5
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View file

@ -142,7 +142,7 @@
- HydroponicsStatic
- type: EmagLatheRecipes
emagStaticPacks:
# - SecurityAmmoStatic # Sunrise - comment
- SecurityStaticSunrise # Sunrise-Add
- SyndicateAmmoStatic
- type: BlueprintReceiver
whitelist:
@ -229,7 +229,7 @@
# Sunrise-End
- type: EmagLatheRecipes
emagDynamicPacks:
- SecurityAmmo
# - SecurityAmmo # Sunrise-edit
- SecurityExplosives
- SecurityEquipment
- SecurityWeapons
@ -239,6 +239,7 @@
- MedicalCyberlimbDynamic # Sunrise-Add
- MedicalCyberOrgansDynamic # Sunrise-Add
- MedicalImplantDynamic # Sunrise-Add
- SyndicateAmmoSunrise # Sunrise-Add
- type: entity
id: ProtolatheHyperConvection

2
Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
View file

@ -1239,7 +1239,7 @@
- type: entity
parent: VendingMachine
id: VendingMachineSovietSoda
name: ВОДА
name: VODA # Sunrise-edit
description: An old vending machine containing sweet water.
suffix: VODA
components:

3
Resources/Prototypes/Entities/Structures/plastic_flaps.yml
View file

@ -96,7 +96,8 @@
- type: StaticPrice
price: 100
- type: Anchorable
delay: 999
flags:
- Anchorable
- type: entity
id: PlasticFlapsAirtightOpaque

4
Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
View file

@ -9,3 +9,7 @@
- MagazineShotgunSlug
- MagazinePistolCaselessRifle
- MagazineBoxAntiMateriel
# Sunrise-start
- MagazineRifleBoxSP
- MagazineRifleBoxFMJ
# Sunrise-end

33
Resources/Prototypes/Recipes/Lathes/ammo.yml
View file

@ -45,8 +45,7 @@
result: MagazineRifleIncendiary
materials:
Steel: 25
Plastic: 225 #Sunrise-edit
Plasma: 225 #Sunrise-add
Plastic: 450
- type: latheRecipe
parent: BaseAmmoRecipe
@ -76,8 +75,7 @@
id: MagazineBoxRifleIncendiary
result: MagazineBoxRifleIncendiary
materials:
Plastic: 375 #Sunrise-edit
Plasma: 375 #Sunrise-add
Plastic: 750
- type: latheRecipe
parent: BaseAmmoBoxRecipe
@ -123,8 +121,7 @@
result: MagazineLightRifleIncendiary
materials:
Steel: 25
Plastic: 270 #Sunrise-edit
Plasma: 270 #Sunrise-add
Plastic: 540
- type: latheRecipe
parent: BaseAmmoRecipe
@ -154,8 +151,7 @@
id: MagazineBoxLightRifleIncendiary
result: MagazineBoxLightRifleIncendiary
materials:
Plastic: 450 #Sunrise-edit
Plasma: 450 #Sunrise-add
Plastic: 900
- type: latheRecipe
parent: BaseAmmoBoxRecipe
@ -193,8 +189,7 @@
result: MagazinePistolIncendiary
materials:
Steel: 25
Plastic: 60 #Sunrise-edit
Plasma: 60 #Sunrise-add
Plastic: 120
- type: latheRecipe
parent: BaseAmmoRecipe
@ -232,8 +227,7 @@
result: MagazinePistolSubMachineGunIncendiary
materials:
Steel: 25
Plastic: 135 # Sunrise-edit
Plasma: 140 # Sunrise-add
Plastic: 275
- type: latheRecipe
parent: BaseAmmoRecipe
@ -277,8 +271,7 @@
id: MagazineBoxPistolIncendiary
result: MagazineBoxPistolIncendiary
materials:
Plastic: 300 #Sunrise-edit
Plasma: 300 #Sunrise-add
Plastic: 600
- type: latheRecipe
parent: BaseAmmoBoxRecipe
@ -316,8 +309,7 @@
result: SpeedLoaderMagnumIncendiary
materials:
Steel: 50
Plastic: 75 #Sunrise-edit
Plasma: 75 #Sunrise-add
Plastic: 150
- type: latheRecipe
parent: BaseAmmoRecipe
@ -347,8 +339,7 @@
id: MagazineBoxMagnumIncendiary
result: MagazineBoxMagnumIncendiary
materials:
Plastic: 120 #Sunrise-edit
Plasma: 120 #Sunrise-add
Plastic: 240
- type: latheRecipe
parent: BaseAmmoBoxRecipe
@ -386,8 +377,7 @@
result: MagazineShotgunIncendiary
materials:
Steel: 100
Plastic: 95 #Sunrise-edit
Plasma: 95 #Sunrise-add
Plastic: 190
- type: latheRecipe
parent: BaseAmmoRecipe
@ -418,8 +408,7 @@
result: BoxShotgunIncendiary
materials:
Steel: 80
Plastic: 160 #Sunrise-edit
Plasma: 160 #Sunrise-add
Plastic: 320
- type: latheRecipe
parent: BaseAmmoBoxRecipe

3
Resources/Prototypes/Research/arsenal.yml
View file

@ -40,6 +40,7 @@
- MagazinePistolHighCapacityIncendiary # Sunrise-Add
- MagazineRifleHeavyIncendiary # Sunrise-Add
- MagazineBoxHeavyRifleIncendiary # Sunrise-Add
- MagazineLightRifleBoxIncendiary # Sunrise-Add
- type: technology
id: WeaponizedLaserManipulation
@ -103,6 +104,8 @@
- MagazinePistolHighCapacityUranium # Sunrise-Add
- MagazineRifleHeavyUranium # Sunrise-Add
- MagazineBoxHeavyRifleUranium # Sunrise-Add
- MagazineLightRifleBoxUranium # Sunrise-Add
- MagazineLightRifleBeltBoxUranium # Sunrise-Add
- type: technology
id: AdvancedRiotControl

1
Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
View file

@ -17,6 +17,7 @@
- type: Tag
tags:
- Cartridge
- CartridgeLightRifle
- CartridgeLightRifleImprovised
- type: Construction
graph: ImprovisedLightRifleBulletGraph

1
Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
View file

@ -18,6 +18,7 @@
tags:
- Cartridge
- CartridgeMagnumImprovised
- CartridgeMagnum
- type: Construction
graph: ImprovisedMagnumBulletGraph
node: shell

1
Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
View file

@ -80,6 +80,7 @@
color: "#717171"
- type: Tag
tags:
- Cartridge
- CartridgePistol
- CartridgePistolImprovised
- type: Construction

289
Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
View file

@ -6,20 +6,22 @@
- type: Tag
tags:
- LightRifleHeavy
- MagazineRPD
- type: BallisticAmmoProvider
proto: CartridgeLightRifleSP
mayTransfer: true
whitelist:
tags:
- CartridgeLightRifle
capacity: 100
- type: Item
size: Normal
shape:
- 0,0,2,1
- type: Sprite
sprite: _Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi
sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle_box.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
- state: mag-7
map: ["enum.GunVisualLayers.Mag"]
- type: Item
size: Normal
- type: MagazineVisuals
magState: mag
steps: 8
@ -27,8 +29,112 @@
- type: Appearance
- type: entity
id: LightRifleMagazineEmpty
name: "Magazine Box (7.62 any)"
id: MagazineLightRifleBeltBox
name: "belt box (7.62 SP)"
parent: LightRifleHeavyBase
components:
- type: BallisticAmmoProvider
proto: CartridgeLightRifleSP
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-7
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#575EF5"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#575EF5"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#575EF5"
- type: entity
id: MagazineLightRifleBeltBoxHP
name: "belt box (7.62 HP)"
parent: LightRifleHeavyBase
components:
- type: BallisticAmmoProvider
proto: CartridgeLightRifleHP
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-7
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#F5514C"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#F5514C"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#F5514C"
- type: entity
id: MagazineLightRifleBeltBoxFMJ
name: "belt box (7.62 FMJ)"
parent: LightRifleHeavyBase
components:
- type: BallisticAmmoProvider
proto: CartridgeLightRifleFMJ
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-7
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#080706"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#080706"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#080706"
- type: entity
id: MagazineLightRifleBeltBoxAP
name: "belt box (7.62 AP)"
parent: LightRifleHeavyBase
components:
- type: BallisticAmmoProvider
proto: CartridgeLightRifleAP
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-7
map: ["enum.GunVisualLayers.Mag"]
- state: stripe
color: "#540000"
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
- state: inhand-left-stripe
color: "#540000"
right:
- state: inhand-right-mag
- state: inhand-right-stripe
color: "#540000"
- type: entity
id: MagazineLightRifleBeltBoxEmpty
name: "belt box (7.62 any)"
suffix: empty
parent: LightRifleHeavyBase
components:
@ -38,75 +144,16 @@
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- type: MagazineVisuals
magState: mag
steps: 8
zeroVisible: false
- type: Appearance
- type: Item
inhandVisuals:
left:
- state: inhand-left-mag
right:
- state: inhand-right-mag
- type: entity
id: LightRifleMagazineSP
name: "Magazine Box (7.62 SP)"
parent: LightRifleHeavyBase
components:
- type: BallisticAmmoProvider
proto: CartridgeLightRifleSP
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: sp
- type: MagazineVisuals
magState: mag
steps: 8
zeroVisible: false
- type: Appearance
- type: entity
id: LightRifleMagazineHP
name: "Magazine Box (7.62 HP)"
parent: LightRifleHeavyBase
components:
- type: BallisticAmmoProvider
proto: CartridgeLightRifleHP
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: hp
- type: MagazineVisuals
magState: mag
steps: 8
zeroVisible: false
- type: Appearance
- type: entity
id: LightRifleMagazineFMJ
name: "Magazine Box (7.62 FMJ)"
parent: LightRifleHeavyBase
components:
- type: BallisticAmmoProvider
proto: CartridgeLightRifleFMJ
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: fmj
- type: MagazineVisuals
magState: mag
steps: 8
zeroVisible: false
- type: Appearance
- type: entity
id: LightRifleMagazineIncendiary
name: "Magazine Box (7.62 incendiary)"
id: MagazineLightRifleBeltBoxIncendiary
name: "belt box (7.62 incendiary)"
parent: LightRifleHeavyBase
components:
- type: BallisticAmmoProvider
@ -115,18 +162,50 @@
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
- state: mag-7
map: ["enum.GunVisualLayers.Mag"]
- state: incendiary
- type: MagazineVisuals
magState: mag
steps: 8
zeroVisible: false
- type: Appearance
- 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: LightRifleMagazineUranium
name: "Magazine Box (7.62 uranium)"
id: MagazineLightRifleBeltBoxPractice
name: "belt box (7.62 practice)"
parent: LightRifleHeavyBase
components:
- type: BallisticAmmoProvider
proto: CartridgeLightRiflePractice
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-7
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: MagazineLightRifleBeltBoxUranium
name: "belt box (7.62 uranium)"
parent: LightRifleHeavyBase
components:
- type: BallisticAmmoProvider
@ -135,31 +214,17 @@
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
- state: mag-7
map: ["enum.GunVisualLayers.Mag"]
- state: uranium
- type: MagazineVisuals
magState: mag
steps: 8
zeroVisible: false
- type: Appearance
- type: entity
id: LightRifleMagazineAP
name: "Magazine Box (7.62 AP)"
parent: LightRifleHeavyBase
components:
- type: BallisticAmmoProvider
proto: CartridgeLightRifleAP
- type: Sprite
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: ap
- type: MagazineVisuals
magState: mag
steps: 8
zeroVisible: false
- type: Appearance
- state: stripe
color: "#40F57A"
- 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"

1
Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
View file

@ -92,6 +92,7 @@
id: MagazinePistol40Base
name: "Pistol Magazine (.40)"
parent: BaseMagazinePistol
categories: [ HideSpawnMenu ]
components:
- type: BallisticAmmoProvider
proto: CartridgePistol40SP

227
Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
View file

@ -1,104 +1,125 @@
# - type: entity
# name: M492 Smart LMG # Sunrise-TODO: PORT SEC-LMG rework: https://github.com/ss14Starlight/space-station-14/pull/1104
# id: WeaponLightMachineGunM492
# parent: [BaseWeaponLightMachineGun, BaseSecurityContraband]
# description: A high tech non-traditional LMG built specifically for combating the big threats among us. Uses .30 ammo.
# components:
# - type: Sprite
# sprite: _Starlight/Objects/Weapons/Guns/LMGs/M492.rsi
# layers:
# - state: base
# map: ["enum.GunVisualLayers.Base"]
# - state: mag-3
# map: ["enum.GunVisualLayers.Mag"]
# - type: Clothing
# sprite: _Starlight/Objects/Weapons/Guns/LMGs/M492.rsi
# quickEquip: false
# slots:
# - Back
# - suitStorage
# - type: GunRequiresWield
# - type: MagazineVisuals
# magState: mag
# steps: 4
# zeroVisible: true
# - type: ClothingSpeedModifier
# walkModifier: 1
# sprintModifier: 0.9
# - type: HeldSpeedModifier
# - type: Gun
# minAngle: 22
# maxAngle: 35
# angleIncrease: 2
# angleDecay: 10
# fireRate: 6
# - type: Appearance
# - type: ItemSlots
# slots:
# gun_magazine:
# name: Magazine
# startingItem: LightRifleMagazineSP
# whitelist:
# tags:
# - LightRifleHeavy
# gun_chamber:
# name: Chamber
# startingItem: CartridgeLightRifleSP
# priority: 1
# whitelist:
# tags:
# - CartridgeLightRifle
- type: entity
name: M492 Smart LMG
id: WeaponLightMachineGunM492
parent: [BaseWeaponLightMachineGun, BaseSecurityContraband]
description: A high tech non-traditional LMG built specifically for combating the big threats among us. Uses .30 ammo.
components:
- type: Sprite
sprite: _Starlight/Objects/Weapons/Guns/LMGs/M492.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-3
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: _Starlight/Objects/Weapons/Guns/LMGs/M492.rsi
quickEquip: false
slots:
- Back
- suitStorage
- type: GunRequiresWield
- type: GunWieldBonus
minAngle: 0
maxAngle: 0
- type: MagazineVisuals
magState: mag
steps: 4
zeroVisible: true
- type: Gun
minAngle: 10
maxAngle: 35
angleIncrease: 0.75
angleDecay: 15
fireRate: 6
- type: Appearance
# - type: RestrictByEquippedTag # Need Port from starlight #https://github.com/ss14Starlight/space-station-14/pull/1104
# requiredTag: "RequiredForLmgTag"
# denialMessage: "lmg-restricted-to-hardsuit-message"
# denialSound: /Audio/Machines/custom_deny.ogg
- type: ItemSlots
slots:
gun_chamber:
name: Chamber
startingItem: CartridgeLightRifleSP
priority: 1
whitelist:
tags:
- CartridgeLightRifle
gun_magazine:
name: Magazine
startingItem: MagazineLightRifleBeltBox
whitelist:
tags:
- LightRifleHeavy
- type: Biocode # delete after port
factions:
- NanoTrasen
- type: FactionClothingBlocker
# - type: entity # Sunrise-TODO: Развить тему с СССП, может подкрепа для Революции, может режим какой
# name: DP-28 LMG
# id: WeaponLightMachineGunDP28
# parent: [BaseWeaponLightMachineGun] #, BaseSovietContraband
# description: From RA-TA-TA-TA with love. Uses .30 ammo.
# components:
# - type: Sprite
# sprite: _Starlight/Objects/Weapons/Guns/LMGs/DP28.rsi
# layers:
# - state: base
# map: ["enum.GunVisualLayers.Base"]
# - state: mag-0
# map: ["enum.GunVisualLayers.Mag"]
# - type: Clothing
# sprite: _Starlight/Objects/Weapons/Guns/LMGs/DP28.rsi
# quickEquip: false
# - type: ChamberMagazineAmmoProvider
# soundRack:
# path: /Audio/Weapons/Guns/Cock/m41_cock.ogg
# soundBoltClosed:
# path: /Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg
# soundBoltOpened:
# path: /Audio/Weapons/Guns/Cock/shotgun_open.ogg
# - type: Appearance
# - type: ItemSlots
# slots:
# gun_magazine:
# name: Magazine
# startingItem: MagazineLightRifleMaxim
# insertSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
# ejectSound: /Audio/Weapons/Guns/MagIn/rifle_load.ogg
# whitelist:
# tags:
# - MagazineLightRiflePan
# gun_chamber:
# name: Chamber
# startingItem: CartridgeLightRifleSP
# priority: 1
# whitelist:
# tags:
# - CartridgeLightRifle
# - type: ClothingSpeedModifier
# walkModifier: 1
# sprintModifier: 0.85
# - type: HeldSpeedModifier
# - type: Gun
# minAngle: 20
# maxAngle: 27
# angleIncrease: 2
# angleDecay: 10
# fireRate: 5
# soundGunshot:
# path: /Audio/_Starlight/Weapons/Guns/Gunshots/dp28.ogg
- type: entity
name: DP-28 LMG
id: WeaponLightMachineGunDP28
parent: [BaseWeaponLightMachineGun, BaseMajorContraband] #BaseSovietContraband]
description: From RA-TA-TA-TA with love. Uses .30 ammo.
components:
- type: Sprite
sprite: _Starlight/Objects/Weapons/Guns/LMGs/DP28.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: _Starlight/Objects/Weapons/Guns/LMGs/DP28.rsi
quickEquip: false
- type: ChamberMagazineAmmoProvider
soundRack:
path: /Audio/Weapons/Guns/Cock/m41_cock.ogg
soundBoltClosed:
path: /Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg
soundBoltOpened:
path: /Audio/Weapons/Guns/Cock/shotgun_open.ogg
- type: Appearance
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazineLightRifleMaxim
insertSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
ejectSound: /Audio/Weapons/Guns/MagIn/rifle_load.ogg
whitelist:
tags:
- MagazineLightRiflePan
gun_chamber:
name: Chamber
startingItem: CartridgeHeavyRifleRFMJ
priority: 1
whitelist:
tags:
- CartridgeHeavyRifleR
- type: ClothingSpeedModifier
walkModifier: 1
sprintModifier: 0.85
- type: HeldSpeedModifier
- type: Gun
minAngle: 20
maxAngle: 27
angleIncrease: 2
angleDecay: 10
fireRate: 5
soundGunshot:
path: /Audio/_Starlight/Weapons/Guns/Gunshots/dp28.ogg
- type: entity
id: MagazineLightRifleMaxim
name: "pan magazine (7.62mmR)"
parent: BaseMagazineDragunov
components:
- type: Tag
tags:
- MagazineLightRiflePan
- type: BallisticAmmoProvider
proto: CartridgeHeavyRifleRFMJ
capacity: 47
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi

145
Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
View file

@ -1,50 +1,3 @@
# - type: entity
# name: makarov
# parent: [BaseWeaponPistol] # , BaseSovietContraband
# id: WeaponPistolMakarov
# description: A cheap and cumbersome pistol, with a dot on the rear sight indicating the direction in which it tends to misfire, as this model does not shoot straight. Uses .35 auto ammo.
# components:
# - type: Sprite
# sprite: _Starlight/Objects/Weapons/Guns/Pistols/makarov.rsi
# - type: Gun
# minAngle: 1
# maxAngle: 30
# angleIncrease: 9
# angleDecay: 10
# fireRate: 3
# availableModes:
# - SemiAuto
# soundGunshot:
# path: /Audio/_Starlight/Weapons/Guns/Gunshots/makarov.ogg
# params:
# variation: 0.05
# - type: ItemSlots
# slots:
# gun_magazine:
# name: Magazine
# startingItem: MagazinePistolSP
# insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
# ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
# priority: 2
# whitelist:
# tags:
# - MagazinePistol
# - MagazinePistolHighCapacitySP
# whitelistFailPopup: gun-magazine-whitelist-fail
# gun_chamber:
# name: Chamber
# startingItem: CartridgePistolSP
# priority: 1
# whitelist:
# tags:
# - CartridgePistol
# - type: ContainerContainer
# containers:
# gun_magazine: !type:ContainerSlot
# gun_chamber: !type:ContainerSlot
# - type: StaticPrice
# price: 150
- type: entity
id: WeaponPistolMk58Nonlethal
parent: [WeaponPistolMk58, BaseSecurityContraband]
@ -128,104 +81,6 @@
# - grey
# - greengrip
# - type: entity
# name: Due Process
# parent: [BaseWeaponPistol, BaseSecurityContraband]
# id: WeaponPistolDP
# description: A pistol that packs a punch for brig defense, just as NanoTransen intended.
# components:
# - type: Sprite
# sprite: _Starlight/Objects/Weapons/Guns/Pistols/dp.rsi
# - type: Clothing
# sprite: _Starlight/Objects/Weapons/Guns/Pistols/dp.rsi
# - type: Gun
# fireRate: 5
# availableModes:
# - SemiAuto
# soundGunshot:
# path: /Audio/_Starlight/Weapons/Guns/Gunshots/dp.ogg
# - type: ItemSlots
# slots:
# gun_magazine:
# name: Magazine
# startingItem: MagazinePistol40SP
# insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
# ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
# priority: 2
# whitelist:
# tags:
# - MagazinePistolDP
# whitelistFailPopup: gun-magazine-whitelist-fail
# gun_chamber:
# name: Chamber
# startingItem: CartridgePistol40SP
# priority: 1
# whitelist:
# tags:
# - CartridgePistolDP
# - type: entity
# name: sp-8t
# parent: [WeaponPistolDP, BaseSecurityContraband]
# id: WeaponPistolSP8T
# components:
# - type: Gun
# soundGunshot:
# path: /Audio/_Starlight/Weapons/Guns/Gunshots/sp8t.ogg
# - type: Sprite
# sprite: _Starlight/Objects/Weapons/Guns/Pistols/sp8t.rsi
# - type: ChamberMagazineAmmoProvider
# availablePrefixes:
# - ""
# - dust
# - type: entity
# name: sp-8ar
# parent: [WeaponPistolDP, BaseSecurityContraband]
# id: WeaponPistolSP8AR
# components:
# - type: Gun
# soundGunshot:
# path: /Audio/_Starlight/Weapons/Guns/Gunshots/sp8ar.ogg
# - type: Sprite
# sprite: _Starlight/Objects/Weapons/Guns/Pistols/sp8ar.rsi
# - type: ChamberMagazineAmmoProvider
# availablePrefixes:
# - ""
# - type: entity
# name: stechkin pistol #Fix
# parent: [WeaponPistolMk58, BaseSecurityContraband]
# id: WeaponPistolStechkin
# description: A small, easily concealable 10mm handgun. Has a threaded barrel for suppressors.
# components:
# - type: Sprite
# sprite: _Starlight/Objects/Weapons/Guns/Pistols/stechkin.rsi
# - type: Clothing
# sprite: _Starlight/Objects/Weapons/Guns/Pistols/stechkin.rsi
# - type: Gun
# soundGunshot:
# path: /Audio/_Starlight/Weapons/Guns/Gunshots/1suppres.ogg
# - type: entity
# name: Stechkin APS
# parent: [WeaponPistolMk58] #, BaseSovietContraband
# id: WeaponPistolAPS
# description: A high quality firearm issued to SNKVD elites and high ranking officials. It's half pistol, half closing argument.
# components:
# - type: Sprite
# sprite: _Starlight/Objects/Weapons/Guns/Pistols/aps.rsi
# - type: Clothing
# sprite: _Starlight/Objects/Weapons/Guns/Pistols/aps.rsi
# - type: Gun
# selectedMode: Burst
# shotsPerBurst: 3
# availableModes:
# - Burst
# - SemiAuto
# soundGunshot:
# path: /Audio/_Starlight/Weapons/Guns/Gunshots/1suppres.ogg
# - type: entity
# name: m1911
# parent: [WeaponPistolN1984, BaseSecurityContraband]

18
Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
View file

@ -1213,20 +1213,16 @@
pierceChance: 0.30
ricochetChance: 0.40
- type: hitscan
- type: entity
id: BulletRifleTraceHeavyIncendiary
parent: BulletTrace
igniteOnCollision: true
parent: BaseBulletIncendiary
categories: [ HideSpawnMenu ]
components:
- type: Projectile
damage:
types:
Blunt: 3
Heat: 20
pierceChance: 0.60
ricochetChance: 0.30
bullet:
sprite:
sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
state: incendiary
Piercing: 20
Heat: 3
- type: hitscan
id: BulletRifleTraceHeavyUranium

215
Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
View file

@ -13,6 +13,8 @@
map: ["enum.GunVisualLayers.Mag"]
- type: Item
size: Huge
shape:
- 0,0,4,1
- type: Clothing
sprite: _Starlight/Objects/Weapons/Guns/Rifles/lr30.rsi
quickEquip: false
@ -42,13 +44,16 @@
- type: Gun
minAngle: 4
maxAngle: 16
angleIncrease: 1
angleIncrease: 1.75
angleDecay: 6
fireRate: 4
selectedMode: FullAuto
shotsPerBurst: 3
burstFireRate: 7
burstCooldown: 0.75
selectedMode: Burst
availableModes:
- SemiAuto
- FullAuto
- Burst
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/laser.ogg
- type: MagazineVisuals
@ -73,7 +78,7 @@
- type: Item
size: Huge
shape:
- 0,0,4,2
- 0,0,3,2
- type: MagazineAmmoProvider
- type: ItemSlots
slots:
@ -114,55 +119,155 @@
zeroVisible: true
- type: Appearance
# - type: entity #Sunrise-TODO: implement and fix this
# name: ARG
# parent: [ WeaponRifleLecter, BaseCentcommContraband ]
# id: WeaponRifleARG
# description: A robust assault rile used by Nanotrasen fighting forces.
# components:
# - type: Sprite
# sprite: _Starlight/Objects/Weapons/Guns/Rifles/arg.rsi
# - type: Clothing
# sprite: _Starlight/Objects/Weapons/Guns/Rifles/arg.rsi
# - type: Gun
# fireRate: 7
# soundGunshot:
# path: /Audio/_Starlight/Weapons/Guns/Gunshots/m90.ogg
- type: entity
name: ARG
parent: [ BaseWeaponRifle, BaseMajorContraband ]
id: WeaponRifleARG
description: An old galactic standard assault rifle, used by various paramilitary groups and former militias ever since. Uses .30 rifle ammo.
components:
- type: Sprite
sprite: _Starlight/Objects/Weapons/Guns/Rifles/arg.rsi
layers:
- state: base
map: [ "enum.GunVisualLayers.Base" ]
- state: mag-0
map: [ "enum.GunVisualLayers.Mag" ]
- type: Item
sprite: _Starlight/Objects/Weapons/Guns/Rifles/arg.rsi
- type: Clothing
sprite: _Starlight/Objects/Weapons/Guns/Rifles/arg.rsi
- type: Gun
fireRate: 6
soundGunshot:
path: /Audio/_Starlight/Weapons/Guns/Gunshots/m90.ogg
- type: ChamberMagazineAmmoProvider
soundRack:
path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazineLightRifleFMJ
insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
priority: 2
whitelist:
tags:
- MagazineLightRifle
whitelistFailPopup: gun-magazine-whitelist-fail
gun_chamber:
name: Chamber
startingItem: CartridgeLightRifleFMJ
priority: 1
whitelist:
tags:
- CartridgeLightRifle
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot ""
gun_chamber: !type:ContainerSlot ""
- type: Appearance
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: Contraband
allowedDepartments: [ Security ]
# - type: entity #Sunrise-TODO: implement and fix this
# name: Aussec Armory M-52
# parent: [WeaponRifleLecter, BaseSecurityContraband]
# id: WeaponRifleM52
# description: One of the least popular examples of heavy assault rifles. It has impressive firepower.
# components:
# - type: Sprite
# sprite: _Starlight/Objects/Weapons/Guns/Rifles/m-52.rsi
# - type: Clothing
# sprite: _Starlight/Objects/Weapons/Guns/Rifles/m-52.rsi
# - type: Gun
# fireRate: 8
# soundGunshot:
# path: /Audio/_Starlight/Weapons/Guns/Gunshots/aussec.ogg
# - type: MagazineVisuals
# magState: mag
# steps: 3
# zeroVisible: true
# - type: ItemSlots
# slots:
# gun_magazine:
# name: Magazine
# startingItem: MagazineRifleM52SP
# insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
# ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
# priority: 2
# whitelist:
# tags:
# - MagazineRifleM52
# whitelistFailPopup: gun-magazine-whitelist-fail
# gun_chamber:
# name: Chamber
# startingItem: CartridgeRifleSP
# priority: 1
# whitelist:
# tags:
# - CartridgeRifle
- type: entity
name: Aussec Armory M-52
parent: [WeaponRifleLecter, BaseSecurityContraband]
id: WeaponRifleM52
description: One of the least popular examples of heavy assault rifles. It has impressive firepower.
components:
- type: Sprite
sprite: _Starlight/Objects/Weapons/Guns/Rifles/m-52.rsi
- type: Clothing
sprite: _Starlight/Objects/Weapons/Guns/Rifles/m-52.rsi
- type: Item
sprite: _Starlight/Objects/Weapons/Guns/Rifles/m-52_wielded_x64.rsi
- type: Gun
fireRate: 8
soundGunshot:
path: /Audio/_Starlight/Weapons/Guns/Gunshots/aussec.ogg
- type: MagazineVisuals
magState: mag
steps: 3
zeroVisible: true
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazineRifleM52SP
insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
priority: 2
whitelist:
tags:
- MagazineRifleM52
whitelistFailPopup: gun-magazine-whitelist-fail
gun_chamber:
name: Chamber
startingItem: CartridgeRifleSP
priority: 1
whitelist:
tags:
- CartridgeRifle
- type: entity
name: Leikha
parent: [ BaseWeaponRifle, BaseSecurityContraband ]
id: WeaponRifleLeikha
description: A high end military grade assault rifle. This one has been retrofitted with a scope and a burst receiver. Uses .20 rifle ammo.
components:
- type: Sprite
sprite: _Starlight/Objects/Weapons/Guns/Rifles/m16a4.rsi
layers:
- state: base
map: [ "enum.GunVisualLayers.Base" ]
- state: mag-0
map: [ "enum.GunVisualLayers.Mag" ]
- type: Clothing
sprite: _Starlight/Objects/Weapons/Guns/Rifles/m16a4.rsi
- type: Gun
burstFireRate: 12
shotsPerBurst: 3
burstCooldown: 0.55
selectedMode: Burst
availableModes:
- Burst
- SemiAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazineRifleSP
insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
priority: 2
whitelist:
tags:
- MagazineRifle
whitelistFailPopup: gun-magazine-whitelist-fail
gun_chamber:
name: Chamber
startingItem: CartridgeRifleSP
priority: 1
whitelist:
tags:
- CartridgeRifle
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot ""
gun_chamber: !type:ContainerSlot ""
- type: MagazineVisuals
magState: mag
steps: 5
zeroVisible: true
- type: Appearance
- type: CursorOffsetRequiresWield
- type: EyeCursorOffset
maxOffset: 5
pvsIncrease: 0.5

62
Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
View file

@ -82,68 +82,6 @@
# tags:
# - CartridgePistol
#PPSH
- type: entity
name: PPSH 59 SMG
parent: [BaseWeaponSubMachineGun] #, BaseSovietContraband
id: WeaponSubMachineGunPPSH
description: Beloved by USSP veterans and feared by friendly fire protocols everywhere. Uses .35 ammo.
components:
- type: Sprite
sprite: _Starlight/Objects/Weapons/Guns/SMGs/PPSh59.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: _Starlight/Objects/Weapons/Guns/SMGs/PPSh59.rsi
quickEquip: false
slots:
- Back
- suitStorage
- type: Wieldable
unwieldOnUse: false
- type: GunWieldBonus
minAngle: -9
maxAngle: -9
- type: Gun
minAngle: 21
maxAngle: 32
fireRate: 15
selectedMode: FullAuto
availableModes:
- SemiAuto
- FullAuto
soundGunshot:
path: /Audio/_Starlight/Weapons/Guns/Gunshots/ppsh.ogg
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: Appearance
- type: ChamberMagazineAmmoProvider
autoEject: true
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazinePistolSubMachineGunPPSH
insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
priority: 2
whitelist:
tags:
- MagazineSMGPPSH
whitelistFailPopup: gun-magazine-whitelist-fail
gun_chamber:
name: Chamber
startingItem: CartridgePistolSP
priority: 1
whitelist:
tags:
- CartridgePistol
- type: entity
name: makeshift SMG
parent: [BaseWeaponSubMachineGun, BaseMinorContraband]

9
Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
View file

@ -14,7 +14,7 @@
sprite: _Starlight/Objects/Weapons/Guns/Shotguns/riot.rsi
- type: GunRequiresWield
- type: BallisticAmmoProvider
capacity: 7
capacity: 8
- type: Construction
graph: ShotgunRiotSawn
node: start
@ -22,7 +22,7 @@
- type: entity
name: sawn-off riot shotgun
parent: [BaseWeaponShotgunPump, BaseGunWieldable, BaseSecurityContraband]
parent: [BaseWeaponShotgunPump, BaseSecurityContraband]
id: WeaponShotgunRiotSawn
description: Come with me if you want to live.
components:
@ -37,16 +37,15 @@
sprite: _Starlight/Objects/Weapons/Guns/Shotguns/riot_sawn_inhands_64x.rsi
- type: Gun
spread: 30
- type: GunRequiresWield
- type: BallisticAmmoProvider
capacity: 4
capacity: 5
- type: Construction
graph: ShotgunRiotSawn
node: shotgunsawn
deconstructionTarget: null
- type: entity
parent: [WeaponShotgunRiotSawn, BaseSecurityContraband]
parent: WeaponShotgunRiotSawn
id: WeaponShotgunRiotSawnEmpty
suffix: Empty
components:

2
Resources/Prototypes/_Sunrise/Boss/damage_modifier.yml
View file

@ -8,4 +8,4 @@
Radiation: 0.0 # 100% resistance
Shock: 0.2 # 80% resistance
Bloodloss: 0 # 100% resistance
Holy: 1
Holy: 1.5 # -50% resistance

110
Resources/Prototypes/_Sunrise/Boss/ents.yml
View file

@ -1,7 +1,8 @@
- type: entity
parent: MobHellspawn
id: MobHellspawnBoss
categories: [ HideSpawnMenu ]
# categories: [ HideSpawnMenu ]
suffix: Boss
components:
- type: Damageable
damageContainer: BiologicalMetaphysical
@ -35,6 +36,12 @@
thresholds:
0: Alive
750: Dead
- type: Stamina
critThreshold: 175
stunTime: 2
- type: AmbientSound
sound: /Audio/Ambience/ambiodd.ogg
range: 15
# Abilities start
- type: NPCUseActionWhenTargetInRange
actions:
@ -71,8 +78,12 @@
path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
damage:
types:
Blunt: 50
Structural: 70
Blunt: 40
Slash: 10
Structural: 50
- type: MeleeThrowOnHit
distance: 2
speed: 12
# Abilities end
- type: Butcherable
spawned:
@ -80,20 +91,78 @@
prob: 0.5
- id: ClothingUniformJumpsuitGalaxyRed
prob: 0.5
- id: ResearchDiskDebug
prob: 0.05
- id: ClothingNeckGoldmedal
prob: 0.5
- id: PKAUpgradeDamage
prob: 0.25
- id: PKAUpgradeFireRate
prob: 0.25
- id: PKAUpgradeRange
prob: 0.25
- id: PowerCellAntiqueProto
prob: 0.2
- id: ClothingOuterHardsuitMaxim
- id: ArtifactFragment
amount: 3
- id: ComplexXenoArtifactItem
prob: 0.5
- id: MedipenCombatInjector
prob: 0.2
- id: LeftArmCyberGorillaUpgraded
prob: 0.15
# Meme
- id: ClothingNeckGoldmedal
prob: 0.5
- id: BibleNarsie
prob: 0.4
- id: MobGoliath
prob: 0.2
- id: MobBasilisk
prob: 0.2
- id: SoulShardGhost
prob: 0.15
- id: MobSkeletonPirate
prob: 0.1
- id: SpawnPointGhostParadoxClone
prob: 0.1
- id: SpawnPointGhostParadoxClone
prob: 0.1
- id: SpawnPointGhostParadoxClone
prob: 0.1
- id: ResearchDiskDebug
prob: 0.05
# Armors
- id: ClothingOuterHardsuitSalvage
prob: 0.25
- id: ClothingOuterHardsuitGoliath
prob: 0.2
- id: ClothingOuterHardsuitMaxim
prob: 0.15
- id: ClothingOuterSoftsuitCBURN
prob: 0.1
# Weapons
- id: WeaponShotgunGA12
prob: 0.2
- id: WeaponPistolM1984
prob: 0.15
- id: ClothingHandsPowerGlovesNoUplink
prob: 0.25
- id: WeaponMeleeMoltenCollider
prob: 0.2
- id: WeaponMeleeMoltenAmputator
prob: 0.15
- id: WeaponShotgunCycler
prob: 0.1
- id: HyperEutacticBlade
prob: 0.05
- id: WeaponMeleeMoltenCollider
prob: 0.3
- id: WeaponMeleeMoltenAmputator
# Boss lunch
- id: MaterialGoliathHide1
prob: 0.25
- id: MaterialGoliathHide1
prob: 0.2
- id: MaterialGoliathHide1
prob: 0.15
- id: FoodMeatGoliath
prob: 0.15
- id: FoodMeatGoliath
prob: 0.1
- type: Destructible
thresholds:
- trigger:
@ -121,7 +190,9 @@
- type: Tag
tags:
- Hellspawn
- CannotSuicide
- DoorBumpOpener
- FootstepSound
- type: entity
parent: AltarFangs
@ -130,13 +201,13 @@
placement:
mode: SnapgridCenter
components:
# - type: UserInterface
# interfaces:
# enum.HellSpawnArenaUiKey.Key:
# type: HellSpawnArenaConsoleBoundUserInterface
# - type: ActivatableUI
# key: enum.HellSpawnArenaUiKey.Key
# - type: HellSpawnConsole
- type: UserInterface
interfaces:
enum.HellSpawnArenaUiKey.Key:
type: HellSpawnArenaConsoleBoundUserInterface
- type: ActivatableUI
key: enum.HellSpawnArenaUiKey.Key
- type: HellSpawnConsole
- type: Godmode
- type: BlockedTool
@ -194,6 +265,7 @@
damage:
types:
Heat: 15
Blunt: 5
- type: IgniteOnCollide
fireStacks: 1
count: 10

16
Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml
View file

@ -108,6 +108,22 @@
- id: MagazineRifleSP
amount: 1
- type: entity
id: ClothingBackpackDuffelWeaponRifleM52Filled
parent: ClothingBackpackDuffelMilitary
name: Bundle M-52
description: Premium assault rifle with 3 raspy FMJ magazines, 2 SP and 1 HP.
components:
- type: StorageFill
contents:
- id: WeaponRifleM52
- id: MagazineRifleM52FMJ
amount: 3
- id: MagazineRifleM52SP
amount: 2
- id: MagazineRifleM52HP
amount: 1
- type: entity
id: ClothingBackpackDuffelWeaponSubMachineGunP90Filled
parent: ClothingBackpackDuffelMilitary

19
Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml
View file

@ -197,9 +197,24 @@
name: box of .308 SP magazines
parent: BoxMagazine
id: BoxMagazineRifleNanotrasen
description: A box full of 7,62x51 Nanotrasen Soft Point magazines.
description: A box full of 7,62x51 magazines.
components:
- type: StorageFill
contents:
- id: MagazineRifleHeavySP
amount: 4
amount: 2
- id: MagazineRifleHeavyFMJ
- id: MagazineRifleHeavyHP
- type: entity
name: box of M-52 magazines
parent: BoxMagazine
id: BoxMagazineRifleM52
description: A box full of 5,56x45 magazines.
components:
- type: StorageFill
contents:
- id: MagazineRifleM52SP
amount: 2
- id: MagazineRifleM52FMJ
- id: MagazineRifleM52HP

83
Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/security.yml
View file

@ -1,4 +1,4 @@
# Energy Guns
# region Energy Guns
- type: entity
parent: GunSafeBaseSecure
id: GunSafeEnergyGunMini
@ -8,7 +8,7 @@
- type: StorageFill
contents:
- id: WeaponMiniEnergyGun
amount: 5
amount: 6
- type: entity
id: GunSafeEnergyGunPistolSecurity
@ -43,7 +43,7 @@
- id: WeaponEnergyGunTactical
amount: 2
## Pistols and revolvers safes
# region Pistols safes
- type: entity
parent: GunSafeBaseSecure
id: GunSafePistolG22
@ -95,12 +95,8 @@
contents:
- id: WeaponPistolVP78
amount: 4
- id: MagazinePistol40Base
- id: PouchAmmoFilledPistol40
amount: 4
- id: MagazinePistol40HP
amount: 2
- id: MagazinePistol40FMJ
amount: 2
- type: entity
parent: GunSafeBaseSecure
@ -112,10 +108,10 @@
contents:
- id: WeaponPistolACP14
amount: 4
- id: MagazineACP14
amount: 8
- id: PouchAmmoFilledPistol40
amount: 4
# Safes for SMGs
# region SMGs safes
- type: entity
parent: GunSafeBaseSecure
@ -195,7 +191,7 @@
- id: MagazinePistolSubMachineGunSP
amount: 4
# Rifles safes
# region Rifles safes
- type: entity
parent: GunSafeBaseSecure
id: GunSafeRifleM16A4
@ -232,8 +228,13 @@
contents:
- id: WeaponRifleLecterMk2
amount: 2
- id: WeaponRifleG36
- id: MagazineRifleSP
amount: 4
- id: MagazineRifleHP
amount: 2
- id: MagazineRifleFMJ
amount: 2
- type: entity
parent: GunSafeBaseSecure
@ -245,7 +246,10 @@
contents:
- id: WeaponRifleAR18
amount: 2
- id: WeaponRifleM28
- id: MagazineRifleHeavySP
amount: 6
- id: MagazineRifleHeavyHP
amount: 4
- type: entity
@ -258,23 +262,16 @@
contents:
- id: WeaponRifleFamas
amount: 2
- id: MagazineRifleSP
amount: 4
- type: entity
parent: GunSafeBaseSecure
id: GunSafeWeaponRifleG36
name: safe
suffix: G-36
components:
- type: StorageFill
contents:
- id: WeaponRifleG36
amount: 2
- id: MagazineRifleSP
amount: 4
- id: MagazineRifleHP
amount: 2
- id: MagazineRifleFMJ
amount: 2
# Shotguns safes
# region Shotguns safes
- type: entity
parent: GunSafeBaseSecure
id: GunSafeShotgunTrenchgun4034
@ -371,6 +368,7 @@
- id: BoxShotgunFlare
amount: 1
# region Spawners
# Small Arms Spawner
- type: entity
name: Armory Safe Spawner
@ -392,21 +390,23 @@
table: !type:GroupSelector
children:
- !type:GroupSelector
weight: 85
weight: 75
children:
- id: GunSafePistolMk58
- id: GunSafePistolG22
- id: GunSafeEnergyGunPistolSecurity
- !type:GroupSelector
weight: 10
weight: 20
children:
- id: GunSafePistolACP14
- id: GunSafeEnergyPistolDominator
- id: GunSafePistolVP78
- id: GunSafeEnergyGunMini
- id: GunSafeDisabler
- id: GunSafeSnubRevolver
- !type:GroupSelector
weight: 5
children:
- id: GunSafePistolACP14
- id: GunSafePistolVP78
- id: GunSafePistolM1984
- id: GunSafeSubMachineGunSkorpion
@ -431,19 +431,19 @@
table: !type:GroupSelector
children:
- !type:GroupSelector
weight: 90
weight: 80
children:
- id: GunSafeShotgunTrenchgun4034
- id: GunSafeShotgunKammerer
- id: GunSafeShotgunRiot
- !type:GroupSelector
weight: 9
weight: 15
children:
- id: GunSafeShotgunSPAS12
- id: GunSafeShotgunEnforcer
- id: GunSafeShotgunCombat
- !type:GroupSelector
weight: 1
weight: 5
children:
- id: GunSafeDoubleBarreled
@ -468,21 +468,20 @@
table: !type:GroupSelector
children:
- !type:GroupSelector
weight: 85
weight: 80
children:
- id: GunSafeRifleLecter
- id: GunSafeRifleM16A4
- !type:GroupSelector
weight: 10
weight: 15
children:
- id: GunSafeRifleAKMU
- id: GunSafeRifleFamas
- id: GunSafeRifleLecterMk2
- !type:GroupSelector
weight: 5
children:
- id: GunSafeRifleAR18
- id: GunSafeRifleFamas
- id: GunSafeWeaponRifleG36
- id: GunSafeRifleAKMU
# SMG Spawner
- type: entity
@ -505,20 +504,20 @@
table: !type:GroupSelector
children:
- !type:GroupSelector
weight: 80
weight: 70
children:
- id: GunSafeSubMachineGunMP7
- id: GunSafeSubMachineGunMP5
- id: GunSafeSubMachineGunDrozd
- !type:GroupSelector
weight: 15
weight: 20
children:
- id: GunSafeSubMachineGunMP7
- id: GunSafeSubMachineGunDrozdMk2
- id: GunSafeSubMachineGunVector
- id: GunSafeSubMachineGunWt550
- !type:GroupSelector
weight: 5
weight: 10
children:
- id: GunSafeRifleAR18
- id: GunSafeSubMachineGunSP91RC
- id: GunSafeSubMachineGunVector
- id: WeaponSubMachineGunSkorpion

158
Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/liberation.yml
View file

@ -8,6 +8,13 @@
WeaponPistolFlintlock: 3
WeaponPistolCHIMP: 3
WeaponPulsePistol: 3
WeaponPistolVP78: 3
WeaponPistolG22: 3
WeaponPistolG22Auto: 3
WeaponPistolHIB88M4: 3
WeaponPistolACP14: 3
WeaponPistolDeagle: 3
WeaponPistolM1984: 3
WeaponRevolverDeckard: 3
WeaponRevolverInspector: 3
@ -20,6 +27,9 @@
WeaponRevolverImprovised: 3
WeaponRevolverForged: 3
WeaponRevolverSnubRevolver: 3
WeaponRevolverMatebaNew: 3
WeaponRevolverSpearhead: 3
WeaponRevolverSpearheadBlack: 3
WeaponRifleAk: 3
WeaponRifleAKM: 3
@ -29,15 +39,16 @@
WeaponRifleG36: 3
WeaponRifleM28: 3
WeaponRifleAR18: 3
WeaponRifleV31: 3
WeaponRifleScarH: 3
WeaponRifleLecterMk2: 3
WeaponRifleFoam: 3
WeaponSTG44: 3
WeaponRifleARG: 3
WeaponRifleM52: 3
WeaponRifleM90GrenadeLauncher: 3
WeaponRifleLecter: 3
WeaponRifleM16A4: 3
WeaponRifleEstoc: 3
WeaponRifleBR64: 3
WeaponShotgunBulldog: 3
WeaponShotgunDoubleBarreled: 3
@ -49,6 +60,8 @@
Musket: 3
WeaponEnergyShotgun: 3
WeaponShotgunTrenchgun4034: 3
WeaponShotgunTrenchgun4034Sawn: 3
WeaponShotgunSPAS12: 3
WeaponShotgunRiot: 3
WeaponShotgunRiotSawn: 3
WeaponShotgunCombat: 3
@ -69,7 +82,6 @@
WeaponSubMachineGunMP5: 3
WeaponSubMachineGunSkorpion: 3
WeaponSubMachineGunNewVector: 3
WeaponSubMachineGunPPSH41: 3
WeaponAMS-42: 3
WeaponAJ100: 3
WeaponSIAR52: 3
@ -87,10 +99,18 @@
WeaponSniperGarand: 3
WeaponSniperRepeater: 3
WeaponRifleBauer127: 3
WeaponSniperDragunov: 3
WeaponSniperMosinNew: 3
WeaponSniperMosinLubed: 3
WeaponLauncherChinaLake: 3
WeaponLauncherRocket: 3
WeaponLauncherPirateCannon: 3
WeaponLauncherRL5: 3
WeaponGrenadeLauncherGL70: 3
WeaponGrenadeLauncherGL70Flash: 3
WeaponGrenadeLauncherSecurity: 3
WeaponLauncherM79: 3
WeaponTetherGun: 3
WeaponForceGun: 3
@ -105,7 +125,7 @@
PowerpackDL6902: 3
WeaponDL6902: 3
WeaponMinigun: 3
WeaponLightMachineGunDP28: 3
WeaponLaserSvalinn: 3
WeaponLaserGun: 3
WeaponMakeshiftLaser: 3
@ -130,6 +150,7 @@
WeaponDominator: 3
WeaponMultiphaseGun: 3
WeaponIonRifle: 3
WeaponIONRifle: 3
WeaponIonCarbine: 3
WeaponLaserImmolator: 3
WeaponGunLaserCarbineSemi: 3
@ -142,6 +163,23 @@
WeaponDecloner: 3
WeaponMiniEnergyCrossbow: 3
WeaponEnergyCrossbow: 3
WeaponLaserLNT620: 3
WeaponEnergyGun: 3
WeaponEnergyGunPulseRevolver: 3
WeaponEnergyGunPistol: 3
WeaponEnergyGunPistolSecurity: 3
WeaponEnergyGunTactical: 3
WeaponEarthGovLaserPistol: 3
WeaponEarthGovLaserRifle: 3
WeaponEarthGovLaserCarbine: 3
WeaponEarthGovLaserMG: 3
WeaponEarthGovXRay: 3
WeaponEarthGovLaserSniper: 3
WeaponSyndieLaserGun: 3
WeaponSyndieLaserPistol: 3
WeaponLaserMinigun: 3
WeaponSniperPulseCarbine: 3
WeaponAlien: 3
BowImprovised: 3
WeaponFlareGun: 3
@ -191,14 +229,122 @@
# Ammo magnum
MagazineBoxImprovisedMagnum: 3
SpeedLoaderMagnumRubber: 8
SpeedLoaderMagnumSP: 8
SpeedLoaderMagnumHP: 8
SpeedLoaderMagnumFMJ: 8
SpeedLoaderMagnumAP: 8
MagazineBoxMagnumRubber: 3
MagazineBoxMagnumSP: 3
MagazineBoxMagnumHP: 3
MagazineBoxMagnumFMJ: 3
MagazineBoxMagnumAP: 3
# Pistol Ammo
MagazinePistolImprovisedFilled: 8
MagazinePistolSubMachineGunImprovisedFilled: 8
MagazineBoxImprovisedPistol: 3
MagazinePistolSubMachineGunPPSHExtended: 3
MagazinePistolSubMachineGunPPSH: 3
MagazineVP78: 5
MagazineGlock22: 5
MagazineDeagle: 5
MagazineHIBrowning: 5
MagazineACP14: 5
MagazineP90: 5
MagazineMP7: 5
MagazineMP5: 5
MagazineScorpion: 5
MagazineNewVector: 5
MagazineBoxPistolRubber: 3
MagazineBoxPistolSP: 3
MagazineBoxPistolHP: 3
MagazineBoxPistolFMJ: 3
MagazineBoxPistolAP: 3
MagazineBoxPistol40SP: 3
MagazineBoxPistol40HP: 3
MagazineBoxPistol40FMJ: 3
MagazineBoxPistol40AP: 3
# Rifle Ammo
MagazineBoxImprovisedRifle: 3
MagazineLightRifleMaxim: 3
MagazineRifleM52AP: 5
MagazineRifleM52FMJ: 5
MagazineRifleM52HP: 5
MagazineRifleM52SP: 5
MagazineRifleM52Incendiary: 5
MagazineRifleM52Practice: 5
MagazineRifleM52Uranium: 5
MagazineRifleSP: 5
MagazineRifleHP: 5
MagazineRifleFMJ: 5
MagazineRifleAP: 5
MagazineBoxRifleSP: 3
MagazineBoxRifleHP: 3
MagazineBoxRifleFMJ: 3
MagazineBoxRifleAP: 3
MagazineLightRifleSP: 5
MagazineLightRifleHP: 5
MagazineLightRifleFMJ: 5
MagazineLightRifleAP: 5
MagazineBoxLightRifleSP: 3
MagazineBoxLightRifleHP: 3
MagazineBoxLightRifleFMJ: 3
MagazineBoxLightRifleAP: 3
MagazineRifleHeavySP: 5
MagazineRifleHeavyHP: 5
MagazineRifleHeavyFMJ: 5
MagazineRifleHeavyAP: 5
MagazineBoxHeavyRifleSP: 3
MagazineBoxHeavyRifleHP: 3
MagazineBoxHeavyRifleFMJ: 3
MagazineBoxHeavyRifleAP: 3
MagazineBoxHeavyRiflePractice: 3
MagazineBoxHeavyRifleIncendiary: 3
MagazineBoxHeavyRifleUranium: 3
MagazineScarH: 5
MagazineBR64: 5
MagazineDragunov: 5
MagazineBauer127: 5
MagazineBoxAntiMateriel: 3
# LMG Ammo
MagazineLightMachineGunMG60: 5
MagazineLightRifleBeltBox: 5
MagazineLightRifleBeltBoxHP: 5
MagazineLightRifleBeltBoxFMJ: 5
MagazineLightRifleBeltBoxAP: 5
MagazineLightRifleBeltBoxIncendiary: 5
MagazineLightRifleBeltBoxPractice: 5
MagazineLightRifleBeltBoxUranium: 5
MagazineMachineGunMG42: 5
MagazineDl6902: 5
MagazineBoxRifleMachineSP: 3
MagazineBoxRifleMachineHP: 3
MagazineBoxRifleMachineFMJ: 3
MagazineBoxRifleMachineAP: 3
MagazineBoxRifleMachinePractice: 3
MagazineBoxRifleMachineIncendiary: 3
MagazineBoxRifleMachineUranium: 3
#Lasers IK
MagazineBatteryLr30: 8
MagazineBatteryLr60: 8
# Test Tools
AdminPDA: 3
AccessConfiguratorUniversal: 3
# Mechs
MechHauler: 2
MechBigYarrkeBattery: 2
MechPaddyFilled: 2
MechRipley2DeathBattery: 2
MechRipley2Battery: 2
MechSecPod: 2
MechMaulerSyndieFilled: 2
MechMarauderFilled: 2
MechSeraphFilled: 2
MechLockerBattery: 2
MechPhazonBattery: 2
MechHonkerFilled: 2
MechRoverSyndieFilled: 2
MechDurandBattery: 2
MechNTGygaxFilled: 2
MechGygaxSyndieFilled: 2
MechGygaxBattery: 2

92
Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml
View file

@ -85,7 +85,7 @@
productEntity: WeaponMachineGunMG42
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mg42 }
cost:
Bluecrystal: 45
Bluecrystal: 35
categories:
- NTAutoGun
conditions:
@ -103,7 +103,7 @@
productEntity: PowerpackMinigunMG100
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mg_100 }
cost:
Bluecrystal: 45
Bluecrystal: 38
categories:
- NTAutoGun
conditions:
@ -116,18 +116,6 @@
- ERTGamma
- ERTEpsilon
- type: listing
id: ERTUplinkWeaponRifleAR18Filled
productEntity: ClothingBackpackDuffelWeaponRifleAR18Filled
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: ar18 }
cost:
Bluecrystal: 13
categories:
- NTAutoGun
conditions:
- !type:ListingLimitedStockCondition
stock: 3
- type: listing
id: ERTUplinkWeaponRifleM28Filled
productEntity: ClothingBackpackDuffelWeaponRifleM28Filled
@ -140,13 +128,31 @@
- !type:ListingLimitedStockCondition
stock: 3
- type: listing
id: ERTUplinklWeaponRifleM52Filled
name: ntuplink-gun-bundlem52-name
productEntity: ClothingBackpackDuffelWeaponRifleM52Filled
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: m52 }
cost:
Bluecrystal: 25
categories:
- NTAutoGun
conditions:
- !type:ListingLimitedStockCondition
stock: 1
- !type:StoreWhitelistCondition
whitelist:
tags:
- ERTGamma
- ERTEpsilon
- type: listing
id: ERTUplinkWeaponRifleBR64Filled
name: ntuplink-gun-bundlebr64-name
productEntity: ClothingBackpackDuffelWeaponRifleBR64Filled
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: br64 }
cost:
Bluecrystal: 25
Bluecrystal: 20
categories:
- NTAutoGun
conditions:
@ -177,12 +183,11 @@
- ERTEpsilon
- type: listing
id: ERTUplinkWeaponShotgunZauer
name: ntuplink-gun-bundlezauer-name
id: ERTUplinkWeaponShotgunCycler
productEntity: ClothingBackpackDuffelWeaponShotgunCycler
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: zauer }
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: cycler }
cost:
Bluecrystal: 20
Bluecrystal: 23
categories:
- NTAutoGun
conditions:
@ -533,6 +538,18 @@
- !type:ListingLimitedStockCondition
stock: 6
- type: listing
id: ERTUplinkBoxMagazineRifleM52
productEntity: BoxMagazineRifleM52
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_rifle }
cost:
Crystallite: 9
categories:
- NTAmmo
conditions:
- !type:ListingLimitedStockCondition
stock: 6
- type: listing
id: ERTUplinkMagazineMagnum
productEntity: MagazineMagnum
@ -565,7 +582,7 @@
productEntity: MagazineP90
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mag_p90 }
cost:
Crystallite: 6
Crystallite: 5
categories:
- NTAmmo
conditions:
@ -580,7 +597,7 @@
productEntity: SMGAmmoKit
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_smg }
cost:
Crystallite: 12
Crystallite: 9
categories:
- NTAmmo
conditions:
@ -626,7 +643,7 @@
productEntity: MagazineMachineGunMG42
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mag_mg342 }
cost:
Crystallite: 8
Crystallite: 6
categories:
- NTAmmo
conditions:
@ -901,6 +918,8 @@
- type: listing
id: ERTUplinkStimkitFilledNT
productEntity: StimkitFilledNT
name: uplink-stimkit-nt-name
description: uplink-stimkit-nt-desc
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: stimkit }
cost:
Crystallite: 12
@ -910,6 +929,20 @@
- !type:ListingLimitedStockCondition
stock: 5
- type: listing
id: ERTUplinkCoalpenKit
name: uplink-coalpen-kit-name
description: uplink-coalpen-kit-desc
productEntity: CoalpenKitFilled
icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: stimkit }
cost:
Crystallite: 10
categories:
- NTMedicine
conditions:
- !type:ListingLimitedStockCondition
stock: 5
- type: listing
id: ERTUplinkDuffelNanotrasenMedicalBundleFilled
productEntity: ClothingBackpackDuffelNanotrasenMedicalBundleFilled
@ -946,21 +979,6 @@
- !type:ListingLimitedStockCondition
stock: 3
- type: listing
id: ERTUplinkCoalpenKit
name: uplink-coalpen-kit-name
description: uplink-coalpen-kit-desc
productEntity: CoalpenKitFilled
icon: { sprite: _Sunrise/Objects/Specific/Medical/medipen.rsi, state: coalpen }
cost:
Crystallite: 12
categories:
- NTMedicine
conditions:
- !type:ListingLimitedStockCondition
stock: 5
# Дополнительное:
- type: listing

54
Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml
View file

@ -178,13 +178,6 @@
- type: Icon
sprite: _Sunrise/Objects/Devices/pda.rsi
state: pda-space-prison-guardian
- type: CartridgeLoader
uiKey: enum.PdaUiKey.Key
preinstalled:
- CrewManifestCartridge
- NotekeeperCartridge
- NanoTaskCartridge
- NewsReaderCartridge
- type: entity
parent: BasePDA
@ -207,13 +200,6 @@
- type: Icon
sprite: _Sunrise/Objects/Devices/pda.rsi
state: pda-space-prison-engineer
- type: CartridgeLoader
uiKey: enum.PdaUiKey.Key
preinstalled:
- CrewManifestCartridge
- NotekeeperCartridge
- NanoTaskCartridge
- NewsReaderCartridge
- type: entity
parent: BasePDA
@ -236,16 +222,9 @@
- type: Icon
sprite: _Sunrise/Objects/Devices/pda.rsi
state: pda-space-prison-scientist
- type: CartridgeLoader
uiKey: enum.PdaUiKey.Key
preinstalled:
- CrewManifestCartridge
- NotekeeperCartridge
- NanoTaskCartridge
- NewsReaderCartridge
- type: entity
parent: BasePDA
parent: BaseMedicalPDA
id: PrisonDoctorPDA
name: prison doctor's PDA
description: Sterile in appearance but worn at the edges, it has held more than one story of pain and salvation.
@ -265,14 +244,6 @@
- type: Icon
sprite: _Sunrise/Objects/Devices/pda.rsi
state: pda-space-prison-doctor
- type: CartridgeLoader
uiKey: enum.PdaUiKey.Key
preinstalled:
- CrewManifestCartridge
- NotekeeperCartridge
- NanoTaskCartridge
- NewsReaderCartridge
- MedTekCartridge
- type: entity
parent: BasePDA
@ -295,13 +266,6 @@
- type: Icon
sprite: _Sunrise/Objects/Devices/pda.rsi
state: pda-space-prison-chef
- type: CartridgeLoader
uiKey: enum.PdaUiKey.Key
preinstalled:
- CrewManifestCartridge
- NotekeeperCartridge
- NanoTaskCartridge
- NewsReaderCartridge
- type: entity
parent: BasePDA
@ -361,6 +325,7 @@
- NotekeeperCartridge
- NanoTaskCartridge
- NewsReaderCartridge
- AstroNavCartridge
- type: entity
parent: BasePDA
@ -413,16 +378,9 @@
- type: Icon
sprite: _Sunrise/Objects/Devices/pda.rsi
state: pda-space-prison-boss
- type: CartridgeLoader
uiKey: enum.PdaUiKey.Key
preinstalled:
- CrewManifestCartridge
- NotekeeperCartridge
- NanoTaskCartridge
- NewsReaderCartridge
- type: entity
parent: BasePDA
parent: BaseMedicalPDA
id: RoboticistPDA
name: roboticist's PDA
description: It's covered in something sticky.
@ -439,12 +397,6 @@
accentVColor: "#8900c9"
- type: Icon
state: pda-roboticist
- type: HealthAnalyzer
scanningEndSound:
path: "/Audio/Items/Medical/healthscanner.ogg"
damageContainers:
- Synth
- Silicon
- type: entity
parent: BaseSecurityPDA

49
Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml
View file

@ -1504,3 +1504,52 @@
path: /Audio/Items/Defib/defib_zap.ogg
params:
volume: 100
# region Figurine
# Только для Фигурок. Покусаю!
- type: entity
abstract: true
parent: BaseFigurine
id: BasePlayerFigurine
description: A small, detailed miniature.
components:
- type: Sprite
sprite: _Sunrise/Objects/player_figurines.rsi
scale: 0.5, 0.5
- type: Item
size: Tiny
- type: entity
parent: BasePlayerFigurine
id: PFigurineGuardRat
name: guard rat
# description:
components:
- type: Sprite
state: guardrat
- type: RandomMetadata
nameSegments:
- NamesRegalratKingdom
- NamesRegalratTitle
nameFormat: name-format-regal-rat
- type: entity
parent: BasePlayerFigurine
id: PFigurineChaminaM
name: Chamina Maus
# description:
components:
- type: Sprite
state: chamina_maus
- type: entity
parent: BasePlayerFigurine
id: PFigurinePirateJugger
name: Murmillo
# description:
components:
- type: Sprite
layers:
- state: pirate_jugger
- state: pirate_jugger_unshaded
shader: unshaded

66
Resources/Prototypes/_Sunrise/Entities/Objects/Specific/NTUplink.yml
View file

@ -5,7 +5,7 @@
name: Bluespace ERT visionary
description: Ultra-innovative portable bluespace teleporter.
suffix: Empty
categories: [ HideSpawnMenu ]
abstract: true
components:
- type: Sprite
sprite: _Sunrise/Objects/Devices/nt_uplink.rsi
@ -31,11 +31,10 @@
- type: entity
parent: BaseUplinkNTERT
id: BaseUplinkNTERTAmber
id: UplinkNTERTAmber
name: Bluespace ERT visionary
description: Ultra-innovative portable bluespace teleporter.
suffix: 75BC, 75C, Amber
categories: [ HideSpawnMenu ]
components:
- type: Sprite
sprite: _Sunrise/Objects/Devices/nt_uplink.rsi
@ -55,11 +54,10 @@
- type: entity
parent: BaseUplinkNTERT
id: BaseUplinkNTERTRed
id: UplinkNTERTRed
name: Bluespace ERT visionary
description: Ultra-innovative portable bluespace teleporter.
suffix: 100BC, 100C, Red
categories: [ HideSpawnMenu ]
components:
- type: Sprite
sprite: _Sunrise/Objects/Devices/nt_uplink.rsi
@ -80,11 +78,10 @@
- type: entity
parent: BaseUplinkNTERT
id: BaseUplinkNTERTGamma
id: UplinkNTERTGamma
name: Bluespace ERT visionary
description: Ultra-innovative portable bluespace teleporter.
suffix: 200BC, 200C, Gamma
categories: [ HideSpawnMenu ]
components:
- type: Sprite
sprite: _Sunrise/Objects/Devices/nt_uplink.rsi
@ -105,7 +102,7 @@
- type: entity
parent: BaseUplinkNTERT
id: BaseUplinkNTERTEpsilon
id: UplinkNTERTEpsilon
name: Bluespace DeathSquad visionary
description: Ultra-innovative portable bluespace teleporter.
suffix: Epsilon
@ -129,7 +126,7 @@
- type: entity
parent: BaseUplinkNTERT
id: BaseUplinkNTERTBlueShield
id: UplinkNTERTBlueShield
name: Bluespace ERT visionary
description: Ultra-innovative portable bluespace teleporter.
suffix: 8BC, 10C, BlueShield
@ -154,7 +151,7 @@
- type: entity
parent: BaseUplinkNTERT
id: BaseUplinkNTERTDebug
id: UplinkNTERTDebug
name: Bluespace ERT visionary
description: Ultra-innovative portable bluespace teleporter.
suffix: DEBUG
@ -183,12 +180,47 @@
- ERTEpsilon
- CBURN
- type: entity
parent: [ClothingHandsGlovesPowerglove, BaseMajorContraband]
id: ClothingHandsPowerGlovesNoUplink
name: power gloves
description: A solid argument made of duraplastalloy fibers in any brawl — just hope the other guy doesn’t bring a gun.
suffix: No Uplink
components:
- type: Item
size: Normal
- type: Clothing
equipSound: /Audio/_Sunrise/Weapons/Guns/Lasers/Pulse/pickup1.ogg
unequipSound: /Audio/_Sunrise/Weapons/Guns/Lasers/Pulse/drop1.ogg
equipDelay: 1.5
unequipDelay: 3
stripDelay: 20
- type: MeleeWeapon
autoAttack: true
attackRate: 1.5
damage:
types:
Blunt: 14
Structural: 6
bluntStaminaDamageFactor: 1.75
soundHit:
collection: PunchHard
animation: WeaponArcFist
mustBeEquippedToUse: true
- type: MeleeThrowOnHit
distance: 0.5
speed: 5
- type: Reflect
reflectProb: .05
- type: Insulated
- type: entity
parent: [ClothingHandsGlovesPowerglove, StorePresetNTUplink, BaseCentcommContraband]
id: BaseClothingHandsPowerGlovesUplinkNTERT
name: ERT power gloves
description: A solid argument made of duraplastalloy fibers in any brawl — just hope the other guy doesn’t bring a gun. Comes with a built-in ERT-standard uplink.
suffix: Uplink, Empty
categories: [ HideSpawnMenu ]
components:
- type: Item
size: Normal
@ -238,7 +270,7 @@
parent: BaseClothingHandsPowerGlovesUplinkNTERT
id: ClothingHandsPowerGlovesUplinkNTERTAmber
suffix: Uplink, Amber
categories: [ HideSpawnMenu ]
#categories: [ HideSpawnMenu ]
components:
- type: Store
balance:
@ -249,7 +281,7 @@
parent: BaseClothingHandsPowerGlovesUplinkNTERT
id: ClothingHandsPowerGlovesUplinkNTERTAmberLeader
suffix: Uplink, Amber, Leader
categories: [ HideSpawnMenu ]
#categories: [ HideSpawnMenu ]
components:
- type: Store
balance:
@ -260,7 +292,7 @@
parent: ClothingHandsPowerGlovesUplinkNTERTAmber
id: ClothingHandsPowerGlovesUplinkNTERTRed
suffix: Uplink, Red
categories: [ HideSpawnMenu ]
#categories: [ HideSpawnMenu ]
components:
- type: Store
balance:
@ -275,7 +307,7 @@
parent: BaseClothingHandsPowerGlovesUplinkNTERT
id: ClothingHandsPowerGlovesUplinkNTERTRedLeader
suffix: Uplink, Red, Leader
categories: [ HideSpawnMenu ]
#categories: [ HideSpawnMenu ]
components:
- type: Store
balance:
@ -290,7 +322,7 @@
parent: ClothingHandsPowerGlovesUplinkNTERTAmber
id: ClothingHandsPowerGlovesUplinkNTERTGamma
suffix: Uplink, Gamma
categories: [ HideSpawnMenu ]
#categories: [ HideSpawnMenu ]
components:
- type: Store
balance:
@ -305,7 +337,7 @@
parent: BaseClothingHandsPowerGlovesUplinkNTERT
id: ClothingHandsPowerGlovesUplinkNTERTGammaLeader
suffix: Uplink, Gamma, Leader
categories: [ HideSpawnMenu ]
#categories: [ HideSpawnMenu ]
components:
- type: Store
balance:
@ -321,7 +353,7 @@
id: ClothingHandsPowerGlovesUplinkNTERTCBURN
suffix: Uplink, CBURN
name: CBURN Power Gloves
categories: [ HideSpawnMenu ]
#categories: [ HideSpawnMenu ]
components:
- type: MeleeWeapon
damage:

12
Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Catrtidges/heavy_rifle.yml
View file

@ -8,8 +8,6 @@
tags:
- Cartridge
- CartridgeHeavyRifle
- type: HitScanCartridgeAmmo
hitscan: BulletRifleTraceHeavySP
- type: Sprite
sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Casings/7.62x51.rsi
scale: 0.60, 0.60
@ -29,8 +27,6 @@
tags:
- Cartridge
- CartridgeHeavyRifleR
- type: HitScanCartridgeAmmo
hitscan: BulletRifleTraceHeavySP
- type: Sprite
sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Casings/7.62x54.rsi
scale: 0.60, 0.60
@ -121,8 +117,8 @@
name: cartridge (.308 incendiary)
parent: BaseCartridgeRifleHeavy
components:
- type: HitScanCartridgeAmmo
hitscan: BulletRifleTraceHeavyIncendiary
- type: CartridgeAmmo
proto: BulletRifleTraceHeavyIncendiary
- type: Sprite
layers:
- state: base
@ -227,8 +223,8 @@
name: cartridge (7.62mmR incendiary)
parent: BaseCartridgeHeavyRifleR
components:
- type: HitScanCartridgeAmmo
hitscan: BulletRifleTraceHeavyIncendiary
- type: CartridgeAmmo
proto: BulletRifleTraceHeavyIncendiary
- type: Sprite
layers:
- state: base

99
Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
View file

@ -1,69 +1,3 @@
- type: entity
id: MagazineAK
name: Universal AK magazne
parent: BaseItem
components:
- type: Tag
tags:
- MagazineAK
- type: BallisticAmmoProvider
mayTransfer: true
whitelist:
tags:
- CartridgeLightRifle
proto: CartridgeLightRifleSP
capacity: 30
- type: Item
size: Small
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/rifle_machine.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: MagazineMP38
name: MP38 magazine
parent: BaseItem
components:
- type: Tag
tags:
- MagazineMP38
- type: BallisticAmmoProvider
mayTransfer: true
proto: CartridgePistolSP
whitelist:
tags:
- CartridgePistol
capacity: 32
- type: Item
size: Small
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/mp38.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: MagazineScorpion
name: Scorpion magazine
@ -316,39 +250,6 @@
zeroVisible: false
- type: Appearance
- type: entity
id: MagazineSTG44
name: STG44 magazine
parent: BaseItem
components:
- type: Tag
tags:
- MagazineSTG44
- type: BallisticAmmoProvider
mayTransfer: true
whitelist:
tags:
- CartridgeLightRifle
proto: CartridgeLightRifleSP
capacity: 30
- type: Item
size: Small
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/stg44.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: MagazineDl6902
name: box-magazine DL6902

11
Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
View file

@ -98,13 +98,13 @@
- type: Appearance
- type: entity
id: MagazinePPSH41
id: MagazinePistolSubMachineGunPPSHExtended
name: PPSH magazine
parent: BaseItem
components:
- type: Tag
tags:
- MagazinePPSH41
- MagazineSMGPPSH
- type: BallisticAmmoProvider
mayTransfer: true
proto: CartridgePistolSP # 57x28
@ -130,13 +130,6 @@
zeroVisible: false
- type: Appearance
- type: entity
parent: MagazinePPSH41
id: MagazinePPSH41Extended
components:
- type: BallisticAmmoProvider
capacity: 85
- type: entity
parent: MagazineMP5
id: MagazineMP5Extended

41
Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
View file

@ -1,41 +1,2 @@
- type: entity
id: MagazineV31
parent: BaseItem
components:
- type: Tag
tags:
- MagazineV31
# Увы
# - type: BallisticAmmoProvider
# mayTransfer: true
# capacity: 40
# proto: CartridgeRail
# whitelist:
# tags:
# - CartridgeRail
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
- type: Item
size: Small
sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/v31.rsi
- type: Sprite
netsync: false
sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/v31.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
parent: MagazineV31
id: MagazineV31Extended
components:
- type: BallisticAmmoProvider
capacity: 50
# id: MagazineV31 # Press F

69
Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
View file

@ -87,37 +87,6 @@
steps: 5
zeroVisible: true
# - type: entity
# name: IK-30 laser carbine
# parent: [ BaseWeaponAutoPowerCell, BaseRestrictedContraband ]
# id: WeaponGunLaserCarbineSemi
# description: "A semi-automatic battery laser carbine."
# components:
# - type: Sprite
# sprite: _Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi
# layers:
# - state: base
# map: ["enum.GunVisualLayers.Base"]
# - state: mag-unshaded-4
# map: ["enum.GunVisualLayers.MagUnshaded"]
# shader: unshaded
# - type: Gun
# selectedMode: SemiAuto
# fireRate: 2.75
# availableModes:
# - SemiAuto
# - type: Clothing
# sprite: _Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi
# - type: Item
# size: Huge
# shape:
# - 0,0,4,1
# sprite: _Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi
# - type: MagazineVisuals
# magState: mag
# steps: 5
# zeroVisible: true
- type: entity
name: energy gun
parent: BaseWeaponBattery
@ -139,7 +108,7 @@
- type: Item
size: Huge
shape:
- 0,0,4,1
- 0,0,3,1
- type: Gun
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/laser.ogg
@ -350,42 +319,6 @@
- type: StaticPrice
price: 750
# - type: entity
# name: IK-60 laser carbine
# parent: [ BaseWeaponAutoPowerCell, BaseRestrictedContraband ]
# id: WeaponGunLaserCarbineAutomatic
# description: "A burst automatic battery laser carbine."
# components:
# - type: Sprite
# sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi
# layers:
# - state: base
# map: ["enum.GunVisualLayers.Base"]
# - state: mag-unshaded-4
# map: ["enum.GunVisualLayers.MagUnshaded"]
# shader: unshaded
# - type: Gun
# minAngle: 1.5
# maxAngle: 20
# angleIncrease: 1.25
# angleDecay: 12
# selectedMode: Burst
# shotsPerBurst: 5
# burstCooldown: 0.15
# burstFireRate: 8
# availableModes:
# - Burst
# - type: Item
# size: Huge
# shape:
# - 0,0,4,1
# - type: Clothing
# sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi
# - type: MagazineVisuals
# magState: mag
# steps: 5
# zeroVisible: true
- type: entity
name: Energy Pistol «Judge»
parent: BaseWeaponBatterySmall

2
Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
View file

@ -108,7 +108,7 @@
slots:
gun_magazine:
name: Magazine
startingItem: MagazineRPD
startingItem: MagazineLightRifleBeltBox
insertSound: /Audio/_Sunrise/Weapons/Guns/LMGs/reload.ogg
ejectSound: /Audio/_Sunrise/Weapons/Guns/LMGs/unload.ogg
priority: 2

131
Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
View file

@ -76,8 +76,8 @@
- type: HeldSpeedModifier
- type: CursorOffsetRequiresWield
- type: EyeCursorOffset
maxOffset: 4.5
pvsIncrease: 0.45
maxOffset: 3
pvsIncrease: 0.3
- type: KnockbackByUserTag
doestContain:
Resomi:
@ -398,11 +398,8 @@
delay: 0.75
- type: CursorOffsetRequiresWield
- type: EyeCursorOffset
maxOffset: 6
pvsIncrease: 0.6
- type: SpeedModifiedOnWield
walkModifier: 0.85
sprintModifier: 0.85
maxOffset: 5
pvsIncrease: 0.5
- type: entity
name: M-28
@ -463,11 +460,8 @@
delay: 0.75
- type: CursorOffsetRequiresWield
- type: EyeCursorOffset
maxOffset: 5
pvsIncrease: 0.5
- type: SpeedModifiedOnWield
walkModifier: 0.8
sprintModifier: 0.8
maxOffset: 4
pvsIncrease: 0.4
- type: entity
name: AR-18
@ -585,119 +579,6 @@
- type: UseDelay
delay: 0.35
- type: entity
name: STG 44
parent: BaseWeaponRifleSunrise
id: WeaponSTG44
components:
- type: Sprite
sprite: _Sunrise/Objects/Weapons/Guns/Rifles/stg44/big.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: _Sunrise/Objects/Weapons/Guns/Rifles/stg44/tiny.rsi
- type: Item
size: Huge
shape:
- 0,0,3,2
sprite: _Sunrise/Objects/Weapons/Guns/Rifles/stg44/tiny.rsi
- type: Gun
minAngle: 2
maxAngle: 19
angleIncrease: 2.25
angleDecay: 10
fireRate: 5.25
soundGunshot:
collection: ak47
- type: ChamberMagazineAmmoProvider
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazineSTG44
insertSound: /Audio/_Sunrise/Weapons/Guns/Rifles/AK/ak_reload.ogg
ejectSound: /Audio/_Sunrise/Weapons/Guns/Rifles/AK/ak_unload.ogg
priority: 2
whitelist:
tags:
- MagazineSTG44
- MagazineLightRifle
gun_chamber:
name: Chamber
startingItem: CartridgeLightRifleSP
priority: 1
whitelist:
tags:
- CartridgeLightRifle
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 0.5
- type: entity
name: V-31 assault rifle
parent: BaseWeaponRifleSunrise
id: WeaponRifleV31
components:
- type: Sprite
sprite: _Sunrise/Objects/Weapons/Guns/Rifles/v31/big.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: _Sunrise/Objects/Weapons/Guns/Rifles/v31/tiny.rsi
- type: Item
size: Huge
shape:
- 0,0,3,2
sprite: _Sunrise/Objects/Weapons/Guns/Rifles/v31/tiny.rsi
- type: Gun
fireRate: 3.5
minAngle: 1
maxAngle: 12
soundGunshot:
path: /Audio/_Sunrise/Weapons/Guns/Rifles/v31/v31_shot.ogg
params:
volume: -2
- type: ChamberMagazineAmmoProvider
autoEject: true
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazineV31
insertSound: /Audio/_Sunrise/Weapons/Guns/Rifles/v31/v31_reload.ogg
ejectSound: /Audio/_Sunrise/Weapons/Guns/Rifles/v31/v31_unload.ogg
priority: 2
whitelist:
tags:
- MagazineV31
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 0.5
- type: entity
name: scar-h
parent: BaseWeaponRifleSunrise

82
Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
View file

@ -16,11 +16,11 @@
minAngle: -2.9
maxAngle: -30
- type: Gun
minAngle: 6
maxAngle: 65
angleIncrease: 2.95
angleDecay: 24
fireRate: 8
minAngle: 3
maxAngle: 50
angleIncrease: 3
angleDecay: 20
fireRate: 10
soundGunshot:
path: /Audio/_Sunrise/Weapons/Guns/SMGs/p90_shot.ogg
params:
@ -55,13 +55,6 @@
- type: ChamberMagazineAmmoProvider
soundRack:
path: /Audio/_Sunrise/Weapons/Guns/SMGs/p90_cocked.ogg
- type: SpeedModifiedOnWield
walkModifier: 0.86
sprintModifier: 0.86
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.9
- type: HeldSpeedModifier
- type: entity
name: MP-38
@ -355,10 +348,12 @@
- type: UseDelay
delay: 0.5
#PPSH
- type: entity
name: PPSH-41
parent: BaseWeaponSubMachineGun
id: WeaponSubMachineGunPPSH41
name: PPSH 59 SMG
parent: [BaseWeaponSubMachineGun, BaseMajorContraband] #, BaseSovietContraband
id: WeaponSubMachineGunPPSH
description: Beloved by USSP veterans and feared by friendly fire protocols everywhere. Uses .35 ammo.
components:
- type: Sprite
sprite: _Sunrise/Objects/Weapons/Guns/SMGs/ppsh41/big.rsi
@ -370,35 +365,41 @@
- type: Clothing
sprite: _Sunrise/Objects/Weapons/Guns/SMGs/ppsh41/tiny.rsi
- type: Item
size: Large
sprite: _Sunrise/Objects/Weapons/Guns/SMGs/ppsh41/tiny.rsi
- type: Wieldable
unwieldOnUse: false
- type: GunWieldBonus
minAngle: -7
maxAngle: -95
minAngle: -9
maxAngle: -9
- type: Gun
minAngle: 10
maxAngle: 120
angleIncrease: 5
angleDecay: 30
fireRate: 9
minAngle: 21
maxAngle: 32
fireRate: 15
selectedMode: FullAuto
availableModes:
- SemiAuto
- FullAuto
soundGunshot:
path: /Audio/_Sunrise/Weapons/Guns/SMGs/ppsh41/ppsh_shot.ogg
params:
volume: -1
soundEmpty:
path: /Audio/_Sunrise/Weapons/Guns/SMGs/ppsh41/ppsh_empty.ogg
path: /Audio/_Starlight/Weapons/Guns/Gunshots/ppsh.ogg
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: Appearance
- type: ChamberMagazineAmmoProvider
autoEject: true
- type: ItemSlots
slots:
gun_magazine:
name: Magazine
startingItem: MagazinePPSH41
insertSound: /Audio/_Sunrise/Weapons/Guns/SMGs/ppsh41/ppsh_reload.ogg
ejectSound: /Audio/_Sunrise/Weapons/Guns/SMGs/ppsh41/ppsh_unload.ogg
startingItem: MagazinePistolSubMachineGunPPSH
insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
priority: 2
whitelist:
tags:
- MagazinePPSH41
- MagazinePistolSubMachineGun
- MagazineSMGPPSH
whitelistFailPopup: gun-magazine-whitelist-fail
gun_chamber:
name: Chamber
startingItem: CartridgePistolSP
@ -406,17 +407,6 @@
whitelist:
tags:
- CartridgePistol
- type: MagazineVisuals
magState: mag
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1
- type: SpeedModifiedOnWield
walkModifier: 0.85
sprintModifier: 0.85
- type: entity
name: MS-42
@ -652,8 +642,8 @@
walkModifier: 0.99
sprintModifier: 0.99
- type: EyeCursorOffset
maxOffset: 3.5
pvsIncrease: 0.45
maxOffset: 2
pvsIncrease: 0.2
- type: Contraband
allowedDepartments: [ CentralCommand, Security ]

13
Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
View file

@ -33,7 +33,7 @@
id: WeaponShotgunTrenchgun4034
components:
- type: Sprite
scale: 0.85, 0.85
scale: 0.8, 0.8
sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/trenchgun_l_4034/big.rsi
- type: Item
size: Large
@ -52,10 +52,9 @@
- type: Wieldable
- type: GunRequiresWield
- type: Gun
spread: 22
pump: true
fireRate: 1.25
- type: GunSpreadModifier
spread: 0.8
fireRate: 1.8
- type: Construction
graph: ShotgunTrenchgun4034Sawn
node: start
@ -71,11 +70,11 @@
sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/trenchgun_l_4034_sawn/big.rsi
- type: Gun
pump: true
fireRate: 1.5
fireRate: 2
useKey: true
selectedMode: SemiAuto
- type: GunSpreadModifier
spread: 1.4
spread: 1.2
- type: MeleeWeapon
angle: 60
range: 1
@ -95,7 +94,7 @@
- type: Clothing
sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/trenchgun_l_4034_sawn/tiny.rsi
- type: BallisticAmmoProvider
capacity: 5
capacity: 4
- type: UseDelay
delay: 0.25
- type: SpeedModifiedOnWield

4
Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
View file

@ -48,11 +48,11 @@
- MagazineDragunov
gun_chamber:
name: Chamber
startingItem: CartridgeLightRifleSP
startingItem: CartridgeHeavyRifleRFMJ
priority: 1
whitelist:
tags:
- CartridgeLightRifle
- CartridgeHeavyRifleR
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot

36
Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml
View file

@ -69,6 +69,42 @@
contents:
- id: WeaponIONRifle
- type: entity
parent: GunSafe
id: GunSafeSMRTGun
name: SMART Safe
description: Heavy reinforced special gun save delivered from NanoTrasen Smart Arms Division for field testing. Contain unique Smart gun LMG.
components:
- type: StorageFill
contents:
- id: WeaponLightMachineGunM492
- id: ClothingBeltSecurityWebbing
- id: MagazineLightRifleBeltBox # two, one already in lmg
- id: MagazineLightRifleBeltBoxFMJ
- id: MagazineLightRifleBeltBoxHP
- id: MagazineLightRifleBeltBoxIncendiary # All types to manage all variants of threats
- type: AccessReader
access: [["CentralCommand"]]
alertAccesses:
gamma: GammaAlertAccesses
- type: Godmode
- type: Transform
anchored: true
- type: Anchorable
flags:
- Anchorable
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.48,0.25,0.48"
density: 2000
mask:
- MachineMask
layer:
- MachineLayer
- type: entity
id: ClosetPatologoanatom
name: patologoanatom's locker

28
Resources/Prototypes/_Sunrise/Maps/debug.yml
View file

@ -1,14 +1,14 @@
- type: gameMap
id: SunriseDev
mapName: Dev
mapPath: /Maps/_Sunrise/Station/dev_map.yml
minPlayers: 0
stations:
Dev:
stationProto: DevStation
components:
- type: StationNameSetup
mapNameTemplate: "Dev"
- type: StationJobs
availableJobs:
Captain: [ -1, -1 ]
# - type: gameMap
# id: SunriseDev
# mapName: Dev
# mapPath: /Maps/_Sunrise/Station/dev_map.yml
# minPlayers: 0
# stations:
# Dev:
# stationProto: DevStation
# components:
# - type: StationNameSetup
# mapNameTemplate: "Dev"
# - type: StationJobs
# availableJobs:
# Captain: [ -1, -1 ]

29
Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/security.yml
View file

@ -40,10 +40,10 @@
- BoxShellTranquilizer
#####################MAGAZINE#######################
# LMG
- LightRifleMagazineSP
- LightRifleMagazineHP
- LightRifleMagazineFMJ
- LightRifleMagazineEmpty
- MagazineLightRifleBeltBoxSP
- MagazineLightRifleBeltBoxHP
- MagazineLightRifleBeltBoxFMJ
- MagazineLightRifleBeltBoxEmpty
# Light Rifle
- MagazineLightRifleSP
- MagazineLightRifleHP
@ -91,10 +91,6 @@
- MagazineRifleHeavyHP
- MagazineRifleHeavySP
- MagazineRifleHeavyEmpty
# Shotgun Magazine
- MagazineShotgun
- MagazineShotgunEmpty
- MagazineShotgunSlug
# Shotgun Speedloader
- SpeedLoaderShellShotgun
- SpeedLoaderShotgunEmpty
@ -119,7 +115,6 @@
# - MagazineRifleExtended
# - MagazineAR18Extended
# - MagazineM28Extended
# - MagazineV31Extended
# - MagazineBauer127Extended
# - MagazineBR64Extended
# - MagazineDragunovExtended
@ -160,9 +155,9 @@
- BoxShellTranquilizer
#####################MAGAZINE#######################
# LMG
- LightRifleMagazineIncendiary
- LightRifleMagazineUranium
- LightRifleMagazineAP
- MagazineLightRifleBeltBoxIncendiary
- MagazineLightRifleBeltBoxUranium
- MagazineLightRifleBeltBoxAP
# Light Rifle
- MagazineLightRifleIncendiary
- MagazineLightRifleUranium
@ -201,8 +196,6 @@
- MagazineRifleHeavyAP
- MagazineRifleHeavyUranium
# Shotgun
- MagazineShotgunBeanbag
- MagazineShotgunIncendiary
- SpeedLoaderShotgunIncendiary
- SpeedLoaderShotgunUranium
# Grenade
@ -239,3 +232,11 @@
- WeaponMechCombatDisabler
- WeaponMechCombatFlashbangLauncher
- WeaponMechCombatMissileRack8
- type: latheRecipePack
id: SyndicateAmmoSunrise
recipes:
- MagazineLightRifleBoxIncendiary
- MagazineLightRifleBoxUranium
- MagazineShotgunIncendiary
- MagazineShotgunBeanbag

119
Resources/Prototypes/_Sunrise/Recipes/Lathes/ammo.yml
View file

@ -673,15 +673,6 @@
Steel: 300
# Non Stationary Ammunition
- type: latheRecipe
id: MagazineMP38
result: MagazineMP38
categories:
- Ammo
completetime: 5
materials:
Steel: 835
- type: latheRecipe
id: MagazineLightMachineGunMG60
result: MagazineLightMachineGunMG60
@ -691,40 +682,34 @@
materials:
Steel: 3700
- type: latheRecipe
id: MagazinePPSH41
result: MagazinePPSH41
categories:
- Ammo
completetime: 5
materials:
Steel: 1200
- type: latheRecipe
id: MagazineRPD
result: MagazineRPD
categories:
- Ammo
completetime: 5
materials:
Steel: 1465
- type: latheRecipe
parent: BaseAmmoRecipe
id: MagazineLightRifleBoxIncendiary
result: MagazineLightRifleBoxIncendiary
materials:
Steel: 150
Plastic: 475
Plasma: 475
Plastic: 900
- type: latheRecipe
id: MagazineLightRifleBox
parent: BaseAmmoRecipe
id: MagazineLightRifleBoxUranium
result: MagazineLightRifleBoxUranium
materials:
Steel: 150
Plastic: 475
Uranium: 475
- type: latheRecipe
parent: BaseAmmoRecipe
id: MagazineRifleBoxSP
result: MagazineRifleBoxSP
categories:
- Ammo
completetime: 5
materials:
Steel: 1100
- type: latheRecipe
parent: BaseAmmoRecipe
id: MagazineRifleBoxFMJ
result: MagazineRifleBoxFMJ
materials:
Steel: 1100
@ -735,56 +720,56 @@
# 7.62 light Rifle Magazines
- type: latheRecipe
parent: BaseEmptyAmmoRecipe
id: LightRifleMagazineEmpty
result: LightRifleMagazineEmpty
id: MagazineLightRifleBeltBoxEmpty
result: MagazineLightRifleBeltBoxEmpty
materials:
Steel: 100
- type: latheRecipe
parent: BaseAmmoRecipe
id: LightRifleMagazineSP
result: LightRifleMagazineSP
id: MagazineLightRifleBeltBoxSP
result: MagazineLightRifleBeltBox
materials:
Steel: 1412
- type: latheRecipe
parent: BaseAmmoRecipe
id: LightRifleMagazineHP
result: LightRifleMagazineHP
id: MagazineLightRifleBeltBoxHP
result: MagazineLightRifleBeltBoxHP
materials:
Steel: 1412
- type: latheRecipe
parent: BaseAmmoRecipe
id: LightRifleMagazineFMJ
result: LightRifleMagazineFMJ
id: MagazineLightRifleBeltBoxFMJ
result: MagazineLightRifleBeltBoxFMJ
materials:
Steel: 1412
- type: latheRecipe
parent: BaseAmmoRecipe
id: LightRifleMagazineUranium
result: LightRifleMagazineUranium
id: MagazineLightRifleBeltBoxUranium
result: MagazineLightRifleBeltBoxUranium
materials:
Steel: 100
Plastic: 1080
Uranium: 1080
Plastic: 700
Uranium: 700
- type: latheRecipe
parent: BaseAmmoRecipe
id: LightRifleMagazineIncendiary
result: LightRifleMagazineIncendiary
id: MagazineLightRifleBeltBoxIncendiary
result: MagazineLightRifleBeltBoxIncendiary
materials:
Steel: 100
Plastic: 1350
Plastic: 1312
- type: latheRecipe
parent: BaseAmmoRecipe
id: LightRifleMagazineAP
result: LightRifleMagazineAP
id: MagazineLightRifleBeltBoxAP
result: MagazineLightRifleBeltBoxAP
materials:
Steel: 1312
Uranium: 1312
Steel: 800
Uranium: 700
#Speedloaders .50 Shotgun
- type: latheRecipe
@ -882,15 +867,6 @@
materials:
Steel: 835
- type: latheRecipe
id: MagazineAK
result: MagazineAK
categories:
- Ammo
completetime: 5
materials:
Steel: 565
- type: latheRecipe
id: MagazineDragunov
result: MagazineDragunov
@ -900,16 +876,6 @@
materials:
Steel: 800
- type: latheRecipe
id: MagazineV31
result: MagazineV31
categories:
- Ammo
completetime: 5
materials:
Steel: 985
Plastic: 600
- type: latheRecipe
id: MagazineACP14
result: MagazineACP14
@ -1020,15 +986,6 @@
# materials:
# Steel: 650
#
#- type: latheRecipe
# id: MagazineV31Extended
# result: MagazineV31Extended
# categories:
# - Weapons
# completetime: 12
# materials:
# Steel: 1300
# Plastic: 100
#
#- type: latheRecipe
# id: MagazineBauer127Extended

3
Resources/Prototypes/_Sunrise/Research/arsenal.yml
View file

@ -33,7 +33,7 @@
- MagazineBoxPistol40AP
- MagazineBoxRifleAP
- MagazineBoxLightRifleAP
- LightRifleMagazineAP
- MagazineLightRifleBeltBoxAP
- MagazinePistolSubMachineGunAP
- MagazinePistolSubMachineGunTopMountedAP
- MagazinePistolHighCapacityAP
@ -136,7 +136,6 @@
# - MagazineMP5Extended
# - MagazineMP7Extended
# - MagazineRifleExtended
# - MagazineV31Extended
# - MagazineDragunovExtended
# radioChannels:
# - Security

2
Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/blueshield_operative.yml
View file

@ -36,7 +36,7 @@
gloves: ClothingHandsGlovesCombat
neck: ClothingBSMantle
back: ClothingBackpackSatchelBlueShield
pocket1: BaseUplinkNTERTBlueShield
pocket1: WeaponPistolM1984
pocket2: WeaponTaser
storage:
back:

Some files were not shown because too many files have changed in this diff Show more