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.

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

030125bugs #1224

Merged
merged 6 commits into from
Mar 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions code/game/gamemodes/mixed.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
antagonist_pool[pick_weight(antag_weight_map)] += 1
number_of_antags--

for(var/datum/antagonist_selector/selector in shuffle(antag_weight_map))
selector.setup(antag_weight_map[selector], player_pool)
for(var/datum/antagonist_selector/selector in shuffle(antagonist_pool))
selector.setup(antagonist_pool[selector], player_pool)
player_pool -= selector.selected_mobs

/datum/game_mode/mixed/setup_antags()
Expand Down
13 changes: 9 additions & 4 deletions code/modules/client/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
/// Ensures that we always load the last used save, QOL
var/default_slot = 1
/// The maximum number of slots we're allowed to contain
var/max_save_slots = 3
var/max_save_slots = 10

/// Bitflags for communications that are muted
var/muted = NONE
Expand Down Expand Up @@ -406,6 +406,8 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/character_preview_view)

/// The body that is displayed
var/mob/living/carbon/human/dummy/body
/// The appearance to display
var/mutable_appearance/rendered_appearance

/// The preferences this refers to
var/datum/preferences/preferences
Expand Down Expand Up @@ -448,11 +450,13 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/character_preview_view)
create_body()
else
body.wipe_state()
preferences.render_new_preview_appearance(body)

rendered_appearance = preferences.render_new_preview_appearance(body)

for(var/index in subscreens)
var/atom/movable/screen/subscreen = subscreens[index]
var/cache_dir = subscreen.dir
subscreen.appearance = body.appearance
subscreen.appearance = rendered_appearance.appearance
subscreen.dir = cache_dir

/atom/movable/screen/character_preview_view/proc/create_body()
Expand Down Expand Up @@ -487,7 +491,8 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/character_preview_view)
preview = new
subscreens["preview-[dir]"] = preview
client?.register_map_obj(preview)
preview.appearance = body.appearance

preview.appearance = rendered_appearance.appearance
preview.dir = dir
preview.set_position(0, pos)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/_job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ GLOBAL_LIST_INIT(job_display_order, list(
var/rpg_title

/// What company can employ this job? First index is default
var/list/employers = list()
var/list/employers = list(/datum/employer/none)

/// Default security status. Skipped if null.
var/default_security_status = null
Expand Down
2 changes: 2 additions & 0 deletions code/modules/mod/mod_control.dm
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@
playsound(src, 'sound/machines/scanbuzz.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE)
return FALSE

return ..()

/obj/item/mod/control/MouseDrop(atom/over_object)
if(usr != wearer || !istype(over_object, /atom/movable/screen/inventory/hand))
return ..()
Expand Down
2 changes: 1 addition & 1 deletion interface/interface.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
)
var/datum/http_request/issue_report = new
rustg_file_write(issue_body, "[GLOB.log_directory]/issue_reports/[ckey]-[world.time]-[SANITIZE_FILENAME(issue_title)].txt")
message_admins("BUGREPORT: Bug report filed by [ADMIN_LOOKUPFLW(src)], Title: [strip_html(issue_title)]")
message_admins("BUGREPORT: Bug report filed by [ADMIN_LOOKUPFLW(mob)], Title: [strip_html(issue_title)]")
issue_report.prepare(
RUSTG_HTTP_METHOD_POST,
"https://api.github.com/repos/[CONFIG_GET(string/issue_slug)]/issues",
Expand Down
Loading