From 084ab721e67ac782e096e0d3c6a28922b8801b3c Mon Sep 17 00:00:00 2001 From: Morrow Date: Sat, 9 Sep 2023 05:57:48 -0400 Subject: [PATCH] BAM, high effort (inb4 awful) --- code/game/cas_manager/datums/cas_fire_envelope.dm | 5 ----- code/game/cas_manager/datums/cas_fire_mission.dm | 11 +++++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index d270d3d22ab7..d7c939b76e16 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -125,11 +125,6 @@ mission_error = mission.error_message(check_result) return 0 - if(target_turf && target_turf.signal_loc) - var/turf/actual_targeted_turf = get_turf(target_turf.signal_loc) - if(actual_targeted_turf && actual_targeted_turf.z) - notify_ghosts(header = "CAS Fire Mission", message = "[usr] is launching Fire Mission '[mission.name]' at [get_area(actual_targeted_turf)]", source = actual_targeted_turf) - msg_admin_niche("[key_name(usr)] launching Fire Mission '[mission.name]' onto [target_turf.name] at ([actual_targeted_turf.x],[actual_targeted_turf.y],[actual_targeted_turf.z]) [ADMIN_JMP(actual_targeted_turf)]") //actual firemission code execute_firemission_unsafe(target_turf, offset, dir, mission) return 1 diff --git a/code/game/cas_manager/datums/cas_fire_mission.dm b/code/game/cas_manager/datums/cas_fire_mission.dm index 42f5b4bd8655..c868026a4baa 100644 --- a/code/game/cas_manager/datums/cas_fire_mission.dm +++ b/code/game/cas_manager/datums/cas_fire_mission.dm @@ -98,6 +98,17 @@ if(initial_turf == null || check(linked_console) != FIRE_MISSION_ALL_GOOD) return FIRE_MISSION_NOT_EXECUTABLE + var/obj/effect/firemission_effect = new(initial_turf) + + firemission_effect.icon = 'icons/obj/items/weapons/projectiles.dmi' + firemission_effect.icon_state = "laser_target2" + firemission_effect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT + firemission_effect.invisibility = INVISIBILITY_MAXIMUM + QDEL_IN(firemission_effect, 5 SECONDS) + + notify_ghosts(header = "CAS Fire Mission", message = "[usr] is launching Fire Mission '[name]' at [get_area(initial_turf)].", source = firemission_effect) + msg_admin_niche("[key_name(usr)] launching Fire Mission '[name]' at ([initial_turf.x],[initial_turf.y],[initial_turf.z]) [ADMIN_JMP(initial_turf)]") + var/relative_dir for(var/mob/M in range(15, initial_turf)) if(get_turf(M) == initial_turf)