diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index 4d4ac93f5f24..fe0fda34876d 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -698,9 +698,9 @@ break msg_admin_niche("[key_name(user)] is direct-firing [SA] onto [selected_target] at ([target_turf.x],[target_turf.y],[target_turf.z]) [ADMIN_JMP(target_turf)]") - if(ammo_travelling_time) + if(ammo_travelling_time && !istype(SA, /obj/structure/ship_ammo/rocket/thermobaric)) var/total_seconds = max(floor(ammo_travelling_time/10),1) - for(var/i = 0 to total_seconds) + for(var/i in 0 to total_seconds) sleep(10) if(!selected_target || !selected_target.loc)//if laser disappeared before we reached the target, ammo_accuracy_range++ //accuracy decreases @@ -710,6 +710,14 @@ var/list/possible_turfs = RANGE_TURFS(ammo_accuracy_range, target_turf) var/turf/impact = pick(possible_turfs) + + if(ammo_travelling_time && istype(SA, /obj/structure/ship_ammo/rocket/thermobaric)) + playsound(impact, ammo_warn_sound, ammo_warn_sound_volume, 1, 15) + var/total_seconds = max(floor(ammo_travelling_time / 10), 1) + for(var/i in 0 to total_seconds) + sleep(1 SECONDS) + new /obj/effect/overlay/temp/blinking_laser (impact) //no decreased accuracy if laser dissapears, it will land where it is telegraphed to land + if(ammo_warn_sound) playsound(impact, ammo_warn_sound, ammo_warn_sound_volume, 1,15) new /obj/effect/overlay/temp/blinking_laser (impact)