From 3b93f8c710fa9c90e573639fe926fefe9e525c27 Mon Sep 17 00:00:00 2001 From: desven <45808369+desvenlafaxine@users.noreply.github.com> Date: Fri, 29 Oct 2021 10:28:18 -0500 Subject: [PATCH] Readds the normal leather satchel to the loadout, adds normal wallet to the loadout (#12638) --- code/_helpers/global_lists.dm | 2 +- code/datums/outfits/outfit.dm | 4 ++++ .../client/preference_setup/loadout/loadout_utility.dm | 7 ++++++- html/changelogs/desven-classicleather.yml | 6 ++++++ 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/desven-classicleather.yml diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm index 24481d294a9..3293012759d 100644 --- a/code/_helpers/global_lists.dm +++ b/code/_helpers/global_lists.dm @@ -60,7 +60,7 @@ var/global/list/chargen_disabilities_list = list() var/global/static/list/valid_player_genders = list(MALE, FEMALE, NEUTER, PLURAL) //Backpacks -var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Leather satchel", "Duffel Bag", "Messenger Bag", "Black Rucksack", "Blue Rucksack", "Green Rucksack", "Navy Rucksack", "Tan Rucksack", "Khaki Satchel", "Black Satchel", "Navy Satchel", "Olive Satchel", "Auburn Satchel", "Black Pocketbook", "Brown Pocketbook", "Auburn Pocketbook") +var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Leather satchel", "Duffel Bag", "Messenger Bag", "Black Rucksack", "Blue Rucksack", "Green Rucksack", "Navy Rucksack", "Tan Rucksack", "Khaki Satchel", "Black Satchel", "Navy Satchel", "Olive Satchel", "Auburn Satchel", "Black Pocketbook", "Brown Pocketbook", "Auburn Pocketbook", "Classic leather satchel") var/global/list/backbagstyles = list("Job-specific", "Grey") var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg, /datum/job/merchant) diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index a43a73b5172..c0c80c06f31 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -18,6 +18,7 @@ #define OUTFIT_POCKETBOOK 17 #define OUTFIT_BROWNPOCKETBOOK 18 #define OUTFIT_AUBURNPOCKETBOOK 19 +#define OUTFIT_CLASSICSATCHEL 20 #define OUTFIT_TAB_PDA 2 #define OUTFIT_PDA_OLD 3 @@ -91,6 +92,7 @@ var/pocketbook = /obj/item/storage/backpack/satchel/pocketbook var/brownpocketbook = /obj/item/storage/backpack/satchel/pocketbook/brown var/auburnpocketbook = /obj/item/storage/backpack/satchel/pocketbook/reddish + var/classicsatchel = /obj/item/storage/backpack/satchel var/allow_pda_choice = FALSE var/tab_pda = /obj/item/modular_computer/handheld/pda/civilian @@ -155,6 +157,8 @@ back = use_job_specific ? brownpocketbook : /obj/item/storage/backpack/satchel/pocketbook/brown if (OUTFIT_AUBURNPOCKETBOOK) back = use_job_specific ? auburnpocketbook : /obj/item/storage/backpack/satchel/pocketbook/reddish + if (OUTFIT_CLASSICSATCHEL) + back = use_job_specific ? classicsatchel : /obj/item/storage/backpack/satchel else back = backpack //Department backpack if(back) diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index f51b3121f7f..1a04a11b84e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -23,7 +23,7 @@ cost = 2 /datum/gear/utility/purse - display_name = "Purse" + display_name = "purse" description = "A small, fashionable bag typically worn over the shoulder." path = /obj/item/storage/backpack/satchel/pocketbook/purse flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -61,6 +61,11 @@ display_name = "personal AI device" path = /obj/item/device/paicard +/datum/gear/utility/classicwallet + display_name = "wallet" + path = /obj/item/storage/wallet + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + /datum/gear/utility/wallet display_name = "wallet selection" path = /obj/item/storage/wallet diff --git a/html/changelogs/desven-classicleather.yml b/html/changelogs/desven-classicleather.yml new file mode 100644 index 00000000000..d5f73e15167 --- /dev/null +++ b/html/changelogs/desven-classicleather.yml @@ -0,0 +1,6 @@ +author: Desven +delete-after: True +changes: + - rscadd: "Readded the normal leather satchel to the loadout. You can select it as Classic leather satchel." + - rscadd: "Added the default wallet to the loadout." + - spellcheck : "Fixed the word purse being uppercase in the loadout selection." \ No newline at end of file