From 69f697d38b7e0cb44adec9ca4797be5788a5458f Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Mon, 19 Jun 2023 19:26:54 +0200 Subject: [PATCH 1/7] done --- code/datums/emergency_calls/cryo_marines.dm | 8 ++++++-- code/modules/cm_tech/techs/marine/tier3/cryorine.dm | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/datums/emergency_calls/cryo_marines.dm b/code/datums/emergency_calls/cryo_marines.dm index e5992a62ecdd..1843409b2c6c 100644 --- a/code/datums/emergency_calls/cryo_marines.dm +++ b/code/datums/emergency_calls/cryo_marines.dm @@ -12,11 +12,13 @@ name_of_spawn = /obj/effect/landmark/ert_spawns/distress_cryo shuttle_id = "" var/leaders = 0 + var/deployed_marines = 0 -/datum/emergency_call/cryo_squad/spawn_candidates(announce, override_spawn_loc) +/datum/emergency_call/cryo_squad/spawn_candidates(announce, override_spawn_loc, announce_dispatch_message) var/datum/squad/marine/cryo/cryo_squad = RoleAuthority.squads_by_type[/datum/squad/marine/cryo] leaders = cryo_squad.num_leaders - return ..() + . = ..() + shipwide_ai_announcement("Successfully deployed [deployed_marines] Foxtrot marines.") /datum/emergency_call/cryo_squad/create_member(datum/mind/M, turf/override_spawn_loc) set waitfor = 0 @@ -62,6 +64,8 @@ to_chat(H, SPAN_ROLE_BODY("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command.")) to_chat(H, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced.")) + deployed_marines++ + sleep(10) to_chat(H, SPAN_BOLD("Objectives: [objectives]")) diff --git a/code/modules/cm_tech/techs/marine/tier3/cryorine.dm b/code/modules/cm_tech/techs/marine/tier3/cryorine.dm index fb9666623e1c..84361baa618f 100644 --- a/code/modules/cm_tech/techs/marine/tier3/cryorine.dm +++ b/code/modules/cm_tech/techs/marine/tier3/cryorine.dm @@ -23,4 +23,4 @@ /datum/tech/repeatable/cryomarine/on_unlock() . = ..() - SSticker.mode.get_specific_call("Marine Cryo Reinforcements (Squad)", FALSE, FALSE) + SSticker.mode.get_specific_call("Marine Cryo Reinforcements (Squad)", FALSE, FALSE, announce_dispatch_message = FALSE) From cf7ae165a9f6dd901aa0cb07ceea5b4348df9b91 Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Mon, 19 Jun 2023 19:30:06 +0200 Subject: [PATCH 2/7] Update cryorine.dm --- code/modules/cm_tech/techs/marine/tier3/cryorine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_tech/techs/marine/tier3/cryorine.dm b/code/modules/cm_tech/techs/marine/tier3/cryorine.dm index 84361baa618f..fb9666623e1c 100644 --- a/code/modules/cm_tech/techs/marine/tier3/cryorine.dm +++ b/code/modules/cm_tech/techs/marine/tier3/cryorine.dm @@ -23,4 +23,4 @@ /datum/tech/repeatable/cryomarine/on_unlock() . = ..() - SSticker.mode.get_specific_call("Marine Cryo Reinforcements (Squad)", FALSE, FALSE, announce_dispatch_message = FALSE) + SSticker.mode.get_specific_call("Marine Cryo Reinforcements (Squad)", FALSE, FALSE) From 2a015b209de86b32ef5b95eb448f275f8c8c05cf Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Mon, 19 Jun 2023 19:32:29 +0200 Subject: [PATCH 3/7] Update cryo_marines.dm --- code/datums/emergency_calls/cryo_marines.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/emergency_calls/cryo_marines.dm b/code/datums/emergency_calls/cryo_marines.dm index 1843409b2c6c..d9e4377e16ba 100644 --- a/code/datums/emergency_calls/cryo_marines.dm +++ b/code/datums/emergency_calls/cryo_marines.dm @@ -17,6 +17,7 @@ /datum/emergency_call/cryo_squad/spawn_candidates(announce, override_spawn_loc, announce_dispatch_message) var/datum/squad/marine/cryo/cryo_squad = RoleAuthority.squads_by_type[/datum/squad/marine/cryo] leaders = cryo_squad.num_leaders + deployed_marines = 0 . = ..() shipwide_ai_announcement("Successfully deployed [deployed_marines] Foxtrot marines.") From c53caf0552a56ae6884d1420ab887bd46fafebb4 Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Tue, 20 Jun 2023 18:52:29 +0200 Subject: [PATCH 4/7] of course I tested my code --- code/datums/emergency_calls/cryo_marines.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/datums/emergency_calls/cryo_marines.dm b/code/datums/emergency_calls/cryo_marines.dm index d9e4377e16ba..3a1cbb3c7884 100644 --- a/code/datums/emergency_calls/cryo_marines.dm +++ b/code/datums/emergency_calls/cryo_marines.dm @@ -12,14 +12,13 @@ name_of_spawn = /obj/effect/landmark/ert_spawns/distress_cryo shuttle_id = "" var/leaders = 0 - var/deployed_marines = 0 /datum/emergency_call/cryo_squad/spawn_candidates(announce, override_spawn_loc, announce_dispatch_message) var/datum/squad/marine/cryo/cryo_squad = RoleAuthority.squads_by_type[/datum/squad/marine/cryo] leaders = cryo_squad.num_leaders - deployed_marines = 0 + var/previous_members = members.len . = ..() - shipwide_ai_announcement("Successfully deployed [deployed_marines] Foxtrot marines.") + shipwide_ai_announcement("Successfully deployed [members.len - previous_members] Foxtrot marines.") /datum/emergency_call/cryo_squad/create_member(datum/mind/M, turf/override_spawn_loc) set waitfor = 0 @@ -65,8 +64,6 @@ to_chat(H, SPAN_ROLE_BODY("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command.")) to_chat(H, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced.")) - deployed_marines++ - sleep(10) to_chat(H, SPAN_BOLD("Objectives: [objectives]")) From 7855f2b02fce1b0e6d2cd1d1a180a1ecdf43ee67 Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Sun, 25 Jun 2023 11:16:22 +0200 Subject: [PATCH 5/7] Apply suggestions from code review Co-authored-by: harryob --- code/datums/emergency_calls/cryo_marines.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/emergency_calls/cryo_marines.dm b/code/datums/emergency_calls/cryo_marines.dm index 3a1cbb3c7884..8d5e3289f7a0 100644 --- a/code/datums/emergency_calls/cryo_marines.dm +++ b/code/datums/emergency_calls/cryo_marines.dm @@ -16,9 +16,9 @@ /datum/emergency_call/cryo_squad/spawn_candidates(announce, override_spawn_loc, announce_dispatch_message) var/datum/squad/marine/cryo/cryo_squad = RoleAuthority.squads_by_type[/datum/squad/marine/cryo] leaders = cryo_squad.num_leaders - var/previous_members = members.len + var/previous_members = length(members) . = ..() - shipwide_ai_announcement("Successfully deployed [members.len - previous_members] Foxtrot marines.") + shipwide_ai_announcement("Successfully deployed [length(members) - previous_members] Foxtrot marines.") /datum/emergency_call/cryo_squad/create_member(datum/mind/M, turf/override_spawn_loc) set waitfor = 0 From 21bce89b87a4e58e4e7391ff961ecd71853888e4 Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Mon, 26 Jun 2023 21:17:16 +0200 Subject: [PATCH 6/7] Update cryo_marines.dm --- code/datums/emergency_calls/cryo_marines.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/emergency_calls/cryo_marines.dm b/code/datums/emergency_calls/cryo_marines.dm index 8d5e3289f7a0..9bec8b3593dd 100644 --- a/code/datums/emergency_calls/cryo_marines.dm +++ b/code/datums/emergency_calls/cryo_marines.dm @@ -16,9 +16,9 @@ /datum/emergency_call/cryo_squad/spawn_candidates(announce, override_spawn_loc, announce_dispatch_message) var/datum/squad/marine/cryo/cryo_squad = RoleAuthority.squads_by_type[/datum/squad/marine/cryo] leaders = cryo_squad.num_leaders - var/previous_members = length(members) . = ..() - shipwide_ai_announcement("Successfully deployed [length(members) - previous_members] Foxtrot marines.") + if(length(members)) + shipwide_ai_announcement("Successfully deployed [length(members)] Foxtrot marines.") /datum/emergency_call/cryo_squad/create_member(datum/mind/M, turf/override_spawn_loc) set waitfor = 0 From 8d3586f5ecc128e9c69d3e520e11ec82a6b32ea6 Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Thu, 29 Jun 2023 22:35:33 +0200 Subject: [PATCH 7/7] Update cryo_marines_heavy.dm --- code/datums/emergency_calls/cryo_marines_heavy.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/datums/emergency_calls/cryo_marines_heavy.dm b/code/datums/emergency_calls/cryo_marines_heavy.dm index 6a3636568856..70ce52443573 100644 --- a/code/datums/emergency_calls/cryo_marines_heavy.dm +++ b/code/datums/emergency_calls/cryo_marines_heavy.dm @@ -16,10 +16,12 @@ var/leaders = 0 -/datum/emergency_call/cryo_squad_equipped/spawn_candidates(announce, override_spawn_loc) +/datum/emergency_call/cryo_squad_equipped/spawn_candidates(announce, override_spawn_loc, announce_dispatch_message) var/datum/squad/marine/cryo/cryo_squad = RoleAuthority.squads_by_type[/datum/squad/marine/cryo] leaders = cryo_squad.num_leaders - return ..() + . = ..() + if(length(members)) + shipwide_ai_announcement("Successfully deployed [length(members)] Foxtrot marines.") /datum/emergency_call/cryo_squad_equipped/create_member(datum/mind/M, turf/override_spawn_loc) set waitfor = 0