-
Notifications
You must be signed in to change notification settings - Fork 522
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Corporate Liaison's Wardrobe (#6936)
# About the pull request This PR adds a cool new vendor for the CL. Instead of that old overflowing wardrobe full of clothes, this adds a proper vendor that lets you pick and choose your outfits from a menu rather than right-clicking a stack. The vendor includes more options than the cabinet had, including workwear (for business casual), a new orange outfit I made, civilian versions of the white and black berets, and much more. All corporate roles can use it, that being any of them listed in the wy.dm file. Survivors can also use it, as they like to get fresh sets of clothes. You're able to get one set of each clothing available, so you can't get multiples of the same clothes. However, you're able to get ONE of every item available, so you can easily supply others with clothes. This is intentional, because certain groups like fresh clothes. This could be survivors, outside WY visitors, or just someone on the ship who wants to wear a bomber jacket. I also did some minor changes to some minor items I had included with the vendor, such as making a unique variant of the corporate boots without the knife (making sure all the roles that used to spawn with it keep the knife version), renaming the 'sunglasses' (hipster glasses) to proper prescription glasses (considering it's more accurate and we already have 'sunglasses'), changed the item sprites for some of the suits (they were old and didn't match their mobsprites), and a bit more. This PR replaces the CL's cabinet with said vendor, I used the mapmerger tool, and I tested the mapping commit. I also tested everything, and it all works ingame. <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> # Explain why it's good for the game The current cabinet is overflowing with clothes, and it doesn't leave any room for new fashion items to be added. The liaison is also one of the only roles without a vendor when they really should _have_ a clothing vendor. CC has a vendor, CO has a vendor, CMO has a vendor, doctors have vendors, nurses have vendors, etc. It's also just a nice quality of life to be able to select your outfit from a proper GUI, rather than the right click context menu. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> ![image](https://github.com/user-attachments/assets/56cdec25-acec-42f8-91b1-74ed1b081372) ![Screenshot 2024-08-11 140435](https://github.com/user-attachments/assets/d51ffddc-9e73-4552-9756-3340ba530df9) ![image](https://github.com/user-attachments/assets/fccf214b-307e-4844-8d6a-1d093b0fa36b) ![Screenshot 2024-08-11 140453](https://github.com/user-attachments/assets/ad58642f-d14e-4266-876c-27ced2a26e2c) ![image](https://github.com/user-attachments/assets/02e93db9-0bea-4347-bacb-b6d01bbf5c70) ![image](https://github.com/user-attachments/assets/1dc38880-b592-41da-85b8-d36e390115c9) ![Screenshot 2024-08-11 131427](https://github.com/user-attachments/assets/cd356b07-04f2-4f48-9c04-9f9d69199d64) ![Screenshot 2024-08-11 132445](https://github.com/user-attachments/assets/ad8e4e6e-646e-4b49-b6df-1d3d0b9270fc) ![Screenshot 2024-08-11 131712](https://github.com/user-attachments/assets/f81965cc-71e6-4e37-a9c0-7230b9af1a37) ![Screenshot 2024-08-11 143951](https://github.com/user-attachments/assets/7eae84fa-a2d5-4e2c-893c-afc5e93cfcd4) </details> # Changelog :cl: Vandujr add: Added a new 'Corporate Liaison's Wardrobe' that all corporate roles can use. includes more clothes than the cabinet originally had. add: Added a new orange outfit the CL can pick from his Wardrobe Vendor. add: Added civilian black and white berets. refactor: Refactored the corporate boots, making a version with and without a knife in it on spawn. All roles that should have the knife version, have it. imageadd: Added new item sprites to the old 'complete' suits; that being the tan and formal suits, aswell as the suspenders. imageadd: Added a new item sprite for the black beret, in line with the rest of the modern berets. maptweak: Swapped the CL's cabinet for the wardrobe vendor. /:cl:
- Loading branch information
Showing
21 changed files
with
499 additions
and
184 deletions.
There are no files selected for viewing
84 changes: 84 additions & 0 deletions
84
code/game/machinery/vending/vendor_types/crew/corporate_liaison.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
//------------ CL CLOTHING VENDOR--------------- | ||
|
||
GLOBAL_LIST_INIT(cm_vending_clothing_dress_corporate_liaison, list( | ||
list("SUITS AND UNDERSHIRTS", 0, null, null, null), | ||
list("Black Suit Pants", 0, /obj/item/clothing/under/liaison_suit/black, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED), | ||
list("Blue Suit Pants", 0, /obj/item/clothing/under/liaison_suit/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Brown Suit Pants", 0, /obj/item/clothing/under/liaison_suit/brown, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("White Suit Pants", 0, /obj/item/clothing/under/liaison_suit/corporate_formal, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Liaison's Tan Suit", 0, /obj/item/clothing/under/liaison_suit, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Liaison's Charcoal Suit", 0, /obj/item/clothing/under/liaison_suit/charcoal, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Liaison's White Suit", 0, /obj/item/clothing/under/liaison_suit/formal, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Liaison's Blue Blazer", 0, /obj/item/clothing/under/liaison_suit/blazer, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Liaison's Suspenders", 0, /obj/item/clothing/under/liaison_suit/suspenders, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Liaison's Skirt", 0, /obj/item/clothing/under/blackskirt, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Trainee's Uniform", 0, /obj/item/clothing/under/suit_jacket/trainee, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Country Club Outfit", 0, /obj/item/clothing/under/liaison_suit/ivy, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Orange Outfit", 0, /obj/item/clothing/under/liaison_suit/orange, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Corporate Casual", 0, /obj/item/clothing/under/liaison_suit/field, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Grey Workwear", 0, /obj/item/clothing/under/colonist/workwear, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Khaki Workwear", 0, /obj/item/clothing/under/colonist/workwear/khaki, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Pink Workwear", 0, /obj/item/clothing/under/colonist/workwear/pink, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Green Workwear", 0, /obj/item/clothing/under/colonist/workwear/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
|
||
list("SUIT", 0, null, null, null), | ||
list("Black Suit Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/corporate/black, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), | ||
list("Khaki Suit Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/corporate, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
list("Brown Suit Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/corporate/brown, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
list("Blue Suit Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/corporate/blue, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
list("Formal Suit Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/corporate/formal, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
list("Grey Bomber Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/bomber/grey, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
list("Red Bomber Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/bomber/red, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
list("Khaki Bomber Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/bomber, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
list("Brown Bomber Jacket", 0, /obj/item/clothing/suit/storage/bomber, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
list("Black Bomber Jacket", 0, /obj/item/clothing/suit/storage/bomber/alt, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
list("Liaison's Winter Coat", 0, /obj/item/clothing/suit/storage/snow_suit/liaison, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
list("Labcoat", 0, /obj/item/clothing/suit/storage/labcoat, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
list("Grey Vest", 0, /obj/item/clothing/suit/storage/jacket/marine/vest/grey, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
list("Brown Vest", 0, /obj/item/clothing/suit/storage/jacket/marine/vest, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
list("Tan Vest", 0, /obj/item/clothing/suit/storage/jacket/marine/vest/tan, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
|
||
list("TIES", 0, null, null, null), | ||
list("Black Tie", 0, /obj/item/clothing/accessory/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), | ||
list("Red Tie", 0, /obj/item/clothing/accessory/red, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), | ||
list("Purple Tie", 0, /obj/item/clothing/accessory/purple, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), | ||
list("Blue Tie", 0, /obj/item/clothing/accessory/blue, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), | ||
list("Green Tie", 0, /obj/item/clothing/accessory/green, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), | ||
list("Gold Tie", 0, /obj/item/clothing/accessory/gold, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), | ||
list("Special Tie", 0, /obj/item/clothing/accessory/horrible, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), | ||
|
||
list("GLASSES", 0, null, null, null), | ||
list("BiMex Shades", 0, /obj/item/clothing/glasses/sunglasses/big, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_RECOMMENDED), | ||
list("Aviator Shades", 0, /obj/item/clothing/glasses/sunglasses/aviator, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), | ||
list("Sunglasses", 0, /obj/item/clothing/glasses/sunglasses, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), | ||
list("Prescription Sunglasses", 0, /obj/item/clothing/glasses/sunglasses/prescription, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), | ||
list("Prescription Glasses", 0, /obj/item/clothing/glasses/regular/hipster, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), | ||
|
||
list("GLOVES", 0, null, null, null), | ||
list("Black Gloves", 0, /obj/item/clothing/gloves/black, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_RECOMMENDED), | ||
list("Dress Gloves", 0, /obj/item/clothing/gloves/marine/dress, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_REGULAR), | ||
|
||
list("SHOES", 0, null, null, null), | ||
list("Laceup Shoes, Black", 0, /obj/item/clothing/shoes/laceup, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_RECOMMENDED), | ||
list("Laceup Shoes, Brown", 0, /obj/item/clothing/shoes/laceup/brown, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_REGULAR), | ||
list("Sneakers, Black", 0, /obj/item/clothing/shoes/black, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_REGULAR), | ||
list("Corporate Boots", 0, /obj/item/clothing/shoes/marine/corporate, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_REGULAR), | ||
|
||
list("HATS", 0, null, null, null), | ||
list("Black Beret", 0, /obj/item/clothing/head/beret/cm/black/civilian, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), | ||
list("White Beret", 0, /obj/item/clothing/head/beret/cm/white/civilian, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), | ||
list("Fedora", 0, /obj/item/clothing/head/fedora, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), | ||
|
||
)) | ||
|
||
/obj/structure/machinery/cm_vending/clothing/dress/corporate_liaison | ||
name = "\improper Corporate Liaison's Personal Wardrobe" | ||
desc = "A wardrobe containing all the clothes an executive would ever need." | ||
icon_state = "wardrobe_vendor" | ||
vendor_theme = VENDOR_THEME_USCM | ||
show_points = FALSE | ||
req_access = list() | ||
vendor_role = list(JOB_CORPORATE_LIAISON, JOB_SURVIVOR, JOB_TRAINEE, JOB_JUNIOR_EXECUTIVE, JOB_EXECUTIVE, JOB_SENIOR_EXECUTIVE, JOB_EXECUTIVE_SPECIALIST, JOB_EXECUTIVE_SUPERVISOR, JOB_ASSISTANT_MANAGER, JOB_DIVISION_MANAGER, JOB_CHIEF_EXECUTIVE, JOB_DIRECTOR, JOB_WY_GOON_RESEARCHER) | ||
|
||
/obj/structure/machinery/cm_vending/clothing/dress/corporate_liaison/get_listed_products(mob/user) | ||
return GLOB.cm_vending_clothing_dress_corporate_liaison |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.