Merge pull request #69 from Repede/izac

Champs fluff and implants for luke. Prep for the rest

code/modules/vore/fluffstuff/custom_boxes_yw.dm

@@ -178,12 +178,23 @@
 // championfire
 // ************
 
+//Anoki Windroar
+
 /obj/item/weapon/storage/box/fluff/anoki
 	name = "Anoki's kit"
 	desc = "A kit containing Anoki's equipment."
 	has_items = list(
 		/obj/item/weapon/implanter/reagent_generator/roiz/anoki)
 
+//Ivy Kaeire
+
+/obj/item/weapon/storage/box/fluff/ivy
+	name = "Ivy's Kit"
+	desc = "A kit containing Ivy's equipment."
+	has_items = list(
+		/obj/item/clothing/under/fluff/ivy,
+		/obj/item/clothing/suit/storage/fluff/ivy)
+
 // ***************
 // Vanesa FancyFin
 // ***************
@@ -207,4 +218,24 @@
 	desc = "A kit containing Jessica's equipment."
 	has_items = list(
 		/obj/item/clothing/under/rank/security/corp/fluff/jessica,
-		/obj/item/device/modkit_conversion/fluff/jessica_sec_kit)
+		/obj/item/device/modkit_conversion/fluff/jessica_sec_kit)
+
+// *******
+//LukeVale
+// *******
+
+//Mira Rezus
+
+/obj/item/weapon/storage/box/fluff/mira
+	name = "Mira's kit"
+	desc = "A kit containing Mira's equipment."
+	has_items = list(
+		/obj/item/weapon/implanter/reagent_generator/yw/mira)
+
+//Natalya Vospit
+
+/obj/item/weapon/storage/box/fluff/natalya
+	name = "Natalya's kit"
+	desc = "A kit containing Natalya's equipment."
+	has_items = list(
+		/obj/item/weapon/implanter/reagent_generator/yw/natalya)

code/modules/vore/fluffstuff/custom_clothes_yw.dm

@@ -705,14 +705,15 @@
 
 //Aurora Goldtail
 
-/obj/item/clothing/glasses/omnihud/prescription/aurora
-	name = "Round glasses"
-	desc = "A pair of circular shaped prescription glasses. They seem fit for a avian head and will most likely make anyone wearing these look like a big nerd. It seems they are outfitted with a augmented reality module."
-	icon = 'icons/vore/custom_clothes_yw.dmi'
-	icon_state = "aurora_glasses"
-	icon_override = 'icons/vore/custom_onmob_yw.dmi'
-	override = 1
-	item_state = "aurora_glasses"
+ /obj/item/clothing/glasses/omnihud/prescription/aurora
+ 	name = "Round glasses"
+ 	desc = "A pair of circular shaped prescription glasses. They seem fit for a avian head and will most likely make anyone wearing these look like a big nerd. It seems they are outfitted with a augmented reality module."
+ 	icon = 'icons/vore/custom_clothes_yw.dmi'
+ 	icon_state = "aurora_glasses"
+ 	icon_override = 'icons/vore/custom_onmob_yw.dmi'
+ 	override = 1
+ 	item_state = "aurora_glasses"
+
 
 // *******
 // Dawidoe
@@ -762,9 +763,9 @@
 	name = "Golden Rings"
 	desc = "A set of beautiful gold rings, worn on the fingers to show off high class at it's finest."
 
-// ***************
+// ********
 // Vitorhks
-// ***************
+// ********
 
 //Jessica Mayer
 
@@ -784,4 +785,93 @@
 	icon_state = "pfcvest_nobadge"
 	icon_override = 'icons/vore/custom_clothes_yw.dmi'
 	icon_badge = "pfcvest_badge"
