Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Liaison drip #3620

Merged
merged 3 commits into from
Jun 27, 2023
Merged

Liaison drip #3620

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4473039
Initial
morrowwolf Jun 13, 2023
ff8d4cd
shoes DESTROYED (closet too small)
morrowwolf Jun 13, 2023
78227e8
Merge remote-tracking branch 'upstream/master' into liaison-drip
morrowwolf Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/modules/clothing/suits/labcoat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,3 +297,7 @@
/obj/item/device/walkman,
)

/obj/item/clothing/suit/storage/snow_suit/liaison
name = "liaison's winter coat"
desc = "A Weyland-Yutani winter coat. Only the best comfort for the liaison in a cold environment."
icon_state = "snowsuit_liaison"
16 changes: 16 additions & 0 deletions code/modules/clothing/under/marine_uniform.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,12 +777,22 @@
icon_state = "liaison_regular"
worn_state = "liaison_regular"

/obj/item/clothing/under/liaison_suit/charcoal
name = "liaison's charcoal suit"
desc = "A stiff, stylish charcoal suit commonly worn by businessmen from the Weyland-Yutani corporation. Expertly crafted to make you look like a prick."
icon_state = "liaison_charcoal"
worn_state = "liaison_charcoal"

/obj/item/clothing/under/liaison_suit/outing
name = "liaison's outfit"
desc = "A casual outfit consisting of a collared shirt and a vest. Looks like something you might wear on the weekends, or on a visit to a derelict colony."
icon_state = "liaison_outing"
worn_state = "liaison_outing"

/obj/item/clothing/under/liaison_suit/outing/red
icon_state = "liaison_outing_red"
worn_state = "liaison_outing_red"

/obj/item/clothing/under/liaison_suit/formal
name = "liaison's white suit"
desc = "A formal, white suit. Looks like something you'd wear to a funeral, a Weyland-Yutani corporate dinner, or both. Stiff as a board, but makes you feel like rolling out of a Rolls-Royce."
Expand All @@ -795,6 +805,12 @@
icon_state = "liaison_suspenders"
worn_state = "liaison_suspenders"

/obj/item/clothing/under/liaison_suit/blazer
name = "liaison's blue blazer"
desc = "A stiff but casual blue blazer. Similar can be found in any Weyland-Yutani office. Only the finest wear for the galaxy's most cunning."
icon_state = "liaison_blue_blazer"
worn_state = "liaison_blue_blazer"

/obj/item/clothing/under/marine/reporter
name = "combat correspondent uniform"
desc = "A relaxed and robust uniform fit for any potential reporting needs."
Expand Down
Binary file modified icons/mob/humans/onmob/suit_0.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/humans/onmob/uniform_0.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/suits.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/uniforms.dmi
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion maps/map_files/USS_Almayer/USS_Almayer.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62515,12 +62515,15 @@
name = "liaison's navy suit"
},
/obj/item/clothing/under/suit_jacket/trainee,
/obj/item/clothing/under/liaison_suit/charcoal,
/obj/item/clothing/under/liaison_suit/outing/red,
/obj/item/clothing/under/liaison_suit/blazer,
/obj/item/clothing/suit/storage/snow_suit/liaison,
/obj/item/clothing/gloves/black,
/obj/item/clothing/gloves/marine/dress,
/obj/item/clothing/glasses/sunglasses/big,
/obj/item/clothing/accessory/blue,
/obj/item/clothing/accessory/red,
/obj/item/clothing/shoes/dress,
/obj/structure/machinery/status_display{
pixel_x = -32
},
Expand Down