diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index d3047c03..3209ccc7 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -84,3 +84,25 @@ var/atom/A = V hos_gun_list[initial(A.name)] = A return hos_gun_list + +// 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" + +/obj/item/bouquet/rose + name = "rose bouquet" + desc = "A bouquet of roses. A bundle of love." + icon_state = "rosebouquet" diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 63dbff63..4d0a6920 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -371,6 +371,12 @@ obj/item/storage/belt/slut/ComponentInitialize() /obj/item/clothing/mask/luchador ) +/obj/item/storage/belt/cummerbund + name = "cummerbund" //I swear to god if you people aren't mature enough to handle this I'm just gonna call it a sash. + desc = "A pleated sash that pairs well with a suit jacket." + icon_state = "cummerbund" + item_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/misc.dm b/code/modules/cargo/packs/misc.dm index 42d70fa3..c36c49cd 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -350,6 +350,19 @@ /obj/item/toner) crate_name = "toner crate" +/datum/supply_pack/misc/wedding + name = "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, + /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" + /datum/supply_pack/misc/diamondring name = "Diamond Ring" desc = "Show them your love is like a diamond: unbreakable and forever lasting. Shipped straight from child slave cartels in the space african mines." diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm index 0aee666e..0287c2a9 100644 --- a/code/modules/cargo/packs/organic.dm +++ b/code/modules/cargo/packs/organic.dm @@ -386,8 +386,8 @@ /datum/supply_pack/organic/seeds name = "Seeds Crate" - desc = "Big things have small beginnings. Contains thirteen different seeds." - cost = 1250 + desc = "Big things have small beginnings. Contains fourteen different seeds." + cost = 1300 contains = list(/obj/item/seeds/chili, /obj/item/seeds/berry, /obj/item/seeds/corn, @@ -398,6 +398,7 @@ /obj/item/seeds/wheat/rice, /obj/item/seeds/carrot, /obj/item/seeds/sunflower, + /obj/item/seeds/rose, /obj/item/seeds/chanter, /obj/item/seeds/potato, /obj/item/seeds/sugarcane) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 421555d6..59d91dbd 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -806,4 +806,22 @@ item_state = "enzoshirt" item_color = "enzoshirt" body_parts_covered = CHEST|GROIN|ARMS|LEGS -//End \ No newline at end of file +//End + +/obj/item/clothing/under/wedding_dress + name = "wedding dress" + desc = "A luxurious gown for once-in-a-lifetime occasions." + icon_state = "wedding_dress" + item_state = "wedding_dress" + body_parts_covered = CHEST|GROIN|LEGS + flags_cover = HIDESHOES + mutantrace_variation = NO_MUTANTRACE_VARIATION + can_adjust = FALSE + +/obj/item/clothing/under/tuxedo + name = "tuxedo" + desc = "A formal black tuxedo. It exudes classiness." + icon_state = "tuxedo" + item_state = "tuxedo" + mutantrace_variation = NO_MUTANTRACE_VARIATION //temporary + can_adjust = FALSE diff --git a/code/modules/crafting/recipes/recipes_misc.dm b/code/modules/crafting/recipes/recipes_misc.dm index a02146b9..3dc2df2d 100644 --- a/code/modules/crafting/recipes/recipes_misc.dm +++ b/code/modules/crafting/recipes/recipes_misc.dm @@ -373,3 +373,30 @@ time = 100 category = CAT_MISC always_availible = FALSE // Disabled til learned + +//Bouquets <3 +/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/rosebouquet + name = "Rose bouquet" + result = /obj/item/bouquet/rose + reqs = list(/obj/item/grown/rose = 6) + category = CAT_MISC diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 92784ee9..6920810f 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -257,6 +257,69 @@ to_chat(user, "The [name] burns your bare hand!") user.adjustFireLoss(rand(1, 5)) +// Rose +/obj/item/seeds/rose + name = "pack of rose seeds" + desc = "These seeds grow into roses." + icon_state = "seed-rose" + species = "rose" + plantname = "Rose Bush" + product = /obj/item/grown/rose + endurance = 12 + yield = 6 + potency = 15 + growthstages = 3 + genes = list(/datum/plant_gene/trait/repeated_harvest) + growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi' + icon_grow = "rose-grow" + icon_dead = "rose-dead" + mutatelist = list(/obj/item/seeds/carbon_rose) + //Roses are commonly used as herbal medicines (diarrhodons) and for their 'rose oil'. + reagents_add = list(/datum/reagent/consumable/nutriment = 0.05, /datum/reagent/medicine/tricordrazine = 0.1, /datum/reagent/oil = 0.05) + +/obj/item/grown/rose + seed = /obj/item/seeds/rose + name = "rose" + desc = "The classic fleur d'amour - flower of love. Watch for its thorns!" + icon_state = "rose" + lefthand_file = 'icons/mob/inhands/weapons/plants_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/plants_righthand.dmi' + slot_flags = ITEM_SLOT_HEAD //|ITEM_SLOT_MASK // couldn't get this to work, revive another day + +// Carbon Rose +/obj/item/seeds/carbon_rose + name = "pack of carbon rose seeds" + desc = "These seeds grow into carbon roses." + icon_state = "seed-carbonrose" + species = "carbonrose" + plantname = "Carbon Rose Flower" + product = /obj/item/grown/carbon_rose + endurance = 12 + yield = 6 + potency = 15 + growthstages = 3 + growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi' + icon_grow = "carbonrose-grow" + icon_dead = "carbonrose-dead" + mutatelist = list(/obj/item/seeds/carbon_rose) + reagents_add = list(/datum/reagent/plastic_polymers = 0.05) + rarity = 10 + + + +/obj/item/grown/carbon_rose + seed = /obj/item/seeds/carbon_rose + name = "carbon rose" + desc = "The all new fleur d'amour gris - the flower of love, modernized, with no harsh thorns." + icon_state = "carbonrose" + lefthand_file = 'icons/mob/inhands/weapons/plants_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/plants_righthand.dmi' + force = 0 + throwforce = 0 + slot_flags = ITEM_SLOT_HEAD + throw_speed = 1 + throw_range = 3 + // Beebalm /obj/item/seeds/bee_balm name = "pack of Bee Balm seeds" diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index aaa78d27..3941974c 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -132,7 +132,10 @@ /obj/item/clothing/suit/drfreeze_coat = 1, /obj/item/clothing/suit/gothcoat = 2, /obj/item/clothing/under/draculass = 1, - /obj/item/clothing/under/drfreeze = 1) //End of Cit Changes + /obj/item/clothing/under/drfreeze = 1, //End of Cit Changes + /obj/item/clothing/under/wedding_dress = 1, + /obj/item/clothing/under/tuxedo = 1, + /obj/item/storage/belt/cummerbund = 1) refill_canister = /obj/item/vending_refill/autodrobe /obj/machinery/vending/autodrobe/all_access diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm index d48da5b1..0fd49257 100644 --- a/code/modules/vending/megaseed.dm +++ b/code/modules/vending/megaseed.dm @@ -34,6 +34,7 @@ /obj/item/seeds/pumpkin = 3, /obj/item/seeds/replicapod = 3, /obj/item/seeds/wheat/rice = 3, + /obj/item/seeds/rose = 3, /obj/item/seeds/soya = 3, /obj/item/seeds/sugarcane = 3, /obj/item/seeds/sunflower = 3, diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index 8e98eade..0110b610 100644 Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index e3ecab47..2ba92df3 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 4ca4a351..aa989c58 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 8546a78a..279de514 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/plants_lefthand.dmi b/icons/mob/inhands/weapons/plants_lefthand.dmi index 13275a77..7132699a 100644 Binary files a/icons/mob/inhands/weapons/plants_lefthand.dmi and b/icons/mob/inhands/weapons/plants_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/plants_righthand.dmi b/icons/mob/inhands/weapons/plants_righthand.dmi index 910cf798..0f5deffc 100644 Binary files a/icons/mob/inhands/weapons/plants_righthand.dmi and b/icons/mob/inhands/weapons/plants_righthand.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 30ac12e2..0b07349a 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 36ed3f45..eabdc610 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 8d8cd646..0a2ed6c8 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 45688925..370dd9f2 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/hydroponics/growing_flowers.dmi b/icons/obj/hydroponics/growing_flowers.dmi index df0ddc95..1927b297 100644 Binary files a/icons/obj/hydroponics/growing_flowers.dmi and b/icons/obj/hydroponics/growing_flowers.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index 4a47f01e..5eda34d4 100644 Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi index 0ab6ac84..bcdaabaa 100644 Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index ec5fb22b..64902629 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/modular_citadel/icons/mob/mask.dmi b/modular_citadel/icons/mob/mask.dmi index 18d51805..a630610c 100644 Binary files a/modular_citadel/icons/mob/mask.dmi and b/modular_citadel/icons/mob/mask.dmi differ