Skip to content

Commit

Permalink
Adds alot of new Corporate clothes and jackets, laceup shoes updates …
Browse files Browse the repository at this point in the history
…and new ties. (#5437)

# About the pull request

### **PLAN: To replace the current Liaison uniforms with the new ones.**
**FINISHED**

**Sprites Courtesy of AmoryBlaine on Discord:**

1. Added new ties, updated the red/blue one
2. Added new brown laceup shoes/Updated black laceup shoes onmob sprite
3. Added new corporate vests, jackets, bomber jackets and uniforms

# Explain why it's good for the game

Alot of new sprites who look amazing, courtesy of AmoryBlaine yet again.
Can't thank them enough for these new sprites.

Gives alot more costumization options not only to the Liaison but to
also any and all other Corporate Characters/Managers/Employees even
Survivors.

### Currently REPLACING the current Liaison outfits with these new ones,
still keeping them in code but only limited there unless anyone has any
objections. (Charcoal and Blazer will be kept due to demand)


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl: BadAtThisGame302, AmoryBlaine
add: Added new brown laceups, adds new ties and tweaks current ones, as
well as new suit, bomber, vest, and corporate clothes to the game.
Sprites by AmoryBlaine.
imageadd: added six new Corporate clothes sprites
(Casual/Ivy/Formal/Black/Brown/Blue), three suit vest sprites
(Brown/Tan/Grey), three bomber jacket sprites (Khaki/Red/Grey), and five
suit jacket sprites (Khaki/Formal/Black/Brown/Blue).
/:cl:

---------

Co-authored-by: Jeff Watchson <[email protected]>
  • Loading branch information
BadAtThisGame302 and Jeff Watchson authored Jan 31, 2024
1 parent f509ff5 commit 0759f52
Show file tree
Hide file tree
Showing 29 changed files with 437 additions and 282 deletions.
3 changes: 3 additions & 0 deletions code/modules/clothing/shoes/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@
desc = "The height of fashion, and they're pre-polished!"
icon_state = "laceups"

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

/obj/item/clothing/shoes/swimmingfins
desc = "Help you swim good."
name = "swimming fins"
Expand Down
79 changes: 79 additions & 0 deletions code/modules/clothing/suits/marine_coat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -287,3 +287,82 @@
icon_state = "wc_suit"
item_state = "wc_suit"
contained_sprite = TRUE

//==================Corporate Liaison==================\\
/obj/item/clothing/suit/storage/jacket/marine/vest
name = "brown vest"
desc = "A casual brown vest."
icon_state = "vest_brown"
item_state = "vest_brown"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/vest/tan
name = "tan vest"
desc = "A casual tan vest."
icon_state = "vest_tan"
item_state = "vest_tan"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/vest/grey
name = "grey vest"
desc = "A casual grey vest."
icon_state = "vest_grey"
item_state = "vest_grey"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/corporate
name = "khaki suit jacket"
desc = "A khaki suit jacket."
icon_state = "corporate_ivy"
item_state = "corporate_ivy"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/corporate/formal
name = "formal suit jacket"
desc = "An ivory suit jacket; a Weyland-Yutani corporate badge is attached to the right lapel."
icon_state = "corporate_formal"
item_state = "corporate_formal"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/corporate/black
name = "black suit jacket"
desc = "A black suit jacket."
icon_state = "corporate_black"
item_state = "corporate_black"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/corporate/brown
name = "brown suit jacket"
desc = "A brown suit jacket."
icon_state = "corporate_brown"
item_state = "corporate_brown"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/corporate/blue
name = "blue suit jacket"
desc = "A blue suit jacket."
icon_state = "corporate_blue"
item_state = "corporate_blue"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/bomber
name = "khaki bomber jacket"
desc = "A khaki bomber jacket popular among stationeers and blue-collar workers everywhere."
icon_state = "jacket_khaki"
item_state = "jacket_khaki"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/bomber/red
name = "red bomber jacket"
desc = "A reddish-brown bomber jacket popular among stationeers and blue-collar workers everywhere."
icon_state = "jacket_red"
item_state = "jacket_red"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/bomber/grey
name = "grey bomber jacket"
desc = "A blue-grey bomber jacket popular among stationeers and blue-collar workers everywhere."
icon_state = "jacket_grey"
item_state = "jacket_grey"
has_buttons = FALSE
39 changes: 39 additions & 0 deletions code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,9 @@
has_sensor = UNIFORM_NO_SENSORS
suit_restricted = list(/obj/item/clothing/suit/storage/marine/veteran/bear)

item_icons = list(
WEAR_BODY = 'icons/mob/humans/onmob/uniform_1.dmi',
)

/obj/item/clothing/under/marine/veteran/UPP
name = "\improper UPP fatigues"
Expand Down Expand Up @@ -805,6 +808,42 @@
icon_state = "liaison_blue_blazer"
worn_state = "liaison_blue_blazer"

/obj/item/clothing/under/liaison_suit/field
name = "corporate casual"
desc = "A pair of dark brown slacks paired with a dark blue button-down shirt. A popular look among those in the corporate world that conduct the majority of their business from night clubs."
icon_state = "corporate_field"
worn_state = "corporate_field"

/obj/item/clothing/under/liaison_suit/ivy
name = "country club outfit"
desc = "A pair of khaki slacks paired with a light blue button-down shirt. A popular look with those in the corporate world that conduct the majority of their business from country clubs."
icon_state = "corporate_ivy"
worn_state = "corporate_ivy"

/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."
icon_state = "corporate_formal"
worn_state = "corporate_formal"

/obj/item/clothing/under/liaison_suit/black
name = "black suit pants"
desc = "A pair of black slacks paired with a white shirt. The most common pairing among corporate workers."
icon_state = "corporate_black"
worn_state = "corporate_black"

/obj/item/clothing/under/liaison_suit/brown
name = "brown suit pants"
desc = "A pair of brown slacks paired with a white shirt. A common pairing among corporate workers."
icon_state = "corporate_brown"
worn_state = "corporate_brown"

/obj/item/clothing/under/liaison_suit/blue
name = "blue suit pants"
desc = "A pair of blue slacks paired with a white shirt. A common pairing among corporate workers."
icon_state = "corporate_blue"
worn_state = "corporate_blue"

/obj/item/clothing/under/marine/reporter
name = "combat correspondent uniform"
desc = "A relaxed and robust uniform fit for any potential reporting needs."
Expand Down
16 changes: 16 additions & 0 deletions code/modules/clothing/under/ties.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,22 @@
name = "red tie"
icon_state = "redtie"

/obj/item/clothing/accessory/green
name = "green tie"
icon_state = "greentie"

/obj/item/clothing/accessory/black
name = "black tie"
icon_state = "blacktie"

/obj/item/clothing/accessory/gold
name = "gold tie"
icon_state = "goldtie"

/obj/item/clothing/accessory/purple
name = "purple tie"
icon_state = "purpletie"

/obj/item/clothing/accessory/horrible
name = "horrible tie"
desc = "A neosilk clip-on tie. This one is disgusting."
Expand Down
4 changes: 2 additions & 2 deletions code/modules/gear_presets/cmb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@

//clothes
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/ICC, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/mod88, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88, WEAR_IN_ACCESSORY)
Expand Down Expand Up @@ -372,7 +372,7 @@
//clothes
new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/pen, WEAR_R_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/suspenders, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_J_STORE)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/corpses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
)

