Skip to content

Commit

Permalink
TGS Test Merge (#7471)
Browse files Browse the repository at this point in the history
  • Loading branch information
cm13-github committed Nov 2, 2024
2 parents c80d896 + f27a0c0 commit a77c2d8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion code/modules/defenses/sentry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@
new_projectile.damage *= damage_mult
new_projectile.accuracy *= accuracy_mult
GIVE_BULLET_TRAIT(new_projectile, /datum/element/bullet_trait_iff, faction_group)
new_projectile.fire_at(target, src, owner_mob, new_projectile.ammo.max_range, new_projectile.ammo.shell_speed, null, FALSE)
new_projectile.fire_at(target, owner_mob, src, new_projectile.ammo.max_range, new_projectile.ammo.shell_speed, null, FALSE)
muzzle_flash(Get_Angle(get_turf(src), target))
ammo.current_rounds--
track_shot()
Expand Down
10 changes: 5 additions & 5 deletions code/modules/defenses/sentry_flamer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
accuracy_mult = 0.1
fire_delay = 0.5

/obj/structure/machinery/defenses/sentry/flamer/actual_fire(atom/A)
var/obj/projectile/P = new(create_cause_data(initial(name), owner_mob))
P.generate_bullet(new ammo.default_ammo)
GIVE_BULLET_TRAIT(P, /datum/element/bullet_trait_iff, faction_group)
P.fire_at(A, src, owner_mob, P.ammo.max_range, P.ammo.shell_speed, null)
/obj/structure/machinery/defenses/sentry/flamer/actual_fire(atom/target)
var/obj/projectile/new_projectile = new(src, create_cause_data(initial(name), owner_mob, src))
new_projectile.generate_bullet(new ammo.default_ammo)
GIVE_BULLET_TRAIT(new_projectile, /datum/element/bullet_trait_iff, faction_group)
new_projectile.fire_at(target, owner_mob, src, new_projectile.ammo.max_range, new_projectile.ammo.shell_speed, null, FALSE)
ammo.current_rounds--
track_shot()
if(ammo.current_rounds == 0)
Expand Down

0 comments on commit a77c2d8

Please sign in to comment.