diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm index 12bf14ad2f..417b1c5257 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -124,3 +124,8 @@ Talon winter coat display_name = "hazard vest, atmospherics" path = /obj/item/clothing/suit/storage/hazardvest/atmos allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer") + +//Long fur coat +/datum/gear/suit/russofurcoat + display_name = "long fur coat" + path = /obj/item/clothing/suit/storage/vest/hoscoat/russofurcoat diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index 98743d1ab8..225b1b5881 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -289,6 +289,16 @@ item_state = "collar_cowbell_overlay" overlay_state = "collar_cowbell_overlay" +<<<<<<< HEAD +======= +/obj/item/clothing/accessory/collar/collarplanet_earth + name = "planet collar" + desc = "A collar featuring a surprisingly detailed replica of a earth-like planet surrounded by a weak battery powered force shield. There is a button to turn it off." + icon_state = "collarplanet_earth" + item_state = "collarplanet_earth" + overlay_state = "collarplanet_earth" + +>>>>>>> a55f8374da... Merge pull request #12982 from FunnyCatEnjoyer/FunnyCatEnjoyer /obj/item/clothing/accessory/collar/holo name = "Holo-collar" diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index c0b8aed483..53bc3b71ad 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -754,7 +754,8 @@ /obj/item/clothing/mask/bandana/red = 50, /obj/item/clothing/mask/surgical = 50) premium = list(/obj/item/weapon/bedsheet/rainbow = 1) - contraband = list(/obj/item/clothing/mask/gas/clown_hat = 1) + contraband = list(/obj/item/clothing/mask/gas/clown_hat = 1, + /obj/item/clothing/accessory/collar/collarplanet_earth = 5) /obj/machinery/vending/loadout/clothing name = "General Jump" diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 532503b7e0..c220e68676 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -207,6 +207,20 @@ icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "greatcoat_mob" +//For general use +/obj/item/clothing/suit/storage/vest/hoscoat/russofurcoat + name = "long fur coat" + desc = "A sophisticated long coat made of fur." + + icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "russofurcoat" + + icon_override = 'icons/inventory/suit/mob_vr.dmi' + item_state = "russofurcoat" + + allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask) + flags_inv = HIDETIE|HIDEHOLSTER + //For general use /obj/item/clothing/suit/storage/fluff/fedcoat name = "Federation Uniform Jacket (Red)"