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

Cluster OB now respects if a hive core is created while it is firing. #3600

Merged
merged 3 commits into from
Jun 27, 2023
Merged

Cluster OB now respects if a hive core is created while it is firing. #3600

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1be6fd
Update orbital_cannon.dm
TheGamerdk Jun 11, 2023
1131898
Update orbital_cannon.dm
TheGamerdk Jun 13, 2023
24c421a
Update orbital_cannon.dm
TheGamerdk Jun 25, 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: 6 additions & 0 deletions code/modules/cm_marines/orbital_cannon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,12 @@ var/list/ob_type_fuel_requirements
for(var/i = 1 to total_amount)
for(var/k = 1 to instant_amount)
var/turf/U = pick(turf_list)
if(!turf_list.len)
return //No turfs left to fire upon, hive core / OB protection granted to all turfs
if(protected_by_pylon(TURF_PROTECTION_OB, U)) //If the turf somehow gained OB protection while the cluster was firing
k-- //Give them another chance to hit something else
turf_list -= U
continue
fire_in_a_hole(U)
sleep(delay_between_clusters)

Expand Down