Merge branch 'master' of https://github.com/Repede/YawnWiderStation

code/game/machinery/kitchen/cooking_machines/candy.dm

@@ -5,6 +5,7 @@
 	off_icon = "mixer_off"
 	on_icon = "mixer_on"
 	cook_type = "candied"
+	cooked_sound = 'sound/machines/ding.ogg'
 
 	output_options = list(
 		"Jawbreaker" = /obj/item/weapon/reagent_containers/food/snacks/variable/jawbreaker,

code/game/machinery/kitchen/cooking_machines/cereal.dm

@@ -6,6 +6,7 @@
 	cook_type = "cerealized"
 	on_icon = "cereal_on"
 	off_icon = "cereal_off"
+	cooked_sound = 'sound/machines/ding.ogg'
 
 /obj/machinery/cooker/cereal/change_product_strings(var/obj/item/weapon/reagent_containers/food/snacks/product)
 	. = ..()

code/game/machinery/kitchen/cooking_machines/grill.dm

@@ -7,4 +7,5 @@
 	food_color = "#A34719"
 	on_icon = "grill_on"
 	off_icon = "grill_off"
-	can_burn_food = 1
+	can_burn_food = 1
+	cooked_sound = 'sound/machines/ding.ogg'

code/game/machinery/kitchen/cooking_machines/oven.dm

@@ -9,6 +9,7 @@
 	cook_time = 300
 	food_color = "#A34719"
 	can_burn_food = 1
+	cooked_sound = 'sound/machines/ding.ogg'
 
 	output_options = list(
 		"Personal Pizza" = /obj/item/weapon/reagent_containers/food/snacks/variable/pizza,

code/modules/vore/fluffstuff/custom_boxes_yw.dm

@@ -52,6 +52,15 @@
 		/obj/item/clothing/under/fluff/aien_uniform,
 		/obj/item/clothing/suit/storage/fluff/aien_suit)
 
+//Nika Domashev
+
+/obj/item/weapon/storage/box/fluff/nika
+	name = "Nika's Kit"
+	desc = "A kit containing Nika's equipment."
+	has_items = list(
+		/obj/item/clothing/under/rank/security/corp/fluff/nika,
+		/obj/item/device/modkit_conversion/fluff/nika_sec_kit)
+
 //***************
 //The god himself
 //***************
@@ -119,6 +128,15 @@
 		/obj/item/clothing/gloves/fluff/shel_gloves,
 		/obj/item/clothing/under/fluff/shel)
 
+//Alva Karlholm
+
+/obj/item/weapon/storage/box/fluff/alva
+	name = "Alva's Kit"
+	desc = "A kit containing Alva's equipment."
+	has_items = list(
+		/obj/item/clothing/suit/storage/toggle/labcoat/fluff/alva,
+		/obj/item/clothing/under/rank/security/corp/fluff/alva)
+
 
 // **************
 // Admiral Dragon
@@ -164,4 +182,29 @@
 	name = "Anoki's kit"
 	desc = "A kit containing Anoki's equipment."
 	has_items = list(
-		/obj/item/weapon/implanter/reagent_generator/roiz/anoki)
+		/obj/item/weapon/implanter/reagent_generator/roiz/anoki)
+
+// ***************
+// Vanesa FancyFin
+// ***************
+
+//Vanesa FancyFin
+
+/obj/item/weapon/storage/box/fluff/vanesaf
+	name = "Vanesa's kit"
+	desc = "A kit containing Vanesa's equipment."
+	has_items = list(
+		/obj/item/clothing/gloves/weddingring/fluff/vanesa)
+
+// ********
+// Vitorhks
+// ********
+
+//Jessica Mayer
+
+/obj/item/weapon/storage/box/fluff/jessica
+	name = "Jessica's Kit"
+	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)

code/modules/vore/fluffstuff/custom_clothes_yw.dm

@@ -472,6 +472,25 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
 
