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

Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into non-crew-role

Browse Source
This commit is contained in:
TheGreatKitsune
2022-09-21 13:42:13 -05:00
parent d6645adb36 8247ddd9a7
commit 2f4c829afa
174 changed files with 18767 additions and 12396 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/02_language.dm
+4 -2
View File
@@ -9,7 +9,8 @@
/datum/category_item/player_setup_item/general/language/load_character(var/savefile/S)
S["language"] >> pref.alternate_languages
S["extra_languages"] >> pref.extra_languages
testing("LANGSANI: Loaded from [pref.client]'s character [pref.real_name || "-name not yet loaded-"] savefile: [english_list(pref.alternate_languages || list())]")
if(islist(pref.alternate_languages)) // Because aparently it may not be?
testing("LANGSANI: Loaded from [pref.client]'s character [pref.real_name || "-name not yet loaded-"] savefile: [english_list(pref.alternate_languages || list())]")
S["language_prefixes"] >> pref.language_prefixes
//CHOMPEdit Begin
S["species"] >> pref.species
@@ -19,7 +20,8 @@
/datum/category_item/player_setup_item/general/language/save_character(var/savefile/S)
S["language"] << pref.alternate_languages
S["extra_languages"] << pref.extra_languages
testing("LANGSANI: Saved to [pref.client]'s character [pref.real_name || "-name not yet loaded-"] savefile: [english_list(pref.alternate_languages || list())]")
if(islist(pref.alternate_languages)) // Because aparently it may not be?
testing("LANGSANI: Loaded from [pref.client]'s character [pref.real_name || "-name not yet loaded-"] savefile: [english_list(pref.alternate_languages || list())]")
S["language_prefixes"] << pref.language_prefixes
S["language_custom_keys"] << pref.language_custom_keys
code/modules/client/preference_setup/global/setting_datums.dm
+6
View File
@@ -422,3 +422,9 @@ var/list/_client_preferences_by_type
key = "CHAT_RLOOC"
enabled_description = "Show"
disabled_description = "Hide"
/datum/client_preference/holder/show_staff_dsay
description ="Staff Deadchat"
key = "CHAT_ADSAY"
enabled_description = "Show"
disabled_description = "Hide"
code/modules/client/preference_setup/loadout/loadout_head_vr.dm
+8
View File
@@ -49,6 +49,14 @@
display_name = "pink tiger pelt"
path = /obj/item/clothing/head/pelt/tigerpeltpink
/datum/gear/head/magic_hat
display_name = "wizard hat, colorable"
path = /obj/item/clothing/head/wizard/fake/realistic/colorable
/datum/gear/head/magic_hat/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/*
Talon hats
*/
code/modules/client/preference_setup/loadout/loadout_suit.dm
+5
View File
@@ -194,6 +194,11 @@
path = /obj/item/clothing/suit/storage/apron/overalls
cost = 1
/datum/gear/suit/altevian_apron
display_name = "crafters pride apron"
path = /obj/item/clothing/suit/storage/apron/altevian
cost = 1
/datum/gear/suit/cyberpunk
display_name = "cyberpunk jacket"
path = /obj/item/clothing/suit/cyberpunk
code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm
+10 -1
View File
@@ -94,5 +94,14 @@
/datum/gear/suit/taur/white_dress
display_name = "white wedding dress (Wolf/Horse-taur)"
path = /obj/item/clothing/suit/taur_dress/white
path = /obj/item/clothing/suit/taur/dress
sort_category = "Xenowear"
/datum/gear/suit/taur/colorable_skirt
display_name = "colorable skirt (Wolf/Horse-taur)"
path = /obj/item/clothing/suit/taur/skirt
sort_category = "Xenowear"
/datum/gear/suit/taur/colorable_skirt/New()
..()
gear_tweaks += gear_tweak_free_color_choice