diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 67e1f26e82..8177c24b7f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -40,6 +40,10 @@ display_name = "collar, pink" path = /obj/item/clothing/accessory/collar/pink +/datum/gear/collar/cowbell + display_name = "collar, cowbell" + path = /obj/item/clothing/accessory/collar/cowbell + /datum/gear/collar/holo display_name = "collar, holo" path = /obj/item/clothing/accessory/collar/holo diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 7b98dd5132..77194dc819 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -616,3 +616,8 @@ /datum/gear/suit/miscellaneous/cardigan/New() ..() gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/suit/cmddressjacket + display_name = "command dress jacket" + path = /obj/item/clothing/suit/storage/cmddressjacket + allowed_roles = list("Facility Director", "Head of Personnel", "Command Secretary") diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 5b7bc83757..6905a3f0d4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -648,4 +648,36 @@ /datum/gear/uniform/countess display_name = "countess dress" - path = /obj/item/clothing/under/dress/countess \ No newline at end of file + path = /obj/item/clothing/under/dress/countess + +/datum/gear/uniform/verglasdress + display_name = "verglas dress" + path = /obj/item/clothing/under/verglasdress + +/datum/gear/uniform/fashionminiskirt + display_name = "fashionable miniskirt" + path = /obj/item/clothing/under/fashionminiskirt + +/datum/gear/uniform/fashionminiskirt/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/uniform/paramedunidark + display_name = "paramedic uniform - dark" + path = /obj/item/clothing/under/rank/paramedunidark + allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic") + +/datum/gear/uniform/parameduniskirtdark + display_name = "paramedic skirt - dark" + path = /obj/item/clothing/under/rank/parameduniskirtdark + allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic") + +/datum/gear/uniform/paramedunilight + display_name = "paramedic uniform - light" + path = /obj/item/clothing/under/rank/paramedunilight + allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic") + +/datum/gear/uniform/parameduniskirtlight + display_name = "paramedic skirt - light" + path = /obj/item/clothing/under/rank/parameduniskirtlight + allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic") \ No newline at end of file diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 1119079e2a..73d253415d 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -34,6 +34,12 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_inv = HIDEHOLSTER +//Command +/obj/item/clothing/suit/storage/cmddressjacket + name = "command dress jacket" + desc = "A fancy dress jacket made for command staff. Makes you feel in charge." + icon_state = "cmddressjacket" + //Chaplain /obj/item/clothing/suit/storage/hooded/chaplain_hoodie name = "chaplain hoodie" diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index f476fa417a..d17fba45a0 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -282,6 +282,14 @@ item_state = "collar_pnk" overlay_state = "collar_pnk" +/obj/item/clothing/accessory/collar/cowbell + name = "cowbell collar" + desc = "A collar for your little pets... or the big ones." + icon_state = "collar_cowbell" + item_state = "collar_cowbell_overlay" + overlay_state = "collar_cowbell_overlay" + + /obj/item/clothing/accessory/collar/holo name = "Holo-collar" desc = "An expensive holo-collar for the modern day pet." diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 87346c6741..013e3d917f 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -174,6 +174,34 @@ icon_state = "scrubs" item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white") +/obj/item/clothing/under/rank/paramedunidark + name = "dark paramedic uniform" + desc = "A dark jumpsuit for those brave souls who have to deal with a CMO who thinks they're the do everything person." + icon_state = "paramedicdark" + rolled_down = -1 + rolled_sleeves = -1 + +/obj/item/clothing/under/rank/parameduniskirtdark + name = "dark paramedic uniskirt" + desc = "A dark jumpskirt for those brave souls who have to deal with a CMO who thinks they're the do everything person." + icon_state = "paramedicdark_skirt" + rolled_down = -1 + rolled_sleeves = -1 + +/obj/item/clothing/under/rank/paramedunilight + name = "light paramedic uniform" + desc = "A light jumpsuit for those brave souls who have to deal with a CMO who thinks they're the do everything person." + icon_state = "paramediclight" + rolled_down = -1 + rolled_sleeves = -1 + +/obj/item/clothing/under/rank/parameduniskirtlight + name = "light paramedic uniskirt" + desc = "A light jumpskirt for those brave souls who have to deal with a CMO who thinks they're the do everything person." + icon_state = "paramediclight_skirt" + rolled_down = -1 + rolled_sleeves = -1 + /obj/item/clothing/under/rank/psych desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist." name = "psychiatrist's jumpsuit" @@ -186,7 +214,6 @@ icon_state = "psychturtle" item_state_slots = list(slot_r_hand_str = "psyche", slot_l_hand_str = "psyche") rolled_sleeves = 0 - /* * Medsci, unused (i think) stuff */ diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 0f2b43c380..562950f89a 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -565,6 +565,11 @@ desc = "A red and black dress fit for a countess." icon_state = "countess" +/obj/item/clothing/under/verglasdress + name = "verglas dress" + desc = "The modern twist on a forgotten pattern, the Verglas style utilizes comfortable velvet and silver white satin to create an otherworldly effect evocative of winter, or the void." + icon_state = "verglas_dress" + /* * wedding stuff */ @@ -884,6 +889,10 @@ Uniforms and such desc = "A flowery skirt that comes in a variety of colors." icon_state = "flowerskirt" +/obj/item/clothing/under/fashionminiskirt + name = "fashionable miniskirt" + desc = "An impractically short miniskirt allegedly making waves through the local fashion scene." + icon_state = "miniskirt_fashion" /* * swimsuit */ @@ -946,6 +955,12 @@ Uniforms and such desc = "No honest man would wear this abomination" icon_state = "mankini" +/obj/item/clothing/under/swimsuit/cowbikini + name = "cow print bikini" + desc = "A rather skimpy cow patterned swimsuit." + icon_state = "swim_cow" + + /* * pyjamas */ diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 4c05797df8..c8b6f036fe 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -847,6 +847,7 @@ /obj/item/weapon/storage/box/fluff/swimsuit/science = 5, /obj/item/weapon/storage/box/fluff/swimsuit/security = 5, /obj/item/weapon/storage/box/fluff/swimsuit/medical = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/cowbikini = 5, /obj/item/clothing/under/utility = 5, /obj/item/clothing/under/utility/grey = 5, /obj/item/clothing/under/utility/blue = 5, @@ -1017,6 +1018,7 @@ /obj/item/weapon/storage/box/fluff/swimsuit/science = 50, /obj/item/weapon/storage/box/fluff/swimsuit/security = 50, /obj/item/weapon/storage/box/fluff/swimsuit/medical = 50, + /obj/item/weapon/storage/box/fluff/swimsuit/cowbikini = 50, /obj/item/clothing/under/utility = 50, /obj/item/clothing/under/utility/grey = 50, /obj/item/clothing/under/utility/blue = 50, @@ -1952,6 +1954,7 @@ /obj/item/weapon/storage/box/fluff/swimsuit/science = 5, /obj/item/weapon/storage/box/fluff/swimsuit/security = 5, /obj/item/weapon/storage/box/fluff/swimsuit/medical = 5, + /obj/item/weapon/storage/box/fluff/swimsuit/cowbikini = 5, /obj/item/clothing/under/utility = 5, /obj/item/clothing/under/utility/grey = 5, /obj/item/clothing/under/utility/blue = 5, diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index 3c20b5dd6a..70a1e99b45 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -286,6 +286,10 @@ Swimsuits, for general use, to avoid arriving to work with your swimsuit. name = "Medical Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/fluff/medical) +/obj/item/weapon/storage/box/fluff/swimsuit/cowbikini + name = "Cow Bikini Swimsuit capsule" + has_items = list(/obj/item/clothing/under/swimsuit/cowbikini) + //Monkey boxes for the new primals we have /obj/item/weapon/storage/box/monkeycubes/sobakacubes name = "sobaka cube box" diff --git a/icons/inventory/accessory/item_vr.dmi b/icons/inventory/accessory/item_vr.dmi index fdb8608648..c39fad3292 100644 Binary files a/icons/inventory/accessory/item_vr.dmi and b/icons/inventory/accessory/item_vr.dmi differ diff --git a/icons/inventory/accessory/mob_vr.dmi b/icons/inventory/accessory/mob_vr.dmi index c5e7908d71..7327c9b136 100644 Binary files a/icons/inventory/accessory/mob_vr.dmi and b/icons/inventory/accessory/mob_vr.dmi differ diff --git a/icons/inventory/eyes/item.dmi b/icons/inventory/eyes/item.dmi index 768235110b..b4ba37ad39 100644 Binary files a/icons/inventory/eyes/item.dmi and b/icons/inventory/eyes/item.dmi differ diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index 602ab0bcd2..7bef5fc417 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index 6d959d86d8..29a4aa79c9 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/inventory/uniform/item.dmi b/icons/inventory/uniform/item.dmi index 08cc0cb815..f0e5d69092 100644 Binary files a/icons/inventory/uniform/item.dmi and b/icons/inventory/uniform/item.dmi differ diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi index 87cee8aca9..e5f028c969 100644 Binary files a/icons/inventory/uniform/mob.dmi and b/icons/inventory/uniform/mob.dmi differ