/datum/equipment_preset/corpse/security/liaison/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY)
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
add_ice_colony_survivor_equipment(new_human)
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
assignment = "Interstellar Commerce Commission Corporate Liaison"

/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/corsat/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/corporate_formal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET)
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 @@
assignment = "LV-624 Corporate Liaison"

/datum/equipment_preset/survivor/corporate/lv/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/outing(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/field(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison(new_human), WEAR_BACK)
if(new_human.disabilities & NEARSIGHTED)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/prescription(new_human), WEAR_EYES)
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 @@ -109,7 +109,7 @@ Everything below isn't used or out of place.
access = list(ACCESS_CIVILIAN_PUBLIC)

/datum/equipment_preset/survivor/salesman/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY)
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/wcoat(new_human), WEAR_JACKET)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
assignment = "Interstellar Commerce Commission Corporate Liaison"

/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/nv/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/corporate_formal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/black(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_J_STORE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
assignment = "Shivas Snowball Corporate Liaison"

/datum/equipment_preset/survivor/corporate/shiva/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/corporate_formal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
assignment = "Solaris Ridge Corporate Liaison"

/datum/equipment_preset/survivor/corporate/solaris/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/outing/red(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/ivy(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR)
if(new_human.disabilities & NEARSIGHTED)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/prescription(new_human), WEAR_EYES)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/gear_presets/survivors/survivors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ Everything bellow is a parent used as a base for one or multiple maps.
survivor_variant = CORPORATE_SURVIVOR

/datum/equipment_preset/survivor/corporate/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/field(new_human), WEAR_BODY)
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET)
Expand Down Expand Up @@ -404,7 +404,7 @@ Everything bellow is a parent used as a base for one or multiple maps.
access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_COMMAND)

/datum/equipment_preset/survivor/interstellar_human_rights_observer/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/suspenders(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY)
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET)
Expand Down
10 changes: 5 additions & 5 deletions code/modules/gear_presets/uscm_ship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,18 @@
minimap_icon = "cl"
minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN

utility_under = list(/obj/item/clothing/under/liaison_suit/outing)
utility_under = list(/obj/item/clothing/under/liaison_suit/black)
utility_hat = list()
utility_gloves = list()
utility_shoes = list(/obj/item/clothing/shoes/laceup)
utility_extra = list(/obj/item/clothing/under/liaison_suit/suspenders)
utility_extra = list(/obj/item/clothing/under/liaison_suit/blue)

service_under = list(/obj/item/clothing/under/liaison_suit)
service_under = list(/obj/item/clothing/under/liaison_suit/field)
service_over = list()
service_hat = list()
service_shoes = list(/obj/item/clothing/shoes/laceup)

dress_under = list(/obj/item/clothing/under/liaison_suit/formal)
dress_under = list(/obj/item/clothing/under/liaison_suit/corporate_formal)
dress_over = list()
dress_hat = list()
dress_gloves = list(/obj/item/clothing/gloves/marine/dress)
Expand All @@ -80,7 +80,7 @@
//back_item = /obj/item/storage/backpack

new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcl(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/ivy(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/wo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@

new_human.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/suspenders(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/camera(new_human), WEAR_L_HAND)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/wy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

/datum/equipment_preset/wy/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new headset_type(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/ivy(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/wy_goons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@

/datum/equipment_preset/goon/researcher/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/corporate_formal, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET)

Expand Down
Binary file modified icons/mob/humans/onmob/feet.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/suit_1.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/ties.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/uniform_0.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/uniform_1.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/cm_suits.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/shoes.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/ties.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/uniforms.dmi
Binary file not shown.
Loading

0 comments on commit 0759f52

Please sign in to comment.