Skip to content

Commit

Permalink
Corporate Liaison's Wardrobe (#6936)
Browse files Browse the repository at this point in the history
# 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
thevandie committed Aug 18, 2024
1 parent 29cb296 commit 45f9303
Show file tree
Hide file tree
Showing 21 changed files with 499 additions and 184 deletions.
84 changes: 84 additions & 0 deletions code/game/machinery/vending/vendor_types/crew/corporate_liaison.dm
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
4 changes: 2 additions & 2 deletions code/modules/clothing/glasses/glasses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@
flags_equip_slot = SLOT_EYES|SLOT_FACE

/obj/item/clothing/glasses/regular/hipster
name = "Sunglasses"
desc = "They cut the sun and keep things fun. Why would you ever wear these indoors, or on a night operation. Are you trying to get yourself hurt?"
name = "Prescription Glasses"
desc = "Boring glasses, makes you look smart and potentially reputable."
icon_state = "hipster_glasses"
item_state = "hipster_glasses"
flags_equip_slot = SLOT_EYES|SLOT_FACE
Expand Down
10 changes: 10 additions & 0 deletions code/modules/clothing/head/head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,16 @@
name = "USCM Squad Beret"
desc = "For those who want to show pride and have nothing to lose (in their head, at least)."

/obj/item/clothing/head/beret/cm/white/civilian
name = "White Beret"
desc = "A nice fashionable beret, popular with executives."
icon_state = "s_beret"

/obj/item/clothing/head/beret/cm/black/civilian
name = "Black Beret"
desc = "A nice fashionable beret, popular with executives."
icon_state = "beret_black"

/obj/item/clothing/head/beret/cm/squadberet/equipped(mob/user, slot)
. = ..()
self_set()
Expand Down
2 changes: 2 additions & 0 deletions code/modules/clothing/shoes/marine_shoes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@
/obj/item/clothing/shoes/marine/corporate
name = "rugged boots"
desc = "These synth-leather boots seem high quality when first worn, but quickly detoriate, especially in the environments the corporate security members these are issued to operate in. Still, better than nothing."

/obj/item/clothing/shoes/marine/corporate/knife
spawn_item_type = /obj/item/attachable/bayonet

/obj/item/clothing/shoes/marine/ress
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/shoes/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
icon_state = "laceups"

/obj/item/clothing/shoes/laceup/brown
name = "brown laceup shoes"
icon_state = "laceups_brown"

/obj/item/clothing/shoes/swimmingfins
Expand Down
8 changes: 7 additions & 1 deletion code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@
worn_state = "liaison_formal"

/obj/item/clothing/under/liaison_suit/suspenders
name = "liaison's attire"
name = "liaison's suspenders"
desc = "A collared shirt, complimented by a pair of suspenders. Worn by Weyland-Yutani employees who ask the tough questions. Smells faintly of cigars and bad acting."
icon_state = "liaison_suspenders"
worn_state = "liaison_suspenders"
Expand All @@ -863,6 +863,12 @@
icon_state = "corporate_ivy"
worn_state = "corporate_ivy"

/obj/item/clothing/under/liaison_suit/orange
name = "orange outfit"
desc = "A pair of black pants paired with a very Wey-Yu orange shirt. A popular look with those in the corporate world that conduct the majority of their business from Weyland Yutani offices."
icon_state = "corporate_orange"
worn_state = "corporate_orange"

/obj/item/clothing/under/liaison_suit/corporate_formal
name = "white suit pants"
desc = "A pair of ivory slacks paired with a white shirt. A popular pairing for formal corporate events."
Expand Down
4 changes: 2 additions & 2 deletions code/modules/gear_presets/corpses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET)

new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK)
Expand All @@ -731,7 +731,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/lead, WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET)

new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
add_random_kutjevo_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife(new_human), WEAR_FEET)
..()

/datum/equipment_preset/survivor/doctor/kutjevo
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/survivors/lv_624/preset_lv.dm
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife(new_human), WEAR_FEET)
..()

