Skip to content

Commit

Permalink
suits
Browse files Browse the repository at this point in the history
all the suits from that file
  • Loading branch information
MosleyTheMalO committed Apr 1, 2023
1 parent 20011e7 commit 815afcc
Show file tree
Hide file tree
Showing 14 changed files with 266 additions and 16 deletions.
1 change: 0 additions & 1 deletion code/modules/vending/autodrobe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@
/obj/item/clothing/under/costume/christmas/croptop/green = 3,
/obj/item/clothing/head/christmashat = 3,
/obj/item/clothing/head/christmashatg = 3,
/obj/item/clothing/under/wedding_dress = 1,
/obj/item/clothing/under/costume/drfreeze = 1)
refill_canister = /obj/item/vending_refill/autodrobe
default_price = PRICE_ALMOST_CHEAP
Expand Down
8 changes: 8 additions & 0 deletions modular_splurt/code/modules/cargo/packs/costumes_toys.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,11 @@
LAZYADD(contains, extra_contains)
. = ..()

/datum/supply_pack/costumes_toys/wedding/New()
. = ..()
var/list/extra_contains = list(
/obj/item/bouquet,
/obj/item/bouquet/sunflower,
/obj/item/bouquet/poppy
)
LAZYADD(contains, extra_contains)
9 changes: 5 additions & 4 deletions modular_splurt/code/modules/cargo/packs/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -250,18 +250,19 @@
/obj/item/wrench)
crate_name = "stripper pole crate"


