diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index e5b47f3a80..5a6c7c973f 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -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 diff --git a/modular_splurt/code/modules/cargo/packs/costumes_toys.dm b/modular_splurt/code/modules/cargo/packs/costumes_toys.dm index 904d19048e..2290fe603f 100644 --- a/modular_splurt/code/modules/cargo/packs/costumes_toys.dm +++ b/modular_splurt/code/modules/cargo/packs/costumes_toys.dm @@ -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) diff --git a/modular_splurt/code/modules/cargo/packs/misc.dm b/modular_splurt/code/modules/cargo/packs/misc.dm index bf5eec556d..98bdc574ac 100644 --- a/modular_splurt/code/modules/cargo/packs/misc.dm +++ b/modular_splurt/code/modules/cargo/packs/misc.dm @@ -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" diff --git a/modular_splurt/code/modules/client/loadout/uniform.dm b/modular_splurt/code/modules/client/loadout/uniform.dm index 12c14d564d..fedfbf61bc 100644 --- a/modular_splurt/code/modules/client/loadout/uniform.dm +++ b/modular_splurt/code/modules/client/loadout/uniform.dm @@ -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 diff --git a/modular_splurt/code/modules/clothing/suits/miscellaneous.dm b/modular_splurt/code/modules/clothing/suits/miscellaneous.dm index 7a14c9ff14..8307e30221 100644 --- a/modular_splurt/code/modules/clothing/suits/miscellaneous.dm +++ b/modular_splurt/code/modules/clothing/suits/miscellaneous.dm @@ -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." @@ -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" diff --git a/modular_splurt/code/modules/clothing/under/jobs/civilian/suits.dm b/modular_splurt/code/modules/clothing/under/jobs/civilian/suits.dm new file mode 100644 index 0000000000..8c2668d802 --- /dev/null +++ b/modular_splurt/code/modules/clothing/under/jobs/civilian/suits.dm @@ -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" + diff --git a/modular_splurt/code/modules/vending/autodrobe.dm b/modular_splurt/code/modules/vending/autodrobe.dm index adc0a19b57..065deb7ff3 100644 --- a/modular_splurt/code/modules/vending/autodrobe.dm +++ b/modular_splurt/code/modules/vending/autodrobe.dm @@ -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) . = ..() diff --git a/modular_splurt/code/modules/vending/clothesmate.dm b/modular_splurt/code/modules/vending/clothesmate.dm index d6dee6e947..7051fb2edf 100644 --- a/modular_splurt/code/modules/vending/clothesmate.dm +++ b/modular_splurt/code/modules/vending/clothesmate.dm @@ -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, diff --git a/modular_splurt/code/modules/vending/wardrobes.dm b/modular_splurt/code/modules/vending/wardrobes.dm index 6115c7d19f..378abf4967 100644 --- a/modular_splurt/code/modules/vending/wardrobes.dm +++ b/modular_splurt/code/modules/vending/wardrobes.dm @@ -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!" diff --git a/modular_splurt/icons/mob/clothing/under/suits.dmi b/modular_splurt/icons/mob/clothing/under/suits.dmi new file mode 100644 index 0000000000..2e002c0f6a Binary files /dev/null and b/modular_splurt/icons/mob/clothing/under/suits.dmi differ diff --git a/modular_splurt/icons/mob/clothing/under/suits_digi.dmi b/modular_splurt/icons/mob/clothing/under/suits_digi.dmi new file mode 100644 index 0000000000..b83cc5c454 Binary files /dev/null and b/modular_splurt/icons/mob/clothing/under/suits_digi.dmi differ diff --git a/modular_splurt/icons/obj/clothing/under/suits.dmi b/modular_splurt/icons/obj/clothing/under/suits.dmi new file mode 100644 index 0000000000..74736b9827 Binary files /dev/null and b/modular_splurt/icons/obj/clothing/under/suits.dmi differ diff --git a/modular_splurt/icons/obj/clothing/uniforms.dmi b/modular_splurt/icons/obj/clothing/uniforms.dmi index 35db3cd79d..ccff738589 100644 Binary files a/modular_splurt/icons/obj/clothing/uniforms.dmi and b/modular_splurt/icons/obj/clothing/uniforms.dmi differ diff --git a/tgstation.dme b/tgstation.dme index f432953099..cb4ca88872 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -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"