/datum/equipment_preset/survivor/corporate/lv
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/survivors/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Everything below isn't used or out of place.
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET)

new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK)
Expand Down
68 changes: 68 additions & 0 deletions code/modules/gear_presets/survivors/survivors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,74 @@

var/survivor_variant = CIVILIAN_SURVIVOR

dress_under = list(
/obj/item/clothing/under/liaison_suit/black,
/obj/item/clothing/under/liaison_suit/blue,
/obj/item/clothing/under/liaison_suit/brown,
/obj/item/clothing/under/liaison_suit/corporate_formal,
/obj/item/clothing/under/liaison_suit,
/obj/item/clothing/under/liaison_suit/charcoal,
/obj/item/clothing/under/liaison_suit/formal,
/obj/item/clothing/under/liaison_suit/blazer,
/obj/item/clothing/under/liaison_suit/suspenders,
/obj/item/clothing/under/blackskirt,
/obj/item/clothing/under/suit_jacket/trainee,
/obj/item/clothing/under/liaison_suit/ivy,
/obj/item/clothing/under/liaison_suit/orange,
/obj/item/clothing/under/liaison_suit/field,
/obj/item/clothing/under/colonist/workwear,
/obj/item/clothing/under/colonist/workwear/khaki,
/obj/item/clothing/under/colonist/workwear/pink,
/obj/item/clothing/under/colonist/workwear/green,
)
dress_over = list(
/obj/item/clothing/suit/storage/jacket/marine/corporate/black,
/obj/item/clothing/suit/storage/jacket/marine/corporate,
/obj/item/clothing/suit/storage/jacket/marine/corporate/brown,
/obj/item/clothing/suit/storage/jacket/marine/corporate/blue,
/obj/item/clothing/suit/storage/jacket/marine/corporate/black,
/obj/item/clothing/suit/storage/jacket/marine/bomber/grey,
/obj/item/clothing/suit/storage/jacket/marine/bomber/red,
/obj/item/clothing/suit/storage/jacket/marine/bomber,
/obj/item/clothing/suit/storage/bomber,
/obj/item/clothing/suit/storage/bomber/alt,
/obj/item/clothing/suit/storage/snow_suit/liaison,
/obj/item/clothing/suit/storage/labcoat,
/obj/item/clothing/suit/storage/jacket/marine/vest/grey,
/obj/item/clothing/suit/storage/jacket/marine/vest,
/obj/item/clothing/suit/storage/jacket/marine/vest/tan,
/obj/item/clothing/suit/storage/webbing,
)
dress_extra = list(
/obj/item/clothing/accessory/black,
/obj/item/clothing/accessory/red,
/obj/item/clothing/accessory/purple,
/obj/item/clothing/accessory/blue,
/obj/item/clothing/accessory/green,
/obj/item/clothing/accessory/gold,
/obj/item/clothing/accessory/horrible,
/obj/item/clothing/glasses/sunglasses/big,
/obj/item/clothing/glasses/sunglasses/aviator,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses/prescription,
/obj/item/clothing/glasses/regular/hipster,
)
dress_gloves = list(
/obj/item/clothing/gloves/black,
/obj/item/clothing/gloves/marine/dress,
)
dress_shoes = list(
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/shoes/laceup/brown,
/obj/item/clothing/shoes/black,
/obj/item/clothing/shoes/marine/corporate,
)
dress_hat = list(
/obj/item/clothing/head/fedora,
/obj/item/clothing/head/beret/cm/black/civilian,
/obj/item/clothing/head/beret/cm/white/civilian,
)

/datum/equipment_preset/survivor/load_name(mob/living/carbon/human/new_human, randomise)
new_human.gender = pick(MALE, FEMALE)
var/datum/preferences/A = new
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife(new_human), WEAR_FEET)
..()

/datum/equipment_preset/survivor/colonial_marshal/trijent
Expand Down
Loading

0 comments on commit 45f9303

Please sign in to comment.