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

[MIRROR] Fixing the multi-dimensional bomb payload #2207

Merged
merged 2 commits into from
Mar 1, 2024
Merged

[MIRROR] Fixing the multi-dimensional bomb payload #2207

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75c8fc2
[MIRROR] [NO GBP] Fixing the multi-dimensional bomb payload (#1209)
NovaBot13 Feb 29, 2024
f53c481
Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG…
Iajret Mar 1, 2024
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/game/machinery/syndicatebomb.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@
var/list/choosable_dimensions = list()
var/datum/radial_menu_choice/null_choice = new
null_choice.name = DIMENSION_CHOICE_RANDOM
choosable_dimensions += null_choice
choosable_dimensions[DIMENSION_CHOICE_RANDOM] = null_choice
for(var/datum/dimension_theme/theme as anything in SSmaterials.dimensional_themes)
var/datum/radial_menu_choice/theme_choice = new
theme_choice.image = image(initial(theme.icon), initial(theme.icon_state))
Expand All @@ -631,9 +631,11 @@
var/theme_count = length(SSmaterials.dimensional_themes)
var/num_affected = 0
for(var/turf/affected as anything in affected_turfs)
var/datum/dimension_theme/theme_to_use = chosen_theme
var/datum/dimension_theme/theme_to_use
if(isnull(chosen_theme))
theme_to_use = SSmaterials.dimensional_themes[SSmaterials.dimensional_themes[rand(1, theme_count)]]
else
theme_to_use = SSmaterials.dimensional_themes[chosen_theme]
if(!theme_to_use.can_convert(affected))
continue
num_affected++
Expand Down
Loading