From c1f7e7ee5827142b5a6dce08f82a57a9f86433db Mon Sep 17 00:00:00 2001 From: Guy Date: Sun, 15 May 2022 23:47:56 -0300 Subject: [PATCH 1/3] Fixes dumb cat mistakes --- .../preference_setup/loadout/loadout_suit_vr.dm | 5 +++++ .../clothing/under/accessories/accessory_vr.dm | 2 +- code/modules/vore/fluffstuff/custom_clothes_vr.dm | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) 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 a2d996cb2f..d337ef47a4 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -271,7 +271,7 @@ /obj/item/clothing/accessory/collar/collarplanet_earth name = "planet collar" - desc = "A collar featuring a surprisingly detailed replica of planet earth surrounded by a weak battery powered force shield. There is a button to turn it off." + 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" diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 12fd69166e..71d0781afd 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)" From dc02d5b71ef4848dbbb6f89908927c7a62053b12 Mon Sep 17 00:00:00 2001 From: Guy Date: Mon, 16 May 2022 10:10:26 -0300 Subject: [PATCH 2/3] Adds the planet collar to the vending machines --- code/modules/economy/vending_machines_vr.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index afaff608d3..841566101d 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -534,6 +534,7 @@ /obj/item/clothing/accessory/collar/bell = 5, /obj/item/clothing/accessory/collar/spike = 5, /obj/item/clothing/accessory/collar/pink = 5, + /obj/item/clothing/accessory/collar/collarplanet_earth = 5, /obj/item/clothing/accessory/collar/holo = 5, /obj/item/clothing/accessory/collar/shock = 5, /obj/item/weapon/storage/belt/fannypack = 1, From c6e7af4ace9d36187e157c683327445fd555079c Mon Sep 17 00:00:00 2001 From: Guy Date: Mon, 16 May 2022 10:41:02 -0300 Subject: [PATCH 3/3] Planet collar is now a contraband accessory in the accessory vendor. --- code/modules/economy/vending_machines_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 841566101d..2e92584594 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -534,7 +534,6 @@ /obj/item/clothing/accessory/collar/bell = 5, /obj/item/clothing/accessory/collar/spike = 5, /obj/item/clothing/accessory/collar/pink = 5, - /obj/item/clothing/accessory/collar/collarplanet_earth = 5, /obj/item/clothing/accessory/collar/holo = 5, /obj/item/clothing/accessory/collar/shock = 5, /obj/item/weapon/storage/belt/fannypack = 1, @@ -755,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"