/datum/supply_pack/misc/wedding
name = "Wedding Crate"
name = "Small Wedding Crate"
desc = "Almost everything you need to host a wedding! Don't forget a ring!"
cost = 1500
contains = list(/obj/item/clothing/under/wedding_dress,
/obj/item/clothing/under/tuxedo,
contains = list(/obj/item/clothing/under/dress/wedding,
/obj/item/clothing/under/suit/tuxedo,
/obj/item/storage/belt/cummerbund,
/obj/item/bouquet,
/obj/item/bouquet/sunflower,
/obj/item/bouquet/poppy,
/obj/item/reagent_containers/food/drinks/bottle/champagne)
crate_name = "wedding crate"
crate_name = "small wedding crate"

/datum/supply_pack/misc/random1k
name = "1k Surplus Crate"
Expand Down
68 changes: 68 additions & 0 deletions modular_splurt/code/modules/client/loadout/uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -170,3 +170,71 @@
path = /obj/item/clothing/under/rank/cargo/miner/lavaland/stripper
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_roles = list("Shaft Miner")

/datum/gear/uniform/suit/tuxedo
name = "Tuxedo suit"
path = /obj/item/clothing/under/suit/tuxedo

/datum/gear/uniform/suit/tuxedo/carp
name = "Carpskin suit"
path = /obj/item/clothing/under/suit/carpskin

/datum/gear/uniform/suit/pencil
name = "Black Pencilskirt"
path = /obj/item/clothing/under/suit/pencil

/datum/gear/uniform/suit/pencil/black_really
name = "Executive Pencilskirt"
path = /obj/item/clothing/under/suit/pencil/black_really

/datum/gear/uniform/suit/pencil/charcoal
name = "Charcoal Pencilskirt"
path = /obj/item/clothing/under/suit/pencil/charcoal

/datum/gear/uniform/suit/pencil/navy
name = "Navy Pencilskirt"
path = /obj/item/clothing/under/suit/pencil/navy

/datum/gear/uniform/suit/pencil/burgandy
name = "Burgandy Pencilskirt"
path = /obj/item/clothing/under/suit/pencil/burgandy

/datum/gear/uniform/suit/pencil/checkered
name = "Checkered Pencilskirt"
path = /obj/item/clothing/under/suit/pencil/checkered

/datum/gear/uniform/suit/pencil/tan
name = "Tan Pencilskirt"
path = /obj/item/clothing/under/suit/pencil/tan

/datum/gear/uniform/suit/pencil/green
name = "Green Pencilskirt"
path = /obj/item/clothing/under/suit/pencil/green

/datum/gear/uniform/suit/executive_suit_alt
name = "Wide-collared Executive Suit"
path = /obj/item/clothing/under/suit/black_really_collared

/datum/gear/uniform/suit/executive_skirt_alt
name = "Wide-collared Executive Suitskirt"
path = /obj/item/clothing/under/suit/black_really_collared/skirt

/datum/gear/uniform/suit/inferno
name = "Inferno Suit"
path = /obj/item/clothing/under/suit/inferno

/datum/gear/uniform/suit/inferno_skirt
name = "Inferno Skirt"
path = /obj/item/clothing/under/suit/inferno/skirt

/datum/gear/uniform/suit/designer_inferno
name = "Designer Inferno Suit"
path = /obj/item/clothing/under/suit/inferno/beeze

/datum/gear/uniform/suit/helltaker
name = "Red Shirt with White Trousers"
path = /obj/item/clothing/under/suit/helltaker

/datum/gear/uniform/suit/helltaker/skirt
name = "Red Shirt with White Skirt"
path = /obj/item/clothing/under/suit/helltaker/skirt
11 changes: 3 additions & 8 deletions modular_splurt/code/modules/clothing/suits/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON

//Own stuff

/* Already exists
/obj/item/clothing/under/wedding_dress
name = "wedding dress"
desc = "A luxurious gown for once-in-a-lifetime occasions."
Expand All @@ -15,14 +17,7 @@
flags_cover = HIDESHOES
mutantrace_variation = NONE
can_adjust = FALSE

/obj/item/clothing/under/tuxedo
name = "tuxedo"
desc = "A formal black tuxedo. It exudes classiness."
icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
icon_state = "tuxedo"
mutantrace_variation = NONE //temporary
can_adjust = FALSE
*/

/obj/item/clothing/suit/hooded/wintercoat/security/pink
name = "pink security winter coat"
Expand Down
138 changes: 138 additions & 0 deletions modular_splurt/code/modules/clothing/under/jobs/civilian/suits.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
/obj/item/clothing/under/suit/tuxedo
name = "tuxedo"
desc = "A formal black tuxedo. It exudes classiness."
icon = 'modular_splurt/icons/obj/clothing/under/suits.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/under/suits.dmi'
anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/under/suits_digi.dmi'
icon_state = "tuxedo"
can_adjust = FALSE

/obj/item/clothing/under/suit/carpskin
name = "carpskin suit"
desc = "An luxurious suit made with only the finest scales, perfect for conducting dodgy business deals."
icon = 'modular_splurt/icons/obj/clothing/under/suits.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/under/suits.dmi'
anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/under/suits_digi.dmi'
icon_state = "carpskin_suit"

/obj/item/clothing/under/suit/pencil
name = "black pencilskirt"
desc = "A clean white shirt with a tight-fitting black pencilskirt."
icon_state = "black_pencil"
icon = 'modular_splurt/icons/obj/clothing/under/suits.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/under/suits.dmi'
anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/under/suits_digi.dmi'

/obj/item/clothing/under/suit/pencil/black_really
name = "executive pencilskirt"
desc = "A sleek suit with a tight-fitting black pencilskirt."
icon_state = "really_black_pencil"

/obj/item/clothing/under/suit/pencil/charcoal
name = "charcoal pencilskirt"
desc = "A clean white shirt with a tight-fitting charcoal pencilskirt."
icon_state = "charcoal_pencil"

/obj/item/clothing/under/suit/pencil/navy
name = "navy pencilskirt"
desc = "A clean white shirt with a tight-fitting navy-blue pencilskirt."
icon_state = "navy_pencil"

/obj/item/clothing/under/suit/pencil/burgandy
name = "burgandy pencilskirt"
desc = "A clean white shirt with a tight-fitting burgandy-red pencilskirt."
icon_state = "burgandy_pencil"

/obj/item/clothing/under/suit/pencil/checkered
name = "checkered pencilskirt"
desc = "A clean white shirt with a tight-fitting grey checkered pencilskirt."
icon_state = "checkered_pencil"

/obj/item/clothing/under/suit/pencil/tan
name = "tan pencilskirt"
desc = "A clean white shirt with a tight-fitting tan pencilskirt."
icon_state = "tan_pencil"

/obj/item/clothing/under/suit/pencil/green
name = "green pencilskirt"
desc = "A clean white shirt with a tight-fitting green pencilskirt."
icon_state = "green_pencil"

/obj/item/clothing/under/suit/scarface
name = "cuban suit"
desc = "A yayo coloured silk suit with a crimson shirt. You just know how to hide, how to lie. Me, I don't have that problem. Me, I always tell the truth. Even when I lie."
icon_state = "scarface"
icon = 'modular_splurt/icons/obj/clothing/under/suits.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/under/suits.dmi'
anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/under/suits_digi.dmi'

/obj/item/clothing/under/suit/black_really_collared
name = "wide-collared executive suit"
desc = "A formal black suit with the collar worn wide, intended for the station's finest."
icon_state = "really_black_suit_collar"
icon = 'modular_splurt/icons/obj/clothing/under/suits.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/under/suits.dmi'
anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/under/suits_digi.dmi'

/obj/item/clothing/under/suit/black_really_collared/skirt
name = "wide-collared executive suitskirt"
desc = "A formal black suit with the collar worn wide, intended for the station's finest."
icon_state = "really_black_suit_skirt_collar"
icon = 'modular_splurt/icons/obj/clothing/under/suits.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/under/suits.dmi'
anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/under/suits_digi.dmi'
body_parts_covered = CHEST|GROIN|ARMS
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON

/obj/item/clothing/under/suit/inferno
name = "inferno suit"
desc = "Stylish enough to impress the devil."
obj_flags = UNIQUE_RENAME
icon_state = "lucifer"
icon = 'modular_splurt/icons/obj/clothing/under/suits.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/under/suits.dmi'
anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/under/suits_digi.dmi'
unique_reskin = list(
"Pride" = list("icon_state" = "lucifer"),
"Wrath" = list("icon_state" = "justice"),
"Gluttony" = list("icon_state" = "malina"),
"Envy" = list("icon_state" = "zdara"),
"Vanity" = list("icon_state" = "cereberus"),
)

/obj/item/clothing/under/suit/inferno/skirt
name = "inferno suitskirt"
icon_state = "modeus"
unique_reskin = list(
"Lust" = list("icon_state" = "modeus"),
"Sloth" = list("icon_state" = "pande"),
)

/obj/item/clothing/under/suit/inferno/beeze
name = "designer inferno suit"
desc = "A fancy tail-coated suit with a fluffy bow emblazoned on the chest, complete with an NT pin."
icon_state = "beeze"
obj_flags = NONE
unique_reskin = null

/obj/item/clothing/under/suit/helltaker
name = "red shirt with white pants"
desc = "No time. Busy gathering girls."
icon_state = "helltaker"
icon = 'modular_splurt/icons/obj/clothing/under/suits.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/under/suits.dmi'
anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/under/suits_digi.dmi'

/obj/item/clothing/under/suit/helltaker/skirt
name = "red shirt with white skirt"
desc = "No time. Busy gathering boys."
icon_state = "helltakerskirt"

/obj/item/clothing/under/suit/error
name = "error suit"
desc = "Oops! Seems whoever made this suit forgot to download the base cloth for it!"
icon = 'modular_splurt/icons/obj/clothing/under/suits.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/under/suits.dmi'
anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/under/suits_digi.dmi'
icon_state = "error_suit"

17 changes: 16 additions & 1 deletion modular_splurt/code/modules/vending/autodrobe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,23 @@
/obj/item/clothing/suit/hooded/pyramidhead = 1,
/obj/item/clothing/suit/baroness = 3,
/obj/item/clothing/suit/baroness/ladyballat = 3,
/obj/item/clothing/suit/flatwoods = 3
/obj/item/clothing/suit/flatwoods = 3,
/obj/item/clothing/under/dress/wedding = 1,
/obj/item/clothing/under/suit/pencil = 3,
/obj/item/clothing/under/suit/pencil/black_really = 3,
/obj/item/clothing/under/suit/pencil/charcoal = 3,
/obj/item/clothing/under/suit/pencil/navy = 3,
/obj/item/clothing/under/suit/pencil/burgandy = 3,
/obj/item/clothing/under/suit/pencil/checkered = 3,
/obj/item/clothing/under/suit/pencil/tan = 3,
/obj/item/clothing/under/suit/pencil/green = 3,
/obj/item/clothing/under/suit/error = 1
)
var/list/extra_premium = list(
/obj/item/clothing/under/suit/tuxedo = 1,
/obj/item/clothing/under/suit/carpskin = 1
)
LAZYADD(products, extra_products)
LAZYADD(premium, extra_premium)
. = ..()

