Merge branch 'master' into lavaland-update-2

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;
+}

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<BlurOnCollideComponent, ProjectileHitEvent>(OnProjectileHit);
+        SubscribeLocalEvent<BlurOnCollideComponent, ThrowDoHitEvent>(OnEntityHit);
+    }
+
+    private void OnEntityHit(Entity<BlurOnCollideComponent> ent, ref ThrowDoHitEvent args)
+    {
+        ApplyEffects(args.Target, ent.Comp);
+    }
+
+    private void OnProjectileHit(Entity<BlurOnCollideComponent> ent, ref ProjectileHitEvent args)
+    {
+        ApplyEffects(args.Target, ent.Comp);
+    }
+
+    private void ApplyEffects(EntityUid target, BlurOnCollideComponent component)
+    {
+        _statusEffects.TryAddStatusEffect<BlurryVisionComponent>(target,
+            "BlurryVision",
+            TimeSpan.FromSeconds(component.BlurTime),
+            true);
+    }
+}

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
+{
+
+}

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<KnockdownOnCollideComponent, ProjectileHitEvent>(OnProjectileHit);
+    }
+
+    private void OnProjectileHit(Entity<KnockdownOnCollideComponent> ent, ref ProjectileHitEvent args)
+    {
+        ApplyEffects(args.Target, ent.Comp);
+    }
+
+    private void ApplyEffects(EntityUid target, KnockdownOnCollideComponent component)
+    {
+        _standing.Down(target, dropHeldItems: false);
+    }
+}

Content.Shared/Eye/Blinding/Components/BlurryVisionComponent.cs

@@ -15,13 +15,13 @@ public sealed partial class BlurryVisionComponent : Component
     ///     Amount of "blurring". Also modifies examine ranges.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("magnitude"), AutoNetworkedField]
-    public float Magnitude;
+    public float Magnitude = 4f; // Goobstation
 
     /// <summary>
     ///     Exponent that controls the magnitude of the effect.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("correctionPower"), AutoNetworkedField]
-    public float CorrectionPower;
+    public float CorrectionPower = 2f; // Goobstation
 
     public const float MaxMagnitude = 6;
     public const float DefaultCorrectionPower = 2f;

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 по счёту коллаборацию с нами.

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-ADTWeaponMiniatureEnergyCrossbow = миниатюрный энергетический арбалет
+    .desc = Энергетический арбалет синдиката, маленький, тихий и смертоносный.
+ent-ADTWeaponEnergyCrossbow = энергетический арбалет
+    .desc = Тяжёлое смертоносное оружие, поддаётся модификации модулями ПКА. Любимое оружие революционеров, еретиков и прочих любителей кустарной смерти.

Resources/Prototypes/ADT/Catalog/uplink_catalog.yml

@@ -627,3 +627,14 @@
   conditions:
   - !type:ListingLimitedStockCondition
     stock: 3
+
+- type: listing
+  id: ADTUplinkMiniatureEnergyCrossbow
+  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: ADTWeaponMiniatureEnergyCrossbow
+  cost:
+    Telecrystal: 9
+  categories:
+  - UplinkWeaponry

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: ADTWeaponMiniatureEnergyCrossbow
+  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: ADTBulletMic
+    fireCost: 900
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 300
+  - type: MagazineVisuals
+    magState: mag
+    steps: 2
+    zeroVisible: true
+
+- type: entity
+  name: Energy Crossbow
+  parent: ADTWeaponMiniatureEnergyCrossbow
+  id: ADTWeaponEnergyCrossbow
+  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: ADTBulletEnergyCrossbow
+    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

Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -210,3 +210,70 @@
     soundHit:
       collection: WeakHit
     forceSound: true
+
+- type: entity
+  id: ADTBulletMic
+  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: ADTBulletEnergyCrossbow
+  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

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: ADTWeaponEnergyCrossbow

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
+    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

Resources/Prototypes/ADT/status_effects.yml

@@ -0,0 +1,3 @@
+- type: statusEffect
+  id: BlurryVision
+  alwaysAllowed: true

Resources/Prototypes/ADT/tags.yml

@@ -450,3 +450,6 @@
 
 - type: Tag
   id: MiningShop
+
+- type: Tag
+  id: PKA

Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml

@@ -75,4 +75,6 @@
       collection: GenericHit
   - type: AltFireMelee #ADT_Tweak
     attackType: Heavy
-
+  - type: Tag #ADT tweak
+    tags:
+    - PKA

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
+	}
+    ]
+}