Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 7f3aa2e

Browse files
committed
TGS Test merge #13270
2 parents 70ed01b + 08acd85 commit 7f3aa2e

42 files changed

Lines changed: 179 additions & 88 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

code/modules/client/preferences.dm

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
4444
var/preferred_map = null
4545
var/pda_style = MONO
4646
var/pda_color = "#808000"
47+
var/id_in_pda = FALSE
4748
var/show_credits = TRUE
4849
var/uses_glasses_colour = 0
4950

@@ -631,6 +632,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
631632
dat += "<br>"
632633
dat += "<b>PDA Color:</b> <span style='border:1px solid #161616; background-color: [pda_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=pda_color;task=input'>Change</a><BR>"
633634
dat += "<b>PDA Style:</b> <a href='?_src_=prefs;task=input;preference=pda_style'>[pda_style]</a><br>"
635+
dat += "<b>PDA Starts in ID Slot:</b> <a href='?_src_=prefs;task=input;preference=id_in_pda'>[id_in_pda ? "Enabled" : "Disabled"]</a><br>"
634636
dat += "<b>Skillcape:</b> <a href='?_src_=prefs;task=input;preference=skillcape'>[(skillcape_id != "None") ? "[GLOB.skillcapes[skillcape_id]]" : "None"] </a><br>"
635637
dat += "<b>Flare:</b> <a href='?_src_=prefs;task=input;preference=flare'>[flare ? "Enabled" : "Disabled"]</a><br>"
636638
dat += "<b>Map:</b> <a href='?_src_=prefs;task=input;preference=map'>[map ? "Enabled" : "Disabled"]</a><br>"
@@ -1785,6 +1787,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
17851787
var/pickedPDAColor = input(user, "Choose your PDA Interface color.", "Character Preference",pda_color) as color|null
17861788
if(pickedPDAColor)
17871789
pda_color = pickedPDAColor
1790+
if("id_in_pda")
1791+
id_in_pda = !id_in_pda
17881792
if("skillcape")
17891793
var/list/selectablecapes = list()
17901794
var/max_eligable = TRUE
@@ -2071,6 +2075,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
20712075
character.backbag = backbag
20722076

20732077
character.jumpsuit_style = jumpsuit_style
2078+
character.id_in_pda = id_in_pda
20742079

20752080
var/datum/species/chosen_species
20762081
chosen_species = pref_species.type

code/modules/client/preferences_savefile.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
212212
READ_FILE(S["tip_delay"], tip_delay)
213213
READ_FILE(S["pda_style"], pda_style)
214214
READ_FILE(S["pda_color"], pda_color)
215+
READ_FILE(S["id_in_pda"], id_in_pda)
215216

216217
READ_FILE(S["skillcape"], skillcape)
217218
READ_FILE(S["skillcape_id"], skillcape_id)
@@ -348,6 +349,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
348349
WRITE_FILE(S["tip_delay"], tip_delay)
349350
WRITE_FILE(S["pda_style"], pda_style)
350351
WRITE_FILE(S["pda_color"], pda_color)
352+
WRITE_FILE(S["id_in_pda"], id_in_pda)
351353
WRITE_FILE(S["skillcape"], skillcape)
352354
WRITE_FILE(S["skillcape_id"], skillcape_id)
353355
WRITE_FILE(S["show_credits"], show_credits)

0 commit comments

Comments
 (0)