8 changes: 7 additions & 1 deletion modular_splurt/code/modules/vending/clothesmate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@
/obj/item/clothing/accessory/longcrop = 3,
/obj/item/clothing/accessory/formalcrop = 3,
/obj/item/clothing/under/misc/leia_outfit = 2,
/obj/item/clothing/under/performer/polychromic = 2
/obj/item/clothing/under/performer/polychromic = 2,
/obj/item/clothing/under/suit/black_really_collared = 3,
/obj/item/clothing/under/suit/black_really_collared/skirt = 3,
/obj/item/clothing/under/suit/inferno = 3,
/obj/item/clothing/under/suit/inferno/skirt = 3,
/obj/item/clothing/under/suit/helltaker = 3,
/obj/item/clothing/under/suit/helltaker/skirt = 3
)
var/list/extra_contraband = list(
/obj/item/clothing/under/rank/civilian/lawyer/galaxy_red = 3,
Expand Down
21 changes: 20 additions & 1 deletion modular_splurt/code/modules/vending/wardrobes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,30 @@
/obj/machinery/vending/wardrobe/law_wardrobe/Initialize(mapload)
var/list/extra_products = list(
/obj/item/clothing/under/rank/civilian/lawyer/galaxy_blue = 3,
/obj/item/clothing/under/rank/civilian/lawyer/galaxy_red = 3
/obj/item/clothing/under/rank/civilian/lawyer/galaxy_red = 3,
/obj/item/clothing/under/suit/black_really_collared = 3,
/obj/item/clothing/under/suit/black_really_collared/skirt = 3,
/obj/item/clothing/under/suit/inferno = 3,
/obj/item/clothing/under/suit/inferno/skirt = 3,
/obj/item/clothing/under/suit/inferno/beeze
)
LAZYADD(products, extra_products)
. = ..()

/obj/machinery/vending/wardrobe/hydro_wardrobe/Initialize(mapload)
var/list/extra_contraband = list(
/obj/item/clothing/under/suit/scarface = 2,
)
LAZYADD(contraband, extra_contraband)
. = ..()

/obj/machinery/vending/wardrobe/cargo_wardrobe/Initialize(mapload)
var/list/extra_contraband = list(
/obj/item/clothing/under/suit/scarface = 2,
)
LAZYADD(contraband, extra_contraband)
. = ..()

/obj/machinery/vending/wardrobe/blueshield_wardrobe
name = "\improper BlueDrobe"
desc = "A vending machine for blueshield and blueshield-related clothing!"
Expand Down
Binary file added modular_splurt/icons/mob/clothing/under/suits.dmi
Binary file not shown.
Binary file not shown.
Binary file added modular_splurt/icons/obj/clothing/under/suits.dmi
Binary file not shown.
Binary file modified modular_splurt/icons/obj/clothing/uniforms.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -4636,6 +4636,7 @@
#include "modular_splurt\code\modules\clothing\under\jobs\security.dm"
#include "modular_splurt\code\modules\clothing\under\jobs\civilian\civilian.dm"
#include "modular_splurt\code\modules\clothing\under\jobs\civilian\clown_mime.dm"
#include "modular_splurt\code\modules\clothing\under\jobs\civilian\suits.dm"
#include "modular_splurt\code\modules\clothing\underwear\_underwear.dm"
#include "modular_splurt\code\modules\clothing\underwear\boxers.dm"
#include "modular_splurt\code\modules\clothing\underwear\shirts.dm"
Expand Down

0 comments on commit 815afcc

Please sign in to comment.