Merge pull request #451 from cebutris/foxycide

Foxicide fluff items, minor material weapon refactor

code/game/objects/items/weapons/material/material_weapons.dm

@@ -26,6 +26,7 @@
 	var/default_material = DEFAULT_WALL_MATERIAL
 	var/material/material
 	var/drops_debris = 1
+	var/named_from_material = 1 //YW EDIT, Does it prepend the material's name to it's name?
 
 /obj/item/weapon/material/New(var/newloc, var/material_key)
 	..(newloc)
@@ -65,7 +66,8 @@
 	if(!material)
 		qdel(src)
 	else
-		name = "[material.display_name] [initial(name)]"
+		if(named_from_material) //YW EDIT
+			name = "[material.display_name] [initial(name)]"
 		health = round(material.integrity/10)
 		if(applies_material_colour)
 			color = material.icon_colour

code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm

@@ -346,6 +346,22 @@
 
 //  F CKEYS
 
+//Foxicide
+//Kaith
+/datum/gear/fluff/kaith_modkit
+	path = /obj/item/device/modkit_conversion/fluff/kaith_knife_kit
+	display_name = "Kaith's modkit"
+	description = "A kit containing all the needed tools and parts to modify a survival knife"
+	ckeywhitelist = list("foxicide")
+	character_name = list("Kaith")
+
+/datum/gear/fluff/kaith_bag
+	path = /obj/item/weapon/storage/backpack/fluff/kaith
+	display_name = "Light duffle bag"
+	description = "A compact duffle bag, meant for long hikes."
+	ckeywhitelist = list("foxicide")
+	character_name = list("Kaith")
+
 //  G CKEYS
 
 //generalpantsu

code/modules/vore/fluffstuff/custom_clothes_yw.dm

@@ -1591,3 +1591,12 @@
 	icon_override = 'icons/vore/custom_clothes_yw.dmi'
 	item_state = "valormedal1_mob"
 	overlay_state = "valormedal1_mob"
+
+// ******
+// Foxicide
+// ******
+/obj/item/weapon/storage/backpack/fluff/kaith
+	name = "Light duffle bag"
+	desc = "A compact duffle bag, meant for long hikes."
+	icon = 'icons/obj/clothing/backpack.dmi'
+	icon_state = "duffle"

code/modules/vore/fluffstuff/custom_items_yw.dm

@@ -568,3 +568,23 @@
 	from_suit = /obj/item/clothing/suit/storage/hooded/explorer
 	to_suit = /obj/item/clothing/suit/storage/hooded/fluff/mocha_suit
 
+// *************
+// Foxicide
+// *************
+/obj/item/weapon/material/knife/tacknife/survival/fluff/kaith
+	name = "Trusty Survival Knife"
+	desc = "An old looking knife with an outdated wooden handle. Still looks robust, though."
+	icon = 'icons/vore/custom_items_yw.dmi'
+	icon_state = "kaithknife"
+	named_from_material = 0
+
+/obj/item/device/modkit_conversion/fluff/kaith_knife_kit
+	name = "Kaith's modkit"
+	desc = "A kit containing all the needed tools and parts to modify a survival knife"
+
+	icon = 'icons/vore/custom_items_vr.dmi'
+	icon_state = "modkit"
+
+	from_suit = /obj/item/weapon/material/knife/tacknife/survival
+	to_suit = /obj/item/weapon/material/knife/tacknife/survival/fluff/kaith
+