diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 0fe656d1608..80fea40c72e 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -363,15 +363,6 @@ category = CAT_WEAPONRY subcategory = CAT_WEAPON -/datum/crafting_recipe/spooky_camera - name = "Camera Obscura" - result = /obj/item/camera/spooky - time = 15 - reqs = list(/obj/item/camera = 1, - /datum/reagent/water/holywater = 10) - parts = list(/obj/item/camera = 1) - category = CAT_MISC - /datum/crafting_recipe/lizardhat name = "Lizard Cloche Hat" result = /obj/item/clothing/head/lizard @@ -394,6 +385,35 @@ /obj/item/organ/ears/cat = 1) category = CAT_CLOTHING +/datum/crafting_recipe/mixedbouquet + name = "Mixed bouquet" + result = /obj/item/bouquet + reqs = list(/obj/item/reagent_containers/food/snacks/grown/poppy/lily =2, + /obj/item/grown/sunflower = 2, + /obj/item/reagent_containers/food/snacks/grown/poppy/geranium = 2) + category = CAT_MISC + +/datum/crafting_recipe/sunbouquet + name = "Sunflower bouquet" + result = /obj/item/bouquet/sunflower + reqs = list(/obj/item/grown/sunflower = 6) + category = CAT_MISC + +/datum/crafting_recipe/poppybouquet + name = "Poppy bouquet" + result = /obj/item/bouquet/poppy + reqs = list (/obj/item/reagent_containers/food/snacks/grown/poppy = 6) + category = CAT_MISC + +/datum/crafting_recipe/spooky_camera + name = "Camera Obscura" + result = /obj/item/camera/spooky + time = 15 + reqs = list(/obj/item/camera = 1, + /datum/reagent/water/holywater = 10) + parts = list(/obj/item/camera = 1) + category = CAT_MISC + /datum/crafting_recipe/skateboard name = "Skateboard" result = /obj/vehicle/ridden/scooter/skateboard diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index eb107d939c5..fcf2793596c 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -218,3 +218,20 @@ /obj/item/virgin_mary/proc/manual_suicide(mob/living/user) user.adjustOxyLoss(200) user.death(0) + +// Bouquets +/obj/item/bouquet + name = "mixed bouquet" + desc = "A bouquet of sunflowers, lilies, and geraniums. How delightful." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "mixedbouquet" + +/obj/item/bouquet/sunflower + name = "sunflower bouquet" + desc = "A bright bouquet of sunflowers." + icon_state = "sunbouquet" + +/obj/item/bouquet/poppy + name = "poppy bouquet" + desc = "A bouquet of poppies. You feel loved just looking at it." + icon_state = "poppybouquet" diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index fe5a542b76b..4f0ad8646d0 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -370,6 +370,13 @@ /obj/item/clothing/mask/luchador )) +/obj/item/storage/belt/cummerbund + name = "cummerbund" + desc = "A pleated sash that pairs well with a suit jacket." + icon_state = "cummerbund" + inhand_icon_state = "cummerbund" + worn_icon_state = "cummerbund" + /obj/item/storage/belt/military name = "chest rig" desc = "A set of tactical webbing worn by Syndicate boarding parties." diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 43954daa1fd..7aaf79e28f0 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1639,6 +1639,20 @@ contains = list(/obj/item/vending_refill/assist) crate_name = "vendomat supply crate" +/datum/supply_pack/service/wedding + name = "Wedding Crate" + desc = "Everything you need to host a wedding! Now you just need an officiant." + cost = 1500 + contains = list(/obj/item/clothing/under/dress/wedding_dress, + /obj/item/clothing/under/suit/tuxedo, + /obj/item/storage/belt/cummerbund, + /obj/item/clothing/head/weddingveil, + /obj/item/bouquet, + /obj/item/bouquet/sunflower, + /obj/item/bouquet/poppy, + /obj/item/reagent_containers/food/drinks/bottle/champagne) + crate_name = "wedding crate" + /datum/supply_pack/service/emptycrate name = "Empty Crate" desc = "It's an empty crate, for all your storage needs." diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 80d1f96910b..567f07691a9 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -474,3 +474,9 @@ desc = "Hee-ho!" icon_state = "JackFrostHat" inhand_icon_state = "JackFrostHat" + +/obj/item/clothing/head/weddingveil + name = "wedding veil" + desc = "A gauzy white veil." + icon_state = "weddingveil" + inhand_icon_state = "weddingveil" diff --git a/code/modules/clothing/under/skirt_dress.dm b/code/modules/clothing/under/skirt_dress.dm index 0977cd1d01d..8205948a931 100644 --- a/code/modules/clothing/under/skirt_dress.dm +++ b/code/modules/clothing/under/skirt_dress.dm @@ -30,6 +30,14 @@ icon_state = "sailor_dress" inhand_icon_state = "sailor_dress" +/obj/item/clothing/under/dress/wedding_dress + name = "wedding dress" + desc = "A luxurious gown for once-in-a-lifetime occasions." + icon_state = "wedding_dress" + inhand_icon_state = "wedding_dress" + body_parts_covered = CHEST|GROIN|LEGS + flags_cover = HIDESHOES + /obj/item/clothing/under/dress/redeveninggown name = "red evening gown" desc = "Fancy dress for space bar singers." diff --git a/code/modules/clothing/under/suits.dm b/code/modules/clothing/under/suits.dm index 45f7bb30c6c..2278c382360 100644 --- a/code/modules/clothing/under/suits.dm +++ b/code/modules/clothing/under/suits.dm @@ -124,6 +124,7 @@ desc = "An excellent light colored suit, experts in the field stress that it should not to be confused with the inferior tan suit." icon_state = "beige_suit" inhand_icon_state = "beige_suit" + /obj/item/clothing/under/suit/henchmen name = "henchmen jumpsuit" desc = "A very gaudy jumpsuit for a proper Henchman. Guild regulations, you understand." @@ -133,3 +134,9 @@ inhand_icon_state = "henchmen" body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS|HEAD flags_inv = HIDEGLOVES|HIDESHOES|HIDEEARS|HIDEEYES|HIDEHAIR + +/obj/item/clothing/under/suit/tuxedo + name = "tuxedo" + desc = "A formal black tuxedo. It exudes classiness." + icon_state = "tuxedo" + inhand_icon_state = "tuxedo" diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 40626c41e87..24856fd74dc 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -140,7 +140,11 @@ /obj/item/clothing/suit/chaplainsuit/clownpriest = 1, /obj/item/clothing/head/clownmitre = 1, /obj/item/skub = 1, - /obj/item/clothing/suit/hooded/mysticrobe = 1) + /obj/item/clothing/suit/hooded/mysticrobe = 1, + /obj/item/clothing/under/dress/wedding_dress = 1, + /obj/item/clothing/under/suit/tuxedo = 1, + /obj/item/clothing/head/weddingveil = 1, + /obj/item/storage/belt/cummerbund = 1) refill_canister = /obj/item/vending_refill/autodrobe default_price = 180 extra_price = 360 diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index fea1aca2108..e53de1e98c3 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index e7c53daaa23..61ebdc353ad 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/under/dress.dmi b/icons/mob/clothing/under/dress.dmi index 38087ca622e..018b9c4b4a8 100644 Binary files a/icons/mob/clothing/under/dress.dmi and b/icons/mob/clothing/under/dress.dmi differ diff --git a/icons/mob/clothing/under/suits.dmi b/icons/mob/clothing/under/suits.dmi index 65f008271e6..006e0830d7d 100644 Binary files a/icons/mob/clothing/under/suits.dmi and b/icons/mob/clothing/under/suits.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 21945d7f243..cd3ea88916d 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 31f874374fc..b91b8b9228e 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/under/dress.dmi b/icons/obj/clothing/under/dress.dmi index c6632dcf14f..1cc57e1917f 100644 Binary files a/icons/obj/clothing/under/dress.dmi and b/icons/obj/clothing/under/dress.dmi differ diff --git a/icons/obj/clothing/under/suits.dmi b/icons/obj/clothing/under/suits.dmi index ed56febf7a3..d85c5c80944 100644 Binary files a/icons/obj/clothing/under/suits.dmi and b/icons/obj/clothing/under/suits.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index 297cab1966f..b56e96ed336 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