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.

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

Adds a striped skinsuit and a cropped turtleneck #6777

Merged
merged 3 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions code/modules/clothing/suits/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,15 @@
inv_hide_flags = HIDETIE|HIDEHOLSTER
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL

/obj/item/clothing/suit/storage/cropped_turtleneck
name = "turtleneck cropped"
desc = "A tastefully cropped turtleneck with added, entirely cosmetic shoulder straps and puffy sleeves. The contradictory elements bring out the wearer's personality, and navel."
icon = 'icons/clothing/suit/misc/turtle_crop.dmi'
icon_state = "turtle_crop"
body_cover_flags = UPPER_TORSO|ARMS|LOWER_TORSO
inv_hide_flags = HIDETIE
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL

/obj/item/clothing/suit/storage/khaki
name = "khaki jacket"
desc = "A smooth, clean khaki jacket. It stains instantly. In fact, it looks pre-stained so you don't feel bad when someone inevitably pours a single droplet of schnapps that stays there forever."
Expand Down
10 changes: 10 additions & 0 deletions code/modules/clothing/under/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2259,6 +2259,16 @@
name = "gray leotard skinsuit"
icon_state = "skinsuitfemleo_g"

/obj/item/clothing/under/skinsuit_striped
name = "skinsuit striped"
desc = "A dark skinsuit with white stripe embellishments, covering the contours. The latest in the line of skintight outfits that this crew in particular greatly prefers, to the point they now take up 30% of the sector's demands among NT's facilities."
body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
icon = 'icons/clothing/uniform/misc/skin_taped.dmi'
icon_state = "skinsuit_taped"
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL

//Alt Bodysuits
/obj/item/clothing/under/bodysuit/alt
name = "alternate bodysuit"
Expand Down
5 changes: 5 additions & 0 deletions code/modules/loadout/loadout_suit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,11 @@
name = "Bomj Coat"
path = /obj/item/clothing/suit/storage/bomj

/datum/loadout_entry/suit/cropped_turtle
name = "Turtleneck Cropped"
path = /obj/item/clothing/suit/storage/cropped_turtleneck


/datum/loadout_entry/suit/violetjacket
name = "Violet Jacket"
path = /obj/item/clothing/suit/storage/violet
Expand Down
4 changes: 4 additions & 0 deletions code/modules/loadout/loadout_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,10 @@ Swimsuits
altbodysuitfem_selection[initial(altbodysuitfem_type.name)] = altbodysuitfem_type
tweaks += new/datum/loadout_tweak/path(tim_sort(altbodysuitfem_selection, GLOBAL_PROC_REF(cmp_text_asc)))

/datum/loadout_entry/uniform/skinsuit_striped
name = "Skinsuit Striped"
path = /obj/item/clothing/under/skinsuit_striped

/datum/loadout_entry/uniform/ballet
name = "Antheia Tutu"
path = /obj/item/clothing/under/ballet
Expand Down
Binary file added icons/clothing/suit/misc/turtle_crop.dmi
Binary file not shown.
Binary file added icons/clothing/uniform/misc/skin_taped.dmi
Binary file not shown.
Loading