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

Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update

Browse Source
This commit is contained in:
izac112
2024-02-17 01:06:24 +01:00
parent 8871333986 14037deb4a
commit 19e46d19b2
557 changed files with 11113 additions and 12031 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client defines.dm
+1
View File
@@ -47,6 +47,7 @@
var/last_message_count = 0
var/ircreplyamount = 0
var/entity_narrate_holder //Holds /datum/entity_narrate when using the relevant admin verbs.
var/fakeConversations //Holds fake PDA conversations for event set-up
/////////
//OTHER//
code/modules/client/preference_setup/global/01_ui.dm
-8
View File
@@ -14,7 +14,6 @@
S["tgui_fancy"] >> pref.tgui_fancy
S["tgui_lock"] >> pref.tgui_lock
S["tgui_input_mode"] >> pref.tgui_input_mode
S["tgui_input_lock"] >> pref.tgui_input_lock
S["tgui_large_buttons"] >> pref.tgui_large_buttons
S["tgui_swapped_buttons"] >> pref.tgui_swapped_buttons
S["obfuscate_key"] >> pref.obfuscate_key
@@ -34,7 +33,6 @@
S["tgui_fancy"] << pref.tgui_fancy
S["tgui_lock"] << pref.tgui_lock
S["tgui_input_mode"] << pref.tgui_input_mode
S["tgui_input_lock"] << pref.tgui_input_lock
S["tgui_large_buttons"] << pref.tgui_large_buttons
S["tgui_swapped_buttons"] << pref.tgui_swapped_buttons
S["obfuscate_key"] << pref.obfuscate_key
@@ -54,7 +52,6 @@
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))
pref.tgui_input_lock = sanitize_integer(pref.tgui_input_lock, 0, 1, initial(pref.tgui_input_lock))
pref.tgui_large_buttons = sanitize_integer(pref.tgui_large_buttons, 0, 1, initial(pref.tgui_large_buttons))
pref.tgui_swapped_buttons = sanitize_integer(pref.tgui_swapped_buttons, 0, 1, initial(pref.tgui_swapped_buttons))
pref.obfuscate_key = sanitize_integer(pref.obfuscate_key, 0, 1, initial(pref.obfuscate_key))
@@ -74,7 +71,6 @@
. += "<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>TGUI Input Framework:</b> <a href='?src=\ref[src];tgui_input_mode=1'><b>[(pref.tgui_input_mode) ? "Enabled" : "Disabled (default)"]</b></a><br>"
. += "<b>TGUI Input Lock:</b> <a href='?src=\ref[src];tgui_input_lock=1'><b>[(pref.tgui_input_lock) ? "Enabled" : "Disabled (default)"]</b></a><br>"
. += "<b>TGUI Large Buttons:</b> <a href='?src=\ref[src];tgui_large_buttons=1'><b>[(pref.tgui_large_buttons) ? "Enabled (default)" : "Disabled"]</b></a><br>"
. += "<b>TGUI Swapped Buttons:</b> <a href='?src=\ref[src];tgui_swapped_buttons=1'><b>[(pref.tgui_swapped_buttons) ? "Enabled" : "Disabled (default)"]</b></a><br>"
. += "<b>Obfuscate Ckey:</b> <a href='?src=\ref[src];obfuscate_key=1'><b>[(pref.obfuscate_key) ? "Enabled" : "Disabled (default)"]</b></a><br>"
@@ -154,10 +150,6 @@
pref.tgui_input_mode = !pref.tgui_input_mode
return TOPIC_REFRESH
else if(href_list["tgui_input_lock"])
pref.tgui_input_lock = !pref.tgui_input_lock
return TOPIC_REFRESH
else if(href_list["tgui_large_buttons"])
pref.tgui_large_buttons = !pref.tgui_large_buttons
return TOPIC_REFRESH
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
+25 -1
View File
@@ -155,4 +155,28 @@ Talon pin
/datum/gear/accessory/antediluvian/loin
display_name = "antediluvian loincloth"
path = /obj/item/clothing/accessory/antediluvian/loincloth
path = /obj/item/clothing/accessory/antediluvian/loincloth
//Replikant accessories
/datum/gear/accessory/sleekpatch
display_name = "sleek uniform patch"
path = /obj/item/clothing/accessory/sleekpatch
/datum/gear/accessory/poncho/roles/cloak/custom/gestaltjacket
display_name = "sleek uniform jacket"
path = /obj/item/clothing/accessory/poncho/roles/cloak/custom/gestaltjacket
/datum/gear/accessory/replika
display_name = "replikant vest selection"
path = /obj/item/clothing/accessory/replika
/datum/gear/accessory/replika/New()
..()
var/list/replika_vests = list(
"controller replikant chestplate" = /obj/item/clothing/accessory/replika/klbr,
"combat-engineer replikant chestplate" = /obj/item/clothing/accessory/replika/lstr,
"security-controller replikant chestplate" = /obj/item/clothing/accessory/replika/stcr,
"security-technician replikant chestplate" = /obj/item/clothing/accessory/replika/star
)
gear_tweaks += new/datum/gear_tweak/path(replika_vests)
code/modules/client/preference_setup/loadout/loadout_head.dm
+2 -1
View File
@@ -297,7 +297,8 @@
"engineering"=/obj/item/clothing/head/welding/engie,
"fancy"=/obj/item/clothing/head/welding/fancy,
"demonic"=/obj/item/clothing/head/welding/demon,
"knightly"=/obj/item/clothing/head/welding/knight
"knightly"=/obj/item/clothing/head/welding/knight,
"replikant"=/obj/item/clothing/head/welding/arar
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
code/modules/client/preference_setup/loadout/loadout_head_vr.dm
+6
View File
@@ -92,3 +92,9 @@ Talon hats
/datum/gear/head/tiny_tophat
display_name = "tiny tophat"
path = /obj/item/clothing/head/tinytophat
//Replikant hat
/datum/gear/head/eulrhat
display_name = "Sleek side cap"
path = /obj/item/clothing/head/eulrhat
code/modules/client/preference_setup/loadout/loadout_uni_selector.dm
+40
View File
@@ -593,3 +593,43 @@
"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_robo_skirt
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
//Replikant & Signalis-themed human-wear
/datum/gear/uniform/replikant_selector
display_name = "Replikant Uniform Selection"
description = "Several variants of bodysuit designed for Second Generation Biosynthetics."
path = /obj/item/clothing/under/replika/arar
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/replikant_selector/New()
..()
var/list/selector_uniforms = list(
"Macaw"=/obj/item/clothing/under/replika/arar,
"Magpie"=/obj/item/clothing/under/replika/lstr,
"Falcon"=/obj/item/clothing/under/replika/fklr,
"Owl"=/obj/item/clothing/under/replika/eulr,
"Hummingbird"=/obj/item/clothing/under/replika/klbr,
"Stork/Starling"=/obj/item/clothing/under/replika/stcr,
"Eagle"=/obj/item/clothing/under/replika/adlr,
"Magpie, Alternate"=/obj/item/clothing/under/replika/lstr_alt
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/uniform/gestalt_selector
display_name = "Sleek Uniform Selection"
description = "Multiple variants of single-stripe pattern uniforms. Best worn under their accompanying jacket."
path = /obj/item/clothing/under/gestalt
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/gestalt_selector/New()
..()
var/list/selector_uniforms = list(
"Sleek, standard"=/obj/item/clothing/under/gestalt/sleek,
"Sleek, skirt"=/obj/item/clothing/under/gestalt/sleek_skirt,
"Sleek, feminine"=/obj/item/clothing/under/gestalt/sleek_fem,
"Sleek, sleeveless"=/obj/item/clothing/under/gestalt/sleeveless
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+4
View File
@@ -516,6 +516,10 @@
display_name = "high-waisted trousers"
path = /obj/item/clothing/under/dress/hightrousers
/datum/gear/uniform/vampirehunter
display_name = "18th century outfit"
path = /obj/item/clothing/under/vampirehunter
/*
* 80s
*/
code/modules/client/preferences.dm
-1
View File
@@ -29,7 +29,6 @@ var/list/preferences_datums = list()
var/tgui_fancy = TRUE
var/tgui_lock = FALSE
var/tgui_input_mode = FALSE // All the Input Boxes (Text,Number,List,Alert)
var/tgui_input_lock = FALSE
var/tgui_large_buttons = TRUE
var/tgui_swapped_buttons = FALSE
var/obfuscate_key = FALSE
code/modules/client/preferences_toggle_procs.dm
-11
View File
@@ -379,17 +379,6 @@
You will have to reload TGChat and/or reconnect to the server for these changes to take place. \
TGChat message persistence is not guaranteed if you change this again before the start of the next round.")
/client/verb/toggle_tgui_inputlock()
set name = "Toggle TGUI Input Lock"
set category = "Preferences"
set desc = "Toggles whether or not pressing the 'Enter' key in TGUI input sends the message or creates a new line."
prefs.tgui_input_lock = !prefs.tgui_input_lock //There is no preference datum for tgui input lock, nor for any TGUI prefs.
SScharacter_setup.queue_preferences_save(prefs)
to_chat(src, span_notice("You have toggled TGUI input lock: [prefs.tgui_input_lock ? "ON" : "OFF"] \n \
This setting determines whether pressing enter on TGUI input sends the input, or creates a newline."))
/client/verb/toggle_chat_timestamps()
set name = "Toggle Chat Timestamps"
set category = "Preferences"