cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Primary Radio Selection (#12026)

Browse Source 
You can now choose which slot is your primary radio slot between your left and right ears. If both ears have a headset on them, the primary radio will be used.
This commit is contained in:
Geeves
2021-07-21 15:39:06 +03:00
committed by GitHub
parent ca006ffe5a
commit 7f9fdbd9a2
9 changed files with 62 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/04_equipment.dm
+15 -1
View File
@@ -13,6 +13,7 @@
S["backbag_style"] >> pref.backbag_style
S["pda_choice"] >> pref.pda_choice
S["headset_choice"] >> pref.headset_choice
S["primary_radio_slot"] >> pref.primary_radio_slot
/datum/category_item/player_setup_item/general/equipment/save_character(var/savefile/S)
S["all_underwear"] << pref.all_underwear
@@ -21,6 +22,7 @@
S["backbag_style"] << pref.backbag_style
S["pda_choice"] << pref.pda_choice
S["headset_choice"] << pref.headset_choice
S["primary_radio_slot"] << pref.primary_radio_slot
/datum/category_item/player_setup_item/general/equipment/gather_load_query()
return list(
@@ -31,7 +33,8 @@
"backbag",
"backbag_style",
"pda_choice",
"headset_choice"
"headset_choice",
"primary_radio_slot"
),
"args" = list("id")
)
@@ -49,6 +52,7 @@
"backbag_style",
"pda_choice",
"headset_choice",
"primary_radio_slot",
"id" = 1,
"ckey" = 1
)
@@ -62,6 +66,7 @@
"backbag_style" = pref.backbag_style,
"pda_choice" = pref.pda_choice,
"headset_choice" = pref.headset_choice,
"primary_radio_slot" = pref.primary_radio_slot,
"id" = pref.current_character,
"ckey" = PREF_CLIENT_CKEY
)
@@ -116,6 +121,8 @@
pref.backbag_style = sanitize_integer(pref.backbag_style, 1, backbagstyles.len, initial(pref.backbag_style))
pref.pda_choice = sanitize_integer(pref.pda_choice, 1, pdalist.len, initial(pref.pda_choice))
pref.headset_choice = sanitize_integer(pref.headset_choice, 1, headsetlist.len, initial(pref.headset_choice))
if(!(pref.primary_radio_slot in primary_radio_slot_choice))
pref.primary_radio_slot = primary_radio_slot_choice[1]
/datum/category_item/player_setup_item/general/equipment/content(var/mob/user)
. = list()
@@ -135,6 +142,7 @@
. += "Backpack Style: <a href='?src=\ref[src];change_backpack_style=1'><b>[backbagstyles[pref.backbag_style]]</b></a><br>"
. += "PDA Type: <a href='?src=\ref[src];change_pda=1'><b>[pdalist[pref.pda_choice]]</b></a><br>"
. += "Headset Type: <a href='?src=\ref[src];change_headset=1'><b>[headsetlist[pref.headset_choice]]</b></a><br>"
. += "Primary Radio Slot: <a href='?src=\ref[src];change_radio_slot=1'><b>[pref.primary_radio_slot]</b></a><br>"
return jointext(., null)
@@ -179,6 +187,12 @@
pref.headset_choice = headsetlist.Find(new_headset)
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["change_radio_slot"])
var/new_slot = input(user, "Choose which radio will be spoken into first if multiple slots are occupied.", "Charcter Preference", pref.primary_radio_slot) as null|anything in primary_radio_slot_choice
if(!isnull(new_slot) && CanUseTopic(user))
pref.primary_radio_slot = new_slot
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["change_underwear"])
var/datum/category_group/underwear/UWC = global_underwear.categories_by_name[href_list["change_underwear"]]
if(!UWC)