From 400d8dafa8c76e81eab65ca430950df33fb83836 Mon Sep 17 00:00:00 2001 From: Helg2 Date: Sat, 7 Sep 2024 13:43:12 +0300 Subject: [PATCH] eh --- code/game/objects/machinery/doors/airlock.dm | 2 +- code/game/objects/shrapnel.dm | 7 +++---- code/modules/projectiles/projectile.dm | 8 +------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/code/game/objects/machinery/doors/airlock.dm b/code/game/objects/machinery/doors/airlock.dm index 41c84a65240..f9dcafc4005 100644 --- a/code/game/objects/machinery/doors/airlock.dm +++ b/code/game/objects/machinery/doors/airlock.dm @@ -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)].") diff --git a/code/game/objects/shrapnel.dm b/code/game/objects/shrapnel.dm index 4e75368a39d..f401f685b75 100644 --- a/code/game/objects/shrapnel.dm +++ b/code/game/objects/shrapnel.dm @@ -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) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 87a9b0bec84..323096416b7 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -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) . = ..() @@ -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)