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 0000000000..5b54dcdc4a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..5b54dcdc4a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/meta.json index a1d4f2f024..ed693cef37 100644 --- a/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/cult_halberd.rsi/meta.json @@ -25,6 +25,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/_Sunrise/BloodCult/blood_spear.rsi/icon.png b/Resources/Textures/_Sunrise/BloodCult/Entities/blood_spear.rsi/icon.png similarity index 100% rename from Resources/Textures/_Sunrise/BloodCult/blood_spear.rsi/icon.png rename to Resources/Textures/_Sunrise/BloodCult/Entities/blood_spear.rsi/icon.png diff --git a/Resources/Textures/_Sunrise/BloodCult/blood_spear.rsi/inhand-left.png b/Resources/Textures/_Sunrise/BloodCult/Entities/blood_spear.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_Sunrise/BloodCult/blood_spear.rsi/inhand-left.png rename to Resources/Textures/_Sunrise/BloodCult/Entities/blood_spear.rsi/inhand-left.png diff --git a/Resources/Textures/_Sunrise/BloodCult/blood_spear.rsi/inhand-right.png b/Resources/Textures/_Sunrise/BloodCult/Entities/blood_spear.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_Sunrise/BloodCult/blood_spear.rsi/inhand-right.png rename to Resources/Textures/_Sunrise/BloodCult/Entities/blood_spear.rsi/inhand-right.png diff --git a/Resources/Textures/_Sunrise/BloodCult/blood_spear.rsi/meta.json b/Resources/Textures/_Sunrise/BloodCult/Entities/blood_spear.rsi/meta.json similarity index 100% rename from Resources/Textures/_Sunrise/BloodCult/blood_spear.rsi/meta.json rename to Resources/Textures/_Sunrise/BloodCult/Entities/blood_spear.rsi/meta.json diff --git a/Resources/Textures/_Sunrise/BloodCult/blood_spear.rsi/wielded-inhand-left.png b/Resources/Textures/_Sunrise/BloodCult/Entities/blood_spear.rsi/wielded-inhand-left.png similarity index 100% rename from Resources/Textures/_Sunrise/BloodCult/blood_spear.rsi/wielded-inhand-left.png rename to Resources/Textures/_Sunrise/BloodCult/Entities/blood_spear.rsi/wielded-inhand-left.png diff --git a/Resources/Textures/_Sunrise/BloodCult/blood_spear.rsi/wielded-inhand-right.png b/Resources/Textures/_Sunrise/BloodCult/Entities/blood_spear.rsi/wielded-inhand-right.png similarity index 100% rename from Resources/Textures/_Sunrise/BloodCult/blood_spear.rsi/wielded-inhand-right.png rename to Resources/Textures/_Sunrise/BloodCult/Entities/blood_spear.rsi/wielded-inhand-right.png diff --git a/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..6baffa7315 Binary files /dev/null and b/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..6baffa7315 Binary files /dev/null and b/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/icon.png b/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/icon.png new file mode 100644 index 0000000000..135094d0c3 Binary files /dev/null and b/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/icon.png differ 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 0000000000..85eeb85e77 Binary files /dev/null and b/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/inhand-right.png b/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/inhand-right.png new file mode 100644 index 0000000000..bf9138045c Binary files /dev/null and b/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/meta.json b/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/meta.json new file mode 100644 index 0000000000..2dbd985a3d --- /dev/null +++ b/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by github:ladm202", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/wielded-inhand-left.png b/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..e42b5649db Binary files /dev/null and b/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/wielded-inhand-left.png differ 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 0000000000..0d80816dbc Binary files /dev/null and b/Resources/Textures/_Sunrise/BloodCult/Entities/narbee_halberd.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..57ddea98f7 Binary files /dev/null and b/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/equipped-BACKPACK.png differ 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 0000000000..57ddea98f7 Binary files /dev/null and b/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/equipped-SUITSTORAGE.png differ 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 0000000000..94119d3503 Binary files /dev/null and b/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/inhand-left.png b/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/inhand-left.png new file mode 100644 index 0000000000..353dcaaf15 Binary files /dev/null and b/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/inhand-right.png b/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/inhand-right.png new file mode 100644 index 0000000000..7f4fa5b993 Binary files /dev/null and b/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/meta.json b/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/meta.json new file mode 100644 index 0000000000..2dbd985a3d --- /dev/null +++ b/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by github:ladm202", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/wielded-inhand-left.png b/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..df1d98e7e0 Binary files /dev/null and b/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/wielded-inhand-right.png b/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..4258a152fd Binary files /dev/null and b/Resources/Textures/_Sunrise/BloodCult/Entities/reaper_halberd.rsi/wielded-inhand-right.png differ