Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
6749568
PDA starts in ID slot
SapphicOverload Feb 13, 2022
03f3c9b
Fixes a few other jobs
SapphicOverload Feb 13, 2022
e9758c8
Minor fix
SapphicOverload Feb 14, 2022
21a07b3
Makes the PDA's starting slot optional
SapphicOverload Feb 17, 2022
3263ccb
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
SapphicOverload Feb 17, 2022
a78281c
Changes how the PDA is added to the inventory
SapphicOverload Feb 25, 2022
b1ea892
Fixes the PDA and ID not spawning at round start
SapphicOverload Mar 8, 2022
c6b71bd
Reverts changes to yarn
SapphicOverload Mar 8, 2022
f5de6e5
Merge branch 'yogstation13:master' into pda-in-id-slot
SapphicOverload Mar 8, 2022
15e011e
a
SapphicOverload Mar 13, 2022
bc6b952
a
SapphicOverload Mar 13, 2022
9696934
Merge branch 'master' into pda-in-id-slot
SapphicOverload Mar 13, 2022
14a7dbd
Update mining_medic.dm
ToasterBiome Mar 14, 2022
ba0fe94
Merge branch 'pda-in-id-slot' of https://github.com/SapphicOverload/Y…
SapphicOverload Mar 14, 2022
a28d1b8
Revert "a"
SapphicOverload Mar 14, 2022
5106fe7
Update horror.dm
JamieD1 Mar 14, 2022
6a73d11
Update horror_chemicals.dm
JamieD1 Mar 14, 2022
026f878
Revert "Update horror_chemicals.dm"
SapphicOverload Mar 14, 2022
0c72059
Revert "Update horror.dm"
SapphicOverload Mar 14, 2022
70b994e
Revert "Revert "a""
SapphicOverload Mar 14, 2022
bb496f2
Revert "a"
SapphicOverload Mar 14, 2022
20e620d
Revert "Merge branch 'master' into pda-in-id-slot"
SapphicOverload Mar 15, 2022
0f68e8d
Github won't discard these changes
SapphicOverload Mar 15, 2022
9f0d5ad
Revert "Github won't discard these changes"
SapphicOverload Mar 15, 2022
1428f72
Modular access now works correctly
SapphicOverload Mar 21, 2022
08acd85
Update code/modules/jobs/job_types/_job.dm
JamieD1 Mar 27, 2022
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
5 changes: 5 additions & 0 deletions code/modules/client/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/preferred_map = null
var/pda_style = MONO
var/pda_color = "#808000"
var/id_in_pda = FALSE
var/show_credits = TRUE
var/uses_glasses_colour = 0

Expand Down Expand Up @@ -631,6 +632,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<br>"
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>"
dat += "<b>PDA Style:</b> <a href='?_src_=prefs;task=input;preference=pda_style'>[pda_style]</a><br>"
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>"
dat += "<b>Skillcape:</b> <a href='?_src_=prefs;task=input;preference=skillcape'>[(skillcape_id != "None") ? "[GLOB.skillcapes[skillcape_id]]" : "None"] </a><br>"
dat += "<b>Flare:</b> <a href='?_src_=prefs;task=input;preference=flare'>[flare ? "Enabled" : "Disabled"]</a><br>"
dat += "<b>Map:</b> <a href='?_src_=prefs;task=input;preference=map'>[map ? "Enabled" : "Disabled"]</a><br>"
Expand Down Expand Up @@ -1781,6 +1783,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/pickedPDAColor = input(user, "Choose your PDA Interface color.", "Character Preference",pda_color) as color|null
if(pickedPDAColor)
pda_color = pickedPDAColor
if("id_in_pda")
id_in_pda = !id_in_pda
if("skillcape")
var/list/selectablecapes = list()
var/max_eligable = TRUE
Expand Down Expand Up @@ -2067,6 +2071,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
character.backbag = backbag

character.jumpsuit_style = jumpsuit_style
character.id_in_pda = id_in_pda

var/datum/species/chosen_species
chosen_species = pref_species.type
Expand Down
2 changes: 2 additions & 0 deletions code/modules/client/preferences_savefile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
READ_FILE(S["tip_delay"], tip_delay)
READ_FILE(S["pda_style"], pda_style)
READ_FILE(S["pda_color"], pda_color)
READ_FILE(S["id_in_pda"], id_in_pda)

READ_FILE(S["skillcape"], skillcape)
READ_FILE(S["skillcape_id"], skillcape_id)
Expand Down Expand Up @@ -347,6 +348,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["tip_delay"], tip_delay)
WRITE_FILE(S["pda_style"], pda_style)
WRITE_FILE(S["pda_color"], pda_color)
WRITE_FILE(S["id_in_pda"], id_in_pda)
WRITE_FILE(S["skillcape"], skillcape)
WRITE_FILE(S["skillcape_id"], skillcape_id)
WRITE_FILE(S["show_credits"], show_credits)
Expand Down
Loading