diff --git a/Resources/Audio/_Sunrise/Items/Handling/Helmets/drop.ogg b/Resources/Audio/_Sunrise/Items/Handling/Helmets/drop.ogg index 8892e120e0..e8e38f6509 100644 Binary files a/Resources/Audio/_Sunrise/Items/Handling/Helmets/drop.ogg and b/Resources/Audio/_Sunrise/Items/Handling/Helmets/drop.ogg differ diff --git a/Resources/Audio/_Sunrise/Items/Handling/Helmets/pickup.ogg b/Resources/Audio/_Sunrise/Items/Handling/Helmets/pickup.ogg index b28def3a51..a97015a575 100644 Binary files a/Resources/Audio/_Sunrise/Items/Handling/Helmets/pickup.ogg and b/Resources/Audio/_Sunrise/Items/Handling/Helmets/pickup.ogg differ diff --git a/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl b/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl index aa6a60d0f3..030e8d6edc 100644 --- a/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl +++ b/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl @@ -8,3 +8,6 @@ ent-CartridgePistol40AP = cartridge (.40 AP) .desc = { ent-CartridgePistol40SP.desc } ent-CartridgePistolImprovised = improvised cartridge (.35 auto) .desc = A handmade pistol bullet, uses phosphorus as a propellent instead of gunpowder which makes it much less effective. +ent-CartridgePistolImprovisedMech = { ent-CartridgePistolImprovised } + .desc = { ent-CartridgePistolImprovised.desc } + .suffix = Mech diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/items/toolboxes.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/items/toolboxes.ftl index 3b44ef1085..a58f52148d 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/items/toolboxes.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/items/toolboxes.ftl @@ -1,3 +1,6 @@ ent-ToolboxSyndicateFilledCoreExtraction = { ent-ToolboxSyndicate } .suffix = Filled, Core Extraction .desc = { ent-ToolboxSyndicate.desc } +ent-ToolboxElectricalTurretPirateFilled = { ent-ToolboxElectricalTurretPirate } + .suffix = Pirate, Turret, Filled + .desc = { ent-ToolboxElectricalTurretPirate.desc } diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/fun/player_figurines.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/fun/player_figurines.ftl index 48235bddb4..887119027a 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/fun/player_figurines.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/fun/player_figurines.ftl @@ -1,2 +1,4 @@ ent-PFigurineChaminaM = Chamina Maus .desc = A tiny figurine of Chamina Maus. +ent-PFigurinePirateJugger = Murmillo + .desc = A tiny figurine of a Murmillo-class pirate. It's watching... diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/implanters.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/implanters.ftl index 6febcdaae7..87f1db98fa 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/implanters.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/implanters.ftl @@ -4,3 +4,12 @@ ent-SmokeScreenImplanter = { ent-BaseImplantOnlyImplanterSyndi } ent-CreepyLaughImplanter = { ent-BaseImplantOnlyImplanterSyndi } .suffix = Sunrise, laugh .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } +ent-RadioImplanterFreelance = { ent-BaseImplantOnlyImplanterSyndi } + .suffix = freelance radio + .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } +ent-DeathRattleImplanterFreelance = { ent-BaseImplantOnlyImplanterSyndi } + .suffix = freelance death rattle + .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } +ent-ScramImplanterProto = { ent-ScramImplanter } + .suffix = prototype + .desc = { ent-ScramImplanter.desc } diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/subdermal_implants.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/subdermal_implants.ftl index c6aaf1aacc..be9b11eb3d 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/subdermal_implants.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/subdermal_implants.ftl @@ -2,3 +2,6 @@ ent-SmokeScreenImplant = smoke screen implant .desc = This implant creates a cloud of smoke when activated. ent-CreepyLaughImplant = creepy laugh implant .desc = This implant lets the user laugh like borg anywhere at any time. +ent-ScramImplantProto = { ent-ScramImplant } + .suffix = prototype + .desc = { ent-ScramImplant.desc } diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/tools/toolbox.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/tools/toolbox.ftl new file mode 100644 index 0000000000..eb3da0ef61 --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/tools/toolbox.ftl @@ -0,0 +1,3 @@ +ent-ToolboxElectricalTurretPirate = { ent-ToolboxElectricalTurret } + .suffix = Pirate, Turret + .desc = { ent-ToolboxElectricalTurret.desc } diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl index 84a96f2367..8791b7f16d 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl @@ -14,3 +14,21 @@ ent-WeaponRifleLecterMk2 = Lecter Mk2 .desc = { ent-BaseWeaponRifle.desc } ent-WeaponRifleLecterMk2Empty = Lecter Mk2 .desc = { ent-WeaponRifleLecterMk2.desc } +ent-WeaponRifleSKM24 = SKM-24 + .desc = Cheap and reliable. Enough firepower, little accuracy. Easy to repair, hard to control during sustained fire. +ent-WeaponRifleSKM24White = SKM-24 + .desc = Cheap and reliable. Enough firepower, little accuracy. Easy to repair, hard to control during sustained fire. Saved is earned. Wood replaced with cheap plastic. +ent-WeaponRifleSKM24Green = SKM-24 + .desc = Cheap and reliable. Enough firepower, little accuracy. Easy to repair, hard to control during sustained fire. The favorite color of low-income mercenaries and ordinary USSP members. +ent-WeaponRifleSKM24Scrap = SKM-24 + .desc = Cheap and reliable. Enough firepower, little accuracy. Easy to repair, hard to control during sustained fire. This specimen has seen some rough stuff... and not just once. +ent-WeaponRifleSKM24Syndi = SKM-24 + .desc = Cheap and reliable. Enough firepower, little accuracy. Easy to repair, hard to control during sustained fire. Spare option if you lost all your telecrystals at the casino. +ent-WeaponRifleSKM24Nano = SKM-24 + .desc = Cheap and reliable. Enough firepower, little accuracy. Easy to repair, hard to control during sustained fire. Money doesn't smell. +ent-WeaponRifleSKM28 = SKM-28 + .desc = A marksman conversion of the standard SKM-24. Features an extended heavy barrel, reworked internals, and a mounted optical sight. Chambered in .308. +ent-WeaponRifleSKM28Syndi = SKM-28 + .desc = A marksman conversion of the standard SKM-24. Features an extended heavy barrel, reworked internals, and a mounted optical sight. Chambered in .308. Good choice, nukie. +ent-WeaponRifleSKM28Nano = SKM-28 + .desc = A marksman conversion of the standard SKM-24. Features an extended heavy barrel, reworked internals, and a mounted optical sight. Chambered in .308. Money doesn't smell. diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/turrets/turrets_ballistic.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/turrets/turrets_ballistic.ftl index 6e1421e0f7..f54ad20e62 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/turrets/turrets_ballistic.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/turrets/turrets_ballistic.ftl @@ -1,3 +1,6 @@ ent-WeaponTurretPirate = { ent-BaseWeaponBallisticTurret } .suffix = Pirate .desc = { ent-BaseWeaponBallisticTurret.desc } +ent-WeaponTurretPirateDisposable = { ent-WeaponTurretSyndicateDisposable } + .suffix = Pirate, Disposable + .desc = { ent-WeaponTurretSyndicateDisposable.desc } diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/misc/implanters.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/misc/implanters.ftl index 1ab63ad7cc..76c43509a6 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/misc/implanters.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/misc/implanters.ftl @@ -23,6 +23,8 @@ ent-FreedomImplanter = freedom implanter .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } ent-RadioImplanter = syndicate radio implanter .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } +ent-VoiceMaskImplanter = voice mask implanter + .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } ent-UplinkImplanter = uplink implanter .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } ent-EmpImplanter = EMP implanter diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/tools/blueprint.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/tools/blueprint.ftl index f9ee82476f..adb3b94e5b 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/tools/blueprint.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/tools/blueprint.ftl @@ -6,3 +6,5 @@ ent-BlueprintSeismicCharge = seismic charge blueprint .desc = A blueprint with a schematic of a seismic charge. It can be inserted into an autolathe. ent-BlueprintDoubleEmergencyTank = double emergency tank blueprint .desc = A blueprint with a schematic of a double emergency tank. It can be inserted into an autolathe. +ent-BlueprintMagAsh12Slug = ash-12 magazine (.50 slug) blueprint + .desc = A blueprint with a schematic of an ash-12 magazine with slugs. It can be inserted into an autolathe and security fabricator. diff --git a/Resources/Locale/en-US/_strings/_sunrise/guidebook/guides.ftl b/Resources/Locale/en-US/_strings/_sunrise/guidebook/guides.ftl index bef3ce20be..bd4d90f030 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/guidebook/guides.ftl @@ -1,4 +1,8 @@ guide-entry-disease = Разумная болезнь +guide-entry-expeditions = Экспедиции +guide-entry-expedition-pirates = Пираты +guide-entry-expedition-xenos = Ксено +guide-entry-expedition-carps = Карпы ## SUNRISE rules diff --git a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl index d028a3389c..953c00ee6b 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl @@ -97,6 +97,8 @@ uplink-smoke-screen-implanter-desc = Creates a small cloud of smoke for you to s uplink-creepy-laugh-implanter-name = Creepy Laugh Implanter uplink-creepy-laugh-implanter-desc = An audio implant that plays the signature laugh of a Syndicate cyborg. Annoying, intimidating, and undeniably stylish. +uplink-scram-implanter-proto-name = Scram Implanter Proto +uplink-scram-implanter-proto-desc = A 1-use scram implant that recharges after 600 seconds. Teleports you within a large radius, tries to place you on an unobstructed tile, and may sometimes fail. Life insurance not included. uplink-cluster-mini-bomb-name = Cluster Minibomb uplink-cluster-mini-bomb-desc = If you don't care about accuracy, then this choice is for you. diff --git a/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl b/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl index c9bbacc6a9..b46e46c340 100644 --- a/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl @@ -7,4 +7,8 @@ ent-CartridgePistol40FMJ = патрон (.40 FMJ) ent-CartridgePistol40AP = патрон (.40 AP) .desc = { ent-CartridgePistol40SP.desc } ent-CartridgePistolImprovised = самодельный патрон (.35 auto) - .desc = Самодельный пистолетный патрон, использующий фосфор в качестве метательного вещества вместо пороха, что делает его гораздо менее эффективным. \ No newline at end of file + .desc = Самодельный пистолетный патрон, использующий фосфор в качестве метательного вещества вместо пороха, что делает его гораздо менее эффективным. + +ent-CartridgePistolImprovisedMech = { ent-CartridgePistolImprovised } + .desc = { ent-CartridgePistolImprovised.desc } + .suffix = Мех diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/items/toolboxes.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/items/toolboxes.ftl index a161da7688..9f7207547b 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/items/toolboxes.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/items/toolboxes.ftl @@ -4,3 +4,8 @@ ent-ToolboxSyndicateFilledCoreExtraction = { ent-ToolboxSyndicate } ent-ToolboxSyndicateFilledRepair = { ent-ToolboxSyndicate } .desc = { ent-ToolboxSyndicate.desc } .suffix = Заполнен, Ремонт мехов + + +ent-ToolboxElectricalTurretPirateFilled = { ent-ToolboxElectricalTurretPirate } + .suffix = Пират, Турель, Заполненный + .desc = { ent-ToolboxElectricalTurretPirate.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/mobs/npcs/pirates.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/mobs/npcs/pirates.ftl index a0e8a1b04a..113d663b24 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/mobs/npcs/pirates.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/mobs/npcs/pirates.ftl @@ -16,6 +16,8 @@ ent-MobPirateT1Flintlock = пороховой попуга .desc = Вокс в команде пиратов, прямо таки боевой попугай. ent-MobPirateT1Hunter = охотник на голиафов .desc = Ветеран-утилизатор, достаточно богат, чтобы исследовать заброшенные руины и ходить в абордажи ради адреналина и приключений. +ent-MobPirateT1HunterSmash = крушитель голиафов + .desc = Ветеран-утилизатор, достаточно крепкий, чтобы свободно размахивать тяжёлой секирой-крашером. ent-MobPirateT1Knife = абордажник мусорщиков .desc = Первым лезет в пролом. Возвращается редко, зато шуму наделает. ent-MobPirateT1ECutlass = абордажник-ветеран мусорщиков @@ -28,6 +30,8 @@ ent-MobPirateT1Pistol = пистолетчик мусорщиков .desc = Низкоранговый рейдер, вооруженный из излишков оружием. ent-MobPirateT1Mosin = стрелок мусорщиков .desc = Стрелок с винтовкой времён древних войн. Любит цитировать уставы СССП, которых никто не видел. +ent-MobPirateT1Rifle = стрелок-ветеран мусорщиков + .desc = Закалённый ветеран-мусорщик, держит ППШ близко, а бандольер ещё ближе. ent-MobPirateT1ScrapRifle = автоматчик мусорщиков .desc = В команде, где все вооружены чем попало, он прихватил автомат, во всяком случае он был им… когда-то. ent-MobPirateT1PKA = утиль мусорщиков @@ -38,6 +42,13 @@ ent-MobPirateT1ScrapSMG = рейдер мусорщиков .desc = Обожает стрелять, ненавидит целиться. Жмёт спуск, пока всё вокруг не перестанут шевелиться. Вооружён импровизированным ПП. ent-MobPirateT1SMG = рейдер-ветеран мусорщиков .desc = Обожает стрелять, ненавидит целиться. Жмёт спуск, пока всё вокруг не перестанут шевелиться. Вооружён древним ПП. +ent-MobPirateT1BorgAssault = Штурмотрон + .desc = Бывший штурмовой борг Синдиката. Ржавый, помятый и перепрошитый пиратами. Всё ещё уверен, что он оружие массового убеждения. +ent-MobPirateT1BorgMining = Копарь + .desc = Списанный шахтёрский борг, собранный обратно как получилось после встречи с гибтонитом. Провода торчат, панели отсутствуют. Копает теперь только проблемы. +ent-MobPirateT1BorgDerelict = Железяка + .desc = Обычный борг без специализации раньше. После пиратского обучения ПОЛУЧИЛ СПЕЦИАЛИЗАЦИЮ. ЛУПИТЬ ЛОМОМ. + ent-MobPirateT2Grapeshot = шрапнельный громых .desc = Разносит всё в клочья, превращая вещи в сыр с дырками. Говорит, что «осколки — это тоже искусство». diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/player_figurines.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/player_figurines.ftl index 103d29ad92..a242de19de 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/player_figurines.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/player_figurines.ftl @@ -1,2 +1,4 @@ -ent-PFigurineChaminaM = Хамина Маус +ent-PFigurineChaminaM = Чамина Маус .desc = Крошечная фигурка Хамины Маус. +ent-PFigurinePirateJugger = Мурмилло + .desc = Крошечная фигурка пирата класса Мурмилло. Он наблюдает... diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/implanters.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/implanters.ftl index 802a7330ba..6162aefaf6 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/implanters.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/implanters.ftl @@ -4,3 +4,12 @@ ent-SmokeScreenImplanter = { ent-Implanter } ent-CreepyLaughImplanter = { ent-Implanter } .suffix = Санрайз, Смех .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } +ent-RadioImplanterFreelance = { ent-Implanter } + .suffix = Фриланс, радио + .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } +ent-DeathRattleImplanterFreelance = { ent-Implanter } + .suffix = Фриланс, предсмертный хрип + .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } +ent-ScramImplanterProto = { ent-ScramImplanter } + .suffix = прототип + .desc = { ent-ScramImplanter.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/subdermal_implants.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/subdermal_implants.ftl index 6a3deae450..c9a2d2a4b6 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/subdermal_implants.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/subdermal_implants.ftl @@ -1,4 +1,7 @@ ent-SmokeScreenImplant = Имплант Дымовой Завесы .desc = Создает небольшое облако дыма, в котором вы можете скрыться. Можно использовать до трех раз, прежде чем у вас закончится газ. ent-CreepyLaughImplant = имплант жуткого смеха - .desc = Этот имплант позволяет пользователю смеяться так же жутко, как и борг, где угодно и когда угодно. \ No newline at end of file + .desc = Этот имплант позволяет пользователю смеяться так же жутко, как и борг, где угодно и когда угодно. +ent-ScramImplantProto = { ent-ScramImplant } + .suffix = прототип + .desc = { ent-ScramImplant.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/tools/toolbox.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/tools/toolbox.ftl new file mode 100644 index 0000000000..0f09ce09f6 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/tools/toolbox.ftl @@ -0,0 +1,3 @@ +ent-ToolboxElectricalTurretPirate = { ent-ToolboxElectricalTurret } + .suffix = Пират, Турель + .desc = { ent-ToolboxElectricalTurret.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl index 567d4d930c..41a1e9edf8 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl @@ -16,3 +16,21 @@ ent-WeaponRifleLecterMk2Empty = Лектер Мк2 .desc = { ent-WeaponRifleLecterMk2.desc } ent-WeaponRifleAsh12 = АШ-12 .desc = Тяжёлая автоматическая винтовка под пули дробовика. Бьёт, как молоток. +ent-WeaponRifleSKM24 = SKM-24 + .desc = Дешевый и надежный. Достаточно огневой мощи, малая точность. Легко чинится, тяжело контролировать при длительной стрельбе. +ent-WeaponRifleSKM24White = SKM-24 + .desc = Дешевый и надежный. Достаточно огневой мощи, малая точность. Легко чинится, тяжело контролировать при длительной стрельбе. Сэкономленное - заработанное. Дерево заменено дешевым пластиком. +ent-WeaponRifleSKM24Green = SKM-24 + .desc = Дешевый и надежный. Достаточно огневой мощи, малая точность. Легко чинится, тяжело контролировать при длительной стрельбе. Любимый цвет малоимущих наемников и обычных членов USSP. +ent-WeaponRifleSKM24Scrap = SKM-24 + .desc = Дешевый и надежный. Достаточно огневой мощи, малая точность. Легко чинится, тяжело контролировать при длительной стрельбе. Этот экземпляр повидал всякое... и не раз. +ent-WeaponRifleSKM24Syndi = SKM-24 + .desc = Дешевый и надежный. Достаточно огневой мощи, малая точность. Легко чинится, тяжело контролировать при длительной стрельбе. Запасной вариант, если вы проиграли все телекристаллы в казино. +ent-WeaponRifleSKM24Nano = SKM-24 + .desc = Дешевый и надежный. Достаточно огневой мощи, малая точность. Легко чинится, тяжело контролировать при длительной стрельбе. Деньги не пахнут. +ent-WeaponRifleSKM28 = SKM-28 + .desc = Снайперская модификация стандартного SKM-24. Имеет удлиненный тяжелый ствол, переработанную начинку и установленный оптический прицел. Калибр .308. +ent-WeaponRifleSKM28Syndi = SKM-28 + .desc = Снайперская модификация стандартного SKM-24. Имеет удлиненный тяжелый ствол, переработанную начинку и установленный оптический прицел. Калибр .308. Хороший выбор, нюк. +ent-WeaponRifleSKM28Nano = SKM-28 + .desc = Снайперская модификация стандартного SKM-24. Имеет удлиненный тяжелый ствол, переработанную начинку и установленный оптический прицел. Калибр .308. Деньги не пахнут. diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/turrets/turrets_ballistic.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/turrets/turrets_ballistic.ftl index 4616811708..b5c3be2c17 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/turrets/turrets_ballistic.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/turrets/turrets_ballistic.ftl @@ -1,3 +1,8 @@ ent-WeaponTurretPirate = { ent-BaseWeaponBallisticTurret } .suffix = Пират .desc = { ent-BaseWeaponBallisticTurret.desc } + + +ent-WeaponTurretPirateDisposable = { ent-WeaponTurretSyndicateDisposable } + .suffix = Пират, Одноразовый + .desc = { ent-WeaponTurretSyndicateDisposable.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/devices/circuitboards/machine/particle_accelerator.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/devices/circuitboards/machine/particle_accelerator.ftl index 8bdb430d54..6a3a677855 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/devices/circuitboards/machine/particle_accelerator.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/devices/circuitboards/machine/particle_accelerator.ftl @@ -4,9 +4,9 @@ ent-MachineParticleAcceleratorFuelChamberCircuitboard = плата топлив .desc = { ent-BaseMachineCircuitboard.desc } ent-MachineParticleAcceleratorPowerBoxCircuitboard = плата блока питания УЧ .desc = { ent-BaseMachineCircuitboard.desc } -ent-MachineParticleAcceleratorEmitterStarboardCircuitboard = плата левого излучателя УЧ - .desc = Машинная плата для левого излучателя ускорителя частиц. +ent-MachineParticleAcceleratorEmitterStarboardCircuitboard = плата правого излучателя УЧ + .desc = Машинная плата для правого излучателя ускорителя частиц. ent-MachineParticleAcceleratorEmitterForeCircuitboard = плата центрального излучателя УЧ .desc = Машинная плата для центрального излучателя ускорителя частиц. -ent-MachineParticleAcceleratorEmitterPortCircuitboard = плата правого излучателя УЧ - .desc = Машинная плата для правого излучателя ускорителя частиц. +ent-MachineParticleAcceleratorEmitterPortCircuitboard = плата левого излучателя УЧ + .desc = Машинная плата для левого излучателя ускорителя частиц. diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/implanters.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/implanters.ftl index 19fb88241c..1c4b366dd2 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/implanters.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/implanters.ftl @@ -30,6 +30,9 @@ ent-FreedomImplanter = { ent-Implanter } ent-RadioImplanter = { ent-BaseImplantOnlyImplanterSyndi } .suffix = Радио Синдиката .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } +ent-VoiceMaskImplanter = { ent-BaseImplantOnlyImplanterSyndi } + .suffix = Голосовая маска + .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } ent-UplinkImplanter = { ent-Implanter } .desc = { ent-BaseImplantOnlyImplanter.desc } .suffix = Аплинк diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/tools/blueprint.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/tools/blueprint.ftl index 903117a3d0..33aa8916a6 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/tools/blueprint.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/tools/blueprint.ftl @@ -6,5 +6,7 @@ ent-BlueprintSeismicCharge = чертёж сейсмозаряда .desc = Чертёж со схемой сейсмозаряда. Его можно вставить в автолат. ent-BlueprintDoubleEmergencyTank = чертёж двойного аварийного баллона .desc = Чертёж со схемой двойного аварийного баллона. Его можно вставить в автолат. +ent-BlueprintMagAsh12Slug = чертёж магазина АШ-12 (.50 пуля) + .desc = Чертёж со схемой магазина АШ-12 с пулями. Его можно вставить в автолат и охранный ТехФаб. ent-BlueprintFlare = чертёж фальшфейера .desc = Чертёж со схемой фальшфейера. Его можно вставить в автолат. diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/guidebook/guides.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/guidebook/guides.ftl index 1da5a94175..722df408b0 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/guidebook/guides.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/guidebook/guides.ftl @@ -1,4 +1,10 @@ +## SUNRISE guides + guide-entry-disease = Разумная болезнь +guide-entry-expeditions = Экспедиции +guide-entry-expedition-pirates = Пираты +guide-entry-expedition-xenos = Ксено +guide-entry-expedition-carps = Карпы ## SUNRISE rules diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl index efe31a4dae..ebc0b2a85b 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl @@ -176,6 +176,8 @@ uplink-smoke-screen-implanter-name = Имплантер Дымовой Заве uplink-smoke-screen-implanter-desc = Создает небольшое облако дыма, в котором вы можете скрыться. Можно использовать до трех раз, прежде чем у вас закончится газ. uplink-creepy-laugh-implanter-name = Имплантер Жуткого Смеха uplink-creepy-laugh-implanter-desc = Аудиоимплант, воспроизводящий фирменный смех синди-киборга. Раздражает, пугает, стиль гарантирован. +uplink-scram-implanter-proto-name = Прототип Имплантера Побег +uplink-scram-implanter-proto-desc = Имплант побега на 1 заряд с перезарядкой 600 секунд. Телепортирует вас в большом радиусе, пытается перенести на свободную клетку, иногда может сбоить. Страхование жизни не прилагается. ## Ammo Kits and Bundle diff --git a/Resources/Locale/ru-RU/_strings/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_strings/store/uplink-catalog.ftl index efcbf3580c..94522e10e9 100644 --- a/Resources/Locale/ru-RU/_strings/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_strings/store/uplink-catalog.ftl @@ -159,6 +159,8 @@ uplink-micro-bomb-implanter-name = Имплантер Микробомба uplink-micro-bomb-implanter-desc = Взрывается при ручной активации или гибели носителя этого импланта. Уничтожает тело пользователя со всем снаряжением. uplink-radio-implanter-name = Радиоимплант uplink-radio-implanter-desc = Вживляемое радио Синдиката для скрытой связи. Не требует гарнитуры. +uplink-voice-mask-implanter-name = Имплантер Голосовая маска +uplink-voice-mask-implanter-desc = Модифицирует голосовые связки, позволяя звучать как кто угодно. # Cybernetics uplink-nightvision-eyes = Кибер-глаза ночного видения uplink-nightvision-eyes-desc = Позволяют видеть в темноте, но делают вас более уязвимым к светошумовым гранатам. (Внимание: Требуется помощь хирурга.) diff --git a/Resources/Maps/_Sunrise/Dungeon/pirate_base.yml b/Resources/Maps/_Sunrise/Dungeon/pirate_base.yml index fe5833ea13..40075f23d7 100644 --- a/Resources/Maps/_Sunrise/Dungeon/pirate_base.yml +++ b/Resources/Maps/_Sunrise/Dungeon/pirate_base.yml @@ -4,8 +4,8 @@ meta: engineVersion: 270.0.0 forkId: "" forkVersion: "" - time: 01/03/2026 03:12:37 - entityCount: 2583 + time: 01/06/2026 19:18:59 + entityCount: 2623 maps: - 1 grids: @@ -5054,6 +5054,11 @@ entities: powered: True - proto: AlwaysPoweredStrobeDimLight entities: + - uid: 1617 + components: + - type: Transform + pos: 10.5,32.5 + parent: 1 - uid: 2438 components: - type: Transform @@ -5077,6 +5082,12 @@ entities: - type: Transform pos: 38.5,66.5 parent: 1 + - uid: 2623 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,30.5 + parent: 1 - proto: AmmoTechFab entities: - uid: 20 @@ -9705,13 +9716,6 @@ entities: - Construction - proto: CartridgeAntiMateriel entities: - - uid: 889 - components: - - type: Transform - pos: 50.627735,2.6294875 - parent: 1 - - type: Physics - canCollide: False - uid: 890 components: - type: Transform @@ -9729,10 +9733,8 @@ entities: - uid: 892 components: - type: Transform - pos: 50.61211,2.8744068 + pos: 50.605007,2.9106197 parent: 1 - - type: Physics - canCollide: False - uid: 893 components: - type: Transform @@ -9741,6 +9743,22 @@ entities: parent: 1 - type: Physics canCollide: False +- proto: CartridgeAntiMaterielEmp + entities: + - uid: 2615 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 50.391468,1.6189532 + parent: 1 +- proto: CartridgeAntiMaterielFrag + entities: + - uid: 889 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 50.183132,2.2699947 + parent: 1 - proto: CartridgePistolSpent entities: - uid: 1558 @@ -11309,10 +11327,10 @@ entities: fixtures: {} - proto: ComputerPirateUplink entities: - - uid: 1645 + - uid: 2606 components: - type: Transform - pos: 4.5,65.5 + pos: 5.5,65.5 parent: 1 - proto: ComputerPowerMonitoring entities: @@ -11548,8 +11566,8 @@ entities: showEnts: False occludes: True ents: - - 1146 - 1145 + - 1146 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -13160,6 +13178,13 @@ entities: flags: Anchorable missingComponents: - Construction +- proto: Implanter + entities: + - uid: 2603 + components: + - type: Transform + pos: 30.555746,47.036392 + parent: 1 - proto: IntercomConstructed entities: - uid: 1375 @@ -13489,6 +13514,18 @@ entities: - type: Transform pos: 18.5,58.5 parent: 1 +- proto: LootSpawnerScienceMajor + entities: + - uid: 2607 + components: + - type: Transform + pos: 9.5,55.5 + parent: 1 + - uid: 2608 + components: + - type: Transform + pos: 1.5,51.5 + parent: 1 - proto: LootSpawnerSecurity entities: - uid: 1415 @@ -14060,6 +14097,76 @@ entities: - type: Transform pos: 15.5,31.5 parent: 1 + - uid: 2584 + components: + - type: Transform + pos: 5.5,6.5 + parent: 1 + - uid: 2585 + components: + - type: Transform + pos: 15.5,7.5 + parent: 1 + - uid: 2593 + components: + - type: Transform + pos: 2.5,20.5 + parent: 1 + - uid: 2594 + components: + - type: Transform + pos: 5.5,14.5 + parent: 1 + - uid: 2595 + components: + - type: Transform + pos: 13.5,14.5 + parent: 1 + - uid: 2596 + components: + - type: Transform + pos: 19.5,14.5 + parent: 1 + - uid: 2597 + components: + - type: Transform + pos: 7.5,20.5 + parent: 1 + - uid: 2598 + components: + - type: Transform + pos: 14.5,20.5 + parent: 1 + - uid: 2599 + components: + - type: Transform + pos: 13.5,25.5 + parent: 1 + - uid: 2609 + components: + - type: Transform + pos: 5.5,52.5 + parent: 1 + - uid: 2611 + components: + - type: Transform + pos: 35.5,39.5 + parent: 1 + - uid: 2613 + components: + - type: Transform + pos: 19.5,2.5 + parent: 1 + - uid: 2617 + components: + - type: Transform + pos: 25.5,6.5 + parent: 1 + - uid: 2618 + components: + - type: Transform + pos: 32.5,20.5 + parent: 1 - proto: MobPirateT2Spawner entities: - uid: 2282 @@ -14092,6 +14199,21 @@ entities: - type: Transform pos: 3.5,30.5 parent: 1 + - uid: 2612 + components: + - type: Transform + pos: 43.5,39.5 + parent: 1 + - uid: 2619 + components: + - type: Transform + pos: 8.5,67.5 + parent: 1 + - uid: 2620 + components: + - type: Transform + pos: 13.5,58.5 + parent: 1 - proto: MobPirateT3Spawner entities: - uid: 1983 @@ -14129,6 +14251,16 @@ entities: - type: Transform pos: 16.5,61.5 parent: 1 + - uid: 2610 + components: + - type: Transform + pos: 9.5,53.5 + parent: 1 + - uid: 2616 + components: + - type: Transform + pos: 43.5,14.5 + parent: 1 - proto: ModularGrenade entities: - uid: 1437 @@ -14173,6 +14305,42 @@ entities: - type: Transform pos: 33.535812,36.53695 parent: 1 +- proto: NukeOpsAmmoSpawner + entities: + - uid: 2586 + components: + - type: Transform + pos: 16.5,7.5 + parent: 1 + - uid: 2587 + components: + - type: Transform + pos: 18.5,9.5 + parent: 1 + - uid: 2588 + components: + - type: Transform + pos: 8.5,1.5 + parent: 1 + - uid: 2601 + components: + - type: Transform + pos: 5.5,30.5 + parent: 1 +- proto: NukeOpsGrenadeSpawner + entities: + - uid: 2592 + components: + - type: Transform + pos: 0.5,21.5 + parent: 1 +- proto: NukeOpsMedkitBruteSpawner + entities: + - uid: 2600 + components: + - type: Transform + pos: 4.5,30.5 + parent: 1 - proto: OperatingTable entities: - uid: 1441 @@ -15517,17 +15685,6 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,13.5 parent: 1 - - uid: 1616 - components: - - type: Transform - pos: 10.5,32.5 - parent: 1 - - uid: 1617 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,30.5 - parent: 1 - proto: PoweredlightLED entities: - uid: 1618 @@ -15716,6 +15873,11 @@ entities: - type: Transform pos: 26.5,39.5 parent: 1 + - uid: 2590 + components: + - type: Transform + pos: 16.5,9.5 + parent: 1 - proto: PuddleBloodSmall entities: - uid: 2047 @@ -15790,6 +15952,11 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,61.5 parent: 1 + - uid: 1616 + components: + - type: Transform + pos: 4.5,65.5 + parent: 1 - uid: 1643 components: - type: Transform @@ -16883,6 +17050,33 @@ entities: - type: Transform pos: 32.5,36.5 parent: 1 +- proto: RandomImplantCaseSpawner + entities: + - uid: 2447 + components: + - type: Transform + pos: 30.5,46.5 + parent: 1 + - uid: 2604 + components: + - type: Transform + pos: 20.5,54.5 + parent: 1 + - uid: 2605 + components: + - type: Transform + pos: 31.5,63.5 + parent: 1 + - uid: 2614 + components: + - type: Transform + pos: 24.5,2.5 + parent: 1 + - uid: 2622 + components: + - type: Transform + pos: 6.5,65.5 + parent: 1 - proto: RandomPosterContraband entities: - uid: 1835 @@ -17050,6 +17244,11 @@ entities: - type: Transform pos: 26.5,39.5 parent: 1 + - uid: 2589 + components: + - type: Transform + pos: 16.5,9.5 + parent: 1 - proto: ReinforcedGirder entities: - uid: 1841 @@ -17367,12 +17566,12 @@ entities: - type: Transform pos: 33.5,55.5 parent: 1 -- proto: ScramImplant +- proto: ScramImplantProto entities: - uid: 2520 components: - type: Transform - pos: 3.5692098,47.49885 + pos: 3.5086389,47.56261 parent: 1 - proto: ScrapAirlock1 entities: @@ -18697,6 +18896,11 @@ entities: rot: -1.5707963267948966 rad pos: 33.5,36.5 parent: 1 + - uid: 2602 + components: + - type: Transform + pos: 30.5,46.5 + parent: 1 - proto: TargetHuman entities: - uid: 2107 @@ -18894,6 +19098,15 @@ entities: - type: Transform pos: 28.5,30.5 parent: 1 +- proto: VendingMachineWallMedicalCivilian + entities: + - uid: 2591 + components: + - type: Transform + pos: 3.5,2.5 + parent: 1 + - type: Fixtures + fixtures: {} - proto: VestineChemistryVial entities: - uid: 2128 @@ -19751,6 +19964,13 @@ entities: - type: Transform pos: 24.42415,2.5899053 parent: 1 +- proto: WeaponLightMachineGunDP28 + entities: + - uid: 1645 + components: + - type: Transform + pos: 4.5015817,65.49769 + parent: 1 - proto: WeaponPistolCobra entities: - uid: 1131 @@ -19794,13 +20014,6 @@ entities: - type: Transform pos: 4.6858606,61.485825 parent: 1 -- proto: WeaponRifleEstoc - entities: - - uid: 2447 - components: - - type: Transform - pos: 4.553755,64.69905 - parent: 1 - proto: WeaponRifleSKM24Syndi entities: - uid: 1426 @@ -19813,6 +20026,13 @@ entities: - type: Transform pos: 4.50688,62.44124 parent: 1 +- proto: WeaponRifleSKM28Syndi + entities: + - uid: 2621 + components: + - type: Transform + pos: 4.665644,64.37851 + parent: 1 - proto: WeaponTurretNanoTrasen entities: - uid: 2430 @@ -19864,12 +20084,6 @@ entities: parent: 1 - type: Godmode oldDamage: {} - - uid: 2293 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,39.5 - parent: 1 - uid: 2294 components: - type: Transform @@ -19899,6 +20113,14 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,63.5 parent: 1 +- proto: WeaponTurretPirateDisposable + entities: + - uid: 2293 + components: + - type: Transform + pos: 11.5,39.5 + parent: 1 + - type: CMExplosionEffect - proto: WeaponTurretSyndicateBroken entities: - uid: 2298 diff --git a/Resources/Maps/_Sunrise/Nonstations/nukieplanet.yml b/Resources/Maps/_Sunrise/Nonstations/nukieplanet.yml index 0ffb1fa09c..c257e1e822 100644 --- a/Resources/Maps/_Sunrise/Nonstations/nukieplanet.yml +++ b/Resources/Maps/_Sunrise/Nonstations/nukieplanet.yml @@ -4,8 +4,8 @@ meta: engineVersion: 270.0.0 forkId: "" forkVersion: "" - time: 12/31/2025 23:31:42 - entityCount: 4210 + time: 01/04/2026 23:28:52 + entityCount: 4226 maps: - 1 grids: @@ -3276,11 +3276,17 @@ entities: - type: Transform pos: 8.5,1.5 parent: 2 + - type: Godmode + oldDamage: {} + - type: BlockedTool - uid: 184 components: - type: Transform pos: 8.5,2.5 parent: 2 + - type: Godmode + oldDamage: {} + - type: BlockedTool - proto: BlockGameArcade entities: - uid: 185 @@ -11576,6 +11582,13 @@ entities: - type: Transform pos: 17.540028,-1.3454366 parent: 2 +- proto: ClothingBackpackDuffelSyndicateDecoyKitFilled + entities: + - uid: 4216 + components: + - type: Transform + pos: -5.5798607,16.091599 + parent: 2 - proto: ClothingBackpackDuffelSyndicateFilledMedical entities: - uid: 1768 @@ -11594,6 +11607,13 @@ entities: inSlotFlag: BACK - type: Physics canCollide: False +- proto: ClothingBackpackMessengerPirateDecoyKitFilled + entities: + - uid: 4217 + components: + - type: Transform + pos: -5.5642357,15.6853485 + parent: 2 - proto: ClothingBackpackSyndicate entities: - uid: 1777 @@ -11985,6 +12005,11 @@ entities: - type: Transform pos: 12.5,3.5 parent: 2 + - uid: 4211 + components: + - type: Transform + pos: 14.5,5.5 + parent: 2 - proto: ComputerPowerMonitoring entities: - uid: 1824 @@ -12066,6 +12091,13 @@ entities: - type: Transform pos: -0.5,-17.5 parent: 2 +- proto: CrateMaterialSteel + entities: + - uid: 4218 + components: + - type: Transform + pos: 14.5,-1.5 + parent: 2 - proto: CrateTrashCart entities: - uid: 1832 @@ -12207,6 +12239,18 @@ entities: - type: Transform pos: -20.5,-0.5 parent: 2 +- proto: Doubloon5 + entities: + - uid: 4212 + components: + - type: Transform + pos: 13.516264,5.6829247 + parent: 2 + - uid: 4213 + components: + - type: Transform + pos: 13.406889,5.5188622 + parent: 2 - proto: Dresser entities: - uid: 1788 @@ -14910,6 +14954,47 @@ entities: parent: 2 - type: Lock locked: False +- proto: LootSpawnerMaterials + entities: + - uid: 4224 + components: + - type: Transform + pos: 15.5,9.5 + parent: 2 + - uid: 4226 + components: + - type: Transform + pos: 14.5,9.5 + parent: 2 +- proto: LootSpawnerMaterialsHighValue + entities: + - uid: 4221 + components: + - type: Transform + pos: 16.5,9.5 + parent: 2 + - uid: 4222 + components: + - type: Transform + pos: 17.5,9.5 + parent: 2 + - uid: 4223 + components: + - type: Transform + pos: 17.5,8.5 + parent: 2 +- proto: LootSpawnerMaterialsSurplus + entities: + - uid: 4219 + components: + - type: Transform + pos: 14.5,9.5 + parent: 2 + - uid: 4220 + components: + - type: Transform + pos: 15.5,9.5 + parent: 2 - proto: MachineCentrifuge entities: - uid: 2295 @@ -14924,6 +15009,13 @@ entities: - type: Transform pos: 8.5,-13.5 parent: 2 +- proto: MagazineSMGFoam + entities: + - uid: 4215 + components: + - type: Transform + pos: -21.421125,-2.5554514 + parent: 2 - proto: MailSpamLetter entities: - uid: 2297 @@ -15110,7 +15202,7 @@ entities: pos: -3.5,1.5 parent: 2 - type: Door - secondsUntilStateChange: -18601.643 + secondsUntilStateChange: -19217.646 state: Opening - uid: 2309 components: @@ -15118,7 +15210,7 @@ entities: pos: -3.5,2.5 parent: 2 - type: Door - secondsUntilStateChange: -18602.51 + secondsUntilStateChange: -19218.514 state: Opening - proto: MinimoogInstrument entities: @@ -15322,11 +15414,26 @@ entities: parent: 2 - proto: NukeOpsAmmoSpawner entities: + - uid: 3080 + components: + - type: Transform + pos: 11.5,5.5 + parent: 2 + - uid: 3081 + components: + - type: Transform + pos: 10.5,5.5 + parent: 2 - uid: 4099 components: - type: Transform pos: 0.5,15.5 parent: 2 + - uid: 4100 + components: + - type: Transform + pos: 12.5,5.5 + parent: 2 - uid: 4103 components: - type: Transform @@ -15344,6 +15451,26 @@ entities: - type: Transform pos: -26.5,10.5 parent: 2 + - uid: 4156 + components: + - type: Transform + pos: 13.5,-1.5 + parent: 2 + - uid: 4157 + components: + - type: Transform + pos: 12.5,-1.5 + parent: 2 + - uid: 4158 + components: + - type: Transform + pos: 11.5,-1.5 + parent: 2 + - uid: 4159 + components: + - type: Transform + pos: 10.5,-1.5 + parent: 2 - proto: NukeOpsLootSpawner entities: - uid: 1784 @@ -15361,96 +15488,11 @@ entities: - type: Transform pos: -28.5,-0.5 parent: 2 - - uid: 2974 - components: - - type: Transform - pos: 17.5,9.5 - parent: 2 - - uid: 3080 - components: - - type: Transform - pos: 15.5,9.5 - parent: 2 - - uid: 3081 - components: - - type: Transform - pos: 16.5,9.5 - parent: 2 - - uid: 4100 - components: - - type: Transform - pos: 14.5,9.5 - parent: 2 - uid: 4146 components: - type: Transform pos: 2.5,0.5 parent: 2 - - uid: 4147 - components: - - type: Transform - pos: 17.5,8.5 - parent: 2 - - uid: 4148 - components: - - type: Transform - pos: 13.5,5.5 - parent: 2 - - uid: 4149 - components: - - type: Transform - pos: 12.5,5.5 - parent: 2 - - uid: 4150 - components: - - type: Transform - pos: 11.5,5.5 - parent: 2 - - uid: 4151 - components: - - type: Transform - pos: 10.5,5.5 - parent: 2 - - uid: 4152 - components: - - type: Transform - pos: 9.5,5.5 - parent: 2 - - uid: 4153 - components: - - type: Transform - pos: 9.5,4.5 - parent: 2 - - uid: 4154 - components: - - type: Transform - pos: 9.5,-0.5 - parent: 2 - - uid: 4155 - components: - - type: Transform - pos: 9.5,-1.5 - parent: 2 - - uid: 4156 - components: - - type: Transform - pos: 10.5,-1.5 - parent: 2 - - uid: 4157 - components: - - type: Transform - pos: 11.5,-1.5 - parent: 2 - - uid: 4158 - components: - - type: Transform - pos: 12.5,-1.5 - parent: 2 - - uid: 4159 - components: - - type: Transform - pos: 13.5,-1.5 - parent: 2 - proto: NukeOpsMedkitBruteSpawner entities: - uid: 2303 @@ -15458,6 +15500,11 @@ entities: - type: Transform pos: 8.5,-12.5 parent: 2 + - uid: 4148 + components: + - type: Transform + pos: 12.5,-1.5 + parent: 2 - proto: NukeOpsMedkitSpawner entities: - uid: 2300 @@ -15465,6 +15512,11 @@ entities: - type: Transform pos: 9.5,-12.5 parent: 2 + - uid: 4149 + components: + - type: Transform + pos: 13.5,-1.5 + parent: 2 - proto: NukeOpsWeaponSpawner entities: - uid: 2275 @@ -15477,11 +15529,31 @@ entities: - type: Transform pos: -0.5,16.5 parent: 2 + - uid: 2974 + components: + - type: Transform + pos: 9.5,5.5 + parent: 2 - uid: 4101 components: - type: Transform pos: -2.5,16.5 parent: 2 + - uid: 4147 + components: + - type: Transform + pos: 9.5,4.5 + parent: 2 + - uid: 4154 + components: + - type: Transform + pos: 9.5,-1.5 + parent: 2 + - uid: 4155 + components: + - type: Transform + pos: 9.5,-0.5 + parent: 2 - proto: OperatingTable entities: - uid: 2324 @@ -15513,6 +15585,13 @@ entities: - type: Transform pos: -6.9332314,-18.439697 parent: 2 +- proto: PFigurineChaminaM + entities: + - uid: 4161 + components: + - type: Transform + pos: -15.4524765,8.608116 + parent: 2 - proto: PhoneInstrumentSyndicate entities: - uid: 2329 @@ -15544,6 +15623,13 @@ entities: parent: 2 - type: Fixtures fixtures: {} +- proto: PirateTechFab + entities: + - uid: 4150 + components: + - type: Transform + pos: 14.5,3.5 + parent: 2 - proto: PlasmaCanister entities: - uid: 2333 @@ -15676,6 +15762,21 @@ entities: rot: 3.141592653589793 rad pos: 8.5,-1.5 parent: 2 + - uid: 4151 + components: + - type: Transform + pos: 13.5,2.5 + parent: 2 + - uid: 4152 + components: + - type: Transform + pos: 13.5,1.5 + parent: 2 + - uid: 4153 + components: + - type: Transform + pos: 12.5,3.5 + parent: 2 - proto: PlushieKaliumDouble entities: - uid: 4160 @@ -18497,6 +18598,13 @@ entities: - type: Transform pos: 17.485737,1.5503969 parent: 2 +- proto: SalvageMaterialCrateSpawner + entities: + - uid: 4225 + components: + - type: Transform + pos: 15.5,-1.5 + parent: 2 - proto: SawCyber entities: - uid: 564 @@ -19572,7 +19680,7 @@ entities: - uid: 2971 components: - type: Transform - pos: -15.4154625,8.758402 + pos: -15.4212265,8.865929 parent: 2 - proto: SyndyFlashGrenade entities: @@ -20293,16 +20401,6 @@ entities: - type: Transform pos: 2.54736,1.4182131 parent: 2 -- proto: ToyFigurineMouse - entities: - - uid: 4161 - components: - - type: MetaData - desc: Фигурка, изображающая мышь, бегущую к ближайшему кусочку баланса. - name: фигурка Maus - - type: Transform - pos: -15.499947,7.6364183 - parent: 2 - proto: ToyFigurineNukie entities: - uid: 3100 @@ -25422,6 +25520,13 @@ entities: - type: Transform pos: -18.093945,-12.162229 parent: 2 +- proto: WeaponSubMachineGunC20rFake + entities: + - uid: 4214 + components: + - type: Transform + pos: -21.343,-2.407014 + parent: 2 - proto: WeaponTurretSyndicate entities: - uid: 4105 @@ -25666,7 +25771,7 @@ entities: pos: -15.5,-5.5 parent: 2 - type: Door - secondsUntilStateChange: -20871.205 + secondsUntilStateChange: -21487.209 state: Opening - uid: 4142 components: @@ -25674,6 +25779,6 @@ entities: pos: -15.5,-4.5 parent: 2 - type: Door - secondsUntilStateChange: -20871.639 + secondsUntilStateChange: -21487.643 state: Opening ... diff --git a/Resources/Maps/_Sunrise/Shuttles/Salvage/chisel.yml b/Resources/Maps/_Sunrise/Shuttles/Salvage/chisel.yml index c0968a60aa..a2d69f066c 100644 --- a/Resources/Maps/_Sunrise/Shuttles/Salvage/chisel.yml +++ b/Resources/Maps/_Sunrise/Shuttles/Salvage/chisel.yml @@ -4,8 +4,8 @@ meta: engineVersion: 270.0.0 forkId: "" forkVersion: "" - time: 01/02/2026 03:53:15 - entityCount: 452 + time: 01/05/2026 17:04:04 + entityCount: 465 maps: [] grids: - 1 @@ -45,21 +45,21 @@ entities: - type: MetaData name: NTMS-755 "Долото" - type: Transform - pos: 1,-25 + pos: 1,1 parent: invalid - type: MapGrid chunks: 0,0: ind: 0,0 - tiles: DwAAAAAAABAAAAAAAAAPAAAAAAAAEQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA8AAAAAAAAPAAAAAAAAAAAAAAAAABEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAABIAAAAAAAAAAAAAAAAAEQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAUAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA== + tiles: DwAAAAAAABAAAAAAAAAKAAAAAAAAEQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA8AAAAAAAAPAAAAAAAAAAAAAAAAABEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAABIAAAAAAAAAAAAAAAAAEQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAUAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA== version: 7 0,-1: ind: 0,-1 - tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAGAAAAAAAABgAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAAMAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAABUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAVAAAAAAAAFQAAAAAAAA8AAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAFgAAAAAAABUAAAAAAAAAAAAAAAAACgAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAABYAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAADwAAAAAAABAAAAAAAAAAAAAAAAAAEQAAAAAAABEAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA== + tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAGAAAAAAAABgAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAAMAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAABUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAVAAAAAAAAFQAAAAAAAA8AAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAFgAAAAAAABUAAAAAAAAAAAAAAAAACgAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAABYAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAACgAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAADwAAAAAAABAAAAAAAAAAAAAAAAAAEQAAAAAAABEAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA== version: 7 -1,0: ind: -1,0 - tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAoAAAAAAAAAAAAAAAAACgAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAKAAAAAAAAAAAAAAAAAAoAAAAAAAAAAAAAAAAAEQAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAFAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA== + tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAoAAAAAAAAAAAAAAAAACgAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAKAAAAAAAAAAAAAAAAAAoAAAAAAAAAAAAAAAAAEQAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAYAAAAAAAAAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAEgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAANAAAAAAAAAAAAAAAAAAoAAAAAAAAKAAAAAAAAFwAAAAAAABcAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAFAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA== version: 7 -1,-1: ind: -1,-1 @@ -421,7 +421,8 @@ entities: 0,-3: 1: 16384 1,-2: - 0: 13073 + 0: 13057 + 2: 16 1: 4 1,-3: 0: 8192 @@ -449,6 +450,11 @@ entities: - volume: 2500 immutable: True moles: {} + - volume: 2500 + temperature: 293.14975 + moles: + Oxygen: 20.078888 + Nitrogen: 75.53487 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -720,12 +726,6 @@ entities: parent: 1 - proto: ButtonFrameExit entities: - - uid: 216 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.075981,-1.2215269 - parent: 1 - uid: 244 components: - type: Transform @@ -1193,6 +1193,16 @@ entities: - type: Transform pos: 6.5,1.5 parent: 1 + - uid: 454 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 455 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 - proto: CarpetOrange entities: - uid: 344 @@ -1416,6 +1426,25 @@ entities: anchored: True pos: 4.5,-6.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + Oxygen: 1.7459903 + Nitrogen: 6.568249 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 219 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - type: AccessReader accessListsOriginal: - - Engineering @@ -1560,6 +1589,16 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-1.5 parent: 1 +- proto: FloorDrain + entities: + - uid: 456 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,2.5 + parent: 1 + - type: Fixtures + fixtures: {} - proto: FoodDonkpocketCarp entities: - uid: 304 @@ -1630,6 +1669,12 @@ entities: color: '#03FCD3FF' - proto: GasOutletInjector entities: + - uid: 216 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,4.5 + parent: 1 - uid: 395 components: - type: Transform @@ -1720,6 +1765,17 @@ entities: parent: 1 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 459 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,0.5 + parent: 1 + - uid: 463 + components: + - type: Transform + pos: -2.5,4.5 + parent: 1 - proto: GasPipeBendAlt1 entities: - uid: 196 @@ -1900,6 +1956,36 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 460 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,1.5 + parent: 1 + - uid: 461 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,2.5 + parent: 1 + - uid: 462 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,3.5 + parent: 1 + - uid: 464 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,4.5 + parent: 1 + - uid: 465 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,4.5 + parent: 1 - proto: GasPipeStraightAlt1 entities: - uid: 154 @@ -2095,15 +2181,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#03FCD3FF' -- proto: GasPressurePump +- proto: GasValve entities: - uid: 284 components: - type: Transform + rot: 3.141592653589793 rad pos: 0.5,-5.5 parent: 1 - - type: AtmosPipeColor - color: '#FF0000FF' - proto: GasVentPump entities: - uid: 288 @@ -2212,6 +2297,12 @@ entities: - type: DeviceNetwork deviceLists: - 243 + - uid: 458 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,0.5 + parent: 1 - proto: GeneratorWallmountAPU entities: - uid: 325 @@ -2580,18 +2671,14 @@ entities: - type: CMExplosionEffect - proto: PortableGeneratorPacman entities: - - uid: 291 + - uid: 453 components: - type: Transform anchored: True - pos: 3.5,-6.5 + pos: 3.5,-7.5 parent: 1 - - type: MaterialStorage - storage: - Plasma: 2000 - type: Physics bodyType: Static - - type: InsertingMaterialStorage - proto: PowerCellHighPrinted entities: - uid: 265 @@ -2706,6 +2793,16 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,2.5 parent: 1 +- proto: SheetPlasma10 + entities: + - uid: 219 + components: + - type: Transform + parent: 194 + - type: Physics + canCollide: False + - type: InsideEntityStorage + storage: 194 - proto: ShelfBar entities: - uid: 156 @@ -2890,6 +2987,8 @@ entities: fixtures: {} - uid: 253 components: + - type: MetaData + name: кнопка сигнала (Открыть) - type: Transform rot: 3.141592653589793 rad pos: 0.22932816,-1.4554479 @@ -2911,6 +3010,10 @@ entities: - Toggle - type: Fixtures fixtures: {} + - type: Label + currentLabel: Открыть + - type: NameModifier + baseName: кнопка сигнала - uid: 255 components: - type: Transform @@ -2962,31 +3065,59 @@ entities: - Toggle - type: Fixtures fixtures: {} -- proto: SignalButtonExt1 - entities: - - uid: 219 + - uid: 422 components: + - type: MetaData + name: кнопка сигнала (Открыть) - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5837936,-1.2215269 + pos: -5.3478565,-1 parent: 1 - type: DeviceLinkSource linkedPorts: 260: - - Pressed - - Toggle - - - Pressed - - AutoClose - 261: - - - Pressed - - Toggle + - Open - - Pressed - AutoClose 100: - - Pressed - - Toggle + - Open + 261: + - - Pressed + - Open + - - Pressed + - AutoClose - type: Fixtures fixtures: {} + - type: Label + currentLabel: Открыть + - type: NameModifier + baseName: кнопка сигнала + - uid: 457 + components: + - type: MetaData + name: кнопка сигнала (Закрыть) + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-1.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 260: + - - Pressed + - Close + 100: + - - Pressed + - Close + 261: + - - Pressed + - Close + - type: Fixtures + fixtures: {} + - type: Label + currentLabel: Закрыть + - type: NameModifier + baseName: кнопка сигнала - proto: SignSpace entities: - uid: 124 @@ -3072,12 +3203,13 @@ entities: - type: Transform pos: -0.5,5.5 parent: 1 -- proto: SubstationExtended +- proto: SubstationWallBasic entities: - - uid: 422 + - uid: 291 components: - type: Transform - pos: 3.5,-7.5 + rot: -1.5707963267948966 rad + pos: -0.5,-1.5 parent: 1 - type: CMExplosionEffect - proto: Table @@ -3658,6 +3790,6 @@ entities: - uid: 264 components: - type: Transform - pos: -1.508719,1.0624084 + pos: -1.4182944,1.2324314 parent: 1 ... diff --git a/Resources/Maps/_Sunrise/Shuttles/Salvage/miner.yml b/Resources/Maps/_Sunrise/Shuttles/Salvage/miner.yml index 7c693aa0ed..b55b9e62b7 100644 --- a/Resources/Maps/_Sunrise/Shuttles/Salvage/miner.yml +++ b/Resources/Maps/_Sunrise/Shuttles/Salvage/miner.yml @@ -4,8 +4,8 @@ meta: engineVersion: 270.0.0 forkId: "" forkVersion: "" - time: 01/02/2026 03:33:33 - entityCount: 399 + time: 01/05/2026 16:56:33 + entityCount: 398 maps: [] grids: - 1 @@ -45,7 +45,7 @@ entities: - type: MetaData name: NTMS-754 "Горняк" - type: Transform - pos: -0.5078125,-0.4609375 + pos: 1,1 parent: invalid - type: MapGrid chunks: @@ -581,6 +581,14 @@ entities: parent: 1 - type: Stealth - type: StealthOnMove + - uid: 331 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,4.5 + parent: 1 + - type: Stealth + - type: StealthOnMove - uid: 397 components: - type: Transform @@ -1240,24 +1248,12 @@ entities: rot: 3.141592653589793 rad pos: -3.5,-2.5 parent: 1 - - uid: 331 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-4.5 - parent: 1 - uid: 332 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,4.5 parent: 1 - - uid: 333 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,4.5 - parent: 1 - uid: 334 components: - type: Transform diff --git a/Resources/Maps/_Sunrise/Shuttles/Salvage/mining.yml b/Resources/Maps/_Sunrise/Shuttles/Salvage/mining.yml index 30e6637089..0f8185145d 100644 --- a/Resources/Maps/_Sunrise/Shuttles/Salvage/mining.yml +++ b/Resources/Maps/_Sunrise/Shuttles/Salvage/mining.yml @@ -1,10 +1,10 @@ meta: format: 7 category: Grid - engineVersion: 266.0.0 + engineVersion: 270.0.0 forkId: "" forkVersion: "" - time: 08/17/2025 21:57:44 + time: 01/06/2026 20:11:17 entityCount: 252 maps: [] grids: @@ -27,7 +27,7 @@ entities: - type: MetaData name: NTMS-632 "Рудокоп" - type: Transform - pos: 2.2710133,-2.4148211 + pos: 1,1 parent: invalid - type: MapGrid chunks: @@ -200,33 +200,11 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 21.824879 - - 82.10312 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 21.824879 + Nitrogen: 82.10312 - volume: 2500 temperature: 293.15 - moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + moles: {} chunkSize: 4 - type: OccluderTree - type: Shuttle @@ -239,6 +217,7 @@ entities: - type: GridPathfinding - type: SalvageShuttle - type: ImplicitRoof + - type: ExplosionAirtightGrid - proto: AirCanister entities: - uid: 21 @@ -311,13 +290,6 @@ entities: parent: 181 - type: Fixtures fixtures: {} -- proto: AtmosDeviceFanTinyDev - entities: - - uid: 34 - components: - - type: Transform - pos: -2.5,-5.5 - parent: 181 - proto: AtmosFixBlockerMarker entities: - uid: 3 @@ -502,6 +474,11 @@ entities: parent: 181 - proto: CableApcExtension entities: + - uid: 34 + components: + - type: Transform + pos: -0.5,-7.5 + parent: 181 - uid: 45 components: - type: Transform @@ -801,14 +778,6 @@ entities: - type: Transform pos: -3.5,-7.5 parent: 181 -- proto: CableTerminal - entities: - - uid: 64 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-7.5 - parent: 181 - proto: Catwalk entities: - uid: 10 @@ -889,6 +858,33 @@ entities: - type: Transform pos: -2.5,5.5 parent: 181 +- proto: CratePlasma + entities: + - uid: 64 + components: + - type: Transform + anchored: True + pos: -1.5,-7.5 + parent: 181 + - type: AccessReader + accessListsOriginal: + - - Engineering + - - Research + - - Chemistry + - type: Lock + locked: False + - type: Physics + bodyType: Static +- proto: DefibrillatorCabinet + entities: + - uid: 243 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,1.5 + parent: 181 + - type: Fixtures + fixtures: {} - proto: DonkpocketBoxSpawner entities: - uid: 240 @@ -931,6 +927,30 @@ entities: - type: Transform pos: 0.70018744,3.5922637 parent: 181 +- proto: Fulton1 + entities: + - uid: 7 + components: + - type: Transform + pos: -3.4922512,-4.2876997 + parent: 181 + - uid: 176 + components: + - type: Transform + pos: -3.2969387,-4.514262 + parent: 181 + - uid: 184 + components: + - type: Transform + pos: -3.6875637,-4.5376997 + parent: 181 +- proto: FultonBeacon + entities: + - uid: 137 + components: + - type: Transform + pos: -3.5078762,-4.3658247 + parent: 181 - proto: GasPipeBend entities: - uid: 22 @@ -989,20 +1009,6 @@ entities: - type: Transform pos: -2.5,2.5 parent: 181 -- proto: GeneratorBasic15kW - entities: - - uid: 91 - components: - - type: Transform - pos: -0.5,-6.5 - parent: 181 - - type: CMExplosionEffect - - uid: 138 - components: - - type: Transform - pos: -0.5,-7.5 - parent: 181 - - type: CMExplosionEffect - proto: GravityGeneratorMini entities: - uid: 49 @@ -1047,27 +1053,6 @@ entities: - type: Transform pos: -0.7141143,3.5776207 parent: 181 -- proto: LeftArmBorg - entities: - - uid: 245 - components: - - type: Transform - pos: -1.2517962,-7.6630273 - parent: 181 -- proto: LeftLegBorg - entities: - - uid: 244 - components: - - type: Transform - pos: -1.7728889,-7.7776904 - parent: 181 -- proto: LightHeadBorg - entities: - - uid: 243 - components: - - type: Transform - pos: -1.5019208,-7.167929 - parent: 181 - proto: MiningWindow entities: - uid: 11 @@ -1099,10 +1084,10 @@ entities: parent: 181 - proto: OxygenCanister entities: - - uid: 15 + - uid: 91 components: - type: Transform - pos: -3.5,-4.5 + pos: -0.5,-0.5 parent: 181 - proto: PaperBin10 entities: @@ -1126,6 +1111,10 @@ entities: - type: Transform pos: -3.4403822,5.071967 parent: 181 + - type: ContainerContainer + containers: + innate_items: !type:Container + ents: [] - proto: Pickaxe entities: - uid: 81 @@ -1139,6 +1128,32 @@ entities: rot: 1.5707963267948966 rad pos: -4.5434036,-4.46221 parent: 181 +- proto: PortableGeneratorJrPacman + entities: + - uid: 172 + components: + - type: Transform + anchored: True + pos: -0.5,-7.5 + parent: 181 + - type: Physics + bodyType: Static + - type: CMExplosionEffect +- proto: PortableGeneratorPacman + entities: + - uid: 13 + components: + - type: Transform + anchored: True + pos: -2.5,-7.5 + parent: 181 + - type: MaterialStorage + storage: + Plasma: 1000 + - type: Physics + bodyType: Static + - type: InsertingMaterialStorage + endTime: 0 - proto: PowerCellRecharger entities: - uid: 108 @@ -1216,6 +1231,11 @@ entities: parent: 181 - proto: Rack entities: + - uid: 44 + components: + - type: Transform + pos: -3.5,-4.5 + parent: 181 - uid: 52 components: - type: Transform @@ -1226,11 +1246,6 @@ entities: - type: Transform pos: 0.5,3.5 parent: 181 - - uid: 176 - components: - - type: Transform - pos: -5.5,3.5 - parent: 181 - uid: 189 components: - type: Transform @@ -1288,12 +1303,12 @@ entities: - Toggle - type: Fixtures fixtures: {} -- proto: SMESBasic +- proto: StasisBed entities: - - uid: 44 + - uid: 138 components: - type: Transform - pos: -2.5,-7.5 + pos: -5.5,3.5 parent: 181 - proto: SubstationBasic entities: @@ -1386,20 +1401,15 @@ entities: - type: Transform pos: 0.5,5.5 parent: 181 -- proto: TorsoBorg +- proto: VendingMachineWallMedicalCivilian entities: - - uid: 246 + - uid: 241 components: - type: Transform - pos: -1.4602338,-7.5570865 - parent: 181 -- proto: VendingMachineSalvage - entities: - - uid: 7 - components: - - type: Transform - pos: -0.5,-0.5 + pos: -5.5,4.5 parent: 181 + - type: Fixtures + fixtures: {} - proto: WallMining entities: - uid: 6 @@ -1724,16 +1734,15 @@ entities: - type: Transform pos: -4.5,1.5 parent: 181 -- proto: WeaponProtoKineticAccelerator +- proto: WeldingFuelTankFull entities: - - uid: 137 + - uid: 15 components: - type: Transform - pos: -5.530746,3.725446 - parent: 181 - - uid: 184 - components: - - type: Transform - pos: -5.4240065,3.4719396 + anchored: True + pos: -0.5,-6.5 parent: 181 + - type: Physics + bodyType: Static + - type: CMExplosionEffect ... diff --git a/Resources/Maps/_Sunrise/Shuttles/personal.yml b/Resources/Maps/_Sunrise/Shuttles/personal.yml index 33d9f10f63..84aa16b9bf 100644 --- a/Resources/Maps/_Sunrise/Shuttles/personal.yml +++ b/Resources/Maps/_Sunrise/Shuttles/personal.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Grid - engineVersion: 266.0.0 + engineVersion: 270.0.0 forkId: "" forkVersion: "" - time: 08/17/2025 21:08:25 - entityCount: 129 + time: 01/05/2026 17:49:32 + entityCount: 116 maps: [] grids: - 62 @@ -30,7 +30,7 @@ entities: - type: MetaData name: NT Personal-110 - type: Transform - pos: 0.07291666,1.7143848 + pos: 1,1 parent: invalid - type: MapGrid chunks: @@ -98,48 +98,18 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 21.824879 - - 82.10312 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 21.824879 + Nitrogen: 82.10312 - volume: 2500 temperature: 293.15 moles: - - 21.213781 - - 79.80423 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 21.213781 + Nitrogen: 79.80423 - volume: 2500 temperature: 293.15 moles: - - 20.04244 - - 75.39776 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 20.04244 + Nitrogen: 75.39776 chunkSize: 4 - type: RadiationGridResistance - type: GasTileOverlay @@ -147,13 +117,22 @@ entities: - type: ImplicitRoof - type: GravityShake shakeTimes: 10 + - type: ExplosionAirtightGrid - proto: AirCanister entities: - uid: 12 components: - type: Transform + anchored: True pos: -0.5,-7.5 parent: 62 + - type: Physics + bodyType: Static + - type: AccessReader + accessListsOriginal: + - - Atmospherics + - - Engineering + - - Research - proto: AirlockCommand entities: - uid: 18 @@ -339,50 +318,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-4.5 parent: 62 -- proto: ClothingHeadHelmetEVA - entities: - - uid: 17 - components: - - type: Transform - pos: -0.23437434,-2.54319 - parent: 62 - - uid: 38 - components: - - type: Transform - pos: -0.7033577,-2.5744615 - parent: 62 - - uid: 47 - components: - - type: Transform - pos: -0.71377945,-2.1719494 - parent: 62 - - uid: 49 - components: - - type: Transform - pos: -0.14057857,-2.0636902 - parent: 62 -- proto: ClothingOuterHardsuitEVA - entities: - - uid: 37 - components: - - type: Transform - pos: -0.2864844,-2.5805764 - parent: 62 - - uid: 40 - components: - - type: Transform - pos: -0.27606136,-2.1740441 - parent: 62 - - uid: 41 - components: - - type: Transform - pos: -0.7658888,-2.611848 - parent: 62 - - uid: 48 - components: - - type: Transform - pos: -0.75546646,-2.2053158 - parent: 62 - proto: ComputerShuttle entities: - uid: 66 @@ -390,6 +325,28 @@ entities: - type: Transform pos: -0.5,0.5 parent: 62 +- proto: CrateEmergencyInternalsLarge + entities: + - uid: 16 + components: + - type: Transform + anchored: True + pos: 1.5,-2.5 + parent: 62 + - type: Physics + bodyType: Static +- proto: CrateMaterialPlasma + entities: + - uid: 15 + components: + - type: Transform + anchored: True + pos: -1.5,0.5 + parent: 62 + - type: Lock + locked: False + - type: Physics + bodyType: Static - proto: FoodBoxPizzaFilled entities: - uid: 118 @@ -491,20 +448,12 @@ entities: parent: 62 - type: AtmosPipeColor color: '#0000FFFF' -- proto: GeneratorBasic15kW - entities: - - uid: 113 - components: - - type: Transform - pos: -1.5,-0.5 - parent: 62 - - type: CMExplosionEffect - proto: GravityGeneratorMini entities: - - uid: 140 + - uid: 38 components: - type: Transform - pos: 0.5,0.5 + pos: 2.5,-0.5 parent: 62 - proto: Grille entities: @@ -585,37 +534,12 @@ entities: parent: 62 - proto: Gyroscope entities: - - uid: 67 + - uid: 37 components: - type: Transform - pos: -1.5,0.5 + rot: 1.5707963267948966 rad + pos: -3.5,-0.5 parent: 62 -- proto: JetpackBlackFilled - entities: - - uid: 175 - components: - - type: Transform - pos: 1.2604167,-2.566079 - parent: 62 - - type: CMExplosionEffect - - uid: 176 - components: - - type: Transform - pos: 1.6458334,-2.3159053 - parent: 62 - - type: CMExplosionEffect - - uid: 177 - components: - - type: Transform - pos: 1.6770834,-2.6181984 - parent: 62 - - type: CMExplosionEffect - - uid: 178 - components: - - type: Transform - pos: 1.2708334,-2.2637858 - parent: 62 - - type: CMExplosionEffect - proto: KnifePlastic entities: - uid: 86 @@ -624,6 +548,16 @@ entities: rot: -1.5707963267948966 rad pos: -2.38178,-2.156817 parent: 62 +- proto: PortableGeneratorPacman + entities: + - uid: 14 + components: + - type: Transform + anchored: True + pos: -1.5,-0.5 + parent: 62 + - type: Physics + bodyType: Static - proto: Poweredlight entities: - uid: 64 @@ -647,11 +581,6 @@ entities: powerLoad: 0 - proto: Rack entities: - - uid: 69 - components: - - type: Transform - pos: 1.5,-2.5 - parent: 62 - uid: 187 components: - type: Transform @@ -779,27 +708,16 @@ entities: - type: Transform pos: 2.5,0.5 parent: 62 - - uid: 14 - components: - - type: Transform - pos: -3.5,0.5 - parent: 62 - - uid: 15 + - uid: 17 components: - type: Transform rot: 1.5707963267948966 rad - pos: -3.5,-0.5 + pos: -3.5,0.5 parent: 62 - - uid: 16 + - uid: 40 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,-0.5 - parent: 62 - - uid: 55 - components: - - type: Transform - rot: 3.141592653589793 rad pos: 2.5,-8.5 parent: 62 - uid: 101 diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index 7233a46655..5c7a35982c 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -195,28 +195,6 @@ sprite: Objects/Weapons/Grenades/empgrenade.rsi state: icon -# Sunrise-Start #PR Wiz #31782 -- type: entity - id: ActionActivateSmokeGrenadeImplant - name: Activate Smoke Grenade - description: Create a small cloud of smoke around you. - components: - - type: Action - checkCanInteract: false - useDelay: 5 - itemIconStyle: BigAction - priority: -20 - icon: - sprite: Objects/Weapons/Grenades/smoke.rsi - state: icon - - type: InstantAction - event: !type:ActivateImplantEvent - - type: LimitedCharges - maxCharges: 3 - - type: AutoRecharge - rechargeDuration: 120 -# Sunrise-End - - type: entity parent: BaseImplantAction id: ActionActivateScramImplant @@ -395,19 +373,6 @@ icon: { sprite: Objects/Fun/bikehorn.rsi, state: icon } useDelay: 1 -# Sunrise-Start -- type: entity - parent: BaseImplantAction - id: ActionActivateBorgLaughImplant - name: "[color=red]Laugh[/color]" - description: Activates your creepy laugh implant, which will produce the signature sound of the Syndicate cyborg. - components: - - type: Action - icon: { sprite: Mobs/Species/Terminator/parts.rsi, state: skull_icon } - useDelay: 2.75 - itemIconStyle: BigAction -# Sunrise-End - - type: entity parent: BaseAction id: ActionFireStarter diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 0aa04dcc88..600a671e2c 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1598,7 +1598,7 @@ discountDownTo: Telecrystal: 2 cost: - Telecrystal: 4 # it's a gamble that may kill you easily so 4 TC per 2 uses, second one more of a backup + Telecrystal: 6 # it's a gamble that may kill you easily so 4 TC per 2 uses, second one more of a backup # Sunrise-edit categories: - UplinkImplants diff --git a/Resources/Prototypes/Entities/Clothing/Back/specific.yml b/Resources/Prototypes/Entities/Clothing/Back/specific.yml index bafb12d651..c440fe9a66 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/specific.yml @@ -18,12 +18,6 @@ type: StorageBoundUserInterface enum.ChameleonUiKey.Key: type: ChameleonBoundUserInterface - # Sunrise-Start - - type: Biocode - factions: - - Syndicate - - Thief - # Sunrise-End - type: entity parent: [Clothing, ClothingSlotBase] diff --git a/Resources/Prototypes/Entities/Clothing/Ears/specific.yml b/Resources/Prototypes/Entities/Clothing/Ears/specific.yml index 3215265aac..a6f4afdc7e 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/specific.yml @@ -14,9 +14,3 @@ - type: ChameleonClothing slot: [ears] default: ClothingHeadsetGrey - # Sunrise-Start - - type: Biocode - factions: - - Syndicate - - Thief - # Sunrise-End diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml b/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml index 95fa467047..b62773fe50 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml @@ -15,9 +15,3 @@ - type: ChameleonClothing slot: [eyes] default: ClothingEyesGlassesSunglasses - # Sunrise-Start - - type: Biocode - factions: - - Syndicate - - Thief - # Sunrise-End diff --git a/Resources/Prototypes/Entities/Clothing/Hands/specific.yml b/Resources/Prototypes/Entities/Clothing/Hands/specific.yml index c04de5a39c..a6fc405770 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/specific.yml @@ -19,12 +19,6 @@ - type: Fiber fiberMaterial: fibers-chameleon - type: FingerprintMask - # Sunrise-Start - - type: Biocode - factions: - - Syndicate - - Thief - # Sunrise-End - type: entity parent: ClothingHandsChameleon diff --git a/Resources/Prototypes/Entities/Clothing/Head/specific.yml b/Resources/Prototypes/Entities/Clothing/Head/specific.yml index bef3532e6a..b25a7c4a5e 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/specific.yml @@ -15,12 +15,6 @@ - type: ChameleonClothing slot: [HEAD] default: ClothingHeadHatBeret - # Sunrise-Start - - type: Biocode - factions: - - Syndicate - - Thief - # Sunrise-End - type: entity parent: ClothingHeadHatFedoraBrown diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 62e64ccd16..b77bbc1f9b 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -35,14 +35,21 @@ sprite: Clothing/Mask/gassecurity.rsi - type: Clothing sprite: Clothing/Mask/gassecurity.rsi - # Surnise-Start + # Sunrise-Start - type: Tag tags: - HamsterWearable - WhitelistChameleon - type: Pierceable level: Metal - # Surnise-End + # Sunrise-End + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 - type: entity parent: [ClothingMaskGas, BaseSyndicateContraband] @@ -56,8 +63,17 @@ sprite: Clothing/Mask/gassyndicate.rsi - type: FlashImmunity - type: EyeProtection + # Sunrise-Start - type: Pierceable level: Metal + # Sunrise-End + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 - type: entity parent: ClothingMaskGas @@ -69,6 +85,10 @@ sprite: Clothing/Mask/gasatmos.rsi - type: Clothing sprite: Clothing/Mask/gasatmos.rsi + - type: Armor + modifiers: + coefficients: + Heat: 0.9 # Sunrise-edit - type: entity parent: [ClothingMaskGasAtmos, BaseCommandContraband] @@ -106,6 +126,13 @@ sprite: Clothing/Mask/gasexplorer.rsi - type: Clothing sprite: Clothing/Mask/gasexplorer.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.90 + Piercing: 0.95 + Heat: 0.95 - type: entity parent: ClothingMaskPullableBase @@ -144,6 +171,13 @@ sprite: Clothing/Mask/medicalsecurity.rsi - type: Pierceable level: Metal + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 - type: entity parent: ClothingMaskPullableBase @@ -227,6 +261,13 @@ sprite: Clothing/Mask/clown_security.rsi - type: Clothing sprite: Clothing/Mask/clown_security.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 - type: entity parent: ClothingMaskBase @@ -367,6 +408,13 @@ hideOnToggle: true - type: Pierceable level: Metal + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.90 + Piercing: 0.95 + Heat: 0.95 - type: FlashImmunity # Sunrise-Edit - type: entity @@ -381,6 +429,13 @@ sprite: Clothing/Mask/merc.rsi - type: Pierceable level: Metal + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.90 + Piercing: 0.95 + Heat: 0.95 - type: entity parent: [ ClothingMaskGas, BaseCentcommContraband ] @@ -405,6 +460,13 @@ - type: EyeProtection - type: Pierceable level: Metal + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 - type: entity parent: ClothingMaskGasERT @@ -423,6 +485,13 @@ - Hair - HeadTop - HeadSide + - type: Armor + modifiers: + coefficients: + Blunt: 0.80 + Slash: 0.80 + Piercing: 0.90 + Heat: 0.90 - type: entity parent: ClothingMaskBase diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml index 83d4c7aa66..33f0ec3ad6 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml @@ -19,12 +19,6 @@ - type: HideLayerClothing slots: - Snout - # Sunrise-Start - - type: Biocode - factions: - - Syndicate - - Thief - # Sunrise-End - type: entity parent: ClothingMaskGasChameleon diff --git a/Resources/Prototypes/Entities/Clothing/Neck/specific.yml b/Resources/Prototypes/Entities/Clothing/Neck/specific.yml index d91eea8d34..f3de2c6060 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/specific.yml @@ -16,9 +16,3 @@ - type: ChameleonClothing slot: [NECK] default: ClothingNeckScarfStripedRed - # Sunrise-Start - - type: Biocode - factions: - - Syndicate - - Thief - # Sunrise-End diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml index f780b73d75..3cf812530a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml @@ -24,9 +24,3 @@ Slash: 0.95 Heat: 0.90 showArmorOnExamine: false - # Sunrise-Start - - type: Biocode - factions: - - Syndicate - - Thief - # Sunrise-End diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index 2af089e74f..e79cff8427 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -206,12 +206,6 @@ - type: ChameleonClothing slot: [FEET] default: ClothingShoesColorBlack - # Sunrise-Start - - type: Biocode - factions: - - Syndicate - - Thief - # Sunrise-End - type: entity parent: ClothingShoesChameleon diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml index d2f3c8caac..5e3481e9a4 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml @@ -38,9 +38,3 @@ - type: ChameleonClothing slot: [innerclothing] default: ClothingUniformJumpsuitColorBlack - # Sunrise-Start - - type: Biocode - factions: - - Syndicate - - Thief - # Sunrise-End diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml index d697667159..801709afbe 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml @@ -111,6 +111,7 @@ fuel: 5 time: 3 - type: Firelock + lockedPryTimeModifier: 0.5 # Sunrise-Add - type: Appearance - type: WiresVisuals - type: WiresPanel diff --git a/Resources/Prototypes/GameRules/dynamic_rules.yml b/Resources/Prototypes/GameRules/dynamic_rules.yml index 95ab1b3c66..d6a11b308c 100644 --- a/Resources/Prototypes/GameRules/dynamic_rules.yml +++ b/Resources/Prototypes/GameRules/dynamic_rules.yml @@ -71,7 +71,7 @@ - !type:RoundDurationCondition min: 900 # 15 minutes - id: DragonSpawn - weight: 15 + weight: 5 # Sunrise-edit conditions: - !type:HasBudgetCondition - !type:MaxRuleOccurenceCondition diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 5176d67e93..991183bde3 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1982,5 +1982,5 @@ name: loadout-group-medical-doctor-id loadouts: - MedicalPDA - - SeniorOfficerPDA + - SeniorPhysicianPDA # Sunrise-edn diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index 24f61501af..3d838db041 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -18,7 +18,7 @@ types: Poison: 0.55 Blunt: 0.5 - Mangleness: 0.15 #Sunrise-Edit + Mangleness: 0.05 # OD - !type:HealthChange conditions: diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml index bc8898b071..1fbd80f53a 100644 --- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml @@ -313,7 +313,7 @@ Phosphorus: amount: 1 products: - Desoxyephedrine: 2 # Sunrise-Edit # Как-то многовато и много мета производят + Desoxyephedrine: 4 - type: reaction id: Stimulants diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index c4e3e79ae7..f3e32165b1 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -12,6 +12,7 @@ - Maintenance extendedAccess: - Salvage + - CargoPurchaseAccess # Sunrise-add special: - !type:GiveItemOnHolidaySpecial holiday: BoxingDay diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 771efa17bd..b5f8d667fa 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -16,6 +16,8 @@ - Salvage - Maintenance - External + extendedAccess: + - CargoPurchaseAccess # Sunrise-add - type: startingGear id: SalvageSpecialistGear diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml index 54d4bc8a26..18c9084e50 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml @@ -23,3 +23,10 @@ components: - type: CartridgeAmmo deleteOnSpawn: true + +- type: entity + id: CartridgePistolImprovisedMech + parent: [CartridgePistolImprovised, MechCartridge] + components: + - type: CartridgeAmmo + deleteOnSpawn: true diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 9c4e76148c..98d09770d6 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -681,10 +681,10 @@ armorPenetration: -0.35 damage: types: - Piercing: 7 - Blunt: 7 + Piercing: 13 + Blunt: 6 - type: HitscanStaminaDamage - staminaDamage: 3 + staminaDamage: 4 - type: HitscanPierce chance: 0.20 deviation: 0.05 @@ -995,12 +995,16 @@ categories: [ HideSpawnMenu ] components: - type: HitscanBasicDamage + armorPenetration: 0.05 # Sunrise-add damage: types: Piercing: 40 Structural: 15 + - type: HitscanStaminaDamage # Sunrise-add + staminaDamage: 10 - type: HitscanPierce chance: 0.08 + pierceLevel: Metal # Sunrise-add - type: HitscanBasicVisuals bullet: sprite: @@ -1030,12 +1034,17 @@ categories: [ HideSpawnMenu ] components: - type: HitscanBasicDamage + armorPenetration: -0.15 # Sunrise-edit damage: types: Piercing: 5 Structural: 5 + - type: HitscanStaminaDamage # Sunrise-add + staminaDamage: 2 - type: HitscanPierce chance: 0.03 + - type: HitscanRicochet # Sunrise-edit + chance: 0.2 - type: HitscanBasicVisuals bullet: sprite: @@ -1062,6 +1071,8 @@ types: Blunt: 2 Heat: 3 + - type: HitscanStaminaDamage # Sunrise-add + staminaDamage: 2 - type: HitscanPierce chance: 0.02 - type: HitscanIgniteEffect @@ -1090,6 +1101,8 @@ damage: types: Blunt: 1 + - type: HitscanStaminaDamage # Sunrise-add + staminaDamage: 1 - type: HitscanPierce chance: 0 - type: HitscanBasicVisuals @@ -1114,12 +1127,17 @@ categories: [ HideSpawnMenu ] components: - type: HitscanBasicDamage + armorPenetration: -0.15 # Sunrise-edit damage: types: Piercing: 2 Slash: 2 + - type: HitscanStaminaDamage # Sunrise-add + staminaDamage: 2 - type: HitscanPierce chance: 0 + - type: HitscanRicochet # Sunrise-edit + chance: 0.2 - type: HitscanBasicVisuals bullet: sprite: @@ -1146,6 +1164,8 @@ types: Radiation: 2 Piercing: 3 + - type: HitscanStaminaDamage # Sunrise-add + staminaDamage: 2 - type: HitscanPierce chance: 0.05 pierceLevel: HardenedMetal @@ -1175,6 +1195,8 @@ types: Piercing: 5 Structural: 20 + - type: HitscanStaminaDamage # Sunrise-add + staminaDamage: 3 - type: HitscanPierce chance: 0.03 - type: HitscanBasicVisuals diff --git a/Resources/Prototypes/_Sunrise/Actions/implants.yml b/Resources/Prototypes/_Sunrise/Actions/implants.yml new file mode 100644 index 0000000000..5b886fd002 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Actions/implants.yml @@ -0,0 +1,49 @@ +- type: entity + parent: BaseImplantAction + id: ActionActivateScramImplantProto + name: SCRAM! + description: Randomly teleports you within a large distance. + components: + - type: LimitedCharges + maxCharges: 1 + - type: AutoRecharge + rechargeDuration: 600 + - type: Action + checkCanInteract: false + useDelay: 5 + itemIconStyle: BigAction + priority: -20 + icon: + sprite: Structures/Specific/anomaly.rsi + state: anom4 + +- type: entity + id: ActionActivateSmokeGrenadeImplant + name: Activate Smoke Grenade + description: Create a small cloud of smoke around you. + components: + - type: Action + checkCanInteract: false + useDelay: 5 + itemIconStyle: BigAction + priority: -20 + icon: + sprite: Objects/Weapons/Grenades/smoke.rsi + state: icon + - type: InstantAction + event: !type:ActivateImplantEvent + - type: LimitedCharges + maxCharges: 3 + - type: AutoRecharge + rechargeDuration: 120 + +- type: entity + parent: BaseImplantAction + id: ActionActivateBorgLaughImplant + name: "[color=red]Laugh[/color]" + description: Activates your creepy laugh implant, which will produce the signature sound of the Syndicate cyborg. + components: + - type: Action + icon: { sprite: Mobs/Species/Terminator/parts.rsi, state: skull_icon } + useDelay: 3 + itemIconStyle: BigAction diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml index df33f820fc..453557e3e9 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml @@ -360,7 +360,7 @@ children: - id: WeaponRifleAsh12 - id: MagazineAsh12 - amount: 5 + amount: 3 - id: BlueprintMagAsh12Slug - type: entity diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/toolboxes.yml index 07121598de..847518cd21 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/toolboxes.yml @@ -41,3 +41,14 @@ - id: DoubleEmergencyNitrogenTankFilled - type: StaticPrice price: 1500 + +- type: entity + id: ToolboxElectricalTurretPirateFilled + name: electrical toolbox + suffix: Pirate, Turret, Filled + parent: ToolboxElectricalTurretPirate + components: + - type: EntityTableContainerFill + containers: + storagebase: !type:NestedSelector + tableId: ToolboxElectricalEntityTable diff --git a/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/hohohonkers.yml b/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/hohohonkers.yml index 8b4a3e73b5..6334c4b7d3 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/hohohonkers.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/hohohonkers.yml @@ -8,12 +8,15 @@ FaketAnomalyIceFlatpack: 2 FirecrackerBundle: 3 FirecrackerBox: 3 + BoxDonkSoftBox: 1 + FoamCrossbow: 1 contrabandInventory: ToyFigurineClown: 1 - ClothingBackpackDuffelSMGFake: 1 - BoxCartridgeCap: 2 + RevolverCapGun: 1 + BoxCartridgeCap: 1 ClusterSyndyFlashGrenade: 2 SyndieTrickyBomb: 2 emaggedInventory: + ClothingBackpackDuffelSMGFake: 1 ClothingBackpackDuffell6Fake: 1 SyndicateBombFake: 1 diff --git a/Resources/Prototypes/_Sunrise/Catalog/pirate_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/pirate_uplink_catalog.yml index 26398e4df0..0e3a0c309f 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/pirate_uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/pirate_uplink_catalog.yml @@ -143,7 +143,7 @@ id: UplinkPirateDisposableTurret name: uplink-disposable-turret-name description: uplink-disposable-turret-desc - productEntity: ToolboxElectricalTurretFilled + productEntity: ToolboxElectricalTurretPirateFilled cost: Doubloon: 13 categories: @@ -152,9 +152,9 @@ - type: listing id: UplinkPirateHristov icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base } - productEntity: WeaponSniperHristovBiocode + productEntity: WeaponSniperHristov cost: - Doubloon: 30 + Doubloon: 45 categories: - UplinkPirateWeaponry conditions: @@ -303,7 +303,7 @@ id: UplinkPirateL6SAW productEntity: ClothingBackpackDuffelSyndicateFilledLMG cost: - Doubloon: 125 + Doubloon: 85 categories: - UplinkPirateWeaponry restockTime: 3600 @@ -437,7 +437,7 @@ id: UplinkPirateMiniEnergyCrossbow name: uplink-mini-energy-crossbow-name description: uplink-mini-energy-crossbow-desc - productEntity: WeaponEnergyCrossbowBiocode + productEntity: WeaponEnergyCrossbow cost: Doubloon: 36 restockTime: 2700 @@ -545,7 +545,7 @@ name: uplink-eshield-name description: uplink-eshield-desc icon: { sprite: /Textures/Objects/Weapons/Melee/e_shield.rsi, state: eshield-on } - productEntity: EnergyShieldBiocode + productEntity: EnergyShield cost: Doubloon: 39 categories: @@ -586,7 +586,7 @@ - type: listing id: UplinkPirateSyndieLaserGun name: uplink-weapon-syndie-laser-gun-name - productEntity: WeaponSyndieLaserGunBiocode + productEntity: WeaponSyndieLaserGun icon: { sprite: _Sunrise/Objects/Weapons/Guns/Battery/syndielasergun.rsi, state: icon } cost: Doubloon: 43 @@ -637,7 +637,7 @@ name: uplink-esword-name description: uplink-esword-desc icon: { sprite: /Textures/Objects/Weapons/Melee/e_sword.rsi, state: icon } - productEntity: EnergySwordBiocode + productEntity: EnergySword cost: Doubloon: 30 categories: @@ -819,6 +819,42 @@ categories: - UplinkPirateAmmo +- type: listing + id: UplinkPirateHristovAmmoAP + description: uplink-sniper-ammo-pen-desc + productEntity: MagazineBoxAntiMaterielAP + cost: + Doubloon: 10 + categories: + - UplinkPirateAmmo + conditions: + - !type:ListingLimitedStockCondition + stock: 2 + +- type: listing + id: UplinkPirateHristovAmmoFrag + description: uplink-sniper-ammo-frag-desc + productEntity: MagazineBoxAntiMaterielFrag + cost: + Doubloon: 10 + categories: + - UplinkPirateAmmo + conditions: + - !type:ListingLimitedStockCondition + stock: 2 + +- type: listing + id: UplinkPirateHristovAmmoBlast + description: uplink-sniper-ammo-blast-desc + productEntity: MagazineBoxAntiMaterielBlast + cost: + Doubloon: 12 + categories: + - UplinkPirateAmmo + conditions: + - !type:ListingLimitedStockCondition + stock: 2 + - type: listing id: UplinkPirateBoxImprovisedRifle productEntity: MagazineBoxImprovisedRifle @@ -955,7 +991,7 @@ icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: icon } productEntity: MagazineRifleBoxSP cost: - Doubloon: 14 + Doubloon: 10 categories: - UplinkPirateAmmo @@ -963,11 +999,121 @@ id: UplinkPirateL6SAWBoxFMJ icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: icon } productEntity: MagazineRifleBoxFMJ + cost: + Doubloon: 12 + categories: + - UplinkPirateAmmo + +- type: listing + id: UplinkPirateL6SAWBoxIncendiary + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: icon } + productEntity: MagazineRifleBoxIncendiary cost: Doubloon: 16 categories: - UplinkPirateAmmo +- type: listing + id: UplinkPirateBox556SP + productEntity: MagazineBoxRifleSP + cost: + Doubloon: 1 + categories: + - UplinkPirateAmmo + +- type: listing + id: UplinkPirateBox556FMJ + productEntity: MagazineBoxRifleFMJ + cost: + Doubloon: 1 + categories: + - UplinkPirateAmmo + +- type: listing + id: UplinkPirateBox556HP + productEntity: MagazineBoxRifleHP + cost: + Doubloon: 1 + categories: + - UplinkPirateAmmo + +- type: listing + id: UplinkPirateBox556AP + productEntity: MagazineBoxRifleAP + cost: + Doubloon: 6 + categories: + - UplinkPirateAmmo + restockTime: 900 + +- type: listing + id: UplinkPirateBox556Incendiary + productEntity: MagazineBoxRifleIncendiary + cost: + Doubloon: 4 + categories: + - UplinkPirateAmmo + restockTime: 900 + +- type: listing + id: UplinkPiratePRDBeltBoxSP + productEntity: MagazineLightRifleBeltBox + cost: + Doubloon: 5 + categories: + - UplinkPirateAmmo + +- type: listing + id: UplinkPiratePRDBeltBoxFMJ + productEntity: MagazineLightRifleBeltBoxFMJ + cost: + Doubloon: 5 + categories: + - UplinkPirateAmmo + +- type: listing + id: UplinkPiratePRDBeltBoxHP + productEntity: MagazineLightRifleBeltBoxHP + cost: + Doubloon: 5 + categories: + - UplinkPirateAmmo + +- type: listing + id: UplinkPiratePRDBeltBoxAP + productEntity: MagazineLightRifleBeltBoxAP + cost: + Doubloon: 8 + categories: + - UplinkPirateAmmo + restockTime: 900 + +- type: listing + id: UplinkPiratePRDBeltBoxIncendiary + productEntity: MagazineLightRifleBeltBoxIncendiary + cost: + Doubloon: 7 + categories: + - UplinkPirateAmmo + restockTime: 900 + +- type: listing + id: UplinkPiratePRDBeltBoxPractice + productEntity: MagazineLightRifleBeltBoxPractice + cost: + Doubloon: 3 + categories: + - UplinkPirateAmmo + +- type: listing + id: UplinkPiratePRDBeltBoxUranium + productEntity: MagazineLightRifleBeltBoxUranium + cost: + Doubloon: 9 + categories: + - UplinkPirateAmmo + restockTime: 900 + - type: listing id: UplinkPirateMagDragunov description: uplink-magazine-dragunov-desc @@ -1930,9 +2076,9 @@ id: UplinkPirateBootsMagSyndie name: uplink-clothing-shoes-boots-mag-syndie-name description: uplink-clothing-shoes-boots-mag-syndie-desc - productEntity: ClothingShoesBootsMagSyndieBiocode + productEntity: ClothingShoesBootsMagSyndie cost: - Doubloon: 9 + Doubloon: 8 categories: - UplinkPirateWearables @@ -1953,9 +2099,9 @@ name: uplink-syndie-thermal-name description: uplink-syndie-thermal-desc icon: { sprite: /Textures/_Sunrise/Clothing/Eyes/Glasses/synd_thermal.rsi, state: icon } - productEntity: ClothingEyesGlassesThermalSyndieBiocode + productEntity: ClothingEyesGlassesThermalSec cost: - Doubloon: 34 + Doubloon: 15 categories: - UplinkPirateWearables restockTime: 3600 @@ -2162,23 +2308,6 @@ - UplinkPirateWearables restockTime: 3600 -- type: listing - id: UplinkPirateHardsuitSyndie - name: uplink-hardsuit-syndie-name - description: uplink-hardsuit-syndie-desc - icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi, state: icon } - productEntity: ClothingBackpackDuffelSyndicateHardsuitBundle - cost: - Doubloon: 65 - categories: - - UplinkPirateWearables - restockTime: 3600 - conditions: - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle - - type: listing id: UplinkPirateHardsuitInfiltration name: uplink-hardsuit-infiltration-name @@ -2186,7 +2315,7 @@ icon: { sprite: /Textures/_Starlight/Objects/Clothing/OuterClothing/Hardsuits/infiltrationsyndie.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateFilledInfiltration cost: - Doubloon: 70 + Doubloon: 60 categories: - UplinkPirateWearables restockTime: 3600 diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml index dcb8975f78..d67302a59a 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml @@ -1192,7 +1192,7 @@ discountDownTo: Telecrystal: 5 cost: - Telecrystal: 7 + Telecrystal: 8 categories: - UplinkWeaponry conditions: @@ -1758,6 +1758,20 @@ categories: - UplinkImplants +- type: listing + id: UplinkScramImplanterProto + name: uplink-scram-implanter-proto-name + description: uplink-scram-implanter-proto-desc + icon: { sprite: /Textures/Structures/Specific/anomaly.rsi, state: anom4 } + productEntity: ScramImplanterProto + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 1 + cost: + Telecrystal: 3 + categories: + - UplinkImplants + - type: listing id: UplinkCreepyLaughImplanter name: uplink-creepy-laugh-implanter-name diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/eva-helmets.yml index ba329a6e0c..aeb30c1e19 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/eva-helmets.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/eva-helmets.yml @@ -94,14 +94,14 @@ path: /Audio/Machines/button.ogg - type: ToggleCellDraw - type: FireProtection - reduction: 0.9 + reduction: 0.4 - type: Armor modifiers: coefficients: - Blunt: 0.85 - Slash: 0.85 - Piercing: 0.85 - Heat: 0.85 + Blunt: 0.88 + Slash: 0.88 + Piercing: 0.86 + Heat: 0.9 Radiation: 0.9 Caustic: 0.9 - type: EyeProtection diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/softsuits.yml index d31a7a990a..23663085fd 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/softsuits.yml @@ -74,6 +74,19 @@ - type: HeldSpeedModifier - type: StaticPrice price: 2000 + - type: ContainerContainer + containers: + beakerSlot: !type:ContainerSlot + - type: Inject + openCloseDelay: 1 + autoClose: true + autoCloseDelay: 6 + - type: ItemSlots + slots: + beakerSlot: + whitelist: + tags: + - FitsHardsuit #Pirate EVA - type: entity @@ -151,6 +164,21 @@ damageCoefficient: 0.75 - type: ClothingSlowOnDamageModifier modifier: 0.5 + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + beakerSlot: !type:ContainerSlot + - type: Inject + openCloseDelay: 1 + autoClose: true + autoCloseDelay: 6 + - type: ItemSlots + slots: + beakerSlot: + whitelist: + tags: + - FitsHardsuit - type: entity parent: ClothingOuterEVASuitPirateArmored diff --git a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/Random/implants.yml b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/Random/implants.yml new file mode 100644 index 0000000000..8fc8c6cf90 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/Random/implants.yml @@ -0,0 +1,44 @@ +- type: entity + name: random implant case spawner + id: RandomImplantCaseSpawner + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: _Sunrise/Objects/Misc/lockbox.rsi + state: icon + - type: RandomSpawner + prototypes: + - ImplantCaseNightVision + - ImplantCaseThermal + - ImplantCaseImplantChemical + - ImplantCaseImplantWelding + - ImplantCaseImplantMedical + - ImplantCaseGorilla + - ImplantCaseMechwright + - ImplantCaseReaper + - ImplantCaseRobust + - ImplantCaseHack + - ImplantCaseAtmos + - ImplantCaseJani + - ImplantCaseImplantSecurity + - ImplantCaseBonesaw + - ImplantCaseLaserEmitter + - ImplantCaseBulwark + - ImplantCaseGrenadeThrower + - ImplantCaseMantisBladeMaxGuard + - LeftArmCyberGorilla + - LeftArmCyberMechwright + - LeftArmCyberReaper + - LeftArmCyberRobust + - LeftArmCyberHack + - LeftArmCyberAtmos + - LeftArmCyberJanitorial + - LeftArmCyberBonesaw + - LeftArmCyberLaserEmitter + - LeftArmCyberBulwark + - LeftArmCyberGrenadeThrower + - LeftArmCyberMantisBladeMaxGuard + chance: 1 + offset: 0.0 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/implanters.yml index 43f03caf8f..3b164aafbc 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/implanters.yml @@ -33,3 +33,11 @@ components: - type: Implanter implant: DeathRattleImplantFreelance + +- type: entity + id: ScramImplanterProto + name: scram implanter + parent: BaseImplantOnlyImplanterSyndi + components: + - type: Implanter + implant: ScramImplantProto diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/subdermal_implants.yml index 4dbf75e711..31a0e11e99 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/subdermal_implants.yml @@ -51,3 +51,15 @@ components: - type: RattleOnTrigger radioChannel: Freelance + +- type: entity + parent: BaseSubdermalImplant + id: ScramImplantProto + name: scram implant + description: This implant randomly teleports the user within a large radius when activated. + components: + - type: SubdermalImplant + implantAction: ActionActivateScramImplantProto + - type: TriggerOnActivateImplant + - type: ScramOnTrigger + targetUser: true diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml index f0b96429c2..3821e51462 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml @@ -60,7 +60,7 @@ - type: MovementSpeedModifier baseWalkSpeed: 1 baseSprintSpeed: 3 - baseWeightlessModifier: 5 + baseWeightlessModifier: 2 - type: MovementAlwaysTouching - type: Pullable - type: Clickable @@ -209,7 +209,7 @@ - type: MovementSpeedModifier baseWalkSpeed: 2 baseSprintSpeed: 3.75 - baseWeightlessModifier: 4 + baseWeightlessModifier: 2 - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/chemistry.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/chemistry.yml index 6e5a91e91c..994349ccf4 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/chemistry.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/chemistry.yml @@ -31,4 +31,22 @@ - type: SolutionContainerManager solutions: beaker: - maxVol: 200 + maxVol: 150 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + params: + volume: -4 + - !type:SpillBehavior + solution: beaker + - !type:SpawnEntitiesBehavior + spawn: + ShardGlassClockwork: + min: 1 + max: 1 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/toolbox.yml new file mode 100644 index 0000000000..153924113c --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/toolbox.yml @@ -0,0 +1,31 @@ +- type: entity + name: electrical toolbox + suffix: Pirate, Turret + parent: ToolboxElectricalTurret + id: ToolboxElectricalTurretPirate + description: A toolbox typically stocked with electrical gear. + components: + - type: Sprite + sprite: Objects/Tools/Toolboxes/toolbox_thief.rsi + state: icon + - type: Item + sprite: Objects/Tools/Toolboxes/toolbox_thief.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 1 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + WeaponTurretPirateDisposable: + min: 1 + max: 1 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml index 097bc548ad..69cef99b86 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml @@ -7,8 +7,20 @@ - type: Tag tags: - MagazineAsh12 + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] - type: Item size: Small + shape: + - 0,0,0,2 + storedSprite: + state: storage + sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi - type: BallisticAmmoProvider mayTransfer: true whitelist: @@ -19,13 +31,6 @@ - type: ContainerContainer containers: ballistic-ammo: !type:Container - - type: Sprite - sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/ - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag steps: 2 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/projectiles.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/projectiles.yml index 2585f12756..0f1918ea49 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/projectiles.yml @@ -58,8 +58,8 @@ - type: Projectile damage: types: - Piercing: 1.25 - Slash: 1.25 + Piercing: 1.5 + Slash: 1.5 Radiation: 2.5 - type: entity diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 34ad966bd4..f7cf3d3e70 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -322,11 +322,8 @@ - type: FlashOnTrigger range: 7 - type: SpawnOnTrigger - keysIn: - - timer proto: GrenadeFlashEffect predicted: true - - type: ActiveTimerTrigger - type: DeleteOnTrigger - type: entity @@ -371,6 +368,8 @@ totalIntensity: 120 # about a ~4 tile radius canCreateVacuum: false - type: EmitSoundOnTrigger + keysIn: + - timer sound: path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg" - type: EmitSoundOnSpawn @@ -441,6 +440,8 @@ - type: Ammo muzzleFlash: null - type: DeleteOnTrigger + keysIn: + - timer - type: entity id: BulletAirGrenade @@ -585,6 +586,9 @@ keysIn: - timer proto: GrenadeFlashEffect + - type: DeleteOnTrigger + keysIn: + - timer - type: EmitSoundOnSpawn sound: path: /Audio/Effects/countdown.ogg @@ -604,6 +608,8 @@ fillPrototype: PelletClusterIncendiary capacity: 30 - type: EmitSoundOnTrigger + keysIn: + - timer sound: path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg" - type: SpawnOnTrigger @@ -684,6 +690,8 @@ sound: path: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - type: DeleteOnTrigger + keysIn: + - timer - type: entity id: BulletKineticTrash @@ -782,6 +790,8 @@ color: blue energy: 0.5 - type: DeleteOnTrigger + keysIn: + - timer - type: entity id: BulletHeavyRifleArtillery diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 959e1a03f5..7231ce5857 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -549,6 +549,9 @@ shape: - 0,0,4,2 sprite: _Sunrise/Objects/Weapons/Guns/Rifles/ash12/tiny.rsi + storedSprite: + state: icon + sprite: _Sunrise/Objects/Weapons/Guns/Rifles/ash12/big.rsi - type: Gun minAngle: 3 maxAngle: 24 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml index df93bb2180..5a964521eb 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml @@ -54,3 +54,58 @@ SheetSteel1: min: 3 max: 5 + +- type: entity + parent: BaseWeaponBallisticTurret + id: WeaponTurretPirateDisposable + name: disposable ballistic turret + suffix: Pirate, Disposable + components: + - type: NpcFactionMember + factions: + - Pirate + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 600 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:TriggerBehavior + - type: Gun + burstFireRate: 13 + shotsPerBurst: 10 + burstCooldown: 1.2 + minAngle: 5 + maxAngle: 30 + angleIncrease: 1 + angleDecay: 10 + selectedMode: Burst + availableModes: + - Burst + soundGunshot: /Audio/Weapons/Guns/Gunshots/gun_sentry.ogg + - type: BallisticAmmoProvider + proto: CartridgePistolImprovisedMech + capacity: 142 + - type: Construction + deconstructionTarget: null + graph: WeaponTurretSyndicateDisposable + node: disposableTurret + - type: Repairable + qualityNeeded: "Anchoring" + doAfterDelay: 3 + - type: TriggerOnEmptyGunshot + - type: ExplodeOnTrigger + - type: Explosive + explosionType: Default + maxIntensity: 10 + intensitySlope: 1.5 + totalIntensity: 30 + canCreateVacuum: false diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Throwable/Bola.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Throwable/Bola.yml index 6740ec419c..8a3264301a 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Throwable/Bola.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Throwable/Bola.yml @@ -15,6 +15,7 @@ - type: Tag tags: - BolaSecurity + - SecBeltEquip - type: entity name: syndicate bola @@ -31,3 +32,7 @@ walkSpeed: 0.60 sprintSpeed: 0.60 staminaDamage: 30 + - type: Tag + tags: + - BolaSecurity + - SecBeltEquip diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml index a6245d3924..5916b18244 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -87,6 +87,10 @@ access: [["CentralCommand"]] alertAccesses: gamma: GammaAlertAccesses + - type: Tag + tags: + - EmagImmune + - AccessBreakerImmune - type: Godmode - type: Transform anchored: true diff --git a/Resources/Prototypes/_Sunrise/Guidebook/expeditions.yml b/Resources/Prototypes/_Sunrise/Guidebook/expeditions.yml new file mode 100644 index 0000000000..3e4b63d8b2 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Guidebook/expeditions.yml @@ -0,0 +1,24 @@ +- type: guideEntry + id: Expeditions + name: guide-entry-expeditions + text: "/ServerInfo/Guidebook/_Sunrise/Expeditions.xml" + priority: 5 + children: + - MobsExpeditionGuidePirates + - MobsExpeditionGuideXenos + - MobsExpeditionGuideCarps + +- type: guideEntry + id: MobsExpeditionGuidePirates + name: guide-entry-expedition-pirates + text: "/ServerInfo/Guidebook/_Sunrise/MobsHostileExpedition/pirates.xml" + +- type: guideEntry + id: MobsExpeditionGuideXenos + name: guide-entry-expedition-xenos + text: "/ServerInfo/Guidebook/_Sunrise/MobsHostileExpedition/xenos.xml" + +- type: guideEntry + id: MobsExpeditionGuideCarps + name: guide-entry-expedition-carps + text: "/ServerInfo/Guidebook/_Sunrise/MobsHostileExpedition/carps.xml" diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Blueshield/blueshield.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Blueshield/blueshield.yml index 809fe7b15b..d4690214f5 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Blueshield/blueshield.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Blueshield/blueshield.yml @@ -8,6 +8,15 @@ role: JobBlueShield time: 20h +- type: loadoutEffectGroup + id: MisterBlueShit50 + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobBlueShield + time: 50h + - type: loadout id: BlueShieldBackpack equipment: @@ -65,4 +74,4 @@ - ClothingBackpackDuffelWeaponRifleAsh12 effects: - !type:GroupLoadoutEffect - proto: MisterBlueShit + proto: MisterBlueShit50 diff --git a/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/gloves_weapon_npcs.yml b/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/gloves_weapon_npcs.yml index 390d878ec5..0784252dc0 100644 --- a/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/gloves_weapon_npcs.yml +++ b/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/gloves_weapon_npcs.yml @@ -11,6 +11,8 @@ layers: - state: icon color: "#53535304" + - type: FireProtection + reduction: 0.5 - type: entity parent: ClothingHandsNoGloves @@ -561,6 +563,18 @@ - sprite: _Sunrise/Objects/Weapons/Guns/SMGs/mp38/tiny.rsi state: wielded-inhand-right +- type: entity + parent: ClothingHandsNoGloves + id: ClothingHandsPPSH + suffix: ppsh + categories: [ HideSpawnMenu ] + components: + - type: Clothing + clothingVisuals: + gloves: + - sprite: _Sunrise/Objects/Weapons/Guns/SMGs/ppsh41/tiny.rsi + state: wielded-inhand-right + - type: entity parent: ClothingHandsNoGloves id: ClothingHandsSKM28 diff --git a/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/mob_hostile_base.yml b/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/mob_hostile_base.yml index 7e53d1bad6..7a5e535c9c 100644 --- a/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/mob_hostile_base.yml +++ b/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/mob_hostile_base.yml @@ -241,9 +241,9 @@ NavSmash: !type:Bool true VisionRadius: !type:Single - 20 + 30 AggroVisionRadius: !type:Single - 20 + 35 - type: entity id: MobHumanoidHostileAISimpleRanged @@ -262,9 +262,9 @@ NavSmash: !type:Bool true VisionRadius: !type:Single - 20 + 30 AggroVisionRadius: !type:Single - 20 + 35 MeleeRange: !type:Single 4 diff --git a/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/mobpirate_lodout.yml b/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/mobpirate_lodout.yml index c21c19b916..9a6763ac1d 100644 --- a/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/mobpirate_lodout.yml +++ b/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/mobpirate_lodout.yml @@ -35,7 +35,7 @@ id: MobPirateT1KnifeGear equipment: gloves: ClothingHandsMercCombatKnife - belt: ClothingBeltUtility + belt: ClothingBeltUtilityPirateT1 pocket1: SpaceCash500 pocket2: CombatKnife shoes: ClothingShoesBootsJack @@ -57,6 +57,14 @@ pocket1: AdvancedMineralScanner pocket2: WeaponGrapplingGun +- type: startingGear + id: MobPirateT1HunterSmashGear + equipment: + back: ClothingBackScrapperT1Smasher + shoes: ClothingShoesBootsJump + pocket1: AdvancedMineralScanner + pocket2: FoodHivelordRemains + # region Ranged - type: startingGear id: MobPirateT1FlintlockGear @@ -147,6 +155,15 @@ pocket2: Gauze1 shoes: ClothingShoesBootsJack +- type: startingGear + id: MobPirateT1RifleGear + equipment: + gloves: ClothingHandsPPSH + belt: ClothingBeltBandolierT1Rifle + shoes: ClothingShoesBootsSalvage + pocket1: DoubleEmergencyOxygenTankFilled + pocket2: ChemistryBottleSaline + # region Pirate Tier2 - type: startingGear id: MobPirateT2ECutlassGear @@ -387,6 +404,21 @@ belt: BorgOreBag back: ClothingBackOreCrateTier1Mech +- type: startingGear + id: MobPirateT1BorgAssaultGear + equipment: + back: ClothingBackOreCrateTier2Cyborg + +- type: startingGear + id: MobPirateT1BorgMiningGear + equipment: + back: ClothingBackOreCrateTier1Cyborg + +- type: startingGear + id: MobPirateT1BorgDerelictGear + equipment: + back: ClothingBackOreCrateTier1Cyborg + # region Pirate Boss - type: startingGear id: MobPirateGearRangedT4 diff --git a/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/npc_loot_pirate.yml b/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/npc_loot_pirate.yml index 9091701be7..7ca8563291 100644 --- a/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/npc_loot_pirate.yml +++ b/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/npc_loot_pirate.yml @@ -27,7 +27,7 @@ back: - state: equipped-BACKPACK - type: Item - size: Normal + size: Huge inhandVisuals: left: - state: inhand-left @@ -394,6 +394,8 @@ - id: ClothingBeltMercWebbing prob: 0.2 # Bonus Loot T1 + - id: Doubloon1 + prob: 0.05 - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -422,6 +424,71 @@ sound: path: /Audio/Items/jumpsuit_equip.ogg +- type: entity + parent: MercenaryWebbingBox + id: ClothingBeltUtilityPirateT1 + name: utility belt bundle + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Clothing/Belt/utility.rsi + state: icon + - type: SpawnItemsOnUse + items: + - id: Crowbar + prob: 0.9 + - id: Wrench + prob: 0.9 + - id: Screwdriver + prob: 0.9 + - id: Wirecutter + prob: 0.9 + - id: GrenadeFlashBang + prob: 0.4 + - id: MakeshiftShield + prob: 0.5 + # Bonus Loot T3 + - id: Doubloon1 + prob: 0.05 + - id: SpaceCash1000 + prob: 0.9 + - id: SpaceCash500 + prob: 0.9 + - id: SpaceCash1000 + prob: 0.7 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.5 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.25 + - id: PirateTechFabCircuitboard + prob: 0.001 + - id: LootSpawnerMedicalMinor + prob: 0.7 + - id: AirlossAutoInjector + prob: 0.05 + - id: PyraAutoInjector + prob: 0.05 + - id: CombatMedipen + prob: 0.05 + - id: BruteAutoInjector + prob: 0.05 + - id: BurnAutoInjector + prob: 0.05 + - id: BruizAutoInjector + prob: 0.05 + - id: PunctAutoInjector + prob: 0.05 + - id: LacerAutoInjector + prob: 0.05 + - id: EmergencyMedipen + prob: 0.4 + - id: EmergencyMedipen + prob: 0.2 + - id: EmergencyMedipen + prob: 0.1 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + - type: entity parent: SalvageWebbingBox id: ClothingBeltSalvageWebbingTier1Flintlock @@ -441,6 +508,45 @@ prob: 0.3 - id: MagazineBoxMagnumFMJ prob: 0.25 + # Bonus Loot T3 + - id: Doubloon1 + prob: 0.05 + - id: SpaceCash1000 + prob: 0.9 + - id: SpaceCash500 + prob: 0.9 + - id: SpaceCash1000 + prob: 0.7 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.5 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.25 + - id: PirateTechFabCircuitboard + prob: 0.001 + - id: LootSpawnerMedicalMinor + prob: 0.7 + - id: AirlossAutoInjector + prob: 0.05 + - id: PyraAutoInjector + prob: 0.05 + - id: CombatMedipen + prob: 0.05 + - id: BruteAutoInjector + prob: 0.05 + - id: BurnAutoInjector + prob: 0.05 + - id: BruizAutoInjector + prob: 0.05 + - id: PunctAutoInjector + prob: 0.05 + - id: LacerAutoInjector + prob: 0.05 + - id: EmergencyMedipen + prob: 0.4 + - id: EmergencyMedipen + prob: 0.2 + - id: EmergencyMedipen + prob: 0.1 sound: path: /Audio/Items/jumpsuit_equip.ogg @@ -474,6 +580,8 @@ - id: CrateAmmunitionSmallLightRifle prob: 0.25 # Bonus Loot T1 + - id: Doubloon1 + prob: 0.05 - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -621,6 +729,8 @@ amount: 5 prob: 0.2 # Bonus Loot T2 + - id: Doubloon1 + prob: 0.05 - id: SpaceCash1000 prob: 0.9 - id: LootSpawnerMedicalMinor @@ -676,6 +786,12 @@ - id: PatchBrute prob: 0.15 # Bonus Loot T2 + - id: Doubloon1 + prob: 0.05 + - id: Doubloon5 + prob: 0.1 + - id: ClothingBackpackMessengerPirateDecoyKitFilled + prob: 0.02 - id: SpaceCash1000 prob: 0.9 - id: LootSpawnerMedicalMinor @@ -791,6 +907,12 @@ - id: PatchBrute prob: 0.15 # Bonus Loot T2 + - id: Doubloon1 + prob: 0.05 + - id: Doubloon5 + prob: 0.1 + - id: ClothingBackpackMessengerPirateDecoyKitFilled + prob: 0.02 - id: SpaceCash1000 prob: 0.9 - id: LootSpawnerMedicalMinor @@ -861,7 +983,48 @@ prob: 0.5 - id: CartridgeAntiMateriel prob: 0.3 + - id: null + prob: 0.6 + orGroup: AntiMaterielRare + - id: CartridgeAntiMaterielPenetrator + amount: 3 + prob: 0.1 + orGroup: AntiMaterielRare + - id: CartridgeAntiMaterielFrag + amount: 3 + prob: 0.1 + orGroup: AntiMaterielRare + - id: CartridgeAntiMaterielBlast + amount: 3 + prob: 0.1 + orGroup: AntiMaterielRare + - id: CartridgeAntiMaterielEmp + amount: 3 + prob: 0.1 + orGroup: AntiMaterielRare - id: MagazineBoxAntiMateriel + prob: 0.2 + # Bonus Loot T2 + - id: Doubloon1 + prob: 0.05 + - id: Doubloon5 + prob: 0.1 + - id: ClothingBackpackMessengerPirateDecoyKitFilled + prob: 0.02 + - id: SpaceCash1000 + prob: 0.9 + - id: LootSpawnerMedicalMinor + prob: 0.7 + - id: SpaceCash1000 + prob: 0.7 + - id: LootSpawnerMaterials + amount: 2 + prob: 0.7 + - id: NukeOpsGrenadeSpawner + prob: 0.1 + - id: NukeOpsMedkitBruteSpawner + prob: 0.5 + - id: LootSpawnerMaterialsHighValue prob: 0.25 sound: path: /Audio/Items/jumpsuit_equip.ogg @@ -908,6 +1071,28 @@ prob: 0.25 - id: BrutepackAdvanced1 prob: 0.25 + # Bonus Loot T2 + - id: Doubloon1 + prob: 0.05 + - id: Doubloon5 + prob: 0.1 + - id: ClothingBackpackMessengerPirateDecoyKitFilled + prob: 0.02 + - id: SpaceCash1000 + prob: 0.9 + - id: LootSpawnerMedicalMinor + prob: 0.7 + - id: SpaceCash1000 + prob: 0.7 + - id: LootSpawnerMaterials + amount: 2 + prob: 0.7 + - id: NukeOpsGrenadeSpawner + prob: 0.1 + - id: NukeOpsMedkitBruteSpawner + prob: 0.5 + - id: LootSpawnerMaterialsHighValue + prob: 0.25 sound: path: /Audio/Items/jumpsuit_equip.ogg @@ -953,6 +1138,28 @@ prob: 0.25 - id: BrutepackAdvanced1 prob: 0.25 + # Bonus Loot T2 + - id: Doubloon1 + prob: 0.05 + - id: Doubloon5 + prob: 0.1 + - id: ClothingBackpackMessengerPirateDecoyKitFilled + prob: 0.02 + - id: SpaceCash1000 + prob: 0.9 + - id: LootSpawnerMedicalMinor + prob: 0.7 + - id: SpaceCash1000 + prob: 0.7 + - id: LootSpawnerMaterials + amount: 2 + prob: 0.7 + - id: NukeOpsGrenadeSpawner + prob: 0.1 + - id: NukeOpsMedkitBruteSpawner + prob: 0.5 + - id: LootSpawnerMaterialsHighValue + prob: 0.25 sound: path: /Audio/Items/jumpsuit_equip.ogg @@ -998,6 +1205,28 @@ prob: 0.25 - id: BrutepackAdvanced1 prob: 0.25 + # Bonus Loot T2 + - id: Doubloon1 + prob: 0.05 + - id: Doubloon5 + prob: 0.1 + - id: ClothingBackpackMessengerPirateDecoyKitFilled + prob: 0.02 + - id: SpaceCash1000 + prob: 0.9 + - id: LootSpawnerMedicalMinor + prob: 0.7 + - id: SpaceCash1000 + prob: 0.7 + - id: LootSpawnerMaterials + amount: 2 + prob: 0.7 + - id: NukeOpsGrenadeSpawner + prob: 0.1 + - id: NukeOpsMedkitBruteSpawner + prob: 0.5 + - id: LootSpawnerMaterialsHighValue + prob: 0.25 sound: path: /Audio/Items/jumpsuit_equip.ogg @@ -1051,6 +1280,8 @@ - id: LootSpawnerMaterialsHighValue prob: 0.2 # Bonus Loot + - id: Doubloon1 + prob: 0.05 - id: SpaceCash1000 prob: 0.9 - id: LootSpawnerMaterialsHighValueConstruction @@ -1064,6 +1295,72 @@ sound: path: /Audio/Items/jumpsuit_equip.ogg +- type: entity + parent: PirateMessengerGiftBox + id: ClothingBackScrapperT1Smasher + categories: [ HideSpawnMenu ] + components: + - type: SpawnItemsOnUse + items: + # Cash + - id: SpaceCash500 + prob: 0.9 + - id: SpaceCash500 + prob: 0.4 + - id: SpaceCash500 + prob: 0.2 + # Weapons + - id: WeaponCrusherBroadAxe + prob: 0.75 + # Armor + - id: ClothingOuterHardsuitSalvage + prob: 0.3 + orGroup: SalvHardPool + - id: ClothingOuterHardsuitSalvageGoliath + prob: 0.2 + orGroup: SalvHardPool + - id: MaterialGoliathHide1 + amount: 6 + prob: 0.5 + orGroup: SalvHardPool + - id: MaterialGoliathHide1 + amount: 12 + prob: 0.25 + orGroup: SalvHardPool + # Items + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.9 + - id: LootSpawnerMaterialsHighValue + prob: 0.4 + - id: LootSpawnerMaterialsHighValue + prob: 0.2 + # Bonus Loot + - id: Doubloon1 + prob: 0.05 + - id: SpaceCash1000 + prob: 0.9 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.7 + - id: SpaceCash1000 + prob: 0.7 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.5 + - id: LootSpawnerMaterialsSurplus + prob: 0.3 + - id: LootSpawnerMedicalMinor + prob: 0.7 + - id: LootSpawnerMaterials + amount: 2 + prob: 0.7 + - id: NukeOpsGrenadeSpawner + prob: 0.3 + - id: NukeOpsMedkitBruteSpawner + prob: 0.3 + - id: LootSpawnerMaterialsHighValue + prob: 0.25 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + - type: entity parent: PirateMessengerGiftBox id: ClothingBackScrapperRangedT2 @@ -1140,6 +1437,8 @@ - id: PatchBrute prob: 0.15 # Bonus Loot T2 + - id: Doubloon1 + prob: 0.05 - id: SpaceCash1000 prob: 0.9 - id: LootSpawnerMedicalMinor @@ -1183,6 +1482,8 @@ - id: EnergyDaggerLoud prob: 0.4 # Bonus Loot T3 + - id: Doubloon1 + prob: 0.05 - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -1270,6 +1571,12 @@ amount: 5 prob: 0.2 # Bonus Loot T3 + - id: Doubloon1 + prob: 0.05 + - id: Doubloon5 + prob: 0.1 + - id: ClothingBackpackMessengerPirateDecoyKitFilled + prob: 0.02 - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -1283,6 +1590,197 @@ sound: path: /Audio/Effects/closetopen.ogg +- type: entity + parent: MercenaryDuffelGiftBox + id: ClothingBackOreCrateTier1Cyborg + categories: [ HideSpawnMenu ] + components: + - type: Sprite + noRot: true + sprite: /Textures/Structures/Storage/orebox.rsi + layers: + - state: orebox + - state: orebox-top + map: [ top ] + visible: true + - type: MultiHandedItem + - type: SpeedModifiedOnWield + walkModifier: 0.5 + sprintModifier: 0.5 + - type: Item + size: Ginormous + inhandVisuals: + left: + - state: inhand-left + right: + - state: inhand-right + - type: SpawnItemsOnUse + items: + # Salvage + - id: OreBox + prob: 0.5 + - id: SalvageSpawnerScrapCommon75 + prob: 0.9 + - id: SalvageSpawnerScrapCommon75 + prob: 0.85 + - id: SalvageSpawnerScrapCommon75 + prob: 0.85 + - id: SalvageSpawnerScrapValuable75 + prob: 0.8 + - id: SalvageSpawnerScrapValuable75 + prob: 0.75 + - id: SalvageSpawnerScrapValuable75 + prob: 0.7 + - id: SalvageSpawnerEquipment + prob: 0.65 + - id: SalvageSpawnerEquipment + prob: 0.6 + - id: SalvageSpawnerTreasureValuable + prob: 0.55 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.5 + - id: LootSpawnerCableCoil + prob: 0.45 + - id: LootSpawnerScienceMajor + prob: 0.4 + - id: SalvageLootSpawner + prob: 0.35 + # ORE + - id: SteelOre + prob: 0.35 + - id: Coal15 + prob: 0.5 + - id: Coal15 + prob: 0.35 + - id: MobCoalCrab + prob: 0.1 + - id: SilverOre + prob: 0.35 + - id: PlasmaOre + prob: 0.25 + - id: GoldOre + prob: 0.2 + - id: BananiumOre1 + amount: 5 + prob: 0.2 + - id: UraniumOre1 + amount: 5 + prob: 0.2 + - id: DiamondOre1 + amount: 5 + prob: 0.2 + # Bonus Loot T1 + - id: Doubloon1 + prob: 0.05 + - id: SpaceCash500 + prob: 0.9 + - id: SpaceCash1000 + prob: 0.7 + - id: LootSpawnerMedicalMinor + prob: 0.7 + sound: + path: /Audio/Effects/closetopen.ogg + +- type: entity + parent: MercenaryDuffelGiftBox + id: ClothingBackOreCrateTier2Cyborg + categories: [ HideSpawnMenu ] + components: + - type: Sprite + noRot: true + sprite: /Textures/Structures/Storage/orebox.rsi + layers: + - state: orebox + - state: orebox-top + map: [ top ] + visible: true + - type: MultiHandedItem + - type: SpeedModifiedOnWield + walkModifier: 0.5 + sprintModifier: 0.5 + - type: Item + size: Ginormous + inhandVisuals: + left: + - state: inhand-left + right: + - state: inhand-right + - type: SpawnItemsOnUse + items: + # Salvage + - id: OreBox + prob: 0.5 + - id: SalvageSpawnerScrapCommon75 + prob: 0.9 + - id: SalvageSpawnerScrapCommon75 + prob: 0.85 + - id: SalvageSpawnerScrapCommon75 + prob: 0.85 + - id: SalvageSpawnerScrapValuable75 + prob: 0.8 + - id: SalvageSpawnerScrapValuable75 + prob: 0.75 + - id: SalvageSpawnerScrapValuable75 + prob: 0.7 + - id: SalvageSpawnerEquipment + prob: 0.65 + - id: SalvageSpawnerEquipment + prob: 0.6 + - id: SalvageSpawnerTreasureValuable + prob: 0.55 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.5 + - id: LootSpawnerCableCoil + prob: 0.45 + - id: LootSpawnerScienceMajor + prob: 0.4 + - id: SalvageLootSpawner + prob: 0.35 + # ORE + - id: SteelOre + prob: 0.35 + - id: Coal15 + prob: 0.5 + - id: Coal15 + prob: 0.35 + - id: MobCoalCrab + prob: 0.1 + - id: SilverOre + prob: 0.35 + - id: PlasmaOre + prob: 0.25 + - id: GoldOre + prob: 0.2 + - id: BananiumOre1 + amount: 5 + prob: 0.2 + - id: UraniumOre1 + amount: 5 + prob: 0.2 + - id: DiamondOre1 + amount: 5 + prob: 0.2 + # Bonus Loot T2 + - id: Doubloon1 + prob: 0.05 + - id: SpaceCash1000 + prob: 0.9 + - id: LootSpawnerMedicalMinor + prob: 0.7 + - id: SpaceCash1000 + prob: 0.7 + - id: LootSpawnerMaterials + amount: 2 + prob: 0.7 + - id: NukeOpsGrenadeSpawner + prob: 0.05 + - id: NukeOpsMedkitBruteSpawner + prob: 0.5 + - id: LootSpawnerMaterialsHighValue + prob: 0.25 + sound: + path: /Audio/Effects/closetopen.ogg + - type: entity parent: MercenaryDuffelGiftBox id: ClothingBackOreCrateTier3Mech @@ -1334,19 +1832,21 @@ prob: 0.2 # durand - id: DurandArmorPlate - prob: 0.05 + prob: 0.1 - id: DurandLArm - prob: 0.25 + prob: 0.35 - id: DurandRArm - prob: 0.25 + prob: 0.35 - id: DurandLLeg - prob: 0.25 + prob: 0.35 - id: DurandRLeg - prob: 0.25 + prob: 0.35 - id: DurandHarness - prob: 0.25 + prob: 0.35 - id: DurandHead - prob: 0.25 + prob: 0.35 + - id: CratePirateSurplusBundle + prob: 0.3 # Weapon - id: WeaponMechCombatMaxim prob: 0.5 @@ -1364,6 +1864,18 @@ - id: BulletGrenadeStinger prob: 0.1 # Bonus Loot T3 + - id: Doubloon5 + prob: 0.1 + - id: Doubloon5 + prob: 0.1 + - id: ModsuitCore + prob: 0.05 + - id: MedipenCombatInjector + prob: 0.05 + - id: SyringeBluespace + prob: 0.02 + - id: BluespacePillPatchCanister + prob: 0.02 - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -1418,6 +1930,18 @@ - id: EmpGrenade prob: 0.25 # Bonus Loot T3 + - id: Doubloon5 + prob: 0.1 + - id: Doubloon5 + prob: 0.1 + - id: ModsuitCore + prob: 0.05 + - id: MedipenCombatInjector + prob: 0.05 + - id: SyringeBluespace + prob: 0.02 + - id: BluespacePillPatchCanister + prob: 0.02 - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -1470,33 +1994,48 @@ - id: SpaceCash1000 prob: 0.2 # Weapons + - id: CrateAmmunitionSmallDragunov + prob: 0.05 + orGroup: dragunovPool - id: WeaponSniperDragunov - prob: 0.25 + prob: 0.3 orGroup: dragunovPool - id: WeaponSniperDragunovBiocode - prob: 0.75 + prob: 0.6 orGroup: dragunovPool # Items - id: MagazineDragunov amount: 2 - prob: 0.4 + prob: 0.3 orGroup: dragunovAmmoPool - id: MagazineDragunovExtended amount: 2 - prob: 0.4 + prob: 0.04 orGroup: dragunovAmmoPool - id: MagazineDragunovUranium - prob: 0.25 + prob: 0.15 orGroup: dragunovAmmoPool - id: MagazineDragunovIncendiary amount: 2 - prob: 0.45 + prob: 0.4 orGroup: dragunovAmmoPool - id: MagazineDragunovEmpty prob: 0.25 - id: MagazineDragunovEmpty prob: 0.4 # Bonus Loot T3 + - id: Doubloon5 + prob: 0.1 + - id: Doubloon5 + prob: 0.1 + - id: ModsuitCore + prob: 0.05 + - id: MedipenCombatInjector + prob: 0.05 + - id: SyringeBluespace + prob: 0.02 + - id: BluespacePillPatchCanister + prob: 0.02 - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -1588,6 +2127,12 @@ amount: 2 prob: 0.25 # Bonus Loot T3 + - id: Doubloon1 + prob: 0.05 + - id: Doubloon5 + prob: 0.1 + - id: ClothingBackpackMessengerPirateDecoyKitFilled + prob: 0.02 - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -1656,6 +2201,12 @@ prob: 0.3 orGroup: PirateHardPool # Bonus Loot T2 + - id: Doubloon1 + prob: 0.05 + - id: Doubloon5 + prob: 0.1 + - id: ClothingBackpackMessengerPirateDecoyKitFilled + prob: 0.02 - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -1739,6 +2290,8 @@ prob: 0.05 orGroup: SalvHardPool2 # Bonus Loot + - id: Doubloon1 + prob: 0.05 - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -1842,6 +2395,8 @@ amount: 5 prob: 0.2 # Bonus Loot T3 + - id: Doubloon1 + prob: 0.05 - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -1911,6 +2466,18 @@ - id: ClothingOuterHardsuitPrivateer prob: 0.05 # Bonus Loot T3 + - id: Doubloon5 + prob: 0.1 + - id: Doubloon5 + prob: 0.1 + - id: ModsuitCore + prob: 0.05 + - id: MedipenCombatInjector + prob: 0.05 + - id: SyringeBluespace + prob: 0.02 + - id: BluespacePillPatchCanister + prob: 0.02 - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -1971,11 +2538,31 @@ prob: 0.25 - id: MagazineLightRifleAP prob: 0.05 - # Bonus Loot + # Bonus Loot T3 + - id: Doubloon5 + prob: 0.1 + - id: Doubloon5 + prob: 0.1 + - id: ModsuitCore + prob: 0.05 + - id: MedipenCombatInjector + prob: 0.05 + - id: SyringeBluespace + prob: 0.02 + - id: BluespacePillPatchCanister + prob: 0.02 - id: SpaceCash1000 - prob: 0.5 + prob: 0.9 - id: SpaceCash500 - prob: 0.3 + prob: 0.9 + - id: SpaceCash1000 + prob: 0.7 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.5 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.25 + - id: PirateTechFabCircuitboard + prob: 0.001 - id: AirlossAutoInjector prob: 0.05 - id: PyraAutoInjector @@ -2024,10 +2611,10 @@ prob: 0.5 orGroup: Skm25Pool - id: WeaponRifleSKM24 - prob: 0.15 + prob: 0.1 orGroup: Skm25Pool - id: CombatKnife - prob: 0.4 + prob: 0.3 orGroup: Skm25Pool - id: MagazineLightRifleEmpty prob: 0.9 @@ -2059,6 +2646,8 @@ prob: 0.05 orGroup: SalvHardPool2 # Bonus Loot T1 + - id: Doubloon1 + prob: 0.05 - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 @@ -2145,6 +2734,18 @@ prob: 0.1 orGroup: ScafPool # Bonus Loot T3 + - id: Doubloon5 + prob: 0.1 + - id: Doubloon5 + prob: 0.1 + - id: ModsuitCore + prob: 0.05 + - id: MedipenCombatInjector + prob: 0.05 + - id: SyringeBluespace + prob: 0.02 + - id: BluespacePillPatchCanister + prob: 0.02 - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -2233,6 +2834,8 @@ prob: 0.05 orGroup: SalvHardPool2 # Bonus Loot T3 + - id: Doubloon1 + prob: 0.05 - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -2272,6 +2875,99 @@ sound: path: /Audio/Items/jumpsuit_equip.ogg +- type: entity + parent: BandolierBox + id: ClothingBeltBandolierT1Rifle + categories: [ HideSpawnMenu ] + components: + - type: SpawnItemsOnUse + items: + # Cash + - id: SpaceCash1000 + prob: 0.9 + - id: SpaceCash1000 + prob: 0.4 + - id: SpaceCash500 + prob: 0.2 + # Weapons + - id: CombatKnife + prob: 0.15 + - id: WeaponSubMachineGunMakeshift + prob: 0.2 + - id: WeaponSubMachineGunPPSH + prob: 0.5 + - id: MagazinePistolSubMachineGunPPSH + prob: 0.3 + - id: MagazinePistolSubMachineGunPPSH + prob: 0.25 + - id: MagazinePistolSubMachineGunPPSH + prob: 0.1 + - id: MagazinePistolSubMachineGunPPSHExtended + prob: 0.02 + - id: MagazineBoxImprovisedPistol + prob: 0.5 + - id: MagazineBoxImprovisedPistol + prob: 0.3 + - id: MagazineBoxImprovisedPistol + prob: 0.2 + # Armor + - id: ClothingHeadHelmetPirateAlt + prob: 0.15 + orGroup: SalvHardPool2 + - id: ClothingHeadHelmetPirateAlt2 + prob: 0.15 + orGroup: SalvHardPool2 + - id: ClothingOuterEVASuitPirateArmored + prob: 0.25 + orGroup: SalvHardPool2 + - id: ClothingOuterEVASuitPirateArmoredAlt + prob: 0.25 + orGroup: SalvHardPool2 + - id: ClothingOuterHardsuitPrivateer + prob: 0.1 + orGroup: SalvHardPool2 + # Bonus Loot T1 + - id: Doubloon1 + prob: 0.05 + - id: SpaceCash1000 + prob: 0.9 + - id: SpaceCash500 + prob: 0.9 + - id: SpaceCash1000 + prob: 0.7 + - id: LootSpawnerMedicalMinor + prob: 0.7 + - id: Catwalk + prob: 0.5 + - id: JugDexPlusSaline + prob: 0.15 + - id: AirlossAutoInjector + prob: 0.05 + - id: PyraAutoInjector + prob: 0.05 + - id: CombatMedipen + prob: 0.05 + - id: BruteAutoInjector + prob: 0.05 + - id: BurnAutoInjector + prob: 0.05 + - id: BruizAutoInjector + prob: 0.05 + - id: PunctAutoInjector + prob: 0.05 + - id: LacerAutoInjector + prob: 0.05 + - id: EmergencyMedipen + prob: 0.4 + - id: EmergencyMedipen + prob: 0.2 + - id: EmergencyMedipen + prob: 0.1 + - id: ClothingBackpackMessengerPirate + prob: 0.25 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + - type: entity parent: MilitaryWebbingBox id: ClothingBeltMilitaryWebbingTier3Pistol @@ -2296,6 +2992,8 @@ - id: WeaponPistolM1984 prob: 0.25 orGroup: PistolT3Pool + - id: RiotShieldStrobe + prob: 0.65 - id: MagazinePistolEmpty prob: 0.9 - id: MagazinePistolHP @@ -2308,13 +3006,55 @@ # Items - id: ClothingBeltMilitaryWebbing prob: 0.25 - # Bonus Loot T1 + # Bonus Loot T3 + - id: Doubloon5 + prob: 0.1 + - id: Doubloon5 + prob: 0.1 + - id: ModsuitCore + prob: 0.05 + - id: MedipenCombatInjector + prob: 0.05 + - id: SyringeBluespace + prob: 0.02 + - id: BluespacePillPatchCanister + prob: 0.02 + - id: SpaceCash1000 + prob: 0.9 - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 prob: 0.7 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.5 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.25 + - id: PirateTechFabCircuitboard + prob: 0.001 - id: LootSpawnerMedicalMinor prob: 0.7 + - id: AirlossAutoInjector + prob: 0.05 + - id: PyraAutoInjector + prob: 0.05 + - id: CombatMedipen + prob: 0.05 + - id: BruteAutoInjector + prob: 0.05 + - id: BurnAutoInjector + prob: 0.05 + - id: BruizAutoInjector + prob: 0.05 + - id: PunctAutoInjector + prob: 0.05 + - id: LacerAutoInjector + prob: 0.05 + - id: EmergencyMedipen + prob: 0.4 + - id: EmergencyMedipen + prob: 0.2 + - id: EmergencyMedipen + prob: 0.1 sound: path: /Audio/Items/jumpsuit_equip.ogg @@ -2335,6 +3075,8 @@ # Weapons - id: WeaponSubMachineGunSkorpion prob: 0.75 + - id: RiotBulletShield + prob: 0.65 - id: MagazinePistolSubMachineGunEmpty prob: 0.9 - id: MagazinePistolSubMachineGunHP @@ -2347,11 +3089,31 @@ # Items - id: ClothingBeltMilitaryWebbing prob: 0.25 - # Bonus Loot T1 + # Bonus Loot T3 + - id: Doubloon5 + prob: 0.1 + - id: Doubloon5 + prob: 0.1 + - id: ModsuitCore + prob: 0.05 + - id: MedipenCombatInjector + prob: 0.05 + - id: SyringeBluespace + prob: 0.02 + - id: BluespacePillPatchCanister + prob: 0.02 + - id: SpaceCash1000 + prob: 0.9 - id: SpaceCash500 prob: 0.9 - id: SpaceCash1000 prob: 0.7 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.5 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.25 + - id: PirateTechFabCircuitboard + prob: 0.001 - id: LootSpawnerMedicalMinor prob: 0.7 - id: AirlossAutoInjector @@ -2406,10 +3168,30 @@ - id: ClothingBeltSyndieWebbing prob: 0.25 # Bonus Loot T3 + - id: Doubloon5 + prob: 0.1 + - id: Doubloon5 + prob: 0.1 + - id: ModsuitCore + prob: 0.05 + - id: MedipenCombatInjector + prob: 0.05 + - id: SyringeBluespace + prob: 0.02 + - id: BluespacePillPatchCanister + prob: 0.02 - id: SpaceCash500 prob: 0.9 + - id: SpaceCash1000 + prob: 0.9 - id: SpaceCash1000 prob: 0.7 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.5 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.25 + - id: PirateTechFabCircuitboard + prob: 0.001 - id: LootSpawnerMedicalMinor prob: 0.7 - id: AirlossAutoInjector @@ -2478,10 +3260,30 @@ - id: ClothingBeltSyndieWebbing prob: 0.25 # Bonus Loot T3 + - id: Doubloon5 + prob: 0.1 + - id: Doubloon5 + prob: 0.1 + - id: ModsuitCore + prob: 0.05 + - id: MedipenCombatInjector + prob: 0.05 + - id: SyringeBluespace + prob: 0.02 + - id: BluespacePillPatchCanister + prob: 0.02 - id: SpaceCash500 prob: 0.9 + - id: SpaceCash1000 + prob: 0.9 - id: SpaceCash1000 prob: 0.7 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.5 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.25 + - id: PirateTechFabCircuitboard + prob: 0.001 - id: LootSpawnerMedicalMinor prob: 0.7 - id: AirlossAutoInjector @@ -2556,6 +3358,53 @@ prob: 0.6 - id: LootSpawnerMaterialsHighValueConstruction prob: 0.4 + # Bonus Loot T3 + - id: Doubloon5 + prob: 0.1 + - id: Doubloon5 + prob: 0.1 + - id: ModsuitCore + prob: 0.05 + - id: MedipenCombatInjector + prob: 0.05 + - id: SyringeBluespace + prob: 0.02 + - id: BluespacePillPatchCanister + prob: 0.02 + - id: SpaceCash1000 + prob: 0.9 + - id: SpaceCash500 + prob: 0.9 + - id: SpaceCash1000 + prob: 0.7 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.5 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.25 + - id: PirateTechFabCircuitboard + prob: 0.001 + - id: AirlossAutoInjector + prob: 0.05 + - id: PyraAutoInjector + prob: 0.05 + - id: CombatMedipen + prob: 0.05 + - id: BruteAutoInjector + prob: 0.05 + - id: BurnAutoInjector + prob: 0.05 + - id: BruizAutoInjector + prob: 0.05 + - id: PunctAutoInjector + prob: 0.05 + - id: LacerAutoInjector + prob: 0.05 + - id: EmergencyMedipen + prob: 0.4 + - id: EmergencyMedipen + prob: 0.2 + - id: EmergencyMedipen + prob: 0.1 sound: path: /Audio/Items/jumpsuit_equip.ogg @@ -2575,7 +3424,7 @@ prob: 0.2 # Weapons - id: WeaponLightMachineGunRPD - prob: 0.05 + prob: 0.15 # Items - id: MagazineRPD orGroup: AmmoMGPool @@ -2600,6 +3449,53 @@ prob: 0.6 - id: LootSpawnerMaterialsHighValueConstruction prob: 0.4 + # Bonus Loot T3 + - id: Doubloon5 + prob: 0.1 + - id: Doubloon5 + prob: 0.1 + - id: ModsuitCore + prob: 0.05 + - id: MedipenCombatInjector + prob: 0.05 + - id: SyringeBluespace + prob: 0.02 + - id: BluespacePillPatchCanister + prob: 0.02 + - id: SpaceCash1000 + prob: 0.9 + - id: SpaceCash500 + prob: 0.9 + - id: SpaceCash1000 + prob: 0.7 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.5 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.25 + - id: PirateTechFabCircuitboard + prob: 0.001 + - id: AirlossAutoInjector + prob: 0.05 + - id: PyraAutoInjector + prob: 0.05 + - id: CombatMedipen + prob: 0.05 + - id: BruteAutoInjector + prob: 0.05 + - id: BurnAutoInjector + prob: 0.05 + - id: BruizAutoInjector + prob: 0.05 + - id: PunctAutoInjector + prob: 0.05 + - id: LacerAutoInjector + prob: 0.05 + - id: EmergencyMedipen + prob: 0.4 + - id: EmergencyMedipen + prob: 0.2 + - id: EmergencyMedipen + prob: 0.1 sound: path: /Audio/Items/jumpsuit_equip.ogg @@ -2659,12 +3555,54 @@ - id: PatchBrute prob: 0.15 # Bonus Loot T3 + - id: Doubloon5 + prob: 0.1 + - id: Doubloon5 + prob: 0.1 + - id: ModsuitCore + prob: 0.05 + - id: MedipenCombatInjector + prob: 0.05 + - id: SyringeBluespace + prob: 0.02 + - id: BluespacePillPatchCanister + prob: 0.02 - id: SpaceCash1000 prob: 0.9 + - id: SpaceCash500 + prob: 0.9 - id: LootSpawnerMedicalMinor prob: 0.7 - id: SpaceCash1000 prob: 0.7 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.5 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.25 + - id: PirateTechFabCircuitboard + prob: 0.001 + - id: AirlossAutoInjector + prob: 0.05 + - id: PyraAutoInjector + prob: 0.05 + - id: CombatMedipen + prob: 0.05 + - id: BruteAutoInjector + prob: 0.05 + - id: BurnAutoInjector + prob: 0.05 + - id: BruizAutoInjector + prob: 0.05 + - id: PunctAutoInjector + prob: 0.05 + - id: LacerAutoInjector + prob: 0.05 + - id: EmergencyMedipen + prob: 0.4 + - id: EmergencyMedipen + prob: 0.2 + - id: EmergencyMedipen + prob: 0.1 - id: LootSpawnerMaterials amount: 2 prob: 0.7 @@ -2733,12 +3671,54 @@ - id: PatchBrute prob: 0.15 # Bonus Loot T3 + - id: Doubloon5 + prob: 0.1 + - id: Doubloon5 + prob: 0.1 + - id: ModsuitCore + prob: 0.05 + - id: MedipenCombatInjector + prob: 0.05 + - id: SyringeBluespace + prob: 0.02 + - id: BluespacePillPatchCanister + prob: 0.02 - id: SpaceCash1000 prob: 0.9 + - id: SpaceCash500 + prob: 0.9 - id: LootSpawnerMedicalMinor prob: 0.7 - id: SpaceCash1000 prob: 0.7 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.5 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.25 + - id: PirateTechFabCircuitboard + prob: 0.001 + - id: AirlossAutoInjector + prob: 0.05 + - id: PyraAutoInjector + prob: 0.05 + - id: CombatMedipen + prob: 0.05 + - id: BruteAutoInjector + prob: 0.05 + - id: BurnAutoInjector + prob: 0.05 + - id: BruizAutoInjector + prob: 0.05 + - id: PunctAutoInjector + prob: 0.05 + - id: LacerAutoInjector + prob: 0.05 + - id: EmergencyMedipen + prob: 0.4 + - id: EmergencyMedipen + prob: 0.2 + - id: EmergencyMedipen + prob: 0.1 - id: LootSpawnerMaterials amount: 2 prob: 0.7 @@ -2815,12 +3795,54 @@ - id: PatchBrute prob: 0.15 # Bonus Loot T3 + - id: Doubloon5 + prob: 0.1 + - id: Doubloon5 + prob: 0.1 + - id: ModsuitCore + prob: 0.05 + - id: MedipenCombatInjector + prob: 0.05 + - id: SyringeBluespace + prob: 0.02 + - id: BluespacePillPatchCanister + prob: 0.02 - id: SpaceCash1000 prob: 0.9 + - id: SpaceCash500 + prob: 0.9 - id: LootSpawnerMedicalMinor prob: 0.7 - id: SpaceCash1000 prob: 0.7 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.5 + - id: LootSpawnerMaterialsHighValueConstruction + prob: 0.25 + - id: PirateTechFabCircuitboard + prob: 0.001 + - id: AirlossAutoInjector + prob: 0.05 + - id: PyraAutoInjector + prob: 0.05 + - id: CombatMedipen + prob: 0.05 + - id: BruteAutoInjector + prob: 0.05 + - id: BurnAutoInjector + prob: 0.05 + - id: BruizAutoInjector + prob: 0.05 + - id: PunctAutoInjector + prob: 0.05 + - id: LacerAutoInjector + prob: 0.05 + - id: EmergencyMedipen + prob: 0.4 + - id: EmergencyMedipen + prob: 0.2 + - id: EmergencyMedipen + prob: 0.1 - id: LootSpawnerMaterials amount: 2 prob: 0.7 @@ -2950,6 +3972,18 @@ - id: Tourniquet prob: 0.25 # Bonus Loot T4 + - id: Doubloon5 + prob: 0.1 + - id: Doubloon5 + prob: 0.1 + - id: ModsuitCore + prob: 0.05 + - id: MedipenCombatInjector + prob: 0.05 + - id: SyringeBluespace + prob: 0.02 + - id: BluespacePillPatchCanister + prob: 0.02 - id: SpaceCash2500 prob: 0.9 - id: PirateTechFabCircuitboard @@ -3135,6 +4169,12 @@ - id: WeaponCrusherBroadAxe prob: 0.7 # Bonus Loot T3 + - id: Doubloon1 + prob: 0.05 + - id: Doubloon5 + prob: 0.1 + - id: ClothingBackpackMessengerPirateDecoyKitFilled + prob: 0.02 - id: SpaceCash1000 prob: 0.9 - id: SpaceCash500 @@ -3228,3 +4268,4 @@ prob: 0.4 sound: path: /Audio/Items/jumpsuit_equip.ogg + diff --git a/Resources/Prototypes/_Sunrise/NPCs/pirates.yml b/Resources/Prototypes/_Sunrise/NPCs/pirates.yml index f54e3d32fa..c8efb2e34b 100644 --- a/Resources/Prototypes/_Sunrise/NPCs/pirates.yml +++ b/Resources/Prototypes/_Sunrise/NPCs/pirates.yml @@ -18,8 +18,13 @@ 0: Alive 120: Critical 140: Dead + - type: PassiveDamage + allowedStates: + - Alive + - Critical + damageCap: 135 - type: Stamina - baseCritThreshold: 125 + baseCritThreshold: 150 - type: DamageStateVisuals - type: RotationVisuals defaultRotation: 90 @@ -33,17 +38,6 @@ rechargeCooldown: 3 rechargeSound: path: /Audio/_Sunrise/Effects/silence.ogg - - type: MeleeWeapon - attackRate: 1.0 - altDisarm: false - angle: 0 - animation: WeaponArcPunch - damage: - types: - Slash: 15 - Structural: 20 - soundHit: - path: /Audio/Weapons/bladeslice.ogg - type: Strippable - type: UserInterface interfaces: @@ -52,6 +46,9 @@ - type: ToggleableNightVision effect: EffectNightVisionPirate - type: ComplexInteraction + - type: AnomalyAccent + - type: TTS + voice: necrophos_dota_2 - type: entity abstract: true @@ -62,7 +59,7 @@ - type: MobThresholds thresholds: 0: Alive - 85: Critical + 80: Critical 100: Dead - type: PassiveDamage allowedStates: @@ -103,6 +100,34 @@ - type: Damageable damageModifierSet: MobPirateT3 +- type: entity + abstract: true + id: MobPirateSparkEffectBase + components: + - type: CyborgSparkEffect + - type: Reflect + reflectProb: 0.05 + +- type: entity + abstract: true + parent: [MobPirateBase, MobPirateSparkEffectBase] + id: MobPirateBorgBase + components: + - type: Stamina + baseCritThreshold: 500 + - type: Damageable + damageModifierSet: MobPirateT2 + - type: Bloodstream + bloodReferenceSolution: + reagents: + - ReagentId: WeldingFuel + Quantity: 200 + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepCyborgLegs + - type: Reflect + reflectProb: 0.1 + # region Spawners - type: entity name: pirate T1 spawner @@ -135,11 +160,16 @@ - MobPirateT1MonkeyFireBomb - MobPirateT1MonkeyEDagger - MobPirateT1Hunter + - MobPirateT1HunterSmash - MobPirateT1ECutlass - MobPirateT1EPickaxe - MobPirateT1Flintlock - MobPirateT1PlasmaCutter - MobPirateT1ScrapRifle + - MobPirateT1Rifle + - MobPirateT1BorgAssault + - MobPirateT1BorgMining + - MobPirateT1BorgDerelict rareChance: 0.15 - type: entity @@ -174,6 +204,8 @@ - MobPirateT2Cannoball - MobPirateT2Mech - MobPirateT2Juggernaut + - MobPirateT1BorgAssault + - MobPirateT1BorgMining rareChance: 0.15 - type: entity @@ -206,6 +238,7 @@ - MobPirateT3Grenadier - MobPirateT3Infiltrator - MobPirateT3Sniper + - MobPirateT1BorgAssault rareChance: 0.15 # Variations @@ -268,7 +301,7 @@ proto: ShellShotgunImprovised - type: Gun showExamineText: false - fireRate: 0.5 + fireRate: 0.4 selectedMode: SemiAuto availableModes: - SemiAuto @@ -356,12 +389,12 @@ state: inhand-left - type: BasicEntityAmmoProvider proto: FireBomb - capacity: 5 - count: 5 + capacity: 3 + count: 3 - type: Gun - projectileSpeed: 4.5 + projectileSpeed: 6 showExamineText: false - fireRate: 1 + fireRate: 0.5 minAngle: 45 maxAngle: 120 selectedMode: SemiAuto @@ -427,7 +460,7 @@ - type: entity name: Scrap boarder description: Rookie raider sent first through the breach. Usually doesn’t come back, but makes a great distraction. - parent: [MobMovementSpeedModifierEVAMelee, MobPirateBase, MobHumanoidHostileAISimpleMelee] + parent: [MobMovementSpeedModifierEVAMelee, MobPirateBase, MobHumanoidHostileAISimpleMelee, MobPirateSparkEffectBase] id: MobPirateT1Knife components: - type: Loadout @@ -447,6 +480,24 @@ - sprite: _Sunrise/Clothing/Head/Helmets/pirate_eva.rsi state: on-equipped-HELMET shader: unshaded + - type: RechargeBasicEntityAmmo + rechargeCooldown: 33 + rechargeSound: + path: /Audio/_Sunrise/Abductor/holopaper_open.ogg + - type: BasicEntityAmmoProvider + proto: BulletGrenadeFlashBang + capacity: 1 + count: 1 + - type: Gun + fireRate: 1 + selectedMode: SemiAuto + minAngle: 30 + maxAngle: 90 + projectileSpeed: 10 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Effects/drop.ogg - type: entity name: Scrap boarder @@ -561,7 +612,7 @@ - sprite: Clothing/Head/Hardsuits/goliathhelm.rsi state: equipped-head-unshaded-reptilian shader: unshaded - - sprite: _Sunrise/Objects/Weapons/Melee/crusher_broadaxe-inhands.rsi + - sprite: Objects/Weapons/Melee/crusher_glaive-inhands.rsi state: wielded-inhand-left - type: Gun soundGunshot: /Audio/Weapons/plasma_cutter.ogg @@ -588,9 +639,9 @@ wideAnimationRotation: -135 damage: types: - Blunt: 8 - Slash: 12 - Structural: 50 + Blunt: 2 + Slash: 8 + Structural: 30 bluntStaminaDamageFactor: 1 soundHit: collection: MetalThud @@ -603,6 +654,77 @@ minRange: 0 maxRange: 4 +- type: entity + name: goliath smasher + parent: [MobMovementSpeedModifierEVAMelee, MobPirateBaseT2, MobHumanoidHostileAISimpleMelee] + id: MobPirateT1HunterSmash + description: Veteran scrappers, these salvagers are bulky enough to use heavy crusher-axe. + components: + - type: Loadout + prototypes: + - MobPirateT1HunterSmashGear + - type: Sprite + scale: 1.2,1.08 + drawdepth: Mobs + layers: + - sprite: _Sunrise/Mobs/Species/Templates/human.rsi + state: human + - sprite: _Sunrise/Clothing/OuterClothing/Hardsuits/goliath_mining.rsi + state: equipped-OUTERCLOTHING + - sprite: _Sunrise/Clothing/Head/Hardsuits/goliathhelm.rsi + state: equipped-head + - sprite: _Sunrise/Clothing/Head/Hardsuits/goliathhelm.rsi + state: equipped-head-light + shader: unshaded + - sprite: _Sunrise/Objects/Weapons/Melee/crusher_broadaxe-inhands.rsi + state: wielded-inhand-left + - type: Gun + soundGunshot: /Audio/Weapons/plasma_cutter.ogg + fireRate: 1 + useKey: false + - type: RechargeBasicEntityAmmo + rechargeCooldown: 3 + rechargeSound: + path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg + - type: BasicEntityAmmoProvider + proto: BulletCharge + capacity: 1 + count: 1 + - type: LeechOnMarker + leech: + groups: + Brute: -30 + types: + Heat: -10 + Bloodloss: -5 + Mangleness: -5 + - type: MeleeWeapon + attackRate: 1 + wideAnimationRotation: -135 + damage: + types: + Blunt: 8 + Slash: 12 + Structural: 50 + bluntStaminaDamageFactor: 1 + soundHit: + collection: MetalThud + - type: JumpAbility + jumpDistance: 6 + jumpSound: /Audio/Effects/stealthoff.ogg + - type: HellSpawnRush + blacklist: + tags: + - Hellspawn + - GlassBeaker + - DrinkBottle + - DrinkCan + - type: NPCUseActionWhenTargetInRange + actions: + - actionId: ActionGravityJump + minRange: 2 + maxRange: 0 + # region Ranged Tier 1 - type: entity name: Scrap salvager @@ -935,6 +1057,51 @@ soundEmpty: path: /Audio/_Sunrise/Weapons/Guns/Rifles/skm24/skm_cocked.ogg +- type: entity + name: Scrap veteran gunner + description: A hardened scrapper veteran who keeps a PPSH close and a bandolier closer. + parent: [MobMovementSpeedModifierEVARanged, MobPirateBase] + id: MobPirateT1Rifle + components: + - type: Loadout + prototypes: + - MobPirateT1RifleGear + - type: Sprite + drawdepth: Mobs + layers: + - sprite: _Sunrise/Clothing/OuterClothing/Hardsuits/privateer.rsi + state: equipped-OUTERCLOTHING + - sprite: _Sunrise/Clothing/Head/Hardsuits/privateer.rsi + state: equipped-HELMET + - sprite: _Sunrise/Clothing/Head/Hardsuits/privateer.rsi + state: on-equipped-HELMET + shader: unshaded + - sprite: Clothing/Head/Hats/ushanka.rsi + state: up-equipped-HELMET + - type: BatteryAmmoProvider + proto: CartridgePistolImprovised + fireCost: 1 + - type: BatterySelfRecharger + autoRechargePauseTime: 1.5 + autoRechargeRate: 99 + - type: Battery + maxCharge: 10 + startingCharge: 10 + - type: Gun + showExamineText: false + fireRate: 15 + selectedMode: FullAuto + minAngle: 15 + maxAngle: 30 + angleIncrease: 1 + angleDecay: 6 + availableModes: + - FullAuto + soundGunshot: + path: /Audio/_Starlight/Weapons/Guns/Gunshots/ppsh.ogg + soundEmpty: + path: /Audio/_Sunrise/Weapons/Guns/Rifles/skm24/skm_cocked.ogg + - type: entity name: Scrap salvager parent: [MobMovementSpeedModifierEVARanged, MobPirateBase] @@ -982,11 +1149,129 @@ mask: /Textures/Effects/LightMasks/cone.png color: "#FFC458FF" +- type: entity + name: Derelict assault borg + description: A broken assault borg rebuilt for pirate raids. + parent: [MobMovementSpeedModifierRanged, MobPirateBorgBase] + id: MobPirateT1BorgAssault + components: + - type: Loadout + prototypes: + - MobPirateT1BorgAssaultGear + - type: Sprite + drawdepth: Mobs + noRot: true + sprite: Mobs/Silicon/chassis.rsi + layers: + - state: synd_sec_derelict + - state: synd_sec_e + shader: unshaded + - type: BatteryAmmoProvider + proto: CartridgeLightRifleImprovised + fireCost: 1 + - type: BatterySelfRecharger + autoRechargePauseTime: 2 + autoRechargeRate: 99 + - type: Battery + maxCharge: 15 + startingCharge: 15 + - type: Gun + showExamineText: false + fireRate: 8 + selectedMode: FullAuto + minAngle: 8 + maxAngle: 60 + angleIncrease: 2 + angleDecay: 15 + availableModes: + - FullAuto + soundGunshot: + path: /Audio/_Sunrise/Weapons/Guns/Rifles/skm24/skm_shot.ogg + params: + pitch: 0.8 + soundEmpty: + path: /Audio/_Sunrise/Weapons/Guns/Rifles/skm24/skm_cocked.ogg + +- type: entity + name: Derelict mining borg + description: A mining borg stripped down and wired for raiding. + parent: [MobMovementSpeedModifierRanged, MobPirateBorgBase] + id: MobPirateT1BorgMining + components: + - type: Loadout + prototypes: + - MobPirateT1BorgMiningGear + - type: Sprite + drawdepth: Mobs + noRot: true + sprite: Mobs/Silicon/chassis.rsi + layers: + - state: miner_derelict + map: ["movement"] + - state: miner_e_r + shader: unshaded + - type: SpriteMovement + movementLayers: + movement: + state: miner_moving_derelict + noMovementLayers: + movement: + state: miner_derelict + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepCyborgSpider + params: + volume: -15 + - type: RechargeBasicEntityAmmo + rechargeCooldown: 0.6 + rechargeSound: + path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg + - type: BasicEntityAmmoProvider + proto: BulletKinetic + capacity: 1 + count: 1 + - type: Gun + showExamineText: false + fireRate: 0.5 + minAngle: 8 + maxAngle: 18 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg + +- type: entity + name: Derelict borg brawler + description: A derelict borg that fights with brute force. + parent: [MobMovementSpeedModifierMelee, MobPirateBorgBase, MobHumanoidHostileAISimpleMelee] + id: MobPirateT1BorgDerelict + components: + - type: Loadout + prototypes: + - MobPirateT1BorgDerelictGear + - type: Sprite + drawdepth: Mobs + noRot: true + sprite: Mobs/Silicon/chassis.rsi + layers: + - state: derelict + - state: derelict_e_r + shader: unshaded + - type: MeleeWeapon + attackRate: 1 + altDisarm: false + angle: 0 + animation: WeaponArcPunch + damage: + types: + Blunt: 8 + - type: HellSpawnInvincibility + # region Melee Tier 2 - type: entity name: pirate boarder description: Shock troopers that specialize in using the element of surprise and swift, aggressive action to achieve their objectives. - parent: [MobMovementSpeedModifierEVAMelee, MobPirateBaseT2, MobHumanoidHostileAISimpleMelee] + parent: [MobMovementSpeedModifierEVAMelee, MobPirateBaseT2, MobHumanoidHostileAISimpleMelee, MobPirateSparkEffectBase] id: MobPirateT2Cutlass components: - type: Loadout @@ -1023,7 +1308,7 @@ state: equipped-HELMET-unshaded shader: unshaded - type: BasicEntityAmmoProvider - proto: Bola + proto: BolaSecurity capacity: 1 count: 1 - type: RechargeBasicEntityAmmo @@ -1040,7 +1325,7 @@ - type: entity name: pirate breacher description: A boarding team member armed with a sledgehammer, capable of breaking through an airlock — or someone’s skull. - parent: [MobMovementSpeedModifierEVAMelee, MobPirateBaseT2, MobHumanoidHostileAISimpleMelee] + parent: [MobMovementSpeedModifierEVAMelee, MobPirateBaseT2, MobHumanoidHostileAISimpleMelee, MobPirateSparkEffectBase] id: MobPirateT2Sledgehammer components: - type: Loadout @@ -1060,11 +1345,31 @@ state: equipped-INNERCLOTHING - sprite: Clothing/Head/Hats/gladiator.rsi state: equipped-HELMET + - type: BasicEntityAmmoProvider + proto: BolaSecurity + capacity: 1 + count: 1 + - type: RechargeBasicEntityAmmo + rechargeCooldown: 20 + - type: Gun + projectileSpeed: 13 + showExamineText: false + fireRate: 0.1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: /Audio/Weapons/bolathrow.ogg + - type: SlowOnDamage + speedModifierThresholds: + 40: 1.05 + 80: 1.15 + 110: 1.25 + 130: 1.3 - type: entity name: pirate breacher description: Drilling in the name of... drilling. No rock formation or shuttle wall can withstand the power of mining drill gauthlet. - parent: [MobMovementSpeedModifierEVAMelee, MobPirateBaseT2, MobHumanoidHostileAISimpleMelee] + parent: [MobMovementSpeedModifierEVAMelee, MobPirateBaseT2, MobHumanoidHostileAISimpleMelee, MobPirateSparkEffectBase] id: MobPirateT2GauntletDrill components: - type: Loadout @@ -1083,7 +1388,7 @@ - sprite: Clothing/Head/Hats/gladiator.rsi state: equipped-HELMET - type: RechargeBasicEntityAmmo - rechargeCooldown: 35 + rechargeCooldown: 20 rechargeSound: path: /Audio/_Sunrise/Abductor/holopaper_open.ogg - type: BasicEntityAmmoProvider @@ -1109,7 +1414,7 @@ - type: entity name: Big Yarrke description: A heavy ancient mech for cold harsh realities of deep space. It has built-in Mining Industrial Drill. - parent: MobPirateBaseT2 + parent: [MobPirateBaseT2, MobPirateSparkEffectBase] id: MobPirateT2Mech components: - type: Loadout @@ -1212,7 +1517,7 @@ - type: entity name: Jugger Murmillo description: Clad in a heavily armored ancient spacesuit. Slow but incredibly resilient. - parent: MobPirateBaseT2 + parent: [MobPirateBaseT2, MobPirateSparkEffectBase] id: MobPirateT2Juggernaut components: - type: Loadout @@ -1620,7 +1925,7 @@ proto: CartridgeAntiMateriel - type: Gun showExamineText: false - fireRate: 0.25 + fireRate: 0.1 selectedMode: SemiAuto availableModes: - SemiAuto @@ -1716,7 +2021,7 @@ - sprite: Objects/Tanks/oxygen.rsi state: equipped-SUITSTORAGE - type: BasicEntityAmmoProvider - proto: Bola + proto: BolaSyndicateBiocode capacity: 1 count: 1 - type: RechargeBasicEntityAmmo @@ -1813,7 +2118,7 @@ - type: entity name: Privateer boarder description: A pirate who has found sponsors, well-armed and suitably dangerous. - parent: [MobMovementSpeedModifierEVAMelee, MobPirateBaseT3] + parent: [MobMovementSpeedModifierEVAMelee, MobPirateBaseT3, MobPirateSparkEffectBase] id: MobPirateT3ShieldSMG components: - type: Loadout @@ -2394,7 +2699,7 @@ - type: entity name: Captain Rustfist description: An old salvage veteran, more metal than man. His fists creak, his armor’s held together by bolts and faith, and if he swings at you, it’s best to play dead and hope he buys it. - parent: [MobHostileBossBase, MobPirateBase] + parent: [MobHostileBossBase, MobPirateBase, MobPirateSparkEffectBase] id: MobPirateT1Boss components: - type: Loadout @@ -2496,7 +2801,7 @@ - type: entity name: Skull House description: The Heavy Mech USSP, a communist variant of the Durand, features stronger armor and a powerful machine gun. - parent: [MobHostileBossBase, MobPirateBaseT3] + parent: [MobHostileBossBase, MobPirateBaseT3, MobPirateSparkEffectBase] id: MobPirateT3Boss components: - type: Loadout @@ -2533,8 +2838,8 @@ - type: MobThresholds thresholds: 0: Alive - 649: Critical - 650: Dead + 699: Critical + 700: Dead - type: PassiveDamage allowedStates: - Alive @@ -2542,10 +2847,10 @@ damageCap: 600 - type: SlowOnDamage speedModifierThresholds: - 100: 0.9 - 300: 0.8 - 400: 0.7 - 550: 0.6 + 250: 0.9 + 350: 0.8 + 450: 0.7 + 600: 0.6 - type: Stamina baseCritThreshold: 9999 - type: MovementSpeedModifier diff --git a/Resources/Prototypes/_Sunrise/Procedural/dungeon_configs.yml b/Resources/Prototypes/_Sunrise/Procedural/dungeon_configs.yml index 2d65c0692b..106256cf46 100644 --- a/Resources/Prototypes/_Sunrise/Procedural/dungeon_configs.yml +++ b/Resources/Prototypes/_Sunrise/Procedural/dungeon_configs.yml @@ -7,13 +7,6 @@ tags: - SalvageSyndicateBase presets: - # Duplicates are intentional to weight SyndicateBaseLarge to ~40%. - - Bucket - - Wow - - SpaceShip - - Tall - - SyndicateBaseLarge - - SyndicateBaseLarge - SyndicateBaseLarge - !type:CorridorDunGen @@ -112,8 +105,6 @@ id: SyndicateBaseWallMounts table: !type:GroupSelector children: - - id: VendingMachineWallMedicalCivilian - weight: 0.3 - id: IntercomCommon weight: 0.2 - id: IntercomConstructed @@ -121,9 +112,7 @@ - id: StationMapBroken weight: 0.15 - id: ComputerPirateExchangerWallmount - weight: 0.02 - - id: WallMountATM - weight: 0.2 + weight: 0.05 - id: DefibrillatorCabinetFilled weight: 0.5 - id: DefibrillatorCabinetFilledOpen @@ -184,3 +173,7 @@ weight: 0.3 - id: PoweredlightEmpty weight: 0.8 + - id: VendingMachineWallMedicalCivilian + weight: 0.5 + - id: VendingMachineWallMedical + weight: 0.5 diff --git a/Resources/Prototypes/_Sunrise/Procedural/dungeon_presets.yml b/Resources/Prototypes/_Sunrise/Procedural/dungeon_presets.yml index 173a052f58..d8c32d9013 100644 --- a/Resources/Prototypes/_Sunrise/Procedural/dungeon_presets.yml +++ b/Resources/Prototypes/_Sunrise/Procedural/dungeon_presets.yml @@ -9,3 +9,39 @@ - 44,0,55,7 - 44,10,62,15 - 44,18,55,21 + - 70,0,87,5 + - 92,0,109,5 + - 114,0,127,3 + - 132,0,145,3 + - 150,0,163,3 + - 168,0,179,5 + - 184,0,195,5 + - 70,10,81,15 + - 86,10,93,17 + - 98,10,105,17 + - 110,10,117,17 + - 122,10,129,17 + - 134,10,141,15 + - 146,10,153,15 + - 158,10,165,15 + - 170,10,177,15 + - 182,10,189,15 + - 194,10,201,15 + - 70,22,77,25 + - 82,22,89,25 + - 94,22,101,25 + - 106,22,113,25 + - 118,22,125,25 + - 130,22,137,25 + - 142,22,147,27 + - 152,22,157,27 + - 162,22,167,27 + - 172,22,177,27 + - 182,22,187,27 + - 192,22,197,27 + - 202,22,205,27 + - 70,32,73,37 + - 78,32,81,37 + - 86,32,89,37 + - 94,32,97,37 + - 102,32,105,37 diff --git a/Resources/Prototypes/_Sunrise/Procedural/dungeon_room_packs.yml b/Resources/Prototypes/_Sunrise/Procedural/dungeon_room_packs.yml index 8ab967a3a3..4ad5eed401 100644 --- a/Resources/Prototypes/_Sunrise/Procedural/dungeon_room_packs.yml +++ b/Resources/Prototypes/_Sunrise/Procedural/dungeon_room_packs.yml @@ -27,3 +27,51 @@ size: 11,3 rooms: - 0,0,11,3 + +- type: dungeonRoomPack + id: SyndicateBase17x5 + size: 17,5 + rooms: + - 0,0,17,5 + +- type: dungeonRoomPack + id: SyndicateBase13x3 + size: 13,3 + rooms: + - 0,0,13,3 + +- type: dungeonRoomPack + id: SyndicateBase11x5 + size: 11,5 + rooms: + - 0,0,11,5 + +- type: dungeonRoomPack + id: SyndicateBase7x7 + size: 7,7 + rooms: + - 0,0,7,7 + +- type: dungeonRoomPack + id: SyndicateBase7x5 + size: 7,5 + rooms: + - 0,0,7,5 + +- type: dungeonRoomPack + id: SyndicateBase7x3 + size: 7,3 + rooms: + - 0,0,7,3 + +- type: dungeonRoomPack + id: SyndicateBase5x5 + size: 5,5 + rooms: + - 0,0,5,5 + +- type: dungeonRoomPack + id: SyndicateBase3x5 + size: 3,5 + rooms: + - 0,0,3,5 diff --git a/Resources/Prototypes/_Sunrise/Procedural/salvage_factions.yml b/Resources/Prototypes/_Sunrise/Procedural/salvage_factions.yml index 8e08c8ccb2..154286f31d 100644 --- a/Resources/Prototypes/_Sunrise/Procedural/salvage_factions.yml +++ b/Resources/Prototypes/_Sunrise/Procedural/salvage_factions.yml @@ -21,6 +21,9 @@ - proto: MobPirateT1Hunter cost: 5 prob: 0.1 + - proto: MobPirateT1HunterSmash + cost: 6 + prob: 0.08 # range - proto: MobPirateT1Pistol cost: 2 @@ -55,9 +58,22 @@ - proto: MobPirateT1ScrapRifle cost: 6 prob: 0.1 + - proto: MobPirateT1Rifle + cost: 6 + prob: 0.1 + # borgs + - proto: MobPirateT1BorgAssault + cost: 5 + prob: 0.01 + - proto: MobPirateT1BorgMining + cost: 3 + prob: 0.05 + - proto: MobPirateT1BorgDerelict + cost: 2 + prob: 0.07 - proto: MobPirateT1Boss cost: 10 - prob: 0.04 + prob: 0.05 configs: DefenseStructure: ComputerPirateExchanger Megafauna: MobPirateT1Boss @@ -108,10 +124,20 @@ prob: 0.04 - proto: MobPirateT2Mech cost: 7 - prob: 0.04 + prob: 0.03 - proto: MobPirateT2Juggernaut cost: 7 prob: 0.04 + # borgs + - proto: MobPirateT1BorgAssault + cost: 3 + prob: 0.04 + - proto: MobPirateT1BorgMining + cost: 2 + prob: 0.06 + - proto: MobPirateT1BorgDerelict + cost: 2 + prob: 0.1 - proto: MobPirateT2Boss cost: 10 prob: 0.02 @@ -154,23 +180,33 @@ prob: 0.1 - proto: MobPirateT3Revolver cost: 2 - prob: 0.1 + prob: 0.08 # rare - proto: MobPirateT3L6 cost: 5 prob: 0.04 - proto: MobPirateT3RPD cost: 5 - prob: 0.04 + prob: 0.05 - proto: MobPirateT3Grenadier - cost: 7 - prob: 0.04 + cost: 5 + prob: 0.05 - proto: MobPirateT3Infiltrator - cost: 7 + cost: 5 prob: 0.04 - proto: MobPirateT3Sniper - cost: 7 - prob: 0.04 + cost: 5 + prob: 0.03 + # borgs + - proto: MobPirateT1BorgAssault + cost: 1 + prob: 0.05 + - proto: MobPirateT1BorgMining + cost: 1 + prob: 0.02 + - proto: MobPirateT1BorgDerelict + cost: 1 + prob: 0.02 - proto: MobPirateT3Boss cost: 10 prob: 0.02 diff --git a/Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/soda.yml index 52efe25f8b..217f2f6af8 100644 --- a/Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/_Sunrise/Reagents/Consumable/Drink/soda.yml @@ -51,7 +51,7 @@ conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:AdjustReagent reagent: ChangelingStingSunrise amount: -1000 @@ -59,14 +59,14 @@ conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:Polymorph prototype: ChangelingStingReptilian probability: 0.167 conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:AdjustReagent reagent: ChangelingStingSunrise amount: -1000 @@ -74,14 +74,14 @@ conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:Polymorph prototype: ChangelingStingTajaran probability: 0.25 conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:AdjustReagent reagent: ChangelingStingSunrise amount: -1000 @@ -89,14 +89,14 @@ conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:Polymorph prototype: ChangelingStingSlime probability: 0.333 conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:AdjustReagent reagent: ChangelingStingSunrise amount: -1000 @@ -104,14 +104,14 @@ conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:Polymorph prototype: ChangelingStingMoth probability: 0.417 conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:AdjustReagent reagent: ChangelingStingSunrise amount: -1000 @@ -119,14 +119,14 @@ conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:Polymorph prototype: ChangelingStingSwine probability: 0.5 conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:AdjustReagent reagent: ChangelingStingSunrise amount: -1000 @@ -134,14 +134,14 @@ conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:Polymorph prototype: ChangelingStingResomi probability: 0.583 conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:AdjustReagent reagent: ChangelingStingSunrise amount: -1000 @@ -149,14 +149,14 @@ conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:Polymorph prototype: ChangelingStingVox probability: 0.667 conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:AdjustReagent reagent: ChangelingStingSunrise amount: -1000 @@ -164,14 +164,14 @@ conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:Polymorph prototype: ChangelingStingVulpkanin probability: 0.75 conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:AdjustReagent reagent: ChangelingStingSunrise amount: -1000 @@ -179,14 +179,14 @@ conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:Polymorph prototype: ChangelingStingFelinid probability: 0.833 conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:AdjustReagent reagent: ChangelingStingSunrise amount: -1000 @@ -194,14 +194,14 @@ conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:Polymorph prototype: ChangelingStingHumanoidXeno probability: 0.917 conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:AdjustReagent reagent: ChangelingStingSunrise amount: -1000 @@ -209,14 +209,14 @@ conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:Polymorph prototype: ChangelingStingHumanRename probability: 1 conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - !type:AdjustReagent reagent: ChangelingStingSunrise amount: -1000 @@ -224,7 +224,7 @@ conditions: - !type:ReagentCondition reagent: ChangelingStingSunrise - min: 5 + min: 25 - type: reagent id: DrGibbSunrise diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Cargo/mining_specialist.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Cargo/mining_specialist.yml index df19ec6cdd..358f29c985 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Cargo/mining_specialist.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Cargo/mining_specialist.yml @@ -19,6 +19,8 @@ - Mining - Maintenance - External + extendedAccess: + - CargoPurchaseAccess - type: startingGear id: MiningSpecialistGear diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml index d0228beae4..3ee36ef2f2 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml @@ -10,7 +10,7 @@ - Lawyer - NtrOfficer -- type: department # Surnise-Blueshield +- type: department # Sunrise-Blueshield id: BlueShield name: department-Blueshield description: department-Blueshield-description diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/Expeditions.xml b/Resources/ServerInfo/Guidebook/_Sunrise/Expeditions.xml new file mode 100644 index 0000000000..a5c1ba1e77 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/Expeditions.xml @@ -0,0 +1,6 @@ + + # Экспедиции + + Здесь собраны справочники по враждебным фракциям, встречающимся на утилизационных экспедициях. + Используйте эти материалы, чтобы распознавать противников по экипировке и уровню угрозы. + diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/MobsHostileExpedition/carps.xml b/Resources/ServerInfo/Guidebook/_Sunrise/MobsHostileExpedition/carps.xml new file mode 100644 index 0000000000..aa17f85ed8 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/MobsHostileExpedition/carps.xml @@ -0,0 +1,107 @@ + + # Карпы + + Космические карпы - агрессивные хищники, встречающиеся на экспедициях утилизации. + Большинство вариантов летают и способны обходить низкие препятствия. + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # Известные варианты + # "Карп" + + Базовый вариант экспедиционного карпа. + + [color=#a4885c]Летающий[/color]: существо парит над поверхностью и может обходить низкие препятствия. + + + + + - [bold][color=#a4885c]Пороги здоровья:[/color][/bold] 50 + - [bold][color=#a4885c]Скорость:[/color][/bold] 3.5 м/с + - [bold][color=#a4885c]Урон (тип):[/color][/bold] 6 [color=red]Slash[/color] + - [bold][color=#a4885c]Сопротивления:[/color][/bold] нет + - [bold][color=#a4885c]Особые способности:[/color][/bold] Летающий + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # "Магикарп" + + Редкая разновидность карпа. Магии не замечено. + + [color=#a4885c]Летающий[/color]: существо парит над поверхностью и может обходить низкие препятствия. + + + + + - [bold][color=#a4885c]Пороги здоровья:[/color][/bold] 40 + - [bold][color=#a4885c]Скорость:[/color][/bold] 3.5 м/с + - [bold][color=#a4885c]Урон (тип):[/color][/bold] 5 [color=red]Blunt[/color], 7 [color=red]Slash[/color] + - [bold][color=#a4885c]Сопротивления:[/color][/bold] нет + - [bold][color=#a4885c]Особые способности:[/color][/bold] Летающий + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # "Голокарп" + + Карп из голографической энергии. По ощущениям - вполне реален. + + [color=#a4885c]Летающий[/color]: существо парит над поверхностью и может обходить низкие препятствия. + + + + + - [bold][color=#a4885c]Пороги здоровья:[/color][/bold] 40 + - [bold][color=#a4885c]Скорость:[/color][/bold] 3.5 м/с + - [bold][color=#a4885c]Урон (тип):[/color][/bold] 5 [color=red]Blunt[/color], 7 [color=red]Slash[/color] + - [bold][color=#a4885c]Сопротивления:[/color][/bold] нет + - [bold][color=#a4885c]Особые способности:[/color][/bold] Летающий, иммунитет к пулям + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # "Радужный карп" + + Яркая и опасная разновидность карпа. + + [color=#a4885c]Летающий[/color]: существо парит над поверхностью и может обходить низкие препятствия. + + + + + - [bold][color=#a4885c]Пороги здоровья:[/color][/bold] 40 + - [bold][color=#a4885c]Скорость:[/color][/bold] 3.5 м/с + - [bold][color=#a4885c]Урон (тип):[/color][/bold] 5 [color=red]Blunt[/color], 7 [color=red]Slash[/color] + - [bold][color=#a4885c]Сопротивления:[/color][/bold] нет + - [bold][color=#a4885c]Особые способности:[/color][/bold] Летающий, Красивый + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # "Космический дракон" + + Крупная и крайне опасная цель, связанная с карпами. + + [color=#a4885c]Летающий[/color]: существо парит над поверхностью и может обходить низкие препятствия. + + + + + - [bold][color=#a4885c]Пороги здоровья:[/color][/bold] 200 + - [bold][color=#a4885c]Скорость:[/color][/bold] 5 м/с + - [bold][color=#a4885c]Урон (тип):[/color][/bold] 12 [color=red]Brute[/color] + - [bold][color=#a4885c]Сопротивления:[/color][/bold] нет + - [bold][color=#a4885c]Особые способности:[/color][/bold] Летающий, слабое отражение снарядов + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # Цели миссий + ## Устранение + + + + Устранить крупную и опасную цель - [color=#a4885c]космического дракона[/color] - за отведенное время. + + ## Уничтожение + + + + Уничтожить нужное число [color=#a4885c]статуй карпов[/color] за отведенное время. + diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/MobsHostileExpedition/pirates.xml b/Resources/ServerInfo/Guidebook/_Sunrise/MobsHostileExpedition/pirates.xml new file mode 100644 index 0000000000..21b4a3ee8f --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/MobsHostileExpedition/pirates.xml @@ -0,0 +1,202 @@ + + # Пираты + + Пиратские отряды - враждебные фракции, встречающиеся на экспедициях утилизации. + Их сила делится на три уровня угрозы: + [bold]Мусорщики[/bold], [bold]Пираты[/bold], [bold]Наемники[/bold]. + Ниже - ориентиры по экипировке, ролям и особенностям. + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # Мусорщики + Низкоуровневые налетчики и мародеры. Используют самодельное и промышленное снаряжение. + + [bold][color=#a4885c]Общие параметры:[/color][/bold] + - [bold][color=#a4885c]Здоровье:[/color][/bold] 120; у обезьян 80 + - [bold][color=#a4885c]Скорость:[/color][/bold] 3.8 м/с (ближний бой), 3.0 м/с (дальний бой) + - [bold][color=#a4885c]Сопротивления:[/color][/bold] [color=red]Blunt[/color] 40%, [color=red]Slash[/color] 30%, [color=yellow]Piercing[/color] 50%, [color=orange]Heat[/color] 30%, [color=orange]Caustic[/color] 50% + - [bold][color=#a4885c]Особенности:[/color][/bold] ночное зрение, пассивная регенерация, EVA-экипировка + + ## Ближний бой + + + + + + + + + + - [bold][color=#a4885c]Оружие:[/color][/bold] ножи, кирки, кастеты; элитные бойцы вооружены энерго-саблями и энерго-кирками + - [bold][color=#a4885c]Поведение:[/color][/bold] активно сближаются и вскрывают проходы + + ## Дальний бой + + + + + + + + + + + + + + + + + + + - [bold][color=#a4885c]Вооружение:[/color][/bold] пистолеты, винтовки, ПП, самодельное и промышленное оружие, плазморез + - [bold][color=#a4885c]Особые варианты:[/color][/bold] ракетницы обезьян используют разные типы боеприпасов + + ## Редкие и особые + + + + + + + + - [bold][color=#a4885c]Особенности:[/color][/bold] огненные бомбы, отражение энерго-кинжала, охотники с рывком и вампиризмом-крушителей + + ## Киборги + + + + + + - [bold][color=#a4885c]Особенности:[/color][/bold] механические цели, повышенная стойкость к урону и оглушению + + ## Босс + + + + - [bold][color=#a4885c]Скорость:[/color][/bold] 4.0 м/с + - [bold][color=#a4885c]Особенности:[/color][/bold] рывок проламывает окна и стеклянные преграды; удары отбрасывают противников; высокая устойчивость к оглушению; впадает в состояние берсерка, кратковременно ускоряясь и игнорируя урон + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # Пираты + Средний уровень угрозы. Носит классическое пиратское снаряжение и тяжелую броню. + + [bold][color=#a4885c]Общие параметры:[/color][/bold] + - [bold][color=#a4885c]Здоровье:[/color][/bold] 140 + - [bold][color=#a4885c]Скорость:[/color][/bold] 3.8 м/с (ближний бой), 3.0 м/с (дальний бой) + - [bold][color=#a4885c]Сопротивления:[/color][/bold] [color=red]Blunt[/color] 50%, [color=red]Slash[/color] 40%, [color=yellow]Piercing[/color] 60%, [color=orange]Heat[/color] 40%, [color=orange]Caustic[/color] 50% + - [bold][color=#a4885c]Особенности:[/color][/bold] ночное зрение, пассивная регенерация, лучшее бронирование + + ## Ближний бой + + + + + + + - [bold][color=#a4885c]Оружие:[/color][/bold] сабли, энерго-сабли, кувалды, буровые перчатки + - [bold][color=#a4885c]Тактика:[/color][/bold] прорыв в ближний бой под прикрытием брони, броски метательного оружия + + ## Дальний бой + + + + + + + + + + + + - [bold][color=#a4885c]Вооружение:[/color][/bold] дробовики, мушкеты, двустволки, револьверы, пушки + + ## Редкие и тяжелые + + + + + + + + + + - [bold][color=#a4885c]Особенности:[/color][/bold] комбинированное оружие, корабельные пушки, тяжелые доспехи и мехи + - [bold][color=#a4885c]Прочность:[/color][/bold] мех 500, джаггернаут 275; скорость 2.75 м/с + + ## Киборги + + + + + + - [bold][color=#a4885c]Особенности:[/color][/bold] механические цели, устойчивы к урону, могут встречаться вместе с пиратами T2 + + ## Босс + + + + - [bold][color=#a4885c]Скорость:[/color][/bold] 4.5 м/с + - [bold][color=#a4885c]Особенности:[/color][/bold] Смешанное вооружение, высокий рефлект и высокий порог оглушения + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # Наемники + Верхний уровень угрозы. Часто выступают как каперы или наемники с спонсорами и современным оружием. + + [bold][color=#a4885c]Общие параметры:[/color][/bold] + - [bold][color=#a4885c]Здоровье:[/color][/bold] 140 + - [bold][color=#a4885c]Скорость:[/color][/bold] 3.8 м/с (ближний бой), 3.0 м/с (дальний бой) + - [bold][color=#a4885c]Сопротивления:[/color][/bold] [color=red]Blunt[/color] 60%, [color=red]Slash[/color] 50%, [color=yellow]Piercing[/color] 70%, [color=orange]Heat[/color] 50%, [color=orange]Caustic[/color] 50% + - [bold][color=#a4885c]Особенности:[/color][/bold] лучшее снаряжение, щиты, лазеры, продвинутые боевые роли + + ## Ближний бой и контроль + + + + + - [bold][color=#a4885c]Оружие:[/color][/bold] бола и оглушающие средства, энергетический щит + - [bold][color=#a4885c]Тактика:[/color][/bold] контроль и фиксация целей + + ## Дальний бой + + + + + + + + + + + + + - [bold][color=#a4885c]Вооружение:[/color][/bold] щит-стрелки, винтовки, револьверы, лазерные ПП и пушки + + ## Редкие и элитные + + + + + + + + - [bold][color=#a4885c]Особенности:[/color][/bold] тяжелые пулеметы, гранатометчики, скрытные бойцы, снайперы + + ## Киборги + + + + + + - [bold][color=#a4885c]Особенности:[/color][/bold] механические цели, иногда поддерживают наемников T3 + + ## Босс + + + + - [bold][color=#a4885c]Здоровье:[/color][/bold] 700 + - [bold][color=#a4885c]Скорость:[/color][/bold] 2.25 м/с + - [bold][color=#a4885c]Особенности:[/color][/bold] тяжелый мех вооруженный пулемётом, высокий запас прочности и отражение снарядов, изредка может выпускать дым или телепортироваться. Опасен в ближнем бою + diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/MobsHostileExpedition/xenos.xml b/Resources/ServerInfo/Guidebook/_Sunrise/MobsHostileExpedition/xenos.xml new file mode 100644 index 0000000000..ecd1dcfba9 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/MobsHostileExpedition/xenos.xml @@ -0,0 +1,157 @@ + + # Ксено + + Ксено (ксеноморфы) - агрессивные инопланетные формы жизни, действующие стаей. + У них кислотная кровь, коллективный разум и способность вскрывать двери. + При разделке можно получить мясо ксеноморфа. + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # Известные варианты + # "Бурильщик" + + Молодая форма, предпочитает прятаться и вести бой на ближней дистанции. + + + + + - [bold][color=#a4885c]Пороги здоровья:[/color][/bold] 50 + - [bold][color=#a4885c]Скорость:[/color][/bold] 4 м/с + - [bold][color=#a4885c]Урон (тип):[/color][/bold] 6 [color=red]Brute[/color] + - [bold][color=#a4885c]Сопротивления:[/color][/bold] нет + - [bold][color=#a4885c]Особые способности:[/color][/bold] нет + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # "Дрон" + + Рабочая каста улья. Поддерживает рой и помогает в строительстве гнезда. + + + + + - [bold][color=#a4885c]Пороги здоровья:[/color][/bold] 80 + - [bold][color=#a4885c]Скорость:[/color][/bold] 4 м/с + - [bold][color=#a4885c]Урон (тип):[/color][/bold] 6 [color=red]Brute[/color] + - [bold][color=#a4885c]Сопротивления:[/color][/bold] нет + - [bold][color=#a4885c]Особые способности:[/color][/bold] нет + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # "Преторианец" + + Крупный и живучий охранник улья. + + + + + - [bold][color=#a4885c]Пороги здоровья:[/color][/bold] 100 + - [bold][color=#a4885c]Скорость:[/color][/bold] 4 м/с + - [bold][color=#a4885c]Урон (тип):[/color][/bold] 6 [color=red]Brute[/color] + - [bold][color=#a4885c]Сопротивления:[/color][/bold] нет + - [bold][color=#a4885c]Особые способности:[/color][/bold] нет + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # "Раваджер" + + Сильный рукопашник, опасен при прорывах и в ближнем бою. + + + + + - [bold][color=#a4885c]Пороги здоровья:[/color][/bold] 100 + - [bold][color=#a4885c]Скорость:[/color][/bold] 4 м/с + - [bold][color=#a4885c]Урон (тип):[/color][/bold] 10 [color=red]Brute[/color] + - [bold][color=#a4885c]Сопротивления:[/color][/bold] нет + - [bold][color=#a4885c]Особые способности:[/color][/bold] нет + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # "Бегун" + + Быстрая каста, использует тактику "ударил - ушел". + + + + + - [bold][color=#a4885c]Пороги здоровья:[/color][/bold] 50 + - [bold][color=#a4885c]Скорость:[/color][/bold] 6 м/с + - [bold][color=#a4885c]Урон (тип):[/color][/bold] 5 [color=red]Brute[/color] + - [bold][color=#a4885c]Сопротивления:[/color][/bold] нет + - [bold][color=#a4885c]Особые способности:[/color][/bold] нет + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # "Роуни" + + Редкая разновидность бегуна. + + + + + - [bold][color=#a4885c]Пороги здоровья:[/color][/bold] 50 + - [bold][color=#a4885c]Скорость:[/color][/bold] 6 м/с + - [bold][color=#a4885c]Урон (тип):[/color][/bold] 5 [color=red]Brute[/color] + - [bold][color=#a4885c]Сопротивления:[/color][/bold] нет + - [bold][color=#a4885c]Особые способности:[/color][/bold] нет + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # "Плевун" + + Дистанционный боец, атакует кислотой. + + + + + - [bold][color=#a4885c]Пороги здоровья:[/color][/bold] 50 + - [bold][color=#a4885c]Скорость:[/color][/bold] 4 м/с + - [bold][color=#a4885c]Урон (тип):[/color][/bold] 5 [color=orange]Caustic[/color] + - [bold][color=#a4885c]Сопротивления:[/color][/bold] нет + - [bold][color=#a4885c]Особые способности:[/color][/bold] Кислотный урон + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # "Кислотная турель" + + Неподвижная оборонительная органика, стреляет кислотой. + + + + + - [bold][color=#a4885c]Прочность:[/color][/bold] 100 + - [bold][color=#a4885c]Урон (тип):[/color][/bold] 5 [color=orange]Caustic[/color] + - [bold][color=#a4885c]Сопротивления:[/color][/bold] нет + - [bold][color=#a4885c]Особые способности:[/color][/bold] Кислотный урон + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # "Королева" + + Главный организм улья и самая опасная цель. + + + + + - [bold][color=#a4885c]Пороги здоровья:[/color][/bold] 300 + - [bold][color=#a4885c]Скорость:[/color][/bold] 4 м/с + - [bold][color=#a4885c]Урон (тип):[/color][/bold] 12 [color=red]Brute[/color] + - [bold][color=#a4885c]Сопротивления:[/color][/bold] нет + - [bold][color=#a4885c]Особые способности:[/color][/bold] нет + + [bold][color=#a4885c]________________________________________________________________________[/color] + + # Цели миссий + ## Устранение + + + + Устранить крупную и опасную цель - [color=#a4885c]королеву[/color] - за отведенное время. + + ## Уничтожение + + + + Уничтожить нужное число [color=#a4885c]вардинговых башен ксено[/color] за отведенное время. + diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/meta.json index 6373d1e21c..fbd56265c8 100644 --- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/meta.json @@ -16,6 +16,10 @@ }, { "name": "stripe" + }, + { + "name": "storage" + } ] } diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/storage.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/storage.png new file mode 100644 index 0000000000..9e711e29c3 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/ash12.rsi/storage.png differ diff --git a/Tools/_sunrise/Schemas/ignore_list.yml b/Tools/_sunrise/Schemas/ignore_list.yml index 3fff1582fe..2d6b68cf1d 100644 --- a/Tools/_sunrise/Schemas/ignore_list.yml +++ b/Tools/_sunrise/Schemas/ignore_list.yml @@ -60,6 +60,8 @@ ignore_list: - 'EVA' - 'MK58' - 'WT550' + - 'SKM-24' + - 'SKM-28' - 'N1984' - 'DEUS VULT' - 'AMS-42'