From 21f59f220ac9ca9d1537f360575da10cea2ed489 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Tue, 9 Jan 2024 17:36:54 +0100 Subject: [PATCH 01/30] framework --- .../cas_manager/datums/cas_fire_envelope.dm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index d9355cd005a9..c01abc2adbae 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -259,7 +259,24 @@ mission_error = "Target is off bounds or obstructed." return change_current_loc(target_turf) - playsound(target_turf, soundeffect, 70, TRUE, 50) + playsound(shootloc, soundeffect, vol = 70, vary = TRUE, 50, falloff = 8) + + var/relative_dir + for(var/mob/M in range(15, target_turf)) + if(get_turf(M) == target_turf) + relative_dir = 0 + else + relative_dir = Get_Compass_Dir(M, target_turf) + + var/ds_identifier = "LARGE BIRD" + if (M.mob_flags & KNOWS_TECHNOLOGY) + ds_identifier = "DROPSHIP" + + M.show_message( \ + SPAN_HIGHDANGER("A [ds_identifier] FLIES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ + SPAN_HIGHDANGER("YOU HEAR SOMETHING GO [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ + ) + sleep(flyto_period) stat = FIRE_MISSION_STATE_FIRING mission.execute_firemission(linked_console, target_turf, dir, fire_length, step_delay, src) From dea40a49b472c38870527f12abe0b832534ce4bb Mon Sep 17 00:00:00 2001 From: vincibrv Date: Tue, 9 Jan 2024 18:16:36 +0100 Subject: [PATCH 02/30] fix --- code/game/cas_manager/datums/cas_fire_envelope.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index c01abc2adbae..8a0ada2e7051 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -259,7 +259,7 @@ mission_error = "Target is off bounds or obstructed." return change_current_loc(target_turf) - playsound(shootloc, soundeffect, vol = 70, vary = TRUE, 50, falloff = 8) + playsound(target_turf, soundeffect, vol = 70, vary = TRUE, 50, falloff = 8) var/relative_dir for(var/mob/M in range(15, target_turf)) From a4e607a614bf3fd7f6c49f5b303383d2db5a4a09 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Tue, 9 Jan 2024 18:26:21 +0100 Subject: [PATCH 03/30] more fix --- code/game/cas_manager/datums/cas_fire_envelope.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 8a0ada2e7051..275b9b7112d0 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -259,7 +259,7 @@ mission_error = "Target is off bounds or obstructed." return change_current_loc(target_turf) - playsound(target_turf, soundeffect, vol = 70, vary = TRUE, 50, falloff = 8) + playsound(source = target_turf, soundin = soundeffect, vol = 70, vary = TRUE, sound_range = 50, falloff = 8) var/relative_dir for(var/mob/M in range(15, target_turf)) From 17de1e8982ad1286913e8564468349fe5ff69a9c Mon Sep 17 00:00:00 2001 From: vincibrv Date: Tue, 9 Jan 2024 21:25:06 +0100 Subject: [PATCH 04/30] message change --- code/game/cas_manager/datums/cas_fire_envelope.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 275b9b7112d0..9d6383c02dc2 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -269,11 +269,14 @@ relative_dir = Get_Compass_Dir(M, target_turf) var/ds_identifier = "LARGE BIRD" + var/fm_indentifier = "EXECUTE FIREMISSION" + var/ if (M.mob_flags & KNOWS_TECHNOLOGY) ds_identifier = "DROPSHIP" + fm_indentifier = "SPIT FIRE" M.show_message( \ - SPAN_HIGHDANGER("A [ds_identifier] FLIES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ + SPAN_HIGHDANGER("YOU HEAR [ds_identifier] ROAR AS IT READIES TO [fm_indentifier] [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ SPAN_HIGHDANGER("YOU HEAR SOMETHING GO [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ ) From 45c0ed63654167eb512850e439626ef80dbf3915 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Tue, 9 Jan 2024 21:26:21 +0100 Subject: [PATCH 05/30] wording change again --- code/game/cas_manager/datums/cas_fire_envelope.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 9d6383c02dc2..0f72d00c970a 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -276,7 +276,7 @@ fm_indentifier = "SPIT FIRE" M.show_message( \ - SPAN_HIGHDANGER("YOU HEAR [ds_identifier] ROAR AS IT READIES TO [fm_indentifier] [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ + SPAN_HIGHDANGER("YOU HEAR [ds_identifier] ROAR AS IT PREPARES TO [fm_indentifier] [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ SPAN_HIGHDANGER("YOU HEAR SOMETHING GO [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ ) From 1af5bf73e34f40b58275f60431c6ae6dc0f0b617 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Tue, 9 Jan 2024 22:10:33 +0100 Subject: [PATCH 06/30] fix --- code/game/cas_manager/datums/cas_fire_envelope.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 0f72d00c970a..89148a81cd91 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -270,13 +270,12 @@ var/ds_identifier = "LARGE BIRD" var/fm_indentifier = "EXECUTE FIREMISSION" - var/ if (M.mob_flags & KNOWS_TECHNOLOGY) ds_identifier = "DROPSHIP" fm_indentifier = "SPIT FIRE" M.show_message( \ - SPAN_HIGHDANGER("YOU HEAR [ds_identifier] ROAR AS IT PREPARES TO [fm_indentifier] [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ + SPAN_HIGHDANGER("YOU HEAR [ds_identifier] ROAR AS IT PREPARESgi TO [fm_indentifier] [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ SPAN_HIGHDANGER("YOU HEAR SOMETHING GO [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ ) From d84fc9fb0c98bf00fad4a3db0f31cf42ee67e6e6 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Thu, 11 Jan 2024 11:36:37 +0100 Subject: [PATCH 07/30] Update code/game/cas_manager/datums/cas_fire_envelope.dm Co-authored-by: Doubleumc --- code/game/cas_manager/datums/cas_fire_envelope.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 89148a81cd91..4edd6655cfe6 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -269,7 +269,7 @@ relative_dir = Get_Compass_Dir(M, target_turf) var/ds_identifier = "LARGE BIRD" - var/fm_indentifier = "EXECUTE FIREMISSION" + var/fm_indentifier = "SPIT FIRE" if (M.mob_flags & KNOWS_TECHNOLOGY) ds_identifier = "DROPSHIP" fm_indentifier = "SPIT FIRE" From 0ea982ecbe5ebab17216dfea060c9e2ca1e7ba2a Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Thu, 11 Jan 2024 11:36:49 +0100 Subject: [PATCH 08/30] Update code/game/cas_manager/datums/cas_fire_envelope.dm Co-authored-by: Doubleumc --- code/game/cas_manager/datums/cas_fire_envelope.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 4edd6655cfe6..3ea6584eab9b 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -272,7 +272,7 @@ var/fm_indentifier = "SPIT FIRE" if (M.mob_flags & KNOWS_TECHNOLOGY) ds_identifier = "DROPSHIP" - fm_indentifier = "SPIT FIRE" + fm_indentifier = "EXECUTE FIREMISSION" M.show_message( \ SPAN_HIGHDANGER("YOU HEAR [ds_identifier] ROAR AS IT PREPARESgi TO [fm_indentifier] [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ From 4df5cd2146fd34e70f01dec4de8296687c0bc3e3 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 11 Jan 2024 11:39:01 +0100 Subject: [PATCH 09/30] minor text changes --- code/game/cas_manager/datums/cas_fire_envelope.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 3ea6584eab9b..9c3056f1e315 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -275,8 +275,8 @@ fm_indentifier = "EXECUTE FIREMISSION" M.show_message( \ - SPAN_HIGHDANGER("YOU HEAR [ds_identifier] ROAR AS IT PREPARESgi TO [fm_indentifier] [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ - SPAN_HIGHDANGER("YOU HEAR SOMETHING GO [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ + SPAN_HIGHDANGER("YOU HEAR [ds_identifier] ROAR AS IT PREPARES TO [fm_indentifier] [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ + SPAN_HIGHDANGER("YOU HEAR SOMETHING APPROACH [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ ) sleep(flyto_period) From 53fb2d13b832314d5cf2bb2368f381417b287d88 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 11 Jan 2024 11:45:30 +0100 Subject: [PATCH 10/30] text fix --- code/game/cas_manager/datums/cas_fire_envelope.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 9c3056f1e315..edc761b897fb 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -269,13 +269,13 @@ relative_dir = Get_Compass_Dir(M, target_turf) var/ds_identifier = "LARGE BIRD" - var/fm_indentifier = "SPIT FIRE" + var/fm_identifier = "SPIT FIRE" if (M.mob_flags & KNOWS_TECHNOLOGY) ds_identifier = "DROPSHIP" - fm_indentifier = "EXECUTE FIREMISSION" + fm_identifier = "EXECUTE FIREMISSION" M.show_message( \ - SPAN_HIGHDANGER("YOU HEAR [ds_identifier] ROAR AS IT PREPARES TO [fm_indentifier] [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ + SPAN_HIGHDANGER("YOU HEAR [ds_identifier] ROAR AS IT PREPARES TO [fm_identifier] [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ SPAN_HIGHDANGER("YOU HEAR SOMETHING APPROACH [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ ) From 87099c6a78d7deecbbd1d16c5f407b0437fe7bb7 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 11 Jan 2024 12:06:10 +0100 Subject: [PATCH 11/30] renames some vars --- .../cas_manager/datums/cas_fire_envelope.dm | 10 +++---- .../cas_manager/datums/cas_fire_mission.dm | 28 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index edc761b897fb..937c6c6c6c04 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -262,19 +262,19 @@ playsound(source = target_turf, soundin = soundeffect, vol = 70, vary = TRUE, sound_range = 50, falloff = 8) var/relative_dir - for(var/mob/M in range(15, target_turf)) - if(get_turf(M) == target_turf) + for(var/mob/mob in range(15, target_turf)) + if(get_turf(mob) == target_turf) relative_dir = 0 else - relative_dir = Get_Compass_Dir(M, target_turf) + relative_dir = Get_Compass_Dir(mob, target_turf) var/ds_identifier = "LARGE BIRD" var/fm_identifier = "SPIT FIRE" - if (M.mob_flags & KNOWS_TECHNOLOGY) + if (mob.mob_flags & KNOWS_TECHNOLOGY) ds_identifier = "DROPSHIP" fm_identifier = "EXECUTE FIREMISSION" - M.show_message( \ + mob.show_message( \ SPAN_HIGHDANGER("YOU HEAR [ds_identifier] ROAR AS IT PREPARES TO [fm_identifier] [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ SPAN_HIGHDANGER("YOU HEAR SOMETHING APPROACH [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ ) diff --git a/code/game/cas_manager/datums/cas_fire_mission.dm b/code/game/cas_manager/datums/cas_fire_mission.dm index ece78042ac25..842c5278d512 100644 --- a/code/game/cas_manager/datums/cas_fire_mission.dm +++ b/code/game/cas_manager/datums/cas_fire_mission.dm @@ -176,36 +176,36 @@ msg_admin_niche("[usr ? key_name(usr) : "Someone"] is 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) + for(var/mob/mob in range(15, initial_turf)) + if(get_turf(mob) == initial_turf) relative_dir = 0 else - relative_dir = Get_Compass_Dir(M, initial_turf) + relative_dir = Get_Compass_Dir(mob, initial_turf) var/ds_identifier = "LARGE BIRD" - if (M.mob_flags & KNOWS_TECHNOLOGY) + if (mob.mob_flags & KNOWS_TECHNOLOGY) ds_identifier = "DROPSHIP" - M.show_message( \ - SPAN_HIGHDANGER("A [ds_identifier] FLIES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ + mob.show_message( \ + SPAN_HIGHDANGER("area [ds_identifier] FLIES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ SPAN_HIGHDANGER("YOU HEAR SOMETHING GO [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ ) // Xenos have time to react to the first message sleep(0.5 SECONDS) - for(var/mob/M in range(10, initial_turf)) - if(get_turf(M) == initial_turf) + for(var/mob/mob in range(10, initial_turf)) + if(get_turf(mob) == initial_turf) relative_dir = 0 else - relative_dir = Get_Compass_Dir(M, initial_turf) + relative_dir = Get_Compass_Dir(mob, initial_turf) var/ds_identifier = "LARGE BIRD" - if (M.mob_flags & KNOWS_TECHNOLOGY) + if (mob.mob_flags & KNOWS_TECHNOLOGY) ds_identifier = "DROPSHIP" - M.show_message( \ - SPAN_HIGHDANGER("A [ds_identifier] FIRES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), 1, \ + mob.show_message( \ + SPAN_HIGHDANGER("area [ds_identifier] FIRES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), 1, \ SPAN_HIGHDANGER("YOU HEAR SOMETHING FIRE [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), 2 \ ) @@ -243,8 +243,8 @@ if (current_turf == null) return -1 var/turf/shootloc = locate(current_turf.x + sx*offset, current_turf.y + sy*offset, current_turf.z) - var/area/A = get_area(shootloc) - if(shootloc && !CEILING_IS_PROTECTED(A?.ceiling, CEILING_PROTECTION_TIER_3) && !protected_by_pylon(TURF_PROTECTION_CAS, shootloc)) + var/area/area = get_area(shootloc) + if(shootloc && !CEILING_IS_PROTECTED(area?.ceiling, CEILING_PROTECTION_TIER_3) && !protected_by_pylon(TURF_PROTECTION_CAS, shootloc)) item.weapon.open_fire_firemission(shootloc) sleep(step_delay) if(envelope) From 823a3739ec13854205727974fb0b754665436afe Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 11 Jan 2024 12:07:16 +0100 Subject: [PATCH 12/30] more vars --- .../cas_manager/datums/cas_fire_mission.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/game/cas_manager/datums/cas_fire_mission.dm b/code/game/cas_manager/datums/cas_fire_mission.dm index 842c5278d512..1a8852d5b5bd 100644 --- a/code/game/cas_manager/datums/cas_fire_mission.dm +++ b/code/game/cas_manager/datums/cas_fire_mission.dm @@ -38,9 +38,9 @@ for(var/datum/cas_fire_mission_record/record as anything in records) .["records"] += list(record.ui_data(user)) -/datum/cas_fire_mission/proc/build_new_record(obj/structure/dropship_equipment/weapon/weap, fire_length) +/datum/cas_fire_mission/proc/build_new_record(obj/structure/dropship_equipment/weapon/weapon, fire_length) var/datum/cas_fire_mission_record/record = new() - record.weapon = weap + record.weapon = weapon record.offsets = new /list(fire_length) for(var/idx = 1; idx<=fire_length; idx++) record.offsets[idx] = "-" @@ -53,24 +53,24 @@ // if weapon appears in weapons list but not in record // > add empty record for new weapon var/found = FALSE - for(var/obj/structure/dropship_equipment/weapon/weap in weapons) - if(record.weapon == weap) + for(var/obj/structure/dropship_equipment/weapon/weapon in weapons) + if(record.weapon == weapon) found=TRUE break if(!found) bad_records.Add(record) - for(var/obj/structure/dropship_equipment/weapon/weap in weapons) + for(var/obj/structure/dropship_equipment/weapon/weapon in weapons) var/found = FALSE for(var/datum/cas_fire_mission_record/record in records) - if(record.weapon == weap) + if(record.weapon == weapon) found=TRUE break if(!found) - missing_weapons.Add(weap) + missing_weapons.Add(weapon) for(var/datum/cas_fire_mission_record/record in bad_records) records -= record - for(var/obj/structure/dropship_equipment/weapon/weap in missing_weapons) - build_new_record(weap, fire_length) + for(var/obj/structure/dropship_equipment/weapon/weapon in missing_weapons) + build_new_record(weapon, fire_length) /datum/cas_fire_mission/proc/record_for_weapon(weapon_id) for(var/datum/cas_fire_mission_record/record as anything in records) From f70cbddbf5523ac331548248349c03b316626431 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Tue, 16 Jan 2024 00:03:26 +0100 Subject: [PATCH 13/30] Update code/game/cas_manager/datums/cas_fire_envelope.dm Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/game/cas_manager/datums/cas_fire_envelope.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 937c6c6c6c04..e38f81419618 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -276,7 +276,7 @@ mob.show_message( \ SPAN_HIGHDANGER("YOU HEAR [ds_identifier] ROAR AS IT PREPARES TO [fm_identifier] [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ - SPAN_HIGHDANGER("YOU HEAR SOMETHING APPROACH [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ + SPAN_HIGHDANGER("YOU HEAR SOMETHING FLYING CLOSER [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ ) sleep(flyto_period) From d82acfdcf60ec1a533b949a493cc13bf0f78fb71 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Tue, 16 Jan 2024 00:16:59 +0100 Subject: [PATCH 14/30] Update code/game/cas_manager/datums/cas_fire_envelope.dm Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/game/cas_manager/datums/cas_fire_envelope.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index e38f81419618..70696112c316 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -275,7 +275,7 @@ fm_identifier = "EXECUTE FIREMISSION" mob.show_message( \ - SPAN_HIGHDANGER("YOU HEAR [ds_identifier] ROAR AS IT PREPARES TO [fm_identifier] [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ + SPAN_HIGHDANGER("YOU HEAR THE [ds_identifier] ROAR AS IT PREPARES TO [fm_identifier] [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ SPAN_HIGHDANGER("YOU HEAR SOMETHING FLYING CLOSER [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ ) From 4caef5754a78b50d3f27f1f4a43cdd747c35ae89 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Tue, 16 Jan 2024 00:17:29 +0100 Subject: [PATCH 15/30] Update code/game/cas_manager/datums/cas_fire_envelope.dm Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/game/cas_manager/datums/cas_fire_envelope.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 70696112c316..ed86f1263fcf 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -272,7 +272,7 @@ var/fm_identifier = "SPIT FIRE" if (mob.mob_flags & KNOWS_TECHNOLOGY) ds_identifier = "DROPSHIP" - fm_identifier = "EXECUTE FIREMISSION" + fm_identifier = "FIRE" mob.show_message( \ SPAN_HIGHDANGER("YOU HEAR THE [ds_identifier] ROAR AS IT PREPARES TO [fm_identifier] [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ From 4b8390ae7a1da3cdcdf49e4502b3933f662493b3 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:39:58 +0100 Subject: [PATCH 16/30] Update code/game/cas_manager/datums/cas_fire_envelope.dm Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/game/cas_manager/datums/cas_fire_envelope.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index ed86f1263fcf..5c0cc390690a 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -267,6 +267,7 @@ relative_dir = 0 else relative_dir = Get_Compass_Dir(mob, target_turf) + relative_dir = uppertext(dir2text(relative_dir)) var/ds_identifier = "LARGE BIRD" var/fm_identifier = "SPIT FIRE" From 00306b62d41180ab89c1380a03740ceb4082e82e Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:42:32 +0100 Subject: [PATCH 17/30] removes last change --- code/game/cas_manager/datums/cas_fire_envelope.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 5c0cc390690a..ed86f1263fcf 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -267,7 +267,6 @@ relative_dir = 0 else relative_dir = Get_Compass_Dir(mob, target_turf) - relative_dir = uppertext(dir2text(relative_dir)) var/ds_identifier = "LARGE BIRD" var/fm_identifier = "SPIT FIRE" From 8a2fdd77939bf9d65627abfb65c966d016767713 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Sun, 21 Jan 2024 10:01:08 +0100 Subject: [PATCH 18/30] fixes messed up containment escape --- code/game/cas_manager/datums/cas_fire_mission.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/cas_manager/datums/cas_fire_mission.dm b/code/game/cas_manager/datums/cas_fire_mission.dm index 1a8852d5b5bd..34876cbb6fa5 100644 --- a/code/game/cas_manager/datums/cas_fire_mission.dm +++ b/code/game/cas_manager/datums/cas_fire_mission.dm @@ -187,7 +187,7 @@ ds_identifier = "DROPSHIP" mob.show_message( \ - SPAN_HIGHDANGER("area [ds_identifier] FLIES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ + SPAN_HIGHDANGER("A [ds_identifier] FLIES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ SPAN_HIGHDANGER("YOU HEAR SOMETHING GO [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ ) @@ -205,7 +205,7 @@ ds_identifier = "DROPSHIP" mob.show_message( \ - SPAN_HIGHDANGER("area [ds_identifier] FIRES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), 1, \ + SPAN_HIGHDANGER("A [ds_identifier] FIRES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), 1, \ SPAN_HIGHDANGER("YOU HEAR SOMETHING FIRE [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), 2 \ ) From 8b80afa3eec9615bac5788786270259b50bb320b Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Tue, 23 Jan 2024 15:21:07 +0100 Subject: [PATCH 19/30] removes direction from first message --- code/game/cas_manager/datums/cas_fire_envelope.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index ed86f1263fcf..9e02df791664 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -275,8 +275,8 @@ fm_identifier = "FIRE" mob.show_message( \ - SPAN_HIGHDANGER("YOU HEAR THE [ds_identifier] ROAR AS IT PREPARES TO [fm_identifier] [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ - SPAN_HIGHDANGER("YOU HEAR SOMETHING FLYING CLOSER [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ + SPAN_HIGHDANGER("YOU HEAR THE [ds_identifier] ROAR AS IT PREPARES TO [fm_identifier] NEAR YOU!, \ + SPAN_HIGHDANGER("YOU HEAR SOMETHING FLYING CLOSER TO YOU! , SHOW_MESSAGE_AUDIBLE \ ) sleep(flyto_period) From db04a3aede67cf5f62f81b80d7deab2a9490caab Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Tue, 23 Jan 2024 15:22:47 +0100 Subject: [PATCH 20/30] removes messages that show up 0.5 before the ship shoots --- .../cas_manager/datums/cas_fire_mission.dm | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/code/game/cas_manager/datums/cas_fire_mission.dm b/code/game/cas_manager/datums/cas_fire_mission.dm index 34876cbb6fa5..ae89901e69d8 100644 --- a/code/game/cas_manager/datums/cas_fire_mission.dm +++ b/code/game/cas_manager/datums/cas_fire_mission.dm @@ -186,24 +186,6 @@ if (mob.mob_flags & KNOWS_TECHNOLOGY) ds_identifier = "DROPSHIP" - mob.show_message( \ - SPAN_HIGHDANGER("A [ds_identifier] FLIES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ - SPAN_HIGHDANGER("YOU HEAR SOMETHING GO [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ - ) - - // Xenos have time to react to the first message - sleep(0.5 SECONDS) - - for(var/mob/mob in range(10, initial_turf)) - if(get_turf(mob) == initial_turf) - relative_dir = 0 - else - relative_dir = Get_Compass_Dir(mob, initial_turf) - - var/ds_identifier = "LARGE BIRD" - if (mob.mob_flags & KNOWS_TECHNOLOGY) - ds_identifier = "DROPSHIP" - mob.show_message( \ SPAN_HIGHDANGER("A [ds_identifier] FIRES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), 1, \ SPAN_HIGHDANGER("YOU HEAR SOMETHING FIRE [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), 2 \ From c7667f48d2447bd5e82e3aa78e7939aad6688f52 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Tue, 23 Jan 2024 15:26:12 +0100 Subject: [PATCH 21/30] Update cas_fire_envelope.dm --- code/game/cas_manager/datums/cas_fire_envelope.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 9e02df791664..7baf966cee98 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -261,13 +261,7 @@ change_current_loc(target_turf) playsound(source = target_turf, soundin = soundeffect, vol = 70, vary = TRUE, sound_range = 50, falloff = 8) - var/relative_dir for(var/mob/mob in range(15, target_turf)) - if(get_turf(mob) == target_turf) - relative_dir = 0 - else - relative_dir = Get_Compass_Dir(mob, target_turf) - var/ds_identifier = "LARGE BIRD" var/fm_identifier = "SPIT FIRE" if (mob.mob_flags & KNOWS_TECHNOLOGY) From 43f7d30bbd4bdf5555be41d38022b0fe2fcede17 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Tue, 23 Jan 2024 15:45:55 +0100 Subject: [PATCH 22/30] Update cas_fire_envelope.dm --- code/game/cas_manager/datums/cas_fire_envelope.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 7baf966cee98..85a1ebeb7f9d 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -269,8 +269,8 @@ fm_identifier = "FIRE" mob.show_message( \ - SPAN_HIGHDANGER("YOU HEAR THE [ds_identifier] ROAR AS IT PREPARES TO [fm_identifier] NEAR YOU!, \ - SPAN_HIGHDANGER("YOU HEAR SOMETHING FLYING CLOSER TO YOU! , SHOW_MESSAGE_AUDIBLE \ + SPAN_HIGHDANGER("YOU HEAR THE [ds_identifier] ROAR AS IT PREPARES TO [fm_identifier] NEAR YOU!"),SHOW_MESSAGE_VISIBLE, \ + SPAN_HIGHDANGER("YOU HEAR SOMETHING FLYING CLOSER TO YOU!") , SHOW_MESSAGE_AUDIBLE \ ) sleep(flyto_period) From 433c3429dd322d854a775f37185daa917d7d0748 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Tue, 23 Jan 2024 16:43:07 +0100 Subject: [PATCH 23/30] Update cas_fire_envelope.dm --- code/game/cas_manager/datums/cas_fire_envelope.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 85a1ebeb7f9d..413b396dc383 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -325,7 +325,7 @@ /datum/cas_fire_envelope/uscm_dropship fire_length = 12 grace_period = 50 //5 seconds - flyto_period = 50 //five seconds + flyto_period = 40 //four seconds, sleep in the FM itself has been increased by one more second flyoff_period = 50 //FIVE seconds cooldown_period = 100 //f~ I mean, 10 seconds soundeffect = 'sound/weapons/dropship_sonic_boom.ogg' //BOOM~WOOOOOSH~HSOOOOOW~BOOM From e5af0f271359dd08a1b70d0083504735229e5375 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Tue, 23 Jan 2024 16:44:59 +0100 Subject: [PATCH 24/30] Update cas_fire_mission.dm --- code/game/cas_manager/datums/cas_fire_mission.dm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/code/game/cas_manager/datums/cas_fire_mission.dm b/code/game/cas_manager/datums/cas_fire_mission.dm index ae89901e69d8..f317397a1715 100644 --- a/code/game/cas_manager/datums/cas_fire_mission.dm +++ b/code/game/cas_manager/datums/cas_fire_mission.dm @@ -176,6 +176,21 @@ msg_admin_niche("[usr ? key_name(usr) : "Someone"] is launching Fire Mission '[name]' at ([initial_turf.x],[initial_turf.y],[initial_turf.z]) [ADMIN_JMP(initial_turf)]") var/relative_dir + for(var/mob/mob in range(15, initial_turf)) + if(get_turfmob) == initial_turf) + relative_dir = 0 + else + relative_dir = Get_Compass_Dir(mob, initial_turf) + + var/ds_identifier = "LARGE BIRD" + if (mob.mob_flags & KNOWS_TECHNOLOGY) + ds_identifier = "DROPSHIP" + + mob.show_message( \ + SPAN_HIGHDANGER("A [ds_identifier] FLIES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ + SPAN_HIGHDANGER("YOU HEAR SOMETHING GO [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ + ) + for(var/mob/mob in range(15, initial_turf)) if(get_turf(mob) == initial_turf) relative_dir = 0 From d4b06955694c79497780c5fa40ba4ad3235a68ef Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Tue, 23 Jan 2024 16:46:16 +0100 Subject: [PATCH 25/30] Update cas_fire_mission.dm --- code/game/cas_manager/datums/cas_fire_mission.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_mission.dm b/code/game/cas_manager/datums/cas_fire_mission.dm index f317397a1715..a7b8807db3f5 100644 --- a/code/game/cas_manager/datums/cas_fire_mission.dm +++ b/code/game/cas_manager/datums/cas_fire_mission.dm @@ -177,7 +177,7 @@ var/relative_dir for(var/mob/mob in range(15, initial_turf)) - if(get_turfmob) == initial_turf) + if(get_turf(mob)) == initial_turf) relative_dir = 0 else relative_dir = Get_Compass_Dir(mob, initial_turf) From a387ef6031e3244e1564d23e39de5844588bdd85 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Tue, 23 Jan 2024 16:53:49 +0100 Subject: [PATCH 26/30] Update cas_fire_mission.dm --- code/game/cas_manager/datums/cas_fire_mission.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_mission.dm b/code/game/cas_manager/datums/cas_fire_mission.dm index a7b8807db3f5..05ab72905f84 100644 --- a/code/game/cas_manager/datums/cas_fire_mission.dm +++ b/code/game/cas_manager/datums/cas_fire_mission.dm @@ -190,7 +190,10 @@ SPAN_HIGHDANGER("A [ds_identifier] FLIES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ SPAN_HIGHDANGER("YOU HEAR SOMETHING GO [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ ) - + + // Xenos have time to react to the first message + sleep(1.5 SECONDS) + for(var/mob/mob in range(15, initial_turf)) if(get_turf(mob) == initial_turf) relative_dir = 0 From 9f57df29ab5385e24912c0cb49966a70a6bc745c Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Tue, 23 Jan 2024 16:55:16 +0100 Subject: [PATCH 27/30] Update cas_fire_mission.dm --- code/game/cas_manager/datums/cas_fire_mission.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_mission.dm b/code/game/cas_manager/datums/cas_fire_mission.dm index 05ab72905f84..aa2ae47047ab 100644 --- a/code/game/cas_manager/datums/cas_fire_mission.dm +++ b/code/game/cas_manager/datums/cas_fire_mission.dm @@ -194,7 +194,7 @@ // Xenos have time to react to the first message sleep(1.5 SECONDS) - for(var/mob/mob in range(15, initial_turf)) + for(var/mob/mob in range(10, initial_turf)) if(get_turf(mob) == initial_turf) relative_dir = 0 else From b96a9ad526a749f0a0b067c2239876f361f7d1bf Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Tue, 23 Jan 2024 17:01:33 +0100 Subject: [PATCH 28/30] Update cas_fire_mission.dm --- code/game/cas_manager/datums/cas_fire_mission.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_mission.dm b/code/game/cas_manager/datums/cas_fire_mission.dm index aa2ae47047ab..927dded210f0 100644 --- a/code/game/cas_manager/datums/cas_fire_mission.dm +++ b/code/game/cas_manager/datums/cas_fire_mission.dm @@ -177,7 +177,7 @@ var/relative_dir for(var/mob/mob in range(15, initial_turf)) - if(get_turf(mob)) == initial_turf) + if(get_turf(mob) == initial_turf) relative_dir = 0 else relative_dir = Get_Compass_Dir(mob, initial_turf) From 890840b877db1d4733537f032a1e87f5175d28c5 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Tue, 23 Jan 2024 17:28:28 +0100 Subject: [PATCH 29/30] Update code/game/cas_manager/datums/cas_fire_envelope.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/game/cas_manager/datums/cas_fire_envelope.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 413b396dc383..d20952e8432b 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -325,7 +325,7 @@ /datum/cas_fire_envelope/uscm_dropship fire_length = 12 grace_period = 50 //5 seconds - flyto_period = 40 //four seconds, sleep in the FM itself has been increased by one more second + flyto_period = 4 SECONDS //sleep in the FM itself has been increased by one more second flyoff_period = 50 //FIVE seconds cooldown_period = 100 //f~ I mean, 10 seconds soundeffect = 'sound/weapons/dropship_sonic_boom.ogg' //BOOM~WOOOOOSH~HSOOOOOW~BOOM From d4ff9d103612318fcaba1f5172a434642d8ef75f Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Tue, 23 Jan 2024 17:29:30 +0100 Subject: [PATCH 30/30] Update cas_fire_envelope.dm --- code/game/cas_manager/datums/cas_fire_envelope.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index d20952e8432b..cc38b034c764 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -324,10 +324,10 @@ /datum/cas_fire_envelope/uscm_dropship fire_length = 12 - grace_period = 50 //5 seconds + grace_period = 5 SECONDS flyto_period = 4 SECONDS //sleep in the FM itself has been increased by one more second - flyoff_period = 50 //FIVE seconds - cooldown_period = 100 //f~ I mean, 10 seconds + flyoff_period = 5 SECONDS + cooldown_period = 10 SECONDS soundeffect = 'sound/weapons/dropship_sonic_boom.ogg' //BOOM~WOOOOOSH~HSOOOOOW~BOOM step_delay = 3 max_offset = 12