Skip to content

Commit

Permalink
ICEE cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
deltanedas committed Dec 19, 2024
1 parent d5716a8 commit a8099f2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
7 changes: 4 additions & 3 deletions Content.Server/Weapons/Ranged/Systems/GunSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Numerics;
using Content.Server.Cargo.Systems;
using Content.Server.Power.EntitySystems;
using Content.Server.Stunnable;
using Content.Server.Stunnable; // DeltaV
using Content.Server.Temperature.Systems; // DeltaV Heat Change system
using Content.Server.Weapons.Ranged.Components;
using Content.Shared.Damage;
Expand Down Expand Up @@ -220,9 +220,10 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
if (hitscan.StaminaDamage > 0f)
_stamina.TakeProjectileStaminaDamage(hitEntity, hitscan.StaminaDamage, source: user); // DeltaV - Cope with hitscan not being an entity

// DeltaV: Changes the target's temperature by this amount when hit
// Begin DeltaV Additions: Changes the target's temperature by this amount when hit
if (hitscan.HeatChange != 0f)
_temperature.ChangeHeat(hitEntity, hitscan.HeatChange, true);
_temperature.ChangeHeat(hitEntity, hitscan.HeatChange, true);
// End DeltaV Additions

var dmg = hitscan.Damage;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,6 @@
- MiniSyringe
- WeaponColdCannon
- WeaponBeamCannon

# End DeltaV additions

- type: entity
Expand Down

0 comments on commit a8099f2

Please sign in to comment.