Merge pull request #973 from VladinXXV/cupid

Amor in aura est

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."

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)

code/modules/clothing/under/miscellaneous.dm

@@ -806,4 +806,22 @@
 	item_state = "enzoshirt"
 	item_color = "enzoshirt"
 	body_parts_covered = CHEST|GROIN|ARMS|LEGS
-//End
+//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

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

code/modules/hydroponics/grown/flowers.dm

@@ -257,6 +257,69 @@
 		to_chat(user, "<span class='danger'>The [name] burns your bare hand!</span>")
 		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"

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

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,