Merge pull request #881 from OrbisAnima/swimsuits2

Swimsuits for All! Fluff items for some

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

@@ -43,3 +43,19 @@
 	display_name = "fed uniform, eng"
 	path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedeng
 	allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer")
+
+/*
+Swimsuits
+*/
+
+/datum/gear/uniform/swimsuits
+	display_name = "Swimsuits selection"
+	path = /obj/item/weapon/storage/box/fluff/swimsuit
+
+/datum/gear/uniform/swimsuits/New()
+	..()
+	var/list/swimsuits = list()
+	for(var/swimsuit in typesof(/obj/item/weapon/storage/box/fluff/swimsuit))
+		var/obj/item/weapon/storage/box/fluff/swimsuit/swimsuit_type = swimsuit
+		swimsuits[initial(swimsuit_type.name)] = swimsuit_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(swimsuits))

code/modules/vore/fluffstuff/custom_boxes_vr.dm

@@ -135,3 +135,63 @@
 		new /obj/item/weapon/storage/fancy/cigarettes/dromedaryco(src)
 		new /obj/item/weapon/storage/box/matches(src)
 		new /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake(src)
+
+//Xsdew:Penelope Allen
+/obj/item/weapon/storage/box/fluff/penelope
+	name = "Penelope's capsule"
+	desc = "A little capsule where a designer's swimsuit is stored."
+	icon = 'icons/vore/custom_items_vr.dmi'
+	icon_state = "capsule"
+	storage_slots = 1
+	foldable = null
+	w_class = ITEMSIZE_SMALL
+	max_w_class = ITEMSIZE_NORMAL
+	can_hold = list(/obj/item/clothing/under/swimsuit/)
+	has_items = list(/obj/item/clothing/under/swimsuit/fluff/penelope)
+
+/*
+Swimsuits, for general use, to avoid arriving to work with your swimsuit.
+*/
+/obj/item/weapon/storage/box/fluff/swimsuit
+	name = "Black Swimsuit capsule"
+	desc = "A little capsule where a swimsuit is usually stored."
+	storage_slots = 1
+	icon = 'icons/vore/custom_items_vr.dmi'
+	icon_state = "capsule"
+	foldable = null
+	w_class = ITEMSIZE_SMALL
+	max_w_class = ITEMSIZE_NORMAL
+	can_hold = list(/obj/item/clothing/under/swimsuit/)
+	has_items = list(/obj/item/clothing/under/swimsuit/black)
+
+/obj/item/weapon/storage/box/fluff/swimsuit/blue
+	name = "Blue Swimsuit capsule"
+	has_items = list(/obj/item/clothing/under/swimsuit/blue)
+
+/obj/item/weapon/storage/box/fluff/swimsuit/purple
+	name = "Purple Swimsuit capsule"
+	has_items = list(/obj/item/clothing/under/swimsuit/purple)
+
+/obj/item/weapon/storage/box/fluff/swimsuit/green
+	name = "Green Swimsuit capsule"
+	has_items = list(/obj/item/clothing/under/swimsuit/green)
+
+/obj/item/weapon/storage/box/fluff/swimsuit/red
+	name = "Red Swimsuit capsule"
+	has_items = list(/obj/item/clothing/under/swimsuit/red)
+
+/obj/item/weapon/storage/box/fluff/swimsuit/engineering
+	name = "Engineering Swimsuit capsule"
+	has_items = list(/obj/item/clothing/under/swimsuit/fluff/engineering)
+
+/obj/item/weapon/storage/box/fluff/swimsuit/science
+	name = "Science Swimsuit capsule"
+	has_items = list(/obj/item/clothing/under/swimsuit/fluff/science)
+
+/obj/item/weapon/storage/box/fluff/swimsuit/security
+	name = "Security Swimsuit capsule"
+	has_items = list(/obj/item/clothing/under/swimsuit/fluff/security)
+
+/obj/item/weapon/storage/box/fluff/swimsuit/medical
+	name = "Medical Swimsuit capsule"
+	has_items = list(/obj/item/clothing/under/swimsuit/fluff/medical)

code/modules/vore/fluffstuff/custom_clothes_vr.dm

@@ -938,3 +938,43 @@
 	icon_override = 'icons/vore/custom_clothes_vr.dmi'
 	icon_state = "verin"
 	item_state = "verin_mob"
+
+/*
+Departamental Swimsuits, for general use
+*/
+
+/obj/item/clothing/under/swimsuit/fluff/
+	icon = 'icons/vore/custom_clothes_vr.dmi'
+	icon_override = 'icons/vore/custom_clothes_vr.dmi'
+	siemens_coefficient = 1
+
+/obj/item/clothing/under/swimsuit/fluff/engineering
+	name = "Engineering Swimsuit"
+	desc = "It's an orange high visibility swimsuit worn by engineers. It lacks radiation, or any, shielding."
+	icon_state = "swimsuit_engineering"
+	item_state = "swimsuit_engineering_mob"
+
+/obj/item/clothing/under/swimsuit/fluff/science
+	name = "Science Swimsuit"
+	desc = "It's made of a special fiber that provides no protection whatsoever, but its hydrophobic. It has markings that denote the wearer as a scientist."
+	icon_state = "swimsuit_science"
+	item_state = "swimsuit_science_mob"
+
+/obj/item/clothing/under/swimsuit/fluff/security
+	name = "Security Swimsuit"
+	desc = "It's made of a slightly sturdier material than standard swimsuits, to allow for a more robust appearance."
+	icon_state = "swimsuit_security"
+	item_state = "swimsuit_security_mob"
+
+/obj/item/clothing/under/swimsuit/fluff/medical
+	name = "Medical Swimsuit"
+	desc = "It's made of a special fiber that provides no protection whatsoever, but its elastic. It has a cross on the back denoting that the wearer is trained medical personnel."
+	icon_state = "swimsuit_medical"
+	item_state = "swimsuit_medical_mob"
+
+//Xsdew:Penelope Allen
+/obj/item/clothing/under/swimsuit/fluff/penelope
+	name = "Penelope's Swimsuit"
+	desc = "It's made of a special fiber that provides no protection whatsoever, but its elastic. This one was custom made for Penelope."
+	icon_state = "swimsuit_penelope"
+	item_state = "swimsuit_penelope_mob"

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -558,4 +558,4 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
 		assignment = user.job
 		user.set_id_info(src)
 		configured = 1
-		user << "<span class='notice'>Card settings set.</span>"
+		user << "<span class='notice'>Card settings set.</span>"

config/custom_items.txt

@@ -487,6 +487,13 @@ item_path: /obj/item/clothing/glasses/hud/health/fluff/wickedtemphud
 }
 
 # ######## X CKEYS
+
+{
+ckey: Xsdew
+character_name: Penelope Allen
+item_path: /obj/item/weapon/storage/box/fluff/penelope
+}
+
 # ######## Y CKEYS
 # ######## Z CKEYS
 {