mirror of
https://github.com/Yawn-Wider/YWPolarisVore.git
synced 2026-08-23 21:17:20 +01:00
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
This commit is contained in:
@@ -26,21 +26,21 @@
|
||||
|
||||
//Natje: Awen Henry
|
||||
/obj/item/clothing/head/fluff/wolfgirl
|
||||
name = "Wolfgirl Hat"
|
||||
desc = "An odd, small hat with two strings attached to it."
|
||||
name = "Wolfgirl Hat"
|
||||
desc = "An odd, small hat with two strings attached to it."
|
||||
|
||||
icon_state = "wolfgirlhat"
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
icon_state = "wolfgirlhat"
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
|
||||
//Natje: Awen Henry
|
||||
/obj/item/clothing/shoes/fluff/wolfgirl
|
||||
name = "Red Sandals"
|
||||
desc = "A pair of sandals that make you want to awoo!"
|
||||
name = "Red Sandals"
|
||||
desc = "A pair of sandals that make you want to awoo!"
|
||||
|
||||
icon_state = "wolfgirlsandals"
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
icon_state = "wolfgirlsandals"
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
|
||||
//Natje: Awen Henry
|
||||
/obj/item/clothing/under/fluff/wolfgirl
|
||||
@@ -2482,11 +2482,11 @@ Departamental Swimsuits, for general use
|
||||
|
||||
//Uncle_Fruit_VEVO - Bradley Khatibi
|
||||
/obj/item/clothing/shoes/fluff/airjordans
|
||||
name = "A pair of Air Jordan 1 Mid 'Black Gym Red's"
|
||||
desc = "Appearing in a classic Jordan Brand colorway, the Air Jordan 1 Mid 'Black Gym Red' released in May 2021. Built with leather, the shoe's upper sports a white base, contrasted by black on the overlays and highlighted by Gym Red on the padded collar, 'Wings' logo and Swoosh branding. A breathable nylon tongue and perforated toe box support the fit, while underfoot, a standard rubber cupsole with Air in the heel anchors the build."
|
||||
icon_state = "airjordans"
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
name = "A pair of Air Jordan 1 Mid 'Black Gym Red's"
|
||||
desc = "Appearing in a classic Jordan Brand colorway, the Air Jordan 1 Mid 'Black Gym Red' released in May 2021. Built with leather, the shoe's upper sports a white base, contrasted by black on the overlays and highlighted by Gym Red on the padded collar, 'Wings' logo and Swoosh branding. A breathable nylon tongue and perforated toe box support the fit, while underfoot, a standard rubber cupsole with Air in the heel anchors the build."
|
||||
icon_state = "airjordans"
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
|
||||
//Pandora029:Seona Young
|
||||
/obj/item/clothing/under/fluff/foxoflightsuit
|
||||
@@ -2511,29 +2511,54 @@ Departamental Swimsuits, for general use
|
||||
item_state = null // i swear to god this works - hatterhat
|
||||
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
|
||||
//Sudate: Shea Corbett
|
||||
/obj/item/clothing/under/fluff/greek_dress
|
||||
name = "mytilenean dress"
|
||||
desc = "It's a breezy, colorful two-part dress woven from linen, with the top consisting of white linen, and the skirt of rougher, sturdy fabric. It's adorned with a yellow belt and embroidered stripes in the hem, and blue highlights at the sleeves. More notably, however, it exposes the wearer's chest entirely."
|
||||
name = "mytilenean dress"
|
||||
desc = "It's a breezy, colorful two-part dress woven from linen, with the top consisting of white linen, and the skirt of rougher, sturdy fabric. It's adorned with a yellow belt and embroidered stripes in the hem, and blue highlights at the sleeves. More notably, however, it exposes the wearer's chest entirely."
|
||||
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_state = "greek_dress"
|
||||
worn_state = "greek_dress"
|
||||
rolled_sleeves = 0
|
||||
rolled_down = 0
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_state = "greek_dress"
|
||||
worn_state = "greek_dress"
|
||||
rolled_sleeves = 0
|
||||
rolled_down = 0
|
||||
|
||||
icon_override = 'icons/vore/custom_clothes_vr.dmi'
|
||||
item_state = "greek_dress"
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
|
||||
|
||||
icon_override = 'icons/vore/custom_clothes_vr.dmi'
|
||||
item_state = "greek_dress"
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
|
||||
//JadeManique: Freyr
|
||||
/obj/item/clothing/mask/fluff/freyr_mask
|
||||
name = "Freyr's Mask"
|
||||
desc = "A pristine white mask with antlers. Its silky to the touch, like porcelain!"
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_state = "freyrmask"
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
item_state = "freyrmask_mob"
|
||||
item_state_slots = null
|
||||
body_parts_covered = FACE
|
||||
name = "Freyr's Mask"
|
||||
desc = "A pristine white mask with antlers. Its silky to the touch, like porcelain!"
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_state = "freyrmask"
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
item_state = "freyrmask_mob"
|
||||
item_state_slots = null
|
||||
body_parts_covered = FACE
|
||||
flags_inv = HIDEFACE
|
||||
item_flags = FLEXIBLEMATERIAL
|
||||
|
||||
//codeme: Perrin Kade
|
||||
/obj/item/clothing/shoes/fluff/gildedshoes_perrin
|
||||
name = "gilded shoes"
|
||||
desc = "Black shoes with gilding, revealing and comfortable for any wearer!"
|
||||
|
||||
icon_state = "perrinshoes"
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
|
||||
/obj/item/clothing/under/fluff/gildedrobe_perrin
|
||||
name = "gilded robe"
|
||||
desc = "Black robe with gilding, revealing and comfortable for any wearer!"
|
||||
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_state = "perrinrobes"
|
||||
worn_state = "perrinrobes_s"
|
||||
rolled_sleeves = 0
|
||||
rolled_down = 0
|
||||
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
item_state = "perrinrobes_s"
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
||||
@@ -1447,8 +1447,7 @@
|
||||
M.add_language(LANGUAGE_ECHOSONG)
|
||||
to_chat(M,"<span class='notice'>LANGUAGES - INITIALISED</span>")
|
||||
|
||||
//thedavestdave Lucky
|
||||
///I know this is pretty bodgey but if it stupid and it works it isn't stupid
|
||||
//thedavestdave - Lucky
|
||||
/obj/item/clothing/suit/armor/combat/crusader_costume/lucky
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_state = "luck"
|
||||
|
||||
Reference in New Issue
Block a user