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

A Reasonable Suit Sensor Rebalance (#17607)

Browse Source 
* A Reasonable Suit Sensor Rebalance

* discombobulate

* weird ahh

* HAPPY WHEELS

* SQL

* this will work hopefully

* damn me dumb

* please work

* Apply suggestions from code review

* Rename V004_suit_sensors.sql to V004__suit_sensors.sql

* remove sensor lock

* dmdocs + fixes

* Update code/modules/clothing/under/jobs/civilian.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update SQL/migrate-2023/V004__suit_sensors.sql

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/clothing/clothing.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/clothing/clothing.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/clothing/clothing.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/clothing/clothing.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/clothing/clothing.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* changes

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
Wowzewow (Wezzy)
2023-12-07 02:41:46 +08:00
committed by GitHub
parent 5a36bf8231
commit 5ad3c00da2
21 changed files with 257 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/04_equipment.dm
+15 -2
View File
@@ -16,6 +16,7 @@
S["pda_choice"] >> pref.pda_choice
S["headset_choice"] >> pref.headset_choice
S["primary_radio_slot"] >> pref.primary_radio_slot
S["sensor_setting"] >> pref.sensor_setting
/datum/category_item/player_setup_item/general/equipment/save_character(var/savefile/S)
S["all_underwear"] << pref.all_underwear
@@ -27,6 +28,7 @@
S["pda_choice"] << pref.pda_choice
S["headset_choice"] << pref.headset_choice
S["primary_radio_slot"] << pref.primary_radio_slot
S["sensor_setting"] << pref.sensor_setting
/datum/category_item/player_setup_item/general/equipment/gather_load_query()
return list(
@@ -40,7 +42,8 @@
"backbag_strap",
"pda_choice",
"headset_choice",
"primary_radio_slot"
"primary_radio_slot",
"sensor_setting"
),
"args" = list("id")
)
@@ -61,6 +64,7 @@
"pda_choice",
"headset_choice",
"primary_radio_slot",
"sensor_setting",
"id" = 1,
"ckey" = 1
)
@@ -77,6 +81,7 @@
"pda_choice" = pref.pda_choice,
"headset_choice" = pref.headset_choice,
"primary_radio_slot" = pref.primary_radio_slot,
"sensor_setting" = pref.sensor_setting,
"id" = pref.current_character,
"ckey" = PREF_CLIENT_CKEY
)
@@ -137,6 +142,7 @@
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]
pref.sensor_setting = sanitize_inlist(pref.sensor_setting, SUIT_SENSOR_MODES, get_key_by_index(SUIT_SENSOR_MODES, 0))
/datum/category_item/player_setup_item/general/equipment/content(var/mob/user)
. = list()
@@ -160,6 +166,7 @@
. += "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>"
. += "Suit Sensor Setting: <a href='?src=\ref[src];change_sensor_setting=1'><b>[pref.sensor_setting]</b></a><br/>"
return jointext(., null)
@@ -217,11 +224,17 @@
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["change_radio_slot"])
var/new_slot = tgui_input_list(user, "Choose which radio will be spoken into first if multiple slots are occupied.", "Charcter Preference", primary_radio_slot_choice, pref.primary_radio_slot)
var/new_slot = tgui_input_list(user, "Choose which radio will be spoken into first if multiple slots are occupied.", "Character Preference", primary_radio_slot_choice, pref.primary_radio_slot)
if(!isnull(new_slot) && CanUseTopic(user))
pref.primary_radio_slot = new_slot
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["change_sensor_setting"])
var/new_sensor = tgui_input_list(user, "Select a sensor mode.", "Character Preference", SUIT_SENSOR_MODES, pref.sensor_setting)
if(!isnull(new_sensor) && CanUseTopic(user))
pref.sensor_setting = new_sensor
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)
code/modules/client/preference_setup/preference_setup.dm
+1 -1
View File
@@ -196,7 +196,7 @@
/datum/category_group/player_setup_category/proc/content(var/mob/user)
. = "<table style='width:100%'><tr style='vertical-align:top'><td style='width:50%'>"
var/current = 0
var/halfway = items.len / 2
var/halfway = items.len / 2.5
for(var/datum/category_item/player_setup_item/PI in items)
if(halfway && current++ >= halfway)
halfway = 0
code/modules/client/preferences.dm
+2
View File
@@ -53,6 +53,8 @@ var/list/preferences_datums = list()
var/pda_choice = OUTFIT_TAB_PDA
var/headset_choice = OUTFIT_HEADSET
var/primary_radio_slot = "Left Ear"
///Suit sensors setting in the loadout.
var/sensor_setting
var/h_style = "Bedhead 2" //Hair type
var/tail_style = null
var/hair_colour = "#000000" //Hair colour hex value, for SQL loading