diff --git a/Content.Server/ADT/BowsSystem/BowsSystem.cs b/Content.Server/ADT/BowsSystem/BowsSystem.cs new file mode 100644 index 00000000000..3284b76f129 --- /dev/null +++ b/Content.Server/ADT/BowsSystem/BowsSystem.cs @@ -0,0 +1,21 @@ +using Content.Shared.ADT.BowsSystem.Components; +using Content.Shared.Weapons.Ranged.Events; +using Content.Shared.Weapons.Ranged.Systems; + +namespace Content.Server.ADT.BowsSystem; + +public sealed partial class BowsSystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnShootAttempt); + } + + public void OnShootAttempt(Entity bow,ref ShotAttemptedEvent args) + { + if(bow.Comp.StepOfTension==0) + args.Cancel(); + } +} \ No newline at end of file diff --git a/Content.Shared/ADT/BowsSystem/Components/ExpendedBowsComponent.cs b/Content.Shared/ADT/BowsSystem/Components/ExpendedBowsComponent.cs new file mode 100644 index 00000000000..304af310de8 --- /dev/null +++ b/Content.Shared/ADT/BowsSystem/Components/ExpendedBowsComponent.cs @@ -0,0 +1,63 @@ +using Robust.Shared.Audio; +using Robust.Shared.GameStates; + +namespace Content.Shared.ADT.BowsSystem.Components; +[RegisterComponent, NetworkedComponent] +public sealed partial class ExpendedBowsComponent : Component +{ + + /// + /// Sound to bow on tension + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public SoundSpecifier bowSound = new SoundPathSpecifier("/Audio/Weapons/Guns/Misc/arrow_nock.ogg"); + + /// + /// Zero state timer + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public TimeSpan coldownStart = TimeSpan.Zero; + + /// + /// Time to timer + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public float floatToColdown = 7f; + + /// + /// Step of tension in bow + /// + public int StepOfTension=0; + + /// + /// Tension and loc for it + /// + public Dictionary TensionAndLoc = new Dictionary + { + {0, "popup-bow-use-null"}, + {1, "popup-bow-use-light"}, + {2, "popup-bow-use-medium"}, + {3, "popup-bow-use-hard"}, + }; + + /// + /// Tension in bow and speed modiefer for arrow + /// + public Dictionary TensionAndModieferSpeed = new Dictionary + { + {0, 0.5f}, + {1, 1f}, + {2, 1.4f}, + {3, 3f}, + }; + + /// + /// Max tension in bow + /// + public int MaxTension = 3; + + /// + /// Min tension in bow + /// + public int MinTension = 0; +} diff --git a/Content.Shared/ADT/BowsSystem/SharedBowsSystem.cs b/Content.Shared/ADT/BowsSystem/SharedBowsSystem.cs new file mode 100644 index 00000000000..924b0d0fa95 --- /dev/null +++ b/Content.Shared/ADT/BowsSystem/SharedBowsSystem.cs @@ -0,0 +1,75 @@ +using Content.Shared.ADT.BowsSystem.Components; +using Content.Shared.Containers.ItemSlots; +using Content.Shared.Interaction.Events; +using Content.Shared.Projectiles; +using Content.Shared.Popups; +using Content.Shared.Weapons.Ranged.Components; +using Content.Shared.Weapons.Ranged.Events; +using Content.Shared.Weapons.Ranged.Systems; +using Content.Shared.Wieldable.Components; +using Robust.Shared.Audio; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Containers; +using Robust.Shared.Timing; + +namespace Content.Shared.ADT.BowsSystem; + +public sealed partial class BowsSystem : EntitySystem +{ + [Dependency] private readonly SharedContainerSystem _containerSystem = default!; + [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnShoot); + SubscribeLocalEvent(OnUseInHand); + SubscribeLocalEvent(EditSpeed); + } + + private void OnShoot(Entity bow, ref GunShotEvent args) + { + bow.Comp.StepOfTension=bow.Comp.MinTension; + } + + private void OnUseInHand(Entity bow, ref UseInHandEvent args) + { + bow.Comp.coldownStart = _timing.CurTime + TimeSpan.FromSeconds(bow.Comp.floatToColdown); + } + + public override void Update(float frameTime) + { + base.Update(frameTime); + + var query = EntityQueryEnumerator(); + + while (query.MoveNext(out var uid, out var comp)) + { + if (_timing.CurTime < comp.coldownStart) + continue; + if(!TryComp(uid,out var wieldedcomp)) + continue; + if (wieldedcomp.Wielded == false) + { + comp.StepOfTension=comp.MinTension; + continue; + } + if (wieldedcomp.User is not {} owner) + continue; + if (comp.StepOfTension >= comp.MaxTension) + continue; + + comp.StepOfTension++; + _popup.PopupClient(Loc.GetString(comp.TensionAndLoc[comp.StepOfTension],("user", owner)), uid, owner); + _audio.PlayPvs(comp.bowSound, owner); + comp.coldownStart = _timing.CurTime + TimeSpan.FromSeconds(comp.floatToColdown); + } + } + + private void EditSpeed(Entity bow, ref GunRefreshModifiersEvent args) + { + args.ProjectileSpeed =args.ProjectileSpeed * bow.Comp.TensionAndModieferSpeed[bow.Comp.StepOfTension]; + } +} \ No newline at end of file diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs index fa127e3a089..f7d584b243e 100644 --- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs @@ -212,7 +212,7 @@ public sealed partial class GunComponent : Component /// /// The base value for how fast the projectile moves. /// - [DataField] + [DataField] public float ProjectileSpeed = 30f; // ADT-Tweak 42f -> 30f /// diff --git a/Resources/Locale/ru-RU/ADT/bowsexpended/popups-bows-expended.ftl b/Resources/Locale/ru-RU/ADT/bowsexpended/popups-bows-expended.ftl new file mode 100644 index 00000000000..04e69bb07c3 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/bowsexpended/popups-bows-expended.ftl @@ -0,0 +1,4 @@ +popup-bow-use-null = {$user} отпускает тетиву! +popup-bow-use-light = {$user} начинает натягивать тетиву! +popup-bow-use-medium = {$user} натягивает тетиву сильнее! +popup-bow-use-hard = {$user} натягивает тетиву максимально! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Bows/compound_bows.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Bows/compound_bows.ftl new file mode 100644 index 00000000000..ba365eb1304 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Bows/compound_bows.ftl @@ -0,0 +1,5 @@ +ent-ADTHandMadeCompoundBow = блочный лук + .desc = Ты бы еще еоку скрафтил бы! + +ent-ADTSecurityCompoundBow = блочный лук службы безопасности + .desc = Ты вспоминаешь, как по новостям везде крутили одну фразу инженеров программы арсенала станций: "Ну в СССП, в древние времена, была же конское СБ, вот и у нас будет!...Лучники СБ..." \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.ftl new file mode 100644 index 00000000000..7501a10bf96 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.ftl @@ -0,0 +1,8 @@ +ent-ADTArrowSecurity = стрела службы безопасности + .desc = Металлическая, грациозная и идеальная! Самое то, чтобы применить её на клоуне! + +ent-ADTArrowFlashSecurity = светящаяся стрела + .desc = Два в одном! Только сейчас! Пометь цель для ловли стрелой, и оставь тем самым на ней как ментальный, так и физический урон! + +ent-ADTArrowGranade = взрывная стрела + .desc = "Идиальный" снаряд для вашего лука во время стелса! Разорвет всех, кто вас может заметить, услышать или каким либо способом еще обнаружить. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/recipes/tag.ftl b/Resources/Locale/ru-RU/ADT/recipes/tag.ftl index 72db5975db6..4a7b9f94f15 100644 --- a/Resources/Locale/ru-RU/ADT/recipes/tag.ftl +++ b/Resources/Locale/ru-RU/ADT/recipes/tag.ftl @@ -96,6 +96,10 @@ construction-graph-tag-aloe = алоэ construction-graph-door-electronics = микросхема шлюза construction-graph-intercom-electronics = плата интеркома +# Оружие +construction-graph-tag-arrow = любая стрела +construction-graph-tag-c4 = C4 + # Другое construction-graph-voice-trigger = голосовой триггер construction-graph-tag-toy-blaster = игрушечный бластер diff --git a/Resources/Locale/ru-RU/ADT/research/technologies.ftl b/Resources/Locale/ru-RU/ADT/research/technologies.ftl index b9cadfd016f..4dbbe974f29 100644 --- a/Resources/Locale/ru-RU/ADT/research/technologies.ftl +++ b/Resources/Locale/ru-RU/ADT/research/technologies.ftl @@ -14,3 +14,7 @@ research-technology-basemegacells = Мегабатареи research-technology-advancedmegacells = Сверхэффективные мегабатареи research-technology-reducer = Беспроводная передача энергии + +research-technology-bow-security = Снаряжение лучника СБ + +research-technology-arrows-security = Нелетальное, продвинутое снаряжение лучника СБ diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl index 8b0c5813279..f9cb1392ffc 100644 --- a/Resources/Locale/ru-RU/research/technologies.ftl +++ b/Resources/Locale/ru-RU/research/technologies.ftl @@ -73,4 +73,4 @@ research-technology-advanced-spray = Продвинутые спреи research-technology-clowning-utilities = Клоунские принадлежности research-technology-quantum-fiber-weaving = Плетение квантового волокна research-technology-bluespace-cargo-transport = Блюспейс-транспортировка грузов -research-technology-experimental-pka = Экспериментальный протокинетический ускоритель +research-technology-experimental-pka = Экспериментальный протокинетический ускоритель \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Bows/compound_bows.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Bows/compound_bows.yml new file mode 100644 index 00000000000..8043c4e7c6e --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Bows/compound_bows.yml @@ -0,0 +1,77 @@ +- type: entity + id: ADTHandMadeCompoundBow + parent: BaseBow + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi + layers: + - state: unwielded + map: [ base ] + - state: unwielded-arrow + map: [ arrow ] + visible: false + - type: Appearance + - type: ItemMapper + spriteLayers: + - arrow + mapLayers: + arrow: + whitelist: + tags: + - Arrow + - type: GenericVisualizer + visuals: + enum.WieldableVisuals.Wielded: + arrow: + True: { state: wielded-arrow } + False: { state: unwielded-arrow } + base: + True: { state: wielded } + False: { state: unwielded } + - type: ExpendedBows + floatToColdown: 5 + - type: Construction + graph: HandmadeCompoundBow + node: HandmadeCompoundBow + +- type: entity + id: ADTSecurityCompoundBow + parent: BaseBow + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi + layers: + - state: unwielded + map: [ base ] + - state: unwielded-arrow + map: [ arrow ] + visible: false + - type: Appearance + - type: ItemMapper + spriteLayers: + - arrow + mapLayers: + arrow: + whitelist: + tags: + - Arrow + - type: GenericVisualizer + visuals: + enum.WieldableVisuals.Wielded: + arrow: + True: { state: wielded-arrow } + False: { state: unwielded-arrow } + base: + True: { state: wielded } + False: { state: unwielded } + - type: ExpendedBows + floatToColdown: 2 + - type: AttachableHolder + slots: + rmc-aslot-rail: + whitelist: + tags: + - ADTAttachmentT2Miniscope + - type: AttachableHolderVisuals + offsets: + rmc-aslot-rail: -0.0325, -0.0625 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml new file mode 100644 index 00000000000..80a643a6440 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml @@ -0,0 +1,79 @@ +- type: entity + parent: BaseArrow + id: ADTArrowSecurity + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/arrows.rsi + layers: + - state: tail + color: red + - state: rod + color: white + - state: tip + color: white + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: Projectile + damage: + types: + Piercing: 35 + +- type: entity + parent: BaseArrow + id: ADTArrowFlashSecurity + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/arrows.rsi + layers: + - state: tail + color: yellow + - state: rod + color: white + - state: tip + color: white + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: Projectile + damage: + types: + Piercing: 20 + Heat: 5 + - type: AmbientSound + enabled: true + volume: 0 + range: 7 + sound: + path: /Audio/Machines/sonar-ping.ogg + params: + loop: true + - type: IgniteOnCollide + fireStacks: 1 + - type: PointLight + enabled: true + color: "#ffee00" + radius: 15.0 + energy: 9.0 + +- type: entity + parent: BaseArrow + id: ADTArrowGranade + components: + - type: TriggerOnCollide + fixtureID: fix1 + maxTriggers: 1 + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Projectiles/arrows_custom.rsi + layers: + - state: grenade + - type: ExplodeOnTrigger + - type: Explosive + explosionType: DemolitionCharge + totalIntensity: 150 + intensitySlope: 25 + maxIntensity: 50 + canCreateVacuum: false + - type: Construction + graph: ADTArrowGranade + node: ADTArrowGranade diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/weapons/arrows.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/weapons/arrows.yml new file mode 100644 index 00000000000..f6741eba78a --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Construction/Graph/weapons/arrows.yml @@ -0,0 +1,26 @@ +- type: constructionGraph + id: ADTArrowGranade + start: start + graph: + - node: start + edges: + - to: ADTArrowGranade + steps: + - tag: C4 + icon: + sprite: Objects/Weapons/Bombs/c4.rsi + state: icon + name: construction-graph-tag-arrow + - tag: Arrow + icon: + sprite: Objects/Weapons/Guns/Projectiles/arrows.rsi + state: icon_craft + name: construction-graph-tag-c4 + - material: Steel + amount: 5 + doAfter: 4 + - material: Cable + amount: 10 + doAfter: 4 + - node: ADTArrowGranade + entity: ADTArrowGranade diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/weapons/fill.txt b/Resources/Prototypes/ADT/Recipes/Construction/Graph/weapons/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Recipes/Construction/Graph/weapons/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/weapons/handmade_compound_bow.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/weapons/handmade_compound_bow.yml new file mode 100644 index 00000000000..ae18462fdab --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Construction/Graph/weapons/handmade_compound_bow.yml @@ -0,0 +1,21 @@ +- type: constructionGraph + id: HandmadeCompoundBow + start: start + graph: + - node: start + edges: + - to: HandmadeCompoundBow + steps: + - material: WoodPlank + amount: 15 + doAfter: 4 + - material: Cloth + amount: 6 + doAfter: 4 + - material: Steel + amount: 5 + doAfter: 4 + + + - node: HandmadeCompoundBow + entity: ADTHandMadeCompoundBow \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Construction/weapons.yml b/Resources/Prototypes/ADT/Recipes/Construction/weapons.yml new file mode 100644 index 00000000000..0ed2f759084 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Construction/weapons.yml @@ -0,0 +1,15 @@ +- type: construction + id: HandmadeCompoundBow + graph: HandmadeCompoundBow + startNode: start + targetNode: HandmadeCompoundBow + category: construction-category-weapons + objectType: Item + +- type: construction + id: ADTArrowGranade + graph: ADTArrowGranade + startNode: start + targetNode: ADTArrowGranade + category: construction-category-weapons + objectType: Item \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/ADT/Recipes/Lathes/Packs/security.yml index 0937c1d67a8..b8e48d1bec3 100644 --- a/Resources/Prototypes/ADT/Recipes/Lathes/Packs/security.yml +++ b/Resources/Prototypes/ADT/Recipes/Lathes/Packs/security.yml @@ -52,3 +52,9 @@ - ADTBoxAmmoHades # - ADTBoxAmmoSniper Вырезано ради баланса - ADTBoxAmmoGranade + +- type: latheRecipePack + id: ADTBowEquipmentPack + recipes: + - ADTSecurityCompoundBow + - ADTArrowSecurity diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/armory.yml b/Resources/Prototypes/ADT/Recipes/Lathes/armory.yml index 5b72a0bacd8..f6937fbaa7a 100644 --- a/Resources/Prototypes/ADT/Recipes/Lathes/armory.yml +++ b/Resources/Prototypes/ADT/Recipes/Lathes/armory.yml @@ -111,3 +111,21 @@ materials: Lead : 300 #ADT-BFUU-Tweak Plastic: 200 + +- type: latheRecipe + id: ADTSecurityCompoundBow + result: ADTSecurityCompoundBow + completetime: 10 + materials: + Steel : 1100 + Silver: 500 + Lead: 300 + +- type: latheRecipe + id: ADTArrowSecurity + result: ADTArrowSecurity + completetime: 2 + materials: + Steel : 100 + Plastic: 200 + Lead: 100 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Research/arsenal.yml b/Resources/Prototypes/ADT/Research/arsenal.yml index 39b78988d91..32c838f04aa 100644 --- a/Resources/Prototypes/ADT/Research/arsenal.yml +++ b/Resources/Prototypes/ADT/Research/arsenal.yml @@ -95,4 +95,37 @@ - PKAUpgradeFireRate position: 0,2 requiredTech: - - SalvageWeapons \ No newline at end of file + - SalvageWeapons + +# Луки +- type: technology + id: ADTBowSecurity + name: research-technology-bow-security + icon: + sprite: ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi + state: unwielded + discipline: Arsenal + tier: 2 + cost: 6000 + recipeUnlocks: + - ADTSecurityCompoundBow + - ADTArrowSecurity + position: 6,-2 + requiredTech: + - WaveParticleHarnessing + +- type: technology + id: ADTSecurityArrows + name: research-technology-arrows-security + icon: + sprite: Objects/Weapons/Guns/Projectiles/arrows.rsi + state: icon_craft + discipline: Arsenal + tier: 2 + cost: 4000 + recipeUnlocks: + - ADTSecurityCompoundBow + - ADTArrowSecurity + position: 7,-2 + requiredTech: + - ADTBowSecurity \ No newline at end of file diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index 3b82bd90d1b..d60c472dc92 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -742,6 +742,9 @@ - type: Tag id: ADTClosedRadio +- type: Tag + id: C4 + - type: Tag id: ADTDrill diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml index 45c5189ef30..fcff5b785bb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml @@ -94,6 +94,11 @@ festive: Objects/Weapons/Bombs/c4gift.rsi - type: StaticPrice price: 625 # 5000 for a bundle of 8 + #ADT-Tweak-Start + - type: Tag + tags: + - C4 + #ADT-Tweak-End - type: entity name: seismic charge diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml index 6c18a54f104..0a6f34ee94f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml @@ -46,6 +46,7 @@ projectiles: !type:ContainerSlot - type: ContainerAmmoProvider container: projectiles + - type: ExpendedBows # ADT-Tweak - type: entity id: BowImprovised diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 9481adcd554..ff59f2aa99d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -481,6 +481,7 @@ - ADTAttachmentPack - ADT40mmGrenadePack - ADTMechEquipmentSecTechfabPack + - ADTBowEquipmentPack # ADT-tweak-end - type: EmagLatheRecipes emagStaticPacks: diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..1d1679516de Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/inhand-left.png new file mode 100644 index 00000000000..4009a065c42 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/inhand-right.png new file mode 100644 index 00000000000..923a3a8f14d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/meta.json new file mode 100644 index 00000000000..d23a572ddeb --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "equipped backpack and wielded states by firemix_, other by TeddeN : mateo_xilka", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "unwielded" + }, + { + "name": "unwielded-arrow" + }, + { + "name": "wielded" + }, + { + "name": "wielded-arrow" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/unwielded-arrow.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/unwielded-arrow.png new file mode 100644 index 00000000000..d1417b707fd Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/unwielded-arrow.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/unwielded.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/unwielded.png new file mode 100644 index 00000000000..6521f710fbe Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/unwielded.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/wielded-arrow.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/wielded-arrow.png new file mode 100644 index 00000000000..69419f9a7b9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/wielded-arrow.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/wielded-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..b1686a0afef Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/wielded-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..d77917308a1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/wielded.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/wielded.png new file mode 100644 index 00000000000..86a05efe208 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi/wielded.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..68707fbb021 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/inhand-left.png new file mode 100644 index 00000000000..640e478e0d5 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/inhand-right.png new file mode 100644 index 00000000000..be17ace0625 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/meta.json new file mode 100644 index 00000000000..f09a1dfbee2 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "by ds:firemix_", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "unwielded" + }, + { + "name": "unwielded-arrow" + }, + { + "name": "wielded" + }, + { + "name": "wielded-arrow" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/unwielded-arrow.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/unwielded-arrow.png new file mode 100644 index 00000000000..7b616a6a277 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/unwielded-arrow.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/unwielded.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/unwielded.png new file mode 100644 index 00000000000..70400ae2516 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/unwielded.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/wielded-arrow.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/wielded-arrow.png new file mode 100644 index 00000000000..329f3703730 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/wielded-arrow.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/wielded-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..4547e48e20c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/wielded-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..15632353802 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/wielded.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/wielded.png new file mode 100644 index 00000000000..f653dfa9d73 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi/wielded.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/arrows_custom.rsi/grenade.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/arrows_custom.rsi/grenade.png new file mode 100644 index 00000000000..da470a56dca Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/arrows_custom.rsi/grenade.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/arrows_custom.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/arrows_custom.rsi/meta.json new file mode 100644 index 00000000000..47f8c192d0b --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/arrows_custom.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 2, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a, ball made by brainfood1183 (Github) for ss14, the uranium sprite is a modified version of the buckshot pellet by Boaz1111, cleanade made by Southbridge_fur (github), resprited buckshot made by @Peper for Adventure time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "grenade" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/icon_craft.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/icon_craft.png new file mode 100644 index 00000000000..47dc169fd3c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/icon_craft.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json index f5f474b9606..5fbe9db98d7 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "tgstation at a373b4cb08298523d40acc14f9c390a0c403fc31, sprites modified and cut into layers by mirrorcult", + "copyright": "tgstation at a373b4cb08298523d40acc14f9c390a0c403fc31, sprites modified and cut into layers by mirrorcult, icon_craft by FIREMIX", "size": { "x": 32, "y": 32 @@ -26,6 +26,9 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "icon_craft" } ] }