+//Nika Domashev
+
+/obj/item/clothing/under/rank/security/corp/fluff/nika
+	name = "PCRC navy uniform"
+	desc = "A pair of navy digital camo pants and a navy blue shirt. The nameplate on it reads 'N. Domashev' and the rank indicated on it is Lance Corporal. There also is a belt to keep the pants in place and kneepads for protection."
+	icon = 'icons/vore/custom_clothes_yw.dmi'
+	icon_state = "lcpl"
+	icon_override = 'icons/vore/custom_clothes_yw.dmi'
+	item_state = "lcpl"
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/suit/storage/vest/officer/fluff/nika
+	name = "Light armor vest"
+	desc = "An outdated looking armor vest with pouches on the front. Not as flexible as security gear of today, but still as protective as it and surprisingly also lighter."
+	icon = 'icons/vore/custom_clothes_yw.dmi'
+	icon_state = "lcplvest_nobadge"
+	icon_override = 'icons/vore/custom_clothes_yw.dmi'
+	icon_badge = "lcplvest_badge"
+	icon_nobadge = "lcplvest_nobadge"
 
 // *******
 // Izac112
@@ -532,6 +551,25 @@
 	icon_override = 'icons/vore/custom_clothes_yw.dmi'
 	item_state = "paddedpants"
 
+//Alva Karlholm
+
+/obj/item/clothing/under/rank/security/corp/fluff/alva
+	name = "PCRC dress uniform"
+	desc = "A black skirt along with a navy blue sweater. The nametag on the sweater reads 'A. Karlholm' and the rank indicated on it is Sergeant. It also comes with a belt who's buckle is a shiny platinum."
+	icon = 'icons/vore/custom_clothes_yw.dmi'
+	icon_state = "sgt"
+	icon_override = 'icons/vore/custom_clothes_yw.dmi'
+	item_state = "sgt"
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/suit/storage/toggle/labcoat/fluff/alva
+	name = "PCRC labcoat"
+	desc = "A white labcoat with the logo of the Proxima Centauri Risk Control logo on the back. The sleeves are rolled back too."
+	icon = 'icons/vore/custom_clothes_yw.dmi'
+	icon_state = "labcoat_sgt"
+	icon_override = 'icons/vore/custom_clothes_yw.dmi'
+	item_state = "labcoat_sgt"
+
 // ***********
 // Johnwolf135
 // ***********
@@ -700,4 +738,39 @@
 	icon_state = "sifguardjacket_fox"
 	icon_override = 'icons/vore/custom_clothes_yw.dmi'
 	icon_badge = "sifguardjacket_fox"
-	icon_nobadge = "sifguardjacket_fox"
+	icon_nobadge = "sifguardjacket_fox"
+
+// ***************
+// Vanesa FancyFin
+// ***************
+
+//Vanesa Fancyfin
+
+/obj/item/clothing/gloves/weddingring/fluff/vanesa
+
+	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
+
+/obj/item/clothing/under/rank/security/corp/fluff/jessica
+	name = "PCRC navy BDU"
+	desc = "A BDU with a navy blue digital camo pattern. The nametag on it reads 'J. Mayer' and the rank indications show the rank Private First class. Its sleeves are rolled back, there is a belt around the waist and there are kneepads for protection."
+	icon = 'icons/vore/custom_clothes_yw.dmi'
+	icon_state = "pfc"
+	icon_override = 'icons/vore/custom_clothes_yw.dmi'
+	item_state = "pfc"
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/suit/storage/vest/officer/fluff/jessica
+	name = "PCRC security contractor vest"
+	desc = "A somewhat outdated, lightweight security vest with inbuilt pouches to carry security equipment. It is rather bulky, but nontheless still flexible."
+	icon = 'icons/vore/custom_clothes_yw.dmi'
+	icon_state = "pfcvest_nobadge"
+	icon_override = 'icons/vore/custom_clothes_yw.dmi'
+	icon_badge = "pfcvest_badge"
+	icon_nobadge = "pfcvest_nobadge"

