Skip to content

Commit 4b53f36

Browse files
authored
030125bugs (#1224)
* fix savefile regression * fix mixed * fix bad follow * fix ai and cyborg being unselectable * fix prefs not displaying ai/borg * fix modsuits being unremovable
1 parent 53c553c commit 4b53f36

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

code/game/gamemodes/mixed.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
antagonist_pool[pick_weight(antag_weight_map)] += 1
4646
number_of_antags--
4747

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

5252
/datum/game_mode/mixed/setup_antags()

code/modules/client/preferences.dm

+9-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
99
/// Ensures that we always load the last used save, QOL
1010
var/default_slot = 1
1111
/// The maximum number of slots we're allowed to contain
12-
var/max_save_slots = 3
12+
var/max_save_slots = 10
1313

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

407407
/// The body that is displayed
408408
var/mob/living/carbon/human/dummy/body
409+
/// The appearance to display
410+
var/mutable_appearance/rendered_appearance
409411

410412
/// The preferences this refers to
411413
var/datum/preferences/preferences
@@ -448,11 +450,13 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/character_preview_view)
448450
create_body()
449451
else
450452
body.wipe_state()
451-
preferences.render_new_preview_appearance(body)
453+
454+
rendered_appearance = preferences.render_new_preview_appearance(body)
455+
452456
for(var/index in subscreens)
453457
var/atom/movable/screen/subscreen = subscreens[index]
454458
var/cache_dir = subscreen.dir
455-
subscreen.appearance = body.appearance
459+
subscreen.appearance = rendered_appearance.appearance
456460
subscreen.dir = cache_dir
457461

458462
/atom/movable/screen/character_preview_view/proc/create_body()
@@ -487,7 +491,8 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/character_preview_view)
487491
preview = new
488492
subscreens["preview-[dir]"] = preview
489493
client?.register_map_obj(preview)
490-
preview.appearance = body.appearance
494+
495+
preview.appearance = rendered_appearance.appearance
491496
preview.dir = dir
492497
preview.set_position(0, pos)
493498

code/modules/jobs/job_types/_job.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ GLOBAL_LIST_INIT(job_display_order, list(
164164
var/rpg_title
165165

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

169169
/// Default security status. Skipped if null.
170170
var/default_security_status = null

code/modules/mod/mod_control.dm

+2
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@
229229
playsound(src, 'sound/machines/scanbuzz.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE)
230230
return FALSE
231231

232+
return ..()
233+
232234
/obj/item/mod/control/MouseDrop(atom/over_object)
233235
if(usr != wearer || !istype(over_object, /atom/movable/screen/inventory/hand))
234236
return ..()

interface/interface.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
)
120120
var/datum/http_request/issue_report = new
121121
rustg_file_write(issue_body, "[GLOB.log_directory]/issue_reports/[ckey]-[world.time]-[SANITIZE_FILENAME(issue_title)].txt")
122-
message_admins("BUGREPORT: Bug report filed by [ADMIN_LOOKUPFLW(src)], Title: [strip_html(issue_title)]")
122+
message_admins("BUGREPORT: Bug report filed by [ADMIN_LOOKUPFLW(mob)], Title: [strip_html(issue_title)]")
123123
issue_report.prepare(
124124
RUSTG_HTTP_METHOD_POST,
125125
"https://api.github.com/repos/[CONFIG_GET(string/issue_slug)]/issues",

0 commit comments

Comments
 (0)