-	icon_nobadge = "pfcvest_nobadge"
+	icon_nobadge = "pfcvest_nobadge"
+
+// ************
+// Championfire
+// ************
+
+//Ivy Kaeire
+
+/obj/item/clothing/under/fluff/ivy
+	name = "Casual Attire"
+	desc = "This set of clothing is anything but fancy. It's a simple grey shirt with black pants. The pants have small black belts around them on the pant legs."
+	icon = 'icons/vore/custom_clothes_yw.dmi'
+	icon_state = "Ivysuit"
+	icon_override = 'icons/vore/custom_clothes_yw.dmi'
+	item_state = "Ivysuit"
+
+/obj/item/clothing/suit/storage/fluff/ivy
+	name = "Ivy's Trenchcoat"
+	desc = "A black trenchcoat with purplish pink material as the inside of the jacket. It's got some belts around the waist that are presumably used to seal the jacket, but it's never really used. It's got the name Ivy Kaeire sewn on the inside. It also has a hood."
+	icon = 'icons/vore/custom_clothes_yw.dmi'
+	icon_state = "Ivycoat"
+	icon_override = 'icons/vore/custom_clothes_yw.dmi'
+	item_state = "Ivycoat"
+	body_parts_covered = UPPER_TORSO
+	var/hoodup = 1
+
+	verb/toggle()
+		set name = "Toggle Hood"
+		set category = "Object"
+		set src in usr
+
+		if(!usr.canmove || usr.stat || usr.restrained())
+			return 0
+
+		switch(hoodup)
+			if(0)
+				icon_state = "[initial(icon_state)]"
+				item_state = "[initial(item_state)]"
+				hoodup = 1
+				usr << "You take off the hood."
+			if(1)
+				icon_state = "[initial(icon_state)]_up"
+				item_state = "[initial(item_state)]_up"
+				hoodup= 0
+				usr << "You put on the hood."
+		usr.update_inv_wear_suit()
+
+// ********
+// lukevale
+// ********
+
+//Need sprites
+
+//Mira Rezus
+
+
+///obj/item/clothing/under/fluff/wip
+//	name = "WIP"
+//	desc = "WIP"
+//	icon = 'icons/vore/custom_clothes_yw.dmi'
+//	icon_state = "WIP"
+//	icon_override = 'icons/vore/custom_clothes_yw.dmi'
+//	item_state = "WIP"
+//
+//
+///obj/item/clothing/under/fluff/wip
+//	name = "WIP"
+//	desc = "WIP"
+//	icon = 'icons/vore/custom_clothes_yw.dmi'
+//	icon_state = "WIP"
+//	icon_override = 'icons/vore/custom_clothes_yw.dmi'
+//	item_state = "WIP"
+//
+//
+///obj/item/clothing/under/fluff/wip
+//	name = "WIP"
+//	desc = "WIP"
+//	icon = 'icons/vore/custom_clothes_yw.dmi'
+//	icon_state = "WIP"
+//	icon_override = 'icons/vore/custom_clothes_yw.dmi'
+//	item_state = "WIP"
+
+
+///obj/item/clothing/under/fluff/wip
+//	name = "WIP"
+//	desc = "WIP"
+//	icon = 'icons/vore/custom_clothes_yw.dmi'
+//	icon_state = "WIP"
+//	icon_override = 'icons/vore/custom_clothes_yw.dmi'
+//	item_state = "WIP"

code/modules/vore/fluffstuff/custom_items_yw.dm

@@ -1,6 +1,6 @@
-// **********
+// **************
 // Unleashed_Mana
-// **********
+// **************
 /obj/item/weapon/fluff/zekewatch
 	name = "Zeke's pocketwatch"
 	desc = "Looks like it's broken... or is it?"
@@ -43,18 +43,18 @@
 	icon_override = 'icons/vore/custom_items_yw.dmi'
 	item_state_slots = list(slot_r_hand_str = "ragnafork_r", slot_l_hand_str = "ragnafork_l")
 
-// **********
+// *********
 // Capt_matt
-// **********
+// *********
 /obj/item/weapon/material/hatchet/unathiknife/fluff/payton_joghs_1
 	name = "Payton's Knife"
 	desc = "It appears to be a traditional unathi knife, though with 'Payton' written on the side and appearing to be made of steel."
 	icon = 'icons/vore/custom_items_yw.dmi'
 	icon_state = "paytonknife"
 
-// **********
+// **************
 // BlackAngelsAce
-// **********
+// **************
 /obj/item/weapon/oldtwohanded/spear/fluff/madoka_koto_1
 	icon = 'icons/vore/custom_items_yw.dmi'
 	icon_override = 'icons/vore/custom_items_yw.dmi'
@@ -176,4 +176,68 @@
 	icon_state = "modkit"
 
 	from_suit = /obj/item/clothing/suit/storage/vest/officer
