Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ARES will now announce how many Foxtrot marines woke up #3675

Merged
merged 10 commits into from
Jun 30, 2023
Merged

ARES will now announce how many Foxtrot marines woke up #3675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
69f697d
done
TheGamerdk Jun 19, 2023
cf7ae16
Update cryorine.dm
TheGamerdk Jun 19, 2023
2a015b2
Update cryo_marines.dm
TheGamerdk Jun 19, 2023
9d462d0
Merge branch 'master' into patch-345436
TheGamerdk Jun 20, 2023
c53caf0
of course I tested my code
TheGamerdk Jun 20, 2023
58dd23b
Merge branch 'patch-345436' of https://github.com/TheGamerdk/cmss13 i…
TheGamerdk Jun 20, 2023
7855f2b
Apply suggestions from code review
TheGamerdk Jun 25, 2023
dadbdcc
Merge branch 'master' into patch-345436
TheGamerdk Jun 26, 2023
21bce89
Update cryo_marines.dm
TheGamerdk Jun 26, 2023
8d3586f
Update cryo_marines_heavy.dm
TheGamerdk Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions code/datums/emergency_calls/cryo_marines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
shuttle_id = ""
var/leaders = 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)
harryob marked this conversation as resolved.
Show resolved Hide resolved
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/create_member(datum/mind/M, turf/override_spawn_loc)
set waitfor = 0
Expand Down
6 changes: 4 additions & 2 deletions code/datums/emergency_calls/cryo_marines_heavy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down