code/modules/vore/fluffstuff/custom_items_yw.dm

@@ -79,6 +79,9 @@
 // *************
 // GeneralPantsu
 // *************
+
+//Amara Faell
+
 /obj/item/weapon/flame/lighter/zippo/fluff/amara
 	desc = "A zippo that comes in a metallic blood red case. How the flame can be lime green is an enigma in itself."
 	icon = 'icons/vore/custom_items_yw.dmi'
@@ -94,6 +97,18 @@
 	from_suit = /obj/item/clothing/suit/storage/vest/hoscoat
 	to_suit = /obj/item/clothing/suit/storage/vest/hoscoat/amara_hos
 
+//Nika Domashev
+
+/obj/item/device/modkit_conversion/fluff/nika_sec_kit
+	name = "Nika's modkit"
+	desc = "A kit containing all the needed tools and parts to modify a Officer Armor Vest."
+
+	icon = 'icons/vore/custom_items_vr.dmi'
+	icon_state = "modkit"
+
+	from_suit = /obj/item/clothing/suit/storage/vest/officer
+	to_suit = /obj/item/clothing/suit/storage/vest/officer/fluff/nika
+
 // *******
 // Dawidoe
 // *******
@@ -145,4 +160,20 @@
 
 	empty_message = list("Your lower belly feels smooth and empty. Sorry, we're out of eggs!", "The reduced pressure in your lower belly tells you there are no more eggs.")
 	full_message = list("Your lower belly looks swollen with irregular bumps, and it feels heavy.", "Your lower abdomen feels really heavy, making it a bit hard to walk.")
-	emote_descriptor = list("an egg right out of Anoki's lower belly!", "into Anoki' belly firmly, forcing him to lay an egg!", "Anoki really tight, who promptly lays an egg!")
+	emote_descriptor = list("an egg right out of Anoki's lower belly!", "into Anoki' belly firmly, forcing him to lay an egg!", "Anoki really tight, who promptly lays an egg!")
+
+// ********
+// Vitorhks
+// ********
+
+//Jessica Mayer
+
+/obj/item/device/modkit_conversion/fluff/jessica_sec_kit
+	name = "Jessica's modkit"
+	desc = "A kit containing all the needed tools and parts to modify a Officer Armor Vest."
+
+	icon = 'icons/vore/custom_items_vr.dmi'
+	icon_state = "modkit"
+
+	from_suit = /obj/item/clothing/suit/storage/vest/officer
+	to_suit = /obj/item/clothing/suit/storage/vest/officer/fluff/jessica

config/custom_items.txt

@@ -129,6 +129,12 @@ ckey: generalpantsu
 character_name: Aien Waesmaer
 item_path: /obj/item/weapon/storage/box/fluff/aien
 }
+
+{
+ckey: generalpantsu
+character_name: Nika Domashev
+item_path: /obj/item/weapon/storage/box/fluff/nika
+}
 # ######## H CKEYS
 # ######## I CKEYS
 {
@@ -149,6 +155,12 @@ character_name: Shel Nargol
 item_path: /obj/item/weapon/storage/box/fluff/shel
 }
 
+{
+ckey: izac112
+character_name: Alva Karlholm
+item_path: /obj/item/weapon/storage/box/fluff/alva
+}
+
 {
 ckey: ivymoomoo
 character_name: Ivy Baladeva
@@ -312,6 +324,18 @@ character_name: Hans Jaeger
 item_path: /obj/item/weapon/storage/box/fluff/mauser
 }
 
+{
+ckey: vanesafancyfin
+character_name: Vanesa FancyFin
+item_path: /obj/item/weapon/storage/box/fluff/vanesaf
+}
+
+{
+ckey: vitorhks
+character_name: Jessica Mayer
+item_path: /obj/item/weapon/storage/box/fluff/jessica
+}
+
 # ######## W CKEYS
 # ######## X CKEYS
 # ######## Y CKEYS