diff --git a/Content.Server/_Wega/Chaplain/ChaplainEquipmentSystem.cs b/Content.Server/_Wega/Chaplain/ChaplainEquipmentSystem.cs new file mode 100644 index 00000000000..9425d4b393d --- /dev/null +++ b/Content.Server/_Wega/Chaplain/ChaplainEquipmentSystem.cs @@ -0,0 +1,57 @@ +using Content.Shared.Inventory.Events; +using Content.Shared.Hands; +using Content.Shared._Wega.Chaplain.Components; +using Content.Shared.Popups; +using Content.Shared.Throwing; +using Robust.Shared.Random; +using Content.Server.Bible.Components; + +namespace Content.Server._Wega.Chaplain; + +public sealed partial class ChaplainEquipmentSystem : EntitySystem +{ + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private IRobustRandom _random = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnEquipped); + SubscribeLocalEvent(OnPickUp); + } + + private void OnEquipped(Entity ent, ref GotEquippedEvent args) + { + var target = args.EquipTarget; + + if (HasComp(target)) + return; + + _transform.SetCoordinates(ent, Transform(target).Coordinates); + _transform.AttachToGridOrMap(ent); + _throwing.TryThrow(ent, _random.NextVector2(), 1); + _popup.PopupEntity(Loc.GetString("chaplain-pickup-fail"), + target, target, PopupType.MediumCaution); + } + + private void OnPickUp(Entity ent, ref BeforeGettingEquippedHandEvent args) + { + if (args.Cancelled) + return; + + var user = args.User; + + if (HasComp(user)) + return; + + args.Cancelled = true; + _transform.SetCoordinates(ent, Transform(user).Coordinates); + _transform.AttachToGridOrMap(ent); + _throwing.TryThrow(ent, _random.NextVector2(), 1); + _popup.PopupEntity(Loc.GetString("chaplain-pickup-fail"), + user, user, PopupType.MediumCaution); + } +} \ No newline at end of file diff --git a/Content.Shared/_Wega/Clothing/Component/ChaplainItemComponent.cs b/Content.Shared/_Wega/Clothing/Component/ChaplainItemComponent.cs new file mode 100644 index 00000000000..ecadc43e4fc --- /dev/null +++ b/Content.Shared/_Wega/Clothing/Component/ChaplainItemComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._Wega.Chaplain.Components; + +[RegisterComponent, NetworkedComponent] +public sealed partial class ChaplainItemComponent : Component +{ + //РП маркер +} \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_wega/bloodcult/bloodcult.ftl b/Resources/Locale/ru-RU/_wega/bloodcult/bloodcult.ftl index 10816376f92..2127f16b5bc 100644 --- a/Resources/Locale/ru-RU/_wega/bloodcult/bloodcult.ftl +++ b/Resources/Locale/ru-RU/_wega/bloodcult/bloodcult.ftl @@ -123,4 +123,6 @@ blood-cultist-ritual-message = TOK-LYR RQA-NAP G'OLT-ULOFT! blood-cultist-default-message = Durn'koth ya'riska thol'mar! blood-cult-on-equip-hand = Ваша рука теряет возможность сжаться в кулак из-за проклятия и вы роняете предмет. -blood-cult-on-equip = Одежда слетает с вас, как только вы её надели из-за проклятия. \ No newline at end of file +blood-cult-on-equip = Одежда слетает с вас, как только вы её надели из-за проклятия. + +chaplain-pickup-fail = Вы не можете взять этот священный предмет! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/items/belts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/items/belts.ftl index 25ea99a0632..4bab92d4009 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/items/belts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/items/belts.ftl @@ -13,4 +13,6 @@ ent-ClothingBeltSheathChaplinFilled = { ent-ClothingBeltSheathChaplin } .desc = { ent-ClothingBeltSheathChaplin.desc } ent-ClothingBeltSheathChaplinFilledERT = { ent-ClothingBeltSheathChaplin } .suffix = Заполненый, ОБР - .desc = { ent-ClothingBeltSheathChaplin.desc } \ No newline at end of file + .desc = { ent-ClothingBeltSheathChaplin.desc } +ent-ClothingBeltHolsterFilledChaplain = пояс священного вооружения + .desc = Наплечная кобура от богов. Содержит два пистолета. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/outerclothing/armor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/outerclothing/armor.ftl index 0d9f8411c3b..5519efb5046 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/outerclothing/armor.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/outerclothing/armor.ftl @@ -42,5 +42,19 @@ ent-VeilCultBrassCuirassReflection = { ent-VeilCultBrassCuirass } ent-VeilCultBrassCuirassSmoke = { ent-VeilCultBrassCuirass } .desc = { ent-VeilCultBrassCuirass.desc } .suffix = Дымовая завеса +ent-BaseArmorChaplain = броня крестоносца + .desc = Тяжелые доспехи из усиленных металлических пластин, предназначенны для храмовых служителей. +ent-ArmorChaplainHelldiver = адская броня + .desc = { ent-BaseArmorChaplain.desc} +ent-ArmorChaplainMagic = святая броня + .desc = { ent-BaseArmorChaplain.desc} +ent-ArmorChaplainSchema = схима монаха + .desc = { ent-BaseArmorChaplain.desc} +ent-ArmorChaplainInquisitor = доспехи инквизитора + .desc = { ent-BaseArmorChaplain.desc} +ent-ArmorChaplainWitchHunter = одежда охотника на вампиров + .desc = { ent-BaseArmorChaplain.desc} +ent-ArmorChaplainBrass = латунная броня + .desc = { ent-BaseArmorChaplain.desc} ent-ClothingOuterArmorGodslayer = доспехи убийцы богов .desc = Доспехи, сделанные из остатков рыцарских доспехов и частей вендиго. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/vouchers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/vouchers.ftl index bfeb23d7bc2..0f22048bda2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/vouchers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/vouchers.ftl @@ -86,6 +86,9 @@ ent-HardsuitOperSelector = преобразователь кровавого-к ent-HardsuitOperMedSelector = преобразователь медицинского кровавого-красного скафандра .desc = { ent-HardsuitCESelector.desc } .suffix = Селектор +ent-HardsuitChaplain = преобразователь священного одеяния + .desc = { ent-HardsuitCESelector.desc } + .suffix = Селектор # Другие селекторы ent-OtherCrashSelector = преобразователь крушителя diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/battery/battery_guns.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/battery/battery_guns.ftl index d1145790615..6cdf5575a35 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/battery/battery_guns.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/battery/battery_guns.ftl @@ -34,4 +34,8 @@ ent-WeaponPulseShotgun = импульсный дробовик .suffix = Дробовик ent-WeaponPulseSniper = импульсная снайперская винтовка .desc = Импульсныая винтовка с очень низким показателем скоростельности засчет убойности поподания. Один выстрел - один почти готовый труп. - .suffix = Винтовка \ No newline at end of file + .suffix = Винтовка +ent-WeaponPistolUndead = нежить + .desc = Первый из двух огромных пистолетов, способных стрелять регенерирующими пулями. Не может "жить" без своего «сестринского» пистолета. +ent-WeaponPistolFailure = неудача + .desc = { ent-WeaponPistolCasul.desc} \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 7e7f220cfc2..a46640f2876 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -191,6 +191,7 @@ - 0,0,1,3 # Corvax-Wega-NullRod-start - type: NullRod + - type: ChaplainItem - type: Reflect reflectProb: 0.3 spread: 90 diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml index 31768338991..db7df00dfb5 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml @@ -125,11 +125,14 @@ storage: back: - BoxCandle - - DrinkWaterBottleFull # Corvax-Wega - - DrinkWaterBottleFull # Corvax-Wega - - HolyWaterGrenade # Corvax-Wega - - HolyWaterGrenade # Corvax-Wega - - HolyWaterGrenade # Corvax-Wega + # Corvax-Wega-Edit-Start + - DrinkWaterBottleFull + - DrinkWaterBottleFull + - HolyWaterGrenade + - HolyWaterGrenade + - HolyWaterGrenade + - HardsuitChaplain + # Corvax-Wega-Edit-End - Lantern - Lantern - Bible diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index b000799cc1c..fe0d36b542a 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -25,10 +25,11 @@ # shoes: ClothingShoesColorBlack # Corvax-Wega-Edit id: ChaplainPDA ears: ClothingHeadsetService - belt: ClothingBeltSheathChaplinFilled + belt: ClothingBeltSheathChaplinFilled #Wega-Chaplain-Edit storage: back: - RubberStampChaplain + - HardsuitChaplain - type: chameleonOutfit id: ChaplainChameleonOutfit diff --git a/Resources/Prototypes/_Wega/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/_Wega/Catalog/Fills/Items/belt.yml index f5c0982087f..a74b3c0bfde 100644 --- a/Resources/Prototypes/_Wega/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/_Wega/Catalog/Fills/Items/belt.yml @@ -71,4 +71,24 @@ - type: ContainerFill containers: item: - - WeaponNullRodERT \ No newline at end of file + - WeaponNullRodERT + +- type: entity + id: ClothingBeltHolsterFilledChaplain + parent: ClothingBeltHolster + name: Chaplains' Holster + description: A shoulder holster from the Gods. Contains a set of dual pistols. + suffix: Filled, Chaplain + components: + - type: Item + size: Ginormous + - type: Sprite + sprite: _Wega/Clothing/Belt/holster.rsi + - type: Clothing + sprite: _Wega/Clothing/Belt/holster.rsi + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: WeaponPistolFailure + - id: WeaponPistolUndead \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/armor.yml index 9f815538d8f..1633df6dfa0 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/armor.yml @@ -359,6 +359,94 @@ - VeilCultBrassCuirassAbsorb - VeilCultBrassCuirassSmoke +# armor chaplain start +- type: entity + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] + id: BaseArmorChaplain + name: crusader armor + description: A heavy armor made of reinforced metal plates for for temple ministers. + components: + - type: Sprite + sprite: _Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi + - type: Clothing + sprite: _Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.65 + Heat: 0.75 + - type: ExplosionResistance + damageCoefficient: 0.9 + - type: FireProtection + reduction: 0.7 + - type: ClothingSpeedModifier + walkModifier: 1.0 + sprintModifier: 1.0 + - type: ChaplainItem + +- type: entity + parent: BaseArmorChaplain + id: ArmorChaplainHelldiver + name: hell armor + components: + - type: Sprite + sprite: _Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi + - type: Clothing + sprite: _Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi + +- type: entity + parent: BaseArmorChaplain + id: ArmorChaplainMagic + name: magic armor + components: + - type: Sprite + sprite: _Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi + - type: Clothing + sprite: _Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi + +- type: entity + parent: BaseArmorChaplain + id: ArmorChaplainBrass + name: brass armor + components: + - type: Sprite + sprite: _Wega/Clothing/OuterClothing/Armor/chaplain_armor/clock.rsi + - type: Clothing + sprite: _Wega/Clothing/OuterClothing/Armor/chaplain_armor/clock.rsi + +- type: entity + parent: BaseArmorChaplain + id: ArmorChaplainInquisitor + name: inquisitor armor + components: + - type: Sprite + sprite: _Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi + - type: Clothing + sprite: _Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi + +- type: entity + parent: BaseArmorChaplain + id: ArmorChaplainWitchHunter + name: vampire hunter armor + components: + - type: Sprite + sprite: _Wega/Clothing/OuterClothing/Armor/chaplain_armor/witchhunter.rsi + - type: Clothing + sprite: _Wega/Clothing/OuterClothing/Armor/chaplain_armor/witchhunter.rsi + +- type: entity + parent: BaseArmorChaplain + id: ArmorChaplainSchema + name: vampire hunter armor + components: + - type: Sprite + sprite: _Wega/Clothing/OuterClothing/Armor/chaplain_armor/schema_monk.rsi + - type: Clothing + sprite: _Wega/Clothing/OuterClothing/Armor/chaplain_armor/schema_monk.rsi + +# armor chaplain end - type: entity parent: [ ClothingOuterBaseLarge, AllowSuitStorageClothing ] id: ClothingOuterArmorGodslayer diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Misc/hardsuitselector.yml b/Resources/Prototypes/_Wega/Entities/Objects/Misc/hardsuitselector.yml index 65d2bf422d9..c61d0c679bc 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Misc/hardsuitselector.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Misc/hardsuitselector.yml @@ -198,3 +198,23 @@ - ClothingModularControllerSyndicatePreassembled - ClothingOuterHardsuitSyndieMedic +- type: entity + parent: BaseHardsuitSelector + id: HardsuitChaplain + name: operative med hardsuit selector + description: "An obsidian rod that strikes paranormal things." + suffix: Selector + components: + - type: Sprite + sprite: _Wega/Objects/Misc/HardsuitSelector/advanced.rsi + - type: ItemSelector + items: + - BaseArmorChaplain + - ArmorChaplainHelldiver + - ArmorChaplainMagic + - ArmorChaplainBrass + - ArmorChaplainInquisitor + - ArmorChaplainWitchHunter + - ArmorChaplainSchema + - type: Item + size: Normal # чтоб в лодаут вмещался diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index e2af5cd3228..99e2430f0b4 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -389,3 +389,77 @@ maxCharge: 1000 startingCharge: 1000 - type: Appearance + +# Casul & Jackal +- type: entity + name: Casul + parent: BaseWeaponBatterySmall + id: WeaponPistolUndead + description: The first of two huge pistols, capable of firing regenerating silver bullets. Incapable of firing without its sister gun. + components: + - type: ChaplainItem + - type: NullRod + firstNullDamage: 99.99 + nullDamage: 0.01 + - type: PointLight + radius: 1.2 + energy: 2.20 # ///...\\\ + castShadows: false + color: "#0639f9" + - type: Sprite + sprite: _Wega/Objects/Weapons/Guns/Battery/casul.rsi + state: icon + - type: Clothing + sprite: _Wega/Objects/Weapons/Guns/Battery/casul.rsi + quickEquip: false + slots: + - suitStorage + - Belt + - type: Gun + minAngle: 1 + maxAngle: 5 + angleIncrease: 1 + angleDecay: 4 + fireRate: 6 + availableModes: + - SemiAuto + - FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + - type: Item + heldPrefix: lethal + size: Small + shape: + - 0,0,1,0 + - 0,1,0,1 + - type: BatteryAmmoProvider + proto: CartridgePistol + fireCost: 100 + - type: Battery + maxCharge: 700 + startingCharge: 0 + - type: BatterySelfRecharger + autoRechargeRate: 50 + autoRechargePauseTime: 5 + - type: AmmoCounter + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Tag + tags: + - Sidearm + +- type: entity + name: Jackal + parent: WeaponPistolUndead + id: WeaponPistolFailure + description: The second of two huge pistols, capable of firing regenerating silver bullets. Incapable of firing without its sister gun. + components: + - type: Sprite + sprite: _Wega/Objects/Weapons/Guns/Battery/jackal.rsi + state: icon + - type: Clothing + sprite: _Wega/Objects/Weapons/Guns/Battery/jackal.rsi + - type: Tag + tags: + - Sidearm \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/magic.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/magic.yml index a470bd83d32..7accc8a52bd 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/magic.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/magic.yml @@ -27,6 +27,7 @@ - WeaponHighFrequencyBlade - WeaponPossessedBlade - ArrhythmicKnife + - ClothingBeltHolsterFilledChaplain - type: ActivatableUI key: enum.ItemSelectorUiKey.Key - type: UserInterface diff --git a/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/equipped-BELT.png b/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/equipped-BELT.png new file mode 100644 index 00000000000..3503099a298 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/icon-filled.png b/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/icon-filled.png new file mode 100644 index 00000000000..ee57d4a8fb9 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/icon-filled.png differ diff --git a/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/icon.png new file mode 100644 index 00000000000..b929fb74483 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/inhand-left.png new file mode 100644 index 00000000000..05175bdf15f Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/inhand-right.png new file mode 100644 index 00000000000..253491ad42b Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/meta.json new file mode 100644 index 00000000000..bb3b43e3968 --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/Belt/holster.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, icon-filled by SolsticeOfTheWinter", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-filled" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..0da5b7ede68 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi/icon.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi/icon.png new file mode 100644 index 00000000000..b8688497651 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi/inhand-left.png new file mode 100644 index 00000000000..42653c12c0e Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi/inhand-right.png new file mode 100644 index 00000000000..6cc5e3aeb69 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi/meta.json b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi/meta.json new file mode 100644 index 00000000000..1995f0e04d4 --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/churst_armor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by ARMOK", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/clock.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/clock.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..53ec541e117 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/clock.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/clock.rsi/icon.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/clock.rsi/icon.png new file mode 100644 index 00000000000..6cc3bbeb2fb Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/clock.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/clock.rsi/meta.json b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/clock.rsi/meta.json new file mode 100644 index 00000000000..21b28e350cc --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/clock.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/equipped-OUTERCLOTHING-light.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/equipped-OUTERCLOTHING-light.png new file mode 100644 index 00000000000..6b87883799b Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/equipped-OUTERCLOTHING-light.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..1dd34e0cb65 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/icon.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/icon.png new file mode 100644 index 00000000000..3253de30910 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/inhand-left.png new file mode 100644 index 00000000000..53906a109bc Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/inhand-right.png new file mode 100644 index 00000000000..7ce54414de3 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/light-overlay.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/light-overlay.png new file mode 100644 index 00000000000..c98170b7e1d Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/light-overlay.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/meta.json b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/meta.json new file mode 100644 index 00000000000..e351ab2a8c2 --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/helldiver.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Renee in Goobstation discord - https://discord.com/channels/1202734573247795300/1272641181565714486", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-light", + "directions": 4 + }, + { + "name": "light-overlay" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 00000000000..73c500c003c Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..1f27b0b0184 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/icon.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/icon.png new file mode 100644 index 00000000000..7410c513ded Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/inhand-left.png new file mode 100644 index 00000000000..3e591e15c43 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/inhand-right.png new file mode 100644 index 00000000000..4ef1b0b314c Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/meta.json b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/meta.json new file mode 100644 index 00000000000..4af629a8f05 --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/inquisitor.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By RedTerror", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..d1481badeec Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi/icon.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi/icon.png new file mode 100644 index 00000000000..28df12b96be Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi/inhand-left.png new file mode 100644 index 00000000000..c09fdedbeff Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi/inhand-right.png new file mode 100644 index 00000000000..5f21db2ff50 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi/meta.json b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi/meta.json new file mode 100644 index 00000000000..c3663b26613 --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/magic_armor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "discord: Valniae (bbalint105)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/schema_monk.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/schema_monk.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..c894cbd0253 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/schema_monk.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/schema_monk.rsi/icon.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/schema_monk.rsi/icon.png new file mode 100644 index 00000000000..c8018ce3da1 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/schema_monk.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/schema_monk.rsi/meta.json b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/schema_monk.rsi/meta.json new file mode 100644 index 00000000000..f7257bf07f4 --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/schema_monk.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by gladiarus(discord:.keki4)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/witchhunter.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/witchhunter.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..4d3b6346802 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/witchhunter.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/witchhunter.rsi/icon.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/witchhunter.rsi/icon.png new file mode 100644 index 00000000000..80c156529f2 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/witchhunter.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/witchhunter.rsi/meta.json b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/witchhunter.rsi/meta.json new file mode 100644 index 00000000000..21b28e350cc --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/chaplain_armor/witchhunter.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/casul.rsi/icon.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/casul.rsi/icon.png new file mode 100644 index 00000000000..7de9e1b8e9d Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/casul.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/casul.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/casul.rsi/inhand-left.png new file mode 100644 index 00000000000..55bb0957c5b Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/casul.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/casul.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/casul.rsi/inhand-right.png new file mode 100644 index 00000000000..1a47b2d828f Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/casul.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/casul.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/casul.rsi/meta.json new file mode 100644 index 00000000000..5ec7d113e7a --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/casul.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken at commit https://github.com/Space-Stories/space-station-14/commit/9f417bc5b0e90d5d45ed7f0fd3dd84e070770672, resprite by VictorJob", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/jackal.rsi/icon.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/jackal.rsi/icon.png new file mode 100644 index 00000000000..2a65c0374f0 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/jackal.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/jackal.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/jackal.rsi/inhand-left.png new file mode 100644 index 00000000000..b8b37ac3d69 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/jackal.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/jackal.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/jackal.rsi/inhand-right.png new file mode 100644 index 00000000000..5ea94895b73 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/jackal.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/jackal.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/jackal.rsi/meta.json new file mode 100644 index 00000000000..5ec7d113e7a --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/jackal.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken at commit https://github.com/Space-Stories/space-station-14/commit/9f417bc5b0e90d5d45ed7f0fd3dd84e070770672, resprite by VictorJob", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}