From fe1925703a12eff68871bfa3aacb4b6f49a3e7dd Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Thu, 19 Jun 2025 02:17:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=B1=D0=B0=D1=80=D0=B4?= =?UTF-8?q?=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=B1=D0=BE=D0=B6=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=B2,=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B8=20?= =?UTF-8?q?=D0=B1=D0=B8=D0=BE=D0=BA=D0=BE=D0=B4=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=B2=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BD=D1=8B=D1=85=20=D1=8D?= =?UTF-8?q?=D0=BD=D0=B5=D1=80=D0=B3=D0=BE=D1=89=D0=B8=D1=82=D0=BE=D0=B2.?= =?UTF-8?q?=20=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20=D0=BA=D1=83=D0=BB=D1=8C?= =?UTF-8?q?=D1=82=D0=B0=20=D0=BA=D1=80=D0=BE=D0=B2=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/EnergyDome/EnergyDomeSystem.cs | 37 +++++++++++++++ .../Runes/Systems/BloodCultSystem.Actions.cs | 4 +- .../_Sunrise/BloodCult/BloodCultPrototype.cs | 7 ++- Resources/Changelog/ChangelogSunrise.yml | 42 ++++++++++++++++++ Resources/Prototypes/Actions/types.yml | 2 +- .../Entities/Clothing/OuterClothing/armor.yml | 13 ------ .../BloodCult/Construction/Cult/graphs.yml | 4 +- .../BloodCult/Entities/Altars/cult_altars.yml | 8 ++-- .../BloodCult/Entities/Items/clothing.yml | 18 ++++++++ .../BloodCult/Entities/Items/weapon.yml | 40 ++++++++++++++++- .../_Sunrise/BloodCult/cult_types.yml | 15 ++++--- .../Entities/Objects/Tools/biocode.yml | 6 +++ .../Entities/Objects/Tools/energydome.yml | 7 ++- .../cult_halberd.rsi/equipped-BACKPACK.png | Bin 0 -> 630 bytes .../cult_halberd.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 630 bytes .../Weapons/Melee/cult_halberd.rsi/meta.json | 8 ++++ .../{ => Entities}/blood_spear.rsi/icon.png | Bin .../blood_spear.rsi/inhand-left.png | Bin .../blood_spear.rsi/inhand-right.png | Bin .../{ => Entities}/blood_spear.rsi/meta.json | 0 .../blood_spear.rsi/wielded-inhand-left.png | Bin .../blood_spear.rsi/wielded-inhand-right.png | Bin .../narbee_halberd.rsi/equipped-BACKPACK.png | Bin 0 -> 583 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 583 bytes .../Entities/narbee_halberd.rsi/icon.png | Bin 0 -> 543 bytes .../narbee_halberd.rsi/inhand-left.png | Bin 0 -> 597 bytes .../narbee_halberd.rsi/inhand-right.png | Bin 0 -> 607 bytes .../Entities/narbee_halberd.rsi/meta.json | 38 ++++++++++++++++ .../wielded-inhand-left.png | Bin 0 -> 637 bytes .../wielded-inhand-right.png | Bin 0 -> 625 bytes .../reaper_halberd.rsi/equipped-BACKPACK.png | Bin 0 -> 626 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 626 bytes .../Entities/reaper_halberd.rsi/icon.png | Bin 0 -> 596 bytes .../reaper_halberd.rsi/inhand-left.png | Bin 0 -> 1401 bytes .../reaper_halberd.rsi/inhand-right.png | Bin 0 -> 1582 bytes .../Entities/reaper_halberd.rsi/meta.json | 38 ++++++++++++++++ .../wielded-inhand-left.png | Bin 0 -> 668 bytes .../wielded-inhand-right.png | Bin 0 -> 653 bytes 38 files changed, 253 insertions(+), 34 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/equipped-SUITSTORAGE.png rename Resources/Textures/_Sunrise/BloodCult/{ => Entities}/blood_spear.rsi/icon.png (100%) rename Resources/Textures/_Sunrise/BloodCult/{ => Entities}/blood_spear.rsi/inhand-left.png (100%) rename Resources/Textures/_Sunrise/BloodCult/{ => Entities}/blood_spear.rsi/inhand-right.png (100%) rename Resources/Textures/_Sunrise/BloodCult/{ => Entities}/blood_spear.rsi/meta.json (100%) rename Resources/Textures/_Sunrise/BloodCult/{ => Entities}/blood_spear.rsi/wielded-inhand-left.png (100%) rename Resources/Textures/_Sunrise/BloodCult/{ => Entities}/blood_spear.rsi/wielded-inhand-right.png (100%) create mode 100644 Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/wielded-inhand-right.png diff --git a/Content.Server/EnergyDome/EnergyDomeSystem.cs b/Content.Server/EnergyDome/EnergyDomeSystem.cs index f3a0b0cb76..befae4151c 100644 --- a/Content.Server/EnergyDome/EnergyDomeSystem.cs +++ b/Content.Server/EnergyDome/EnergyDomeSystem.cs @@ -2,6 +2,7 @@ using Content.Server.DeviceLinking.Systems; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Server.PowerCell; +using Content.Shared._Sunrise.Biocode; using Content.Shared.Actions; using Content.Shared.Damage; using Content.Shared.DeviceLinking.Events; @@ -14,6 +15,7 @@ using Content.Shared.Timing; using Content.Shared.Toggleable; using Content.Shared.Verbs; using Content.Shared.EnergyDome; +using Robust.Server.Containers; using Robust.Shared.Audio.Systems; using Robust.Shared.Containers; @@ -29,6 +31,8 @@ public sealed partial class EnergyDomeSystem : EntitySystem [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly PowerCellSystem _powerCell = default!; [Dependency] private readonly DeviceLinkSystem _signalSystem = default!; + [Dependency] private readonly ContainerSystem _containerSystem = default!; + [Dependency] private readonly BiocodeSystem _biocodeSystem = default!; public override void Initialize() { @@ -95,6 +99,17 @@ public sealed partial class EnergyDomeSystem : EntitySystem private void OnActivatedInWorld(Entity generator, ref ActivateInWorldEvent args) { + // Sunrise-Start + if (!_containerSystem.ContainsEntity(args.User, generator.Owner)) + return; + + if (TryComp(generator.Owner, out var biocodedComponent)) + { + if (!_biocodeSystem.CanUse(args.User, biocodedComponent.Factions)) + return; + } + // Sunrise-End + if (generator.Comp.CanInteractUse) AttemptToggle(generator, !generator.Comp.Enabled); } @@ -113,6 +128,17 @@ public sealed partial class EnergyDomeSystem : EntitySystem if (!args.CanAccess || !args.CanInteract || !generator.Comp.CanInteractUse) return; + // Sunrise-Start + if (!_containerSystem.ContainsEntity(args.User, generator.Owner)) + return; + + if (TryComp(generator.Owner, out var biocodedComponent)) + { + if (!_biocodeSystem.CanUse(args.User, biocodedComponent.Factions)) + return; + } + // Sunrise-End + var @event = args; ActivationVerb verb = new() { @@ -133,6 +159,17 @@ public sealed partial class EnergyDomeSystem : EntitySystem if (args.Handled) return; + // Sunrise-Start + if (!_containerSystem.ContainsEntity(args.Performer, generator.Owner)) + return; + + if (TryComp(generator.Owner, out var biocodedComponent)) + { + if (!_biocodeSystem.CanUse(args.Performer, biocodedComponent.Factions)) + return; + } + // Sunrise-End + AttemptToggle(generator, !generator.Comp.Enabled); args.Handled = true; diff --git a/Content.Server/_Sunrise/BloodCult/Runes/Systems/BloodCultSystem.Actions.cs b/Content.Server/_Sunrise/BloodCult/Runes/Systems/BloodCultSystem.Actions.cs index 7eba9fab5a..fcc0a81c2d 100644 --- a/Content.Server/_Sunrise/BloodCult/Runes/Systems/BloodCultSystem.Actions.cs +++ b/Content.Server/_Sunrise/BloodCult/Runes/Systems/BloodCultSystem.Actions.cs @@ -304,7 +304,7 @@ namespace Content.Server._Sunrise.BloodCult.Runes.Systems var armor = Spawn(ArmorPrototypeId, coordinates); var shoes = Spawn(ShoesPrototypeId, coordinates); var bola = Spawn(BolaPrototypeId, coordinates); - var blade = Spawn(cultPrototype.CultBladeProto, coordinates); + var blade = Spawn(cultPrototype.BladeProto, coordinates); _inventorySystem.TryUnequip(args.Target, "head"); _inventorySystem.TryUnequip(args.Target, "outerClothing"); @@ -498,7 +498,7 @@ namespace Content.Server._Sunrise.BloodCult.Runes.Systems return; var xform = Transform(args.Performer).Coordinates; - var dagger = _entityManager.SpawnEntity(cultPrototype.RitualDaggerProto, xform); + var dagger = _entityManager.SpawnEntity(cultPrototype.DaggerProto, xform); _bloodstreamSystem.TryModifyBloodLevel(args.Performer, -30, bloodstreamComponent); _handsSystem.TryPickupAnyHand(args.Performer, dagger); diff --git a/Content.Shared/_Sunrise/BloodCult/BloodCultPrototype.cs b/Content.Shared/_Sunrise/BloodCult/BloodCultPrototype.cs index d5704d510f..c97225800a 100644 --- a/Content.Shared/_Sunrise/BloodCult/BloodCultPrototype.cs +++ b/Content.Shared/_Sunrise/BloodCult/BloodCultPrototype.cs @@ -12,10 +12,13 @@ public sealed class BloodCultPrototype : IPrototype public BloodCultType? CultType; [DataField(required: true)] - public EntProtoId RitualDaggerProto; + public EntProtoId DaggerProto; [DataField(required: true)] - public EntProtoId CultBladeProto; + public EntProtoId BladeProto; + + [DataField(required: true)] + public EntProtoId HalberdProto; [DataField(required: true)] public EntProtoId GodProto; diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index 44a94fbbd1..6396f4e781 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -18032,3 +18032,45 @@ type: Fix id: 1220 time: '2025-06-18T20:38:55.241684+00:00' +- author: VigersRay + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043E\u0442\u0434\ + \u0435\u043B\u044C\u043D\u044B\u0435 \u0441\u043F\u0440\u0430\u0439\u0442\u044B\ + \ \u0430\u043B\u0435\u0431\u0430\u0440\u0434\u044B \u043A\u0443\u043B\u044C\u0442\ + \u0430 \u043A\u0440\u043E\u0432\u0438 \u043A\u0430\u0436\u0434\u043E\u043C\u0443\ + \ \u0431\u043E\u0436\u0435\u0441\u0442\u0432\u0443." + type: Add + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u0441\u043E\ + \u0437\u0434\u0430\u043D\u0438\u0435 \u043A\u0443\u0437\u043D\u0438\u0446\u044B\ + \ \u043A\u0443\u043B\u044C\u0442\u0430 \u043A\u0440\u043E\u0432\u0438." + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0430\u043A\ + \u0442\u0438\u0432\u0430\u0446\u0438\u044F \u0432\u0441\u0440\u043E\u0435\u043D\ + \u044B\u0445 \u0449\u0438\u0442\u043E\u0432 \u0432 \u043F\u0440\u0435\u0434\u043C\ + \u0435\u0442\u044B (\u0431\u0440\u043E\u043D\u044F \u0430\u043A\u043E\u043B\u0438\ + \u0442\u0430, \u043F\u043E\u044F\u0441\u043D\u043E\u0439 \u0449\u0438\u0442\ + )." + type: Fix + - message: "\u0412\u0441\u0442\u0440\u043E\u0435\u043D\u044B\u0435 \u0449\u0438\u0442\ + \u044B \u0442\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E \u0430\ + \u043A\u0442\u0438\u0432\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u043E\ + \u043B\u044C\u043A\u043E \u0435\u0441\u043B\u0438 \u043E\u043D\u0438 \u043D\u0430\ + \u0434\u0435\u0442\u044B." + type: Tweak + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0431\u0438\u043E\ + \u043A\u043E\u0434 \u043F\u0435\u0440\u0435\u043D\u043E\u0441\u043D\u044B\u0445\ + \ \u0449\u0438\u0442\u043E\u0432, \u0442\u0435\u043F\u0435\u0440\u044C \u0438\ + \u0445 \u043D\u0435 \u0442\u043E\u043B\u044C\u043A\u043E \u043D\u0435\u043B\u044C\ + \u0437\u044F \u043E\u0434\u0435\u0442\u044C, \u043D\u043E \u0438 \u0430\u043A\ + \u0442\u0438\u0432\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432 \u0440\u0443\ + \u043A\u0430\u0445." + type: Fix + - message: "\u0411\u0440\u043E\u043D\u044F \u043A\u0443\u043B\u044C\u0442\u0430\ + \ \u043A\u043E\u0442\u043E\u0440\u0443\u044E \u043C\u043E\u0436\u043D\u043E\ + \ \u043F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043F\u043E\u0441\u043B\u0435\ + \ \u0435\u043C\u0430\u0433\u0430 \u0431\u043E\u0433\u043E\u043C\u0430\u0442\u0430\ + \ \u043D\u0435 \u0438\u043C\u0435\u0435\u0442 \u0432\u0441\u0442\u0440\u043E\ + \u0435\u043D\u043E\u0433\u043E \u0449\u0438\u0442\u0430." + type: Fix + id: 1221 + time: '2025-06-18T23:16:32.416364+00:00' diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index ed5060613d..56b72500fb 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -86,7 +86,7 @@ - type: Action icon: { sprite: Objects/Weapons/Melee/e_shield.rsi, state: eshield-on } - type: InstantAction - event: !type:ScreamActionEvent + event: !type:ToggleActionEvent - type: entity parent: BaseAction diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 8dd2311b88..af6b7c63b9 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -354,19 +354,6 @@ tags: - FullBodyOuter - WhitelistChameleon - - type: Battery - maxCharge: 40 - startingCharge: 40 - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 40 - autoRechargePause: true - autoRechargePauseTime: 9 - - type: EnergyDomeGenerator - damageEnergyDraw: 1 - domePrototype: EnergyDomeCult - - type: UseDelay - delay: 10.0 # Sunrise-End - type: entity diff --git a/Resources/Prototypes/_Sunrise/BloodCult/Construction/Cult/graphs.yml b/Resources/Prototypes/_Sunrise/BloodCult/Construction/Cult/graphs.yml index 088d57bec5..e3818f9e3e 100644 --- a/Resources/Prototypes/_Sunrise/BloodCult/Construction/Cult/graphs.yml +++ b/Resources/Prototypes/_Sunrise/BloodCult/Construction/Cult/graphs.yml @@ -210,7 +210,7 @@ graph: - node: start edges: - - to: hell_forge + - to: narbee_forge completed: - !type:SnapToGrid southRotation: true @@ -218,7 +218,7 @@ - material: RunicMetalSheets amount: 3 doAfter: 1 - - node: hell_forge + - node: narbee_forge entity: NarbeeCultForge - type: constructionGraph diff --git a/Resources/Prototypes/_Sunrise/BloodCult/Entities/Altars/cult_altars.yml b/Resources/Prototypes/_Sunrise/BloodCult/Entities/Altars/cult_altars.yml index 36a3148d37..e7eba73d1c 100644 --- a/Resources/Prototypes/_Sunrise/BloodCult/Entities/Altars/cult_altars.yml +++ b/Resources/Prototypes/_Sunrise/BloodCult/Entities/Altars/cult_altars.yml @@ -444,7 +444,7 @@ cultistFactoryProduction-MirrorShield: - CultMirrorShield cultistFactoryProduction-Halberd: - - TrueHalberd + - NarsieHalberd - type: entity id: NarbeeCultForge @@ -460,7 +460,7 @@ stateOn: hell_forge - type: Construction graph: NarbeeCultForge - node: hell_forge + node: narbee_forge - type: CultistFactory products: cultistFactoryProduction-EldritchBlade: @@ -472,7 +472,7 @@ cultistFactoryProduction-MirrorShield: - CultMirrorShield cultistFactoryProduction-Halberd: - - TrueHalberd + - NarbeeHalberd - type: entity id: ReaperCultForge @@ -500,7 +500,7 @@ cultistFactoryProduction-MirrorShield: - CultMirrorShield cultistFactoryProduction-Halberd: - - TrueHalberd + - ReaperHalberd - type: cultStructure id: CultStructureNarsieAltarTome diff --git a/Resources/Prototypes/_Sunrise/BloodCult/Entities/Items/clothing.yml b/Resources/Prototypes/_Sunrise/BloodCult/Entities/Items/clothing.yml index 2b338b4455..47103c8c9b 100644 --- a/Resources/Prototypes/_Sunrise/BloodCult/Entities/Items/clothing.yml +++ b/Resources/Prototypes/_Sunrise/BloodCult/Entities/Items/clothing.yml @@ -11,6 +11,24 @@ parent: ClothingOuterArmorCult name: armored mantle description: At first glance, it seems that this is a simple robe, but it has elements of armor on it. + components: + - type: Battery + maxCharge: 50 + startingCharge: 50 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 50 + autoRechargePause: true + autoRechargePauseTime: 9 + - type: EnergyDomeGenerator + damageEnergyDraw: 1 + domePrototype: EnergyDomeCult + - type: UseDelay + delay: 10.0 + # Нихуя технологии у культистов да? + - type: Biocode + factions: + - BloodCult - type: entity id: CultMirrorShield diff --git a/Resources/Prototypes/_Sunrise/BloodCult/Entities/Items/weapon.yml b/Resources/Prototypes/_Sunrise/BloodCult/Entities/Items/weapon.yml index 0f19e77f05..9f70379e22 100644 --- a/Resources/Prototypes/_Sunrise/BloodCult/Entities/Items/weapon.yml +++ b/Resources/Prototypes/_Sunrise/BloodCult/Entities/Items/weapon.yml @@ -113,7 +113,7 @@ sprite: Objects/Weapons/Melee/cult_halberd.rsi quickEquip: false slots: - - back + - Back - suitStorage - type: UseDelay delay: 1 @@ -137,7 +137,7 @@ - type: Item size: Ginormous - type: Sprite - sprite: _Sunrise/BloodCult/blood_spear.rsi + sprite: _Sunrise/BloodCult/Entities/blood_spear.rsi state: icon - type: ThrowingAngle angle: 225 @@ -292,3 +292,39 @@ state: hell_blade - type: Item heldPrefix: hell_blade + +- type: entity + parent: TrueHalberd + id: NarsieHalberd + components: + - type: Sprite + sprite: Objects/Weapons/Melee/cult_halberd.rsi + state: icon + +- type: entity + parent: TrueHalberd + id: ReaperHalberd + components: + - type: Sprite + sprite: _Sunrise/BloodCult/Entities/reaper_halberd.rsi + state: icon + - type: Clothing + sprite: _Sunrise/BloodCult/Entities/reaper_halberd.rsi + quickEquip: false + slots: + - Back + - suitStorage + +- type: entity + parent: TrueHalberd + id: NarbeeHalberd + components: + - type: Sprite + sprite: _Sunrise/BloodCult/Entities/narbee_halberd.rsi + state: icon + - type: Clothing + sprite: _Sunrise/BloodCult/Entities/narbee_halberd.rsi + quickEquip: false + slots: + - Back + - suitStorage diff --git a/Resources/Prototypes/_Sunrise/BloodCult/cult_types.yml b/Resources/Prototypes/_Sunrise/BloodCult/cult_types.yml index 047e8a95be..6b70ae4a73 100644 --- a/Resources/Prototypes/_Sunrise/BloodCult/cult_types.yml +++ b/Resources/Prototypes/_Sunrise/BloodCult/cult_types.yml @@ -1,8 +1,9 @@ - type: bloodCult id: NarsieCult cultType: Narsie - ritualDaggerProto: NarsieRitualDagger - cultBladeProto: NarsieEldritchBlade + daggerProto: NarsieRitualDagger + bladeProto: NarsieEldritchBlade + halberdProto: NarsieHalberd godProto: Narsie startingItems: - NarsieRitualDagger @@ -11,8 +12,9 @@ - type: bloodCult id: NarbeeCult cultType: Narbee - ritualDaggerProto: NarbeeRitualDagger - cultBladeProto: NarbeeEldritchBlade + daggerProto: NarbeeRitualDagger + bladeProto: NarbeeEldritchBlade + halberdProto: NarbeeHalberd godProto: Narbee startingItems: - NarbeeRitualDagger @@ -21,8 +23,9 @@ - type: bloodCult id: ReaperCult cultType: Reaper - ritualDaggerProto: ReaperRitualDagger - cultBladeProto: ReaperEldritchBlade + daggerProto: ReaperRitualDagger + bladeProto: ReaperEldritchBlade + halberdProto: ReaperHalberd godProto: Reaper startingItems: - ReaperRitualDagger diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/biocode.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/biocode.yml index 549d089d02..eb8a9d5509 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/biocode.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/biocode.yml @@ -3,6 +3,9 @@ id: EnergyDomeGeneratorBackpackSyndieBiocode suffix: BIOCODE components: + - type: Biocode + factions: + - Syndicate - type: FactionClothingBlocker factions: - Syndicate @@ -14,6 +17,9 @@ id: EnergyDomeGeneratorPersonalSyndieBiocode suffix: BIOCODE components: + - type: Biocode + factions: + - Syndicate - type: FactionClothingBlocker factions: - Syndicate diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml index 92d22ceb22..fe316b517a 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml @@ -36,6 +36,9 @@ useRate: 0 - type: UseDelay delay: 10.0 + - type: Biocode + factions: + - Syndicate - type: entity name: BR-50c "Bastion" @@ -66,7 +69,7 @@ startingItem: PowerCellNanoTrasen whitelist: tags: - - PowerCell + - PowerCell - type: EnergyDomeGenerator damageEnergyDraw: 3 domePrototype: EnergyDomeMediumBlue @@ -104,7 +107,7 @@ startingItem: PowerCellNanoTrasen whitelist: tags: - - PowerCell + - PowerCell - type: EnergyDomeGenerator damageEnergyDraw: 5 domePrototype: EnergyDomeSmallBlue diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..5b54dcdc4a2cef83e915708332ddcce9dd941022 GIT binary patch literal 630 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/inhand-left.png b/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..85eeb85e7732e7e70879da265bc63c76a2c56f5c GIT binary patch literal 597 zcmV-b0;>IqP)O5XE0Yt;XaOW|SiiX)iiZtyC%ONTq@c2nnoI5a{ZQEyf0KC6^TXcNo9FR*>>0o?48t%C!!QiPXg90nl&|+Q9$UxJ;QJj{%V{?a zh{K3+7&RVzzv&G%L;}F~QKYeL^9E=jroQ~%_KvOPC@dyUCH+KHOf^ zGQqpMo@ce3a?lUBcBmA@+JS?9;9u(JiNlD4eo!d@?}G=x(nUu={Cg5V?Dw|gZ zwb$SrL+n;NYo4kKz$bcnI7P4|CI(D=oD2%~GEAyABL zeei+^m7=7HR+l%y3r)-miE*#@Gk=25x592N$F+q&++O%q;iV^k`+MA^tTXB=X@7G$ z{#>s;InoGXLfuxkm?wKM0n-ytY7FW0<_)MKUSd#i^pGD7fGv zg=P*!?`qwpmDjPIUFCf&lD(NXyWX`t4^R|EQ4~c{6h%?|Wj-15_U4@X*0DEkZ_dfL zhr=}h0Ma;N8YfmJ1U7@)OKP8Qy~OJJ(gygz%kM=8@Mp3bA&nD`2c|v)=9A&!y7_o_ zM!r3Gd%W!QC`=6)1)1Mul1uWOA z4zBX%l(orK4%rM#F+!J9gHMkRpJ2Ax3w%Az6h%=KMNt$*Q52;lHd#igaMZWvgP%W+ z>m5*<5Bj~HHzw3h8Ydin`Fgkp00*ACD|<1q7cbN)RN}b#Wavlnf|wvpRlDSh-u5QR8{^~MS!Lm3%|`O$lr%301TJ-bCD*7l-!K}@LHS5Pce4DhZyMPl`$0X8!zZ7ppU tU%qjmBvS*X26%be{O&*1{~tT2MTf)4{ot?5JttueR_$U?ktKbFV(`as&_&5fKp)5fRa1$c-aeN5#=0 zS?3S+Sq2RN%)Ai?Di;g@z=um$n{`mnf|wT2cY*X#dxv<;=|vxnk~(QZvii)bR^?w8!0BBviBCp;Y;$YW~E3+B`;|t~8worV27+f%D@Qb{ZGj+NUo=0Ii8dhodNS zuy7P%;IH(mCnM`scw=Mv%rEg;3w$bwggrf+im71glgkK}T$3&Z~ zg*?SZZe8MW{G|N+xP|e${}Q=zM4AxK8vmpTS;hOFCAZAM9UbE6lZ%w*-MjzRNgCdr zr`veexbO5{v1oH|FpuHrkiG3>Lj)!_IJN1i^1ch4UQKR{L_|bHL_|bHL_|bH^slLv zEUA?&kzq&7ydmkN<}%V;^Tu0S#3W?c5tY(bS>}P;M!8_b|2+$$(&6*!+7)^K@#o6o z-DBnrQ6C)u!1vGl@zr;9#0gN(O0vGvoG;PYwJRdSjsQTtT3mX(2PZN8s7;Hr!7AIE z%J|M2yIw6y*REvtpC{gvvaj`OQTAUx!%pMkkNs3|^&v#x1&Z$Svc0R0M?^$KME|>A XS@d$zd-?MC00000NkvXXu0mjf=a@Ec literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/wielded-inhand-right.png b/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0d80816dbc02e9362a747c91d2f0067abf3fb268 GIT binary patch literal 625 zcmV-%0*?KOP)qhqNe%r!68Vc zG^N;cIWi`o#ns0lc`tVwH8Hgk{CyzY zaoc(HvpKjqXWY)yD>Cs#RqVV41s{^zVrw*JTIDt00NP;`A3OgP#rG@Zy*R=36%T+H z?^=Hx&q>ZD^K6uVssNj-@Zij2eZ^zDP?)#<+NLkO3x zJ=$SJ_o@%T=dWMln=NJ+tb5XDIk%Jw>c(ES_Tv5T&jApQc8_-I>>u|4hTD4T-{G!X z%r00mhiQxO^5i`L%ekf0+zS41aL322ip}$LJ}tWl%&J(&$FcxC4hAQNg>WZ>+~D&s zlbwajKlvkDbvU2loHH<5C}6bU9h{~Y#(Cz}IX5@>aZwZz5fKp)5fKp)5fKqczdumO zdsfJMX1#`$*L+KMU*|DicG7_zpH!RMbz0kDgiEYhD_vW1lf<)L<7WDnL5{eoXcvLG ziuZW0X5X^J%LAT8x0%hmKqsncv|f_MN+luogI`h5Y@L@TO1!B&x_q=~eW z5lspUD99^Ziq)7EzcXeAdz|}KD|<9L=lJgR*kgcU7=~eLG9=Wt1|L}YQjm`ZKXt5& zIMc2m={TK`{vAqXWJpLGK29g}n)&tTP7Km94o3UPkkB9JTWJu^> zw2whLwx2{_`3wmW5X{vFmf9cc)_#mpkTlI_bqK>)1rtCdBn@L#o1f;hSN{f&P>@tC zN-7p*FvfxVijBn5u=em$02@yoRM-Ll{QCXJi%=g#Leja|1d0SV)z39u!NAhb+;+m% zZrXK*v7*DHFZGq5<})f5B~A00yZ&X}NZtu;UiT?|>&uWBnP2lS(I3ND(TBZV{4FoB zDCUj4Ji89)I+2iXHV*_^0g;fjEp~8QUE`*@c$0_V0&r;_2rK~C<^c}@=v$F1fva=6 zHV=4cf+y9M>nZDbU7PnpB&5>^sMY1Iu7u9xaupfUy9kD17=~dOhG7_{cZ9M@0@!Ia zej}u}%R<0Lt8oBV>0u)=ZD8{)gK+>qzMnM`({+pk`1q;8mliEieg5Wt(vaTE5#YWF z&hf9Anilwq#CUA5o1-sr9&Z|t?d5IIhF(^H4IF^!z>u1t4aNbK!lw+k+*a4dV~qpY z7CVi^w1JIQ;{a?@Z5uBY;A`K%ZT|Zv*h_4lTY9+;;A&+UhGERO1A|}lCY_VY=>Px# M07*qoM6N<$f*tE1y#N3J literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..57ddea98f7414dd10d4088aa06e12ae541f64400 GIT binary patch literal 626 zcmV-&0*(ENP)X5X^J%LAT8x0%hmKqsncv|f_MN+luogI`h5Y@L@TO1!B&x_q=~eW z5lspUD99^Ziq)7EzcXeAdz|}KD|<9L=lJgR*kgcU7=~eLG9=Wt1|L}YQjm`ZKXt5& zIMc2m={TK`{vAqXWJpLGK29g}n)&tTP7Km94o3UPkkB9JTWJu^> zw2whLwx2{_`3wmW5X{vFmf9cc)_#mpkTlI_bqK>)1rtCdBn@L#o1f;hSN{f&P>@tC zN-7p*FvfxVijBn5u=em$02@yoRM-Ll{QCXJi%=g#Leja|1d0SV)z39u!NAhb+;+m% zZrXK*v7*DHFZGq5<})f5B~A00yZ&X}NZtu;UiT?|>&uWBnP2lS(I3ND(TBZV{4FoB zDCUj4Ji89)I+2iXHV*_^0g;fjEp~8QUE`*@c$0_V0&r;_2rK~C<^c}@=v$F1fva=6 zHV=4cf+y9M>nZDbU7PnpB&5>^sMY1Iu7u9xaupfUy9kD17=~dOhG7_{cZ9M@0@!Ia zej}u}%R<0Lt8oBV>0u)=ZD8{)gK+>qzMnM`({+pk`1q;8mliEieg5Wt(vaTE5#YWF z&hf9Anilwq#CUA5o1-sr9&Z|t?d5IIhF(^H4IF^!z>u1t4aNbK!lw+k+*a4dV~qpY z7CVi^w1JIQ;{a?@Z5uBY;A`K%ZT|Zv*h_4lTY9+;;A&+UhGERO1A|}lCY_VY=>Px# M07*qoM6N<$f*tE1y#N3J literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/icon.png b/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..94119d3503d2b5a0f3f8ad6e41777bf0355de5d2 GIT binary patch literal 596 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 literal 0 HcmV?d00001