cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-25 14:07:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2022-06-06 15:26:15 +02:00
parent 996d2f43d8 880c5b8e89
commit 891967a990
351 changed files with 9334 additions and 7965 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/global/01_ui.dm
+30 -22
View File
@@ -3,28 +3,30 @@
sort_order = 1
/datum/category_item/player_setup_item/player_global/ui/load_preferences(var/savefile/S)
S["UI_style"] >> pref.UI_style
S["UI_style_color"] >> pref.UI_style_color
S["UI_style_alpha"] >> pref.UI_style_alpha
S["ooccolor"] >> pref.ooccolor
S["tooltipstyle"] >> pref.tooltipstyle
S["client_fps"] >> pref.client_fps
S["ambience_freq"] >> pref.ambience_freq
S["ambience_chance"] >> pref.ambience_chance
S["tgui_fancy"] >> pref.tgui_fancy
S["tgui_lock"] >> pref.tgui_lock
S["UI_style"] >> pref.UI_style
S["UI_style_color"] >> pref.UI_style_color
S["UI_style_alpha"] >> pref.UI_style_alpha
S["ooccolor"] >> pref.ooccolor
S["tooltipstyle"] >> pref.tooltipstyle
S["client_fps"] >> pref.client_fps
S["ambience_freq"] >> pref.ambience_freq
S["ambience_chance"] >> pref.ambience_chance
S["tgui_fancy"] >> pref.tgui_fancy
S["tgui_lock"] >> pref.tgui_lock
S["tgui_input_mode"] >> pref.tgui_input_mode
/datum/category_item/player_setup_item/player_global/ui/save_preferences(var/savefile/S)
S["UI_style"] << pref.UI_style
S["UI_style_color"] << pref.UI_style_color
S["UI_style_alpha"] << pref.UI_style_alpha
S["ooccolor"] << pref.ooccolor
S["tooltipstyle"] << pref.tooltipstyle
S["client_fps"] << pref.client_fps
S["ambience_freq"] << pref.ambience_freq
S["ambience_chance"] << pref.ambience_chance
S["tgui_fancy"] << pref.tgui_fancy
S["tgui_lock"] << pref.tgui_lock
S["UI_style"] << pref.UI_style
S["UI_style_color"] << pref.UI_style_color
S["UI_style_alpha"] << pref.UI_style_alpha
S["ooccolor"] << pref.ooccolor
S["tooltipstyle"] << pref.tooltipstyle
S["client_fps"] << pref.client_fps
S["ambience_freq"] << pref.ambience_freq
S["ambience_chance"] << pref.ambience_chance
S["tgui_fancy"] << pref.tgui_fancy
S["tgui_lock"] << pref.tgui_lock
S["tgui_input_mode"] << pref.tgui_input_mode
/datum/category_item/player_setup_item/player_global/ui/sanitize_preferences()
pref.UI_style = sanitize_inlist(pref.UI_style, all_ui_styles, initial(pref.UI_style))
@@ -35,8 +37,9 @@
pref.client_fps = sanitize_integer(pref.client_fps, 0, MAX_CLIENT_FPS, initial(pref.client_fps))
pref.ambience_freq = sanitize_integer(pref.ambience_freq, 0, 60, initial(pref.ambience_freq)) // No more than once per hour.
pref.ambience_chance = sanitize_integer(pref.ambience_chance, 0, 100, initial(pref.ambience_chance)) // 0-100 range.
pref.tgui_fancy = sanitize_integer(pref.tgui_fancy, 0, 1, initial(pref.tgui_fancy))
pref.tgui_lock = sanitize_integer(pref.tgui_lock, 0, 1, initial(pref.tgui_lock))
pref.tgui_fancy = sanitize_integer(pref.tgui_fancy, 0, 1, initial(pref.tgui_fancy))
pref.tgui_lock = sanitize_integer(pref.tgui_lock, 0, 1, initial(pref.tgui_lock))
pref.tgui_input_mode = sanitize_integer(pref.tgui_input_mode, 0, 1, initial(pref.tgui_input_mode))
/datum/category_item/player_setup_item/player_global/ui/content(var/mob/user)
. = "<b>UI Style:</b> <a href='?src=\ref[src];select_style=1'><b>[pref.UI_style]</b></a><br>"
@@ -49,6 +52,7 @@
. += "<b>Ambience Chance:</b> <a href='?src=\ref[src];select_ambience_chance=1'><b>[pref.ambience_chance]</b></a><br>"
. += "<b>tgui Window Mode:</b> <a href='?src=\ref[src];tgui_fancy=1'><b>[(pref.tgui_fancy) ? "Fancy (default)" : "Compatible (slower)"]</b></a><br>"
. += "<b>tgui Window Placement:</b> <a href='?src=\ref[src];tgui_lock=1'><b>[(pref.tgui_lock) ? "Primary Monitor" : "Free (default)"]</b></a><br>"
. += "<b>Input Mode (Say, Me, Whisper, Subtle):</b> <a href='?src=\ref[src];tgui_input_mode=1'><b>[(pref.tgui_input_mode) ? "TGUI" : "BYOND (default)"]</b></a><br>"
if(can_select_ooc_color(user))
. += "<b>OOC Color:</b>"
if(pref.ooccolor == initial(pref.ooccolor))
@@ -118,6 +122,10 @@
pref.tgui_lock = !pref.tgui_lock
return TOPIC_REFRESH
else if(href_list["tgui_input_mode"])
pref.tgui_input_mode = !pref.tgui_input_mode
return TOPIC_REFRESH
else if(href_list["reset"])
switch(href_list["reset"])
if("ui")
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+10 -9
View File
@@ -82,19 +82,19 @@
path = /obj/item/clothing/head/fluff/fifi_hat
display_name = "Fifi's hat"
ckeywhitelist = list("allweek")
character_name = list("Fifi the Magnificent")
character_name = list("Fifi The Magnificent")
/datum/gear/fluff/fifi_jumpsuit
path = /obj/item/clothing/under/fluff/fifi_jumpsuit
display_name = "Fifi's jumpsuit"
ckeywhitelist = list("allweek")
character_name = list("Fifi the Magnificent")
character_name = list("Fifi The Magnificent")
/datum/gear/fluff/fifi_hat
/datum/gear/fluff/fifi_socks
path = /obj/item/clothing/shoes/fluff/fifi_socks
display_name = "Fifi's socks"
ckeywhitelist = list("allweek")
character_name = list("Fifi the Magnificent")
character_name = list("Fifi The Magnificent")
/datum/gear/fluff/lynn_penlight
path = /obj/item/device/flashlight/pen/fluff/lynn
@@ -1062,11 +1062,11 @@
ckeywhitelist = list("swat43")
character_name = list("Fortune Bloise")
/datum/gear/fluff/alexis_cane
path = /obj/item/weapon/cane/wand
display_name = "Alexis' Cane"
/datum/gear/fluff/kyutar
path = /obj/item/instrument/piano_synth/fluff/kyutar
display_name = "Kyu's Holotar"
ckeywhitelist = list("stobarico")
character_name = list("Alexis Bloise")
character_name = list("Kyu Comet")
/datum/gear/fluff/roiz_coat
path = /obj/item/clothing/suit/storage/hooded/wintercoat/roiz
@@ -1401,7 +1401,8 @@
character_name = list("Nehi Maximus")
/datum/gear/fluff/lucky_amour
path = /obj/item/device/modkit_conversion/crusader_luck
path = /obj/item/clothing/suit/armor/combat/crusader_costume/lucky
display_name = "Lucky's amour"
ckeywhitelist = list ("thedavestdave")
character_name = list("Lucky")
allowed_roles = "Chaplain"
code/modules/client/preference_setup/loadout/loadout_general_vr.dm
+6 -1
View File
@@ -94,5 +94,10 @@
/datum/gear/schnapsen
display_name = "schnapsen playing cards"
description = "French-suit playing cards! Pre-picked for 2-player mode."
description = "An ancient Austro-Hungarian suit of cards!"
path = /obj/item/weapon/deck/schnapsen
/datum/gear/egy_game
display_name = "EGY playing cards"
description = "A deck of cards for playing EGY! Be the first to lose all cards!"
path = /obj/item/weapon/deck/egy
code/modules/client/preference_setup/loadout/loadout_utility.dm
+5 -1
View File
@@ -72,9 +72,13 @@
path = /obj/item/weapon/folder/yellow
/datum/gear/utility/paicard
display_name = "personal AI device"
display_name = "personal AI device (classic)"
path = /obj/item/device/paicard
/datum/gear/utility/paicard_b
display_name = "personal AI device (new)"
path = /obj/item/device/paicard/typeb
/datum/gear/utility/securecase
display_name = "secure briefcase"
path =/obj/item/weapon/storage/secure/briefcase