From 5cb92eb0784eaa8fa37c8896eef16b640a03f805 Mon Sep 17 00:00:00 2001 From: OrbisAnima Date: Sun, 29 Jan 2017 11:26:32 -0300 Subject: [PATCH] Swimsuits for all! -Added swimsuits to be picked in the loadout, without replacing the uniform (They spawn in a capsule, a limited box that can only hold one swimsuit, and only a swimsuit, and cannot be turned into cardboard.) -Added Xsdew departamental selection of Swimsuits (Security, Medbay, Science and Engineering) -Added Xsdew Fluff Swimsuit! Fixes #874 --- .../vore/fluffstuff/custom_boxes_vr.dm | 2 + .../vore/fluffstuff/custom_clothes_vr.dm | 40 ++++++++++++++++++ .../vore/fluffstuff/custom_items_vr.dm | 42 +------------------ 3 files changed, 43 insertions(+), 41 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index 90890e03f1..d82b271117 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -144,6 +144,7 @@ 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) @@ -158,6 +159,7 @@ Swimsuits, for general use, to avoid arriving to work with your swimsuit. 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) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index e41ba10a8f..aa743d3bab 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -935,3 +935,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 an orange high visibility swimsuit worn by engineers. It lacks radiation, or any, shielding." + icon_state = "swimsuit_penelope" + item_state = "swimsuit_penelope_mob" \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 17479d44c4..678a05d6e6 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -558,44 +558,4 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie assignment = user.job user.set_id_info(src) configured = 1 - user << "Card settings set." - -/* -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 an orange high visibility swimsuit worn by engineers. It lacks radiation, or any, shielding." - icon_state = "swimsuit_penelope" - item_state = "swimsuit_penelope_mob" + user << "Card settings set." \ No newline at end of file