-	to_suit = /obj/item/clothing/suit/storage/vest/officer/fluff/jessica
+	to_suit = /obj/item/clothing/suit/storage/vest/officer/fluff/jessica
+
+// *******
+// ConZon4
+// *******
+
+//Working just Need sprites
+
+//Dillan McGraw
+
+///obj/item/weapon/storage/cane/fluff/dillan
+//	name = "WIP"
+//	desc = "WIP"
+//	icon = 'icons/vore/custom_items_yw.dmi'
+//	icon_state = "browncane"
+//	item_icons = list (slot_r_hand_str = 'icons/vore/custom_items_yw.dmi', slot_l_hand_str = 'icons/vore/custom_items_yw.dmi')
+//	item_state_slots = list(slot_r_hand_str = "browncanemob_r", slot_l_hand_str = "browncanemob_l")
+//	max_storage_space = 4
+//	max_w_class = 1
+//	throwforce = 7
+//	force = 5
+
+// ********
+// lukevale
+// ********
+
+// This implant gives me cancer -Izac
+
+//Mira Rezus
+
+/obj/item/weapon/implant/reagent_generator/yw/mira
+	name = "lactation implant"
+	desc = "This is an implant that allows the user to lactate."
+	generated_reagent = "milk"
+	usable_volume = 1000
+
+	empty_message = list("Your breasts feel unusually empty.", "Your chest feels lighter - your milk supply is empty!", "Your milk reserves have run dry.", "Your grateful nipples ache as the last of your milk leaves them.")
+	full_message = list("Your breasts ache badly - they are swollen and feel fit to burst!", "You need to be milked! Your breasts feel bloated, eager for release.", "Your milky breasts are starting to leak...")
+	emote_descriptor = list("squeezes Mira's nipples, milking them", "milks Mira's breasts", "extracts milk")
+	self_emote_descriptor = list("squeeze out", "extract")
+	random_emote = list("surpresses a moan", "gasps sharply", "bites her lower lip")
+	verb_name = "Milk"
+	verb_desc = "Grab Mira's breasts and milk her, storing her fresh, warm milk in a container. This will undoubtedly turn her on."
+
+/obj/item/weapon/implanter/reagent_generator/yw/mira
+	implant_type = /obj/item/weapon/implant/reagent_generator/yw/mira
+
+//Natalya Vospit
+
+/obj/item/weapon/implant/reagent_generator/yw/natalya
+	name = "lactation implant"
+	desc = "This is an implant that allows the user to lactate."
+	generated_reagent = "milk"
+	usable_volume = 1000
+
+	empty_message = list("Your breasts feel unusually empty.", "Your chest feels lighter - your milk supply is empty!", "Your milk reserves have run dry.", "Your grateful nipples ache as the last of your milk leaves them.")
+	full_message = list("Your breasts ache badly - they are swollen and feel fit to burst!", "You need to be milked! Your breasts feel bloated, eager for release.", "Your milky breasts are starting to leak...")
+	emote_descriptor = list("squeezes Natalya's nipples, milking them", "milks Natalya's breasts", "extracts milk")
+	self_emote_descriptor = list("squeeze out", "extract")
+	random_emote = list("surpresses a moan", "gasps sharply", "bites her lower lip")
+	verb_name = "Milk"
+	verb_desc = "Grab Natalya's breasts and milk her, storing her fresh, warm milk in a container. This will undoubtedly turn her on."
+
+/obj/item/weapon/implanter/reagent_generator/yw/natalya
+	implant_type = /obj/item/weapon/implant/reagent_generator/yw/natalya

config/custom_items.txt

@@ -97,6 +97,12 @@ ckey: championfire
 character_name: Anoki Windroar
 item_path: /obj/item/weapon/storage/box/fluff/anoki
 }
+
+{
+ckey: championfire
+character_name: Ivy Kaeire
+item_path: /obj/item/weapon/storage/box/fluff/ivy
+}
 # ######## D CKEYS
 {
 ckey: dawidoe
@@ -188,6 +194,18 @@ item_path: /obj/item/weapon/storage/box/fluff/John
 
 # ######## K CKEYS
 # ######## L CKEYS
+{
+ckey: lukevale
+character_name: Mira Rezus
+item_path: /obj/item/weapon/storage/box/fluff/mira
+}
+
+{
+ckey: lukevale
+character_name: Natalya Vospit
+item_path: /obj/item/weapon/storage/box/fluff/natalya
+}
+
 # ######## M CKEYS
 # ######## N CKEYS
 # ######## O CKEYS