Merge pull request #267 from Keila-coon/master

Fluff item request

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

@@ -590,6 +590,15 @@
 
 //  L CKEYS
 
+//lawst
+//Domine Brisillidine
+/datum/gear/fluff/medalvalor1
+	path = /obj/item/clothing/accessory/medal/silver/fluff/medalvalorl
+	display_name = "Domine Brisillidine's medal of valor"
+	description = "A silver medal, polished to a shine. On it, it says \"For Honorable Service, Domine Brisillidine, among the first to volunteer to save the world of Virgo-Erigone Four, homeworld of the zorren. Domine lead the volunteer team in to the combat zone and assisted with arming and coordinating them against the hostile forces.\" It is adorned with a purple ribbon."
+	ckeywhitelist = list("lawst")
+	character_name = list("Domine Brisillidine")
+
 //lukevale
 //Mira Rezus
 /datum/gear/fluff/mira_1

code/modules/vore/fluffstuff/custom_clothes_yw.dm

@@ -1548,3 +1548,17 @@
 	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
 	siemens_coefficient = 0.9
 	armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35)
+
+// ******
+// Lawst
+// ******
+//Domine Brisillidine
+
+/obj/item/clothing/accessory/medal/silver/fluff/medalvalorl
+	name = "Domine Brisillidine's medal of valor"
+	desc = "A silver medal, polished to a shine. On it, it says \"For Honorable Service, Domine Brisillidine, among the first to volunteer to save the world of Virgo-Erigone Four, homeworld of the zorren. Domine lead the volunteer team in to the combat zone and assisted with arming and coordinating them against the hostile forces.\" It is adorned with a purple ribbon."
+	icon = 'icons/vore/custom_clothes_yw.dmi'
+	icon_state = "valormedal1"
+	icon_override = 'icons/vore/custom_clothes_yw.dmi'
+	item_state = "valormedal1_mob"
+	overlay_state = "valormedal1_mob"

code/modules/vore/fluffstuff/custom_guns_vr.dm

@@ -852,4 +852,4 @@
 		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam, modifystate="holdoutkill", charge_cost = 600),
 		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, modifystate="holdoutstun", charge_cost = 120),
 		list(mode_name="stun", fire_delay=12, projectile_type=/obj/item/projectile/beam/stun/med, modifystate="holdoutshock", charge_cost = 300),
-	)
+	)

code/modules/vore/fluffstuff/custom_items_yw.dm

@@ -566,4 +566,5 @@
 	icon_state = "modkit"
 
 	from_suit = /obj/item/clothing/suit/storage/hooded/explorer
-	to_suit = /obj/item/clothing/suit/storage/hooded/fluff/mocha_suit
+	to_suit = /obj/item/clothing/suit/storage/hooded/fluff/mocha_suit
+