diff --git a/Content.Shared/ADT/Blur/BlurOnCollideComponent.cs b/Content.Shared/ADT/Blur/BlurOnCollideComponent.cs new file mode 100644 index 00000000000..aa3758e33fc --- /dev/null +++ b/Content.Shared/ADT/Blur/BlurOnCollideComponent.cs @@ -0,0 +1,8 @@ +namespace Content.Shared._White.Collision.Blur; + +[RegisterComponent] +public sealed partial class BlurOnCollideComponent : Component +{ + [DataField] + public float BlurTime = 5f; +} diff --git a/Content.Shared/ADT/Blur/BlurOnCollideSystem.cs b/Content.Shared/ADT/Blur/BlurOnCollideSystem.cs new file mode 100644 index 00000000000..257dc5bd748 --- /dev/null +++ b/Content.Shared/ADT/Blur/BlurOnCollideSystem.cs @@ -0,0 +1,37 @@ +using Content.Shared.Eye.Blinding.Components; +using Content.Shared.Projectiles; +using Content.Shared.StatusEffect; +using Content.Shared.Throwing; + +namespace Content.Shared._White.Collision.Blur; + +public sealed class BlurOnCollideSystem : EntitySystem +{ + [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnProjectileHit); + SubscribeLocalEvent(OnEntityHit); + } + + private void OnEntityHit(Entity ent, ref ThrowDoHitEvent args) + { + ApplyEffects(args.Target, ent.Comp); + } + + private void OnProjectileHit(Entity ent, ref ProjectileHitEvent args) + { + ApplyEffects(args.Target, ent.Comp); + } + + private void ApplyEffects(EntityUid target, BlurOnCollideComponent component) + { + _statusEffects.TryAddStatusEffect(target, + "BlurryVision", + TimeSpan.FromSeconds(component.BlurTime), + true); + } +} diff --git a/Content.Shared/ADT/Knockdown/KnockdownOnCollideComponent.cs b/Content.Shared/ADT/Knockdown/KnockdownOnCollideComponent.cs new file mode 100644 index 00000000000..b1a0f3fd2f9 --- /dev/null +++ b/Content.Shared/ADT/Knockdown/KnockdownOnCollideComponent.cs @@ -0,0 +1,9 @@ +using Content.Shared.ADT.Crawling; + +namespace Content.Shared.ADT.Collision.Knockdown; + +[RegisterComponent] +public sealed partial class KnockdownOnCollideComponent : Component +{ + +} diff --git a/Content.Shared/ADT/Knockdown/KnockdownOnCollideSystem.cs b/Content.Shared/ADT/Knockdown/KnockdownOnCollideSystem.cs new file mode 100644 index 00000000000..6c1553919b5 --- /dev/null +++ b/Content.Shared/ADT/Knockdown/KnockdownOnCollideSystem.cs @@ -0,0 +1,43 @@ +using Content.Shared.Projectiles; +using Content.Shared.ADT.Crawling; +using Content.Shared.Throwing; +using Content.Shared.DoAfter; +using Content.Shared.Explosion; +using Content.Shared.Input; +using Robust.Shared.Input.Binding; +using Content.Shared.Standing; +using Robust.Shared.Serialization; +using Content.Shared.Stunnable; +using Robust.Shared.Player; +using Content.Shared.Movement.Systems; +using Content.Shared.Alert; +using Content.Shared.Climbing.Components; +using Content.Shared.Popups; +using Robust.Shared.Physics.Systems; +using Robust.Shared.Map.Components; +using Content.Shared.Climbing.Systems; +using Content.Shared.Climbing.Events; + +namespace Content.Shared.ADT.Collision.Knockdown; + +public sealed class KnockdownOnCollideSystem : EntitySystem +{ + [Dependency] private readonly StandingStateSystem _standing = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnProjectileHit); + } + + private void OnProjectileHit(Entity ent, ref ProjectileHitEvent args) + { + ApplyEffects(args.Target, ent.Comp); + } + + private void ApplyEffects(EntityUid target, KnockdownOnCollideComponent component) + { + _standing.Down(target, dropHeldItems: false); + } +} diff --git a/Content.Shared/Eye/Blinding/Components/BlurryVisionComponent.cs b/Content.Shared/Eye/Blinding/Components/BlurryVisionComponent.cs index faff4b9e527..4dc3a08fde7 100644 --- a/Content.Shared/Eye/Blinding/Components/BlurryVisionComponent.cs +++ b/Content.Shared/Eye/Blinding/Components/BlurryVisionComponent.cs @@ -15,13 +15,13 @@ public sealed partial class BlurryVisionComponent : Component /// Amount of "blurring". Also modifies examine ranges. /// [ViewVariables(VVAccess.ReadWrite), DataField("magnitude"), AutoNetworkedField] - public float Magnitude; + public float Magnitude = 4f; // Goobstation /// /// Exponent that controls the magnitude of the effect. /// [ViewVariables(VVAccess.ReadWrite), DataField("correctionPower"), AutoNetworkedField] - public float CorrectionPower; + public float CorrectionPower = 2f; // Goobstation public const float MaxMagnitude = 6; public const float DefaultCorrectionPower = 2f; diff --git a/Resources/Audio/ADT/Weapons/Guns/Gunshots/heavy_shot_suppressed.ogg b/Resources/Audio/ADT/Weapons/Guns/Gunshots/heavy_shot_suppressed.ogg new file mode 100644 index 00000000000..bbf63134676 Binary files /dev/null and b/Resources/Audio/ADT/Weapons/Guns/Gunshots/heavy_shot_suppressed.ogg differ diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl index 985823d3b94..3b64cd6a1d7 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl @@ -198,3 +198,5 @@ uplink-suppressor-description = Устанавлаемый на ствол ун uplink-attachments-magneticharness-name = Магнитный ремень uplink-attachments-magneticharness-description = Комплект из ремня и магнитных креплений, которые крепятся к верхней планке. В случае потери бойцом равновесия - оружие не падает на землю и остается с владельцем. +uplink-miniature-energy-crossbow-name = Миниатюрный энергетический арбалет +uplink-miniature-energy-crossbow-desc = Миниатюрный энергетический арбалет синдиката, тихий и смертоносный. Производитель данного товара заверяет: Будь бы он плохим, производители энергетических мечей не создавали бы 1653 по счёту коллаборацию с нами. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl index 0bee193477d..01063d3fba8 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl @@ -1,3 +1,7 @@ ent-ADTWeaponPistolX01 = X-01 М.Э.П. .desc = Мультифазовый энергетический пистолет. Это дорогая, современная версия антикварного лазерного пистолета. У этого оружия есть несколько уникальных режимов огня, но нет возможности самостоятельно перезаряжаться с течением времени. .suffix = { "Пистолет, Мультифазовый" } +ent-WeaponMiniatureEnergyCrossbow = миниатюрный энергетический арбалет + .desc = Энергетический арбалет синдиката, маленький, тихий и смертоносный. +ent-WeaponEnergyCrossbow = энергетический арбалет + .desc = Тяжёлое смертоносное оружие, поддаётся модификации модулями ПКА. Любимое оружие революционеров, еретиков и прочих любителей кустарной смерти. diff --git a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml index b59099012c5..892ca9f10c4 100644 --- a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml @@ -627,3 +627,14 @@ conditions: - !type:ListingLimitedStockCondition stock: 3 + +- type: listing + id: UplinkMiniatureEnergyCrossbow + name: uplink-miniature-energy-crossbow-name + description: uplink-miniature-energy-crossbow-desc + icon: { sprite: /Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi, state: icon } + productEntity: WeaponMiniatureEnergyCrossbow + cost: + Telecrystal: 9 + categories: + - UplinkWeaponry diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml index d0d91d0f87c..2e0a45e8f1a 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml @@ -212,3 +212,69 @@ price: 7500 - type: Item size: Normal + +- type: entity + name: Miniature Energy Crossbow + parent: BaseWeaponBatterySmall + id: WeaponMiniatureEnergyCrossbow + description: The syndicate's energy crossbow, small, silent and deadly. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Gun + resetOnHandSelected: false + soundGunshot: + path: /Audio/ADT/Weapons/Guns/Gunshots/heavy_shot_suppressed.ogg + params: + volume: -5 + - type: ProjectileBatteryAmmoProvider + proto: BulletMic + fireCost: 900 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 300 + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: true + +- type: entity + name: Energy Crossbow + parent: WeaponMiniatureEnergyCrossbow + id: WeaponEnergyCrossbow + description: Energy crossbow, big, powerful and stily. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Battery/ebow.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: ProjectileBatteryAmmoProvider + proto: BulletEnergyCrossbow + fireCost: 900 + - type: Item + size: Ginormous + - type: Construction + graph: EnergyCrossbowGraph + node: crossbow + - type: Gun + resetOnHandSelected: false + soundGunshot: + path: /Audio/ADT/Weapons/Guns/Gunshots/heavy_shot_suppressed.ogg + params: + volume: -5 + fireRate: 1 + - type: UpgradeableGun + whitelist: + tags: + - PKAUpgrade + - type: ContainerContainer + containers: + upgrades: !type:Container diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index bd05c153067..e85caa397e5 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -210,3 +210,70 @@ soundHit: collection: WeakHit forceSound: true + +- type: entity + id: BulletMic + name: MIC bolt + parent: BaseBullet + categories: [ HideSpawnMenu ] + description: Not too bad, but you still don't want to get hit by it. + components: + - type: Sprite + noRot: false + sprite: ADT/Objects/Weapons/Guns/Projectiles/cbbolt.rsi + layers: + - state: cbbolt + - type: Projectile + damage: + types: + Heat: 15 + - type: Ammo + muzzleFlash: null + - type: Reflective + reflective: + - Energy + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.05,-0.05,0.05,0.05" + hard: false + mask: + - Opaque + - type: KnockdownOnCollide + - type: BlurOnCollide + + +- type: entity + id: BulletEnergyCrossbow + name: Energy Crossbow bolt + parent: BaseBullet + categories: [ HideSpawnMenu ] + description: Not too bad, but you still don't want to get hit by it. + components: + - type: Sprite + noRot: false + sprite: ADT/Objects/Weapons/Guns/Projectiles/cbbolt.rsi + layers: + - state: cbbolt + - type: Projectile + damage: + types: + Heat: 17 + - type: Ammo + muzzleFlash: null + - type: Reflective + reflective: + - Energy + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.05,-0.05,0.05,0.05" + hard: false + mask: + - Opaque + - type: KnockdownOnCollide + - type: BlurOnCollide diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/crossbow.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/crossbow.yml new file mode 100644 index 00000000000..bdf407d25df --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/crossbow.yml @@ -0,0 +1,25 @@ +- type: constructionGraph + id: EnergyCrossbowGraph + start: start + graph: + - node: start + edges: + - to: crossbow + steps: + - tag: PKA + icon: + sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi + state: icon + name: PKA + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: modular receiver + - material: Cable + amount: 15 + - material: Uranium + amount: 10 + doAfter: 10 + - node: crossbow + entity: WeaponEnergyCrossbow diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml index 01797e4f6fc..794d9fe2962 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml @@ -113,4 +113,17 @@ description: Dagger to cut your enemies. icon: sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi - state: icon \ No newline at end of file + state: icon + +- type: construction + name: energy crossbow + id: ADTEnergyCrossbow + graph: EnergyCrossbowGraph + startNode: start + targetNode: crossbow + category: construction-category-weapons + objectType: Item + description: Big and modifyable. + icon: + sprite: ADT/Objects/Weapons/Guns/Battery/ebow.rsi + state: icon diff --git a/Resources/Prototypes/ADT/status_effects.yml b/Resources/Prototypes/ADT/status_effects.yml new file mode 100644 index 00000000000..320f3d7ddcd --- /dev/null +++ b/Resources/Prototypes/ADT/status_effects.yml @@ -0,0 +1,3 @@ +- type: statusEffect + id: BlurryVision + alwaysAllowed: true diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index a0d79e01f59..61e12718d41 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -450,3 +450,6 @@ - type: Tag id: MiningShop + +- type: Tag + id: PKA diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml index 48fa3df524f..c69324e9d17 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml @@ -74,4 +74,6 @@ soundHit: collection: GenericHit - type: AltFireMelee #ADT_Tweak - + - type: Tag #ADT tweak + tags: + - PKA diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/base.png new file mode 100644 index 00000000000..3e263ca5658 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/equipped-BACK.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/equipped-BACK.png new file mode 100644 index 00000000000..a4d64471de7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/equipped-BACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/icon.png new file mode 100644 index 00000000000..38aed2eb0d4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/inhand-left.png new file mode 100644 index 00000000000..3ccac4e1f1e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/inhand-right.png new file mode 100644 index 00000000000..35875745fa1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/mag-0.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/mag-0.png new file mode 100644 index 00000000000..db9940e7508 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/mag-0.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/mag-1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/mag-1.png new file mode 100644 index 00000000000..4ffad4b1ee1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/mag-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/meta.json new file mode 100644 index 00000000000..ac0eeada4b5 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/commit/1d0e3dde0f89e7926be32a3706883c3f003931f8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/base.png new file mode 100644 index 00000000000..87e37340c5e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/equipped-BELT.png new file mode 100644 index 00000000000..a4d64471de7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/icon.png new file mode 100644 index 00000000000..cd42cd5e83e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/inhand-left.png new file mode 100644 index 00000000000..1567b5cc795 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/inhand-right.png new file mode 100644 index 00000000000..18152d0db3f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/mag-0.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/mag-0.png new file mode 100644 index 00000000000..cb7a970e822 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/mag-0.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/mag-1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/mag-1.png new file mode 100644 index 00000000000..a1843cfceb9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/mag-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/meta.json new file mode 100644 index 00000000000..813adb28546 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/commit/1d0e3dde0f89e7926be32a3706883c3f003931f8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/cbbolt.rsi/cbbolt.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/cbbolt.rsi/cbbolt.png new file mode 100644 index 00000000000..f49e559ac35 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/cbbolt.rsi/cbbolt.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/cbbolt.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/cbbolt.rsi/meta.json new file mode 100644 index 00000000000..9ce46c39477 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/cbbolt.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cbbolt" + } + ] +}