Skip to content

Commit

Permalink
eh
Browse files Browse the repository at this point in the history
  • Loading branch information
Helg2 committed Sep 7, 2024
1 parent e1b70d6 commit 400d8da
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/machinery/doors/airlock.dm
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@

/obj/machinery/door/airlock/projectile_hit(obj/projectile/proj, cardinal_move, uncrossing)
. = ..()
if(. && is_mainship_level(z) && !proj.is_shrapnel)
if(. && is_mainship_level(z) && proj.firer)
log_attack("[key_name(proj.firer)] shot [src] with [proj] at [AREACOORD(src)]")
if(SSmonitor.gamestate != SHIPSIDE)
msg_admin_ff("[ADMIN_TPMONTY(proj.firer)] shot [src] with [proj] in [ADMIN_VERBOSEJMP(src)].")
Expand Down
7 changes: 3 additions & 4 deletions code/game/objects/shrapnel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@
for(var/i in 1 to shrapnel_number)
var/obj/projectile/our_shrapnel = new(epicenter)
our_shrapnel.generate_bullet(new shrapnel_type)
our_shrapnel.is_shrapnel = TRUE

if(standing_mob && prob(on_hit_coefficient))
our_shrapnel.fire_at(standing_mob, null, epicenter, our_shrapnel.ammo.max_range, our_shrapnel.ammo.shell_speed, null)
our_shrapnel.fire_at(standing_mob, null, epicenter, our_shrapnel.ammo.max_range, our_shrapnel.ammo.shell_speed, null, loc_override = epicenter)
else if(lying_mob && prob(on_hit_coefficient))
our_shrapnel.fire_at(lying_mob, null, epicenter, our_shrapnel.ammo.max_range, our_shrapnel.ammo.shell_speed, null)
our_shrapnel.fire_at(lying_mob, null, epicenter, our_shrapnel.ammo.max_range, our_shrapnel.ammo.shell_speed, null, loc_override = epicenter)
else
var/angle = initial_angle + i * angle_increment + rand(-angle_randomization, angle_randomization)
var/atom/target = get_angle_target_turf(epicenter, angle, our_shrapnel.ammo.max_range)
our_shrapnel.fire_at(target, null, epicenter, our_shrapnel.ammo.max_range, our_shrapnel.ammo.shell_speed, angle)
our_shrapnel.fire_at(target, null, epicenter, our_shrapnel.ammo.max_range, our_shrapnel.ammo.shell_speed, angle, loc_override = epicenter)
8 changes: 1 addition & 7 deletions code/modules/projectiles/projectile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@
/// List of atoms already hit by that projectile. Will only matter for projectiles capable of passing through multiple atoms
var/list/atom/hit_atoms = list()

var/is_shrapnel = FALSE

/obj/projectile/Initialize(mapload)
. = ..()
Expand Down Expand Up @@ -188,12 +187,7 @@
shot_from = source
loc = loc_override
if(!isturf(loc))
//forceMove(get_turf(src)) // RUTGMC DELETION
if(!is_shrapnel) // RUTGMC ADDITION START
forceMove(get_turf(src))
else if(get_turf(source))
forceMove(get_turf(source)) //RUTGMC ADDITION END

forceMove(get_turf(src))
starting_turf = loc

if(target)
Expand Down

0 comments on commit 400d8da

Please sign in to comment.