diff --git a/code/datums/supplypacks/recreation_vr.dm b/code/datums/supplypacks/recreation_vr.dm index 2e61f93473..5c2266523f 100644 --- a/code/datums/supplypacks/recreation_vr.dm +++ b/code/datums/supplypacks/recreation_vr.dm @@ -64,3 +64,25 @@ cost = 25 containertype = /obj/structure/closet/crate containername = "collar crate" + +/datum/supply_pack/recreation/shiny + name = "Shiny Clothing" + contains = list( + /obj/item/clothing/mask/muzzle/ballgag = 1, + /obj/item/clothing/mask/muzzle/ballgag/ringgag = 1, + /obj/item/clothing/head/shiny_hood = 1, + /obj/item/clothing/head/shiny_hood/poly = 1, + /obj/item/clothing/head/shiny_hood/closed = 1, + /obj/item/clothing/head/shiny_hood/closed/poly = 1, + /obj/item/clothing/under/shiny/catsuit = 1, + /obj/item/clothing/under/shiny/catsuit/poly = 1, + /obj/item/clothing/under/shiny/leotard = 1, + /obj/item/clothing/under/shiny/leotard/poly = 1, + /obj/item/clothing/accessory/shiny/gloves = 1, + /obj/item/clothing/accessory/shiny/gloves/poly = 1, + /obj/item/clothing/accessory/shiny/socks = 1, + /obj/item/clothing/accessory/shiny/socks/poly = 1 + ) + containertype = /obj/structure/closet/crate + containername = "Shiny clothes crate" + cost = 30 diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index b68bf225a0..801dabb2f7 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -48,8 +48,11 @@ var/obj/item/clothing/accessory/tie = new T(src) src.attach_accessory(null, tie) set_clothing_index() + + //VOREStation edit start if(polychromic) verbs |= /obj/item/clothing/proc/change_color + //VOREStation edit start /obj/item/clothing/equipped(var/mob/user,var/slot) ..() diff --git a/code/modules/clothing/head/misc_vr.dm b/code/modules/clothing/head/misc_vr.dm index 4e68655a9b..6fddde1c3d 100644 --- a/code/modules/clothing/head/misc_vr.dm +++ b/code/modules/clothing/head/misc_vr.dm @@ -22,3 +22,28 @@ icon_state = "fancycrown" icon = 'icons/obj/clothing/hats_vr.dmi' icon_override = 'icons/mob/head_vr.dmi' + +/obj/item/clothing/head/shiny_hood + icon_override = 'icons/mob/modular_shiny_vr.dmi' + icon = 'icons/obj/clothing/modular_shiny_vr.dmi' + name = "shiny hood" + desc = "You can be a super-hero in this! Just don't forget your suit!" + icon_state = "hood_o" + flags_inv = HIDEFACE|BLOCKHAIR + body_parts_covered = FACE|HEAD + +/obj/item/clothing/head/shiny_hood/poly + name = "polychromic shiny hood" + icon_state = "hood_col_o" + polychromic = TRUE + +/obj/item/clothing/head/shiny_hood/closed + name = "shiny hood" + desc = "You can be a super-hero in this! Just don't forget your superhuman senses!" + icon_state = "hood_c" + gas_transfer_coefficient = 0.90 + +/obj/item/clothing/head/shiny_hood/closed/poly + name = "polychromic closed shiny hood" + icon_state = "hood_col_o" + polychromic = TRUE \ No newline at end of file diff --git a/code/modules/clothing/masks/shiny_vr.dm b/code/modules/clothing/masks/shiny_vr.dm new file mode 100644 index 0000000000..5bed904a9f --- /dev/null +++ b/code/modules/clothing/masks/shiny_vr.dm @@ -0,0 +1,10 @@ +/obj/item/clothing/mask/muzzle/ballgag + name = "ball gag" + desc = "What's that? You'll have to speak up." + icon_state = "ballgag" + +/obj/item/clothing/mask/muzzle/ballgag/ringgag + name = "ring gag" + desc = "What's that? You'll have to speak more clearly." + icon_state = "ringgag" + gas_transfer_coefficient = 1 \ No newline at end of file diff --git a/code/modules/clothing/shoes/boots_vr.dm b/code/modules/clothing/shoes/boots_vr.dm new file mode 100644 index 0000000000..4c62209499 --- /dev/null +++ b/code/modules/clothing/shoes/boots_vr.dm @@ -0,0 +1,6 @@ +/obj/item/clothing/shoes/boots/hoof + name = "hoofboots" + desc = "A pair of high-heeled boots with hooves on the front of the soles, for use with a hobby horse or to disguise your footprints." + icon_state = "hoofboots" + icon = 'icons/obj/clothing/shoes_vr.dmi' + icon_override = 'icons/mob/feet_vr.dmi' \ No newline at end of file diff --git a/code/modules/clothing/suits/shiny.dm b/code/modules/clothing/suits/shiny.dm new file mode 100644 index 0000000000..e69de29bb2 diff --git a/code/modules/clothing/under/accessories/shiny_vr.dm b/code/modules/clothing/under/accessories/shiny_vr.dm new file mode 100644 index 0000000000..a23a0f1c69 --- /dev/null +++ b/code/modules/clothing/under/accessories/shiny_vr.dm @@ -0,0 +1,21 @@ +/obj/item/clothing/accessory/shiny + icon_override = 'icons/mob/modular_shiny_vr.dmi' + icon = 'icons/obj/clothing/modular_shiny_vr.dmi' + w_class = ITEMSIZE_NORMAL + desc = "Shiny! They look like they need to be attached to something, else they'll just fall off." + +/obj/item/clothing/accessory/shiny/gloves + name = "shiny gloves" + icon_state = "gloves" + +/obj/item/clothing/accessory/shiny/gloves/poly + name = "polychromic shiny gloves" + polychromic = TRUE + +/obj/item/clothing/accessory/shiny/socks + name = "shiny socks" + icon_state = "socks" + +/obj/item/clothing/accessory/shiny/socks/poly + name = "polychromic shiny socks" + polychromic = TRUE \ No newline at end of file diff --git a/code/modules/clothing/under/shiny_vr.dm b/code/modules/clothing/under/shiny_vr.dm new file mode 100644 index 0000000000..9020823276 --- /dev/null +++ b/code/modules/clothing/under/shiny_vr.dm @@ -0,0 +1,22 @@ +/obj/item/clothing/under/shiny + icon_override = 'icons/mob/modular_shiny_vr.dmi' + icon = 'icons/obj/clothing/modular_shiny_vr.dmi' + desc = "You can be a super-hero in this! Just don't forget your mask!" + +/obj/item/clothing/under/shiny/catsuit + name = "shiny suit" + icon_state = "suit" + var/opened = 0 + +/obj/item/clothing/under/shiny/catsuit/poly + name = "polychromic shiny suit" + icon_state = "suit_col" + polychromic = TRUE + +/obj/item/clothing/under/shiny/leotard + name = "shiny leotard" + icon_state = "leotard" + +/obj/item/clothing/under/shiny/leotard/poly + name = "polychromic shiny leotard" + polychromic = TRUE \ No newline at end of file diff --git a/icons/mob/feet_vr.dmi b/icons/mob/feet_vr.dmi index 800d211b20..b1fbd831a1 100644 Binary files a/icons/mob/feet_vr.dmi and b/icons/mob/feet_vr.dmi differ diff --git a/icons/mob/mask_vr.dmi b/icons/mob/mask_vr.dmi index 0d3c0479b2..ec49d3cdb7 100644 Binary files a/icons/mob/mask_vr.dmi and b/icons/mob/mask_vr.dmi differ diff --git a/icons/mob/modular_shiny_vr.dmi b/icons/mob/modular_shiny_vr.dmi new file mode 100644 index 0000000000..7398b80193 Binary files /dev/null and b/icons/mob/modular_shiny_vr.dmi differ diff --git a/icons/obj/clothing/masks_vr.dmi b/icons/obj/clothing/masks_vr.dmi index 0a09e048bc..7508f018e7 100644 Binary files a/icons/obj/clothing/masks_vr.dmi and b/icons/obj/clothing/masks_vr.dmi differ diff --git a/icons/obj/clothing/modular_shiny_vr.dmi b/icons/obj/clothing/modular_shiny_vr.dmi new file mode 100644 index 0000000000..df757d6aca Binary files /dev/null and b/icons/obj/clothing/modular_shiny_vr.dmi differ diff --git a/icons/obj/clothing/shoes_vr.dmi b/icons/obj/clothing/shoes_vr.dmi index c6662aa325..5b81be4b1f 100644 Binary files a/icons/obj/clothing/shoes_vr.dmi and b/icons/obj/clothing/shoes_vr.dmi differ diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index c949330797..1e4403afa2 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -543,12 +543,10 @@ /obj/item/weapon/handcuffs/fuzzy, /obj/item/weapon/handcuffs/legcuffs/fuzzy, /obj/item/weapon/handcuffs/fuzzy, -/obj/item/clothing/mask/balaclava, -/obj/item/clothing/gloves/black{ - desc = "They seem to be made of rubber-like material, though insulation quality is doubtful"; - name = "elastic black gloves" - }, -/obj/item/clothing/under/fluff/latexmaid, +/obj/item/clothing/accessory/shiny/socks, +/obj/item/clothing/under/shiny/catsuit, +/obj/item/clothing/accessory/shiny/gloves, +/obj/item/clothing/head/shiny_hood, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining) "aaZ" = ( diff --git a/vorestation.dme b/vorestation.dme index 928765789b..436eeda697 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1866,11 +1866,13 @@ #include "code\modules\clothing\masks\gasmask.dm" #include "code\modules\clothing\masks\gasmask_vr.dm" #include "code\modules\clothing\masks\miscellaneous.dm" +#include "code\modules\clothing\masks\shiny_vr.dm" #include "code\modules\clothing\masks\voice.dm" #include "code\modules\clothing\rings\material.dm" #include "code\modules\clothing\rings\rings.dm" #include "code\modules\clothing\rings\rings_vr.dm" #include "code\modules\clothing\shoes\boots.dm" +#include "code\modules\clothing\shoes\boots_vr.dm" #include "code\modules\clothing\shoes\colour.dm" #include "code\modules\clothing\shoes\leg_guards.dm" #include "code\modules\clothing\shoes\leg_guards_vr.dm" @@ -1957,6 +1959,7 @@ #include "code\modules\clothing\under\miscellaneous_vr.dm" #include "code\modules\clothing\under\nanotrasen_vr.dm" #include "code\modules\clothing\under\pants.dm" +#include "code\modules\clothing\under\shiny_vr.dm" #include "code\modules\clothing\under\shorts.dm" #include "code\modules\clothing\under\solgov.dm" #include "code\modules\clothing\under\solgov_vr.dm" @@ -1972,6 +1975,7 @@ #include "code\modules\clothing\under\accessories\lockets.dm" #include "code\modules\clothing\under\accessories\permits.dm" #include "code\modules\clothing\under\accessories\permits_vr.dm" +#include "code\modules\clothing\under\accessories\shiny_vr.dm" #include "code\modules\clothing\under\accessories\storage.dm" #include "code\modules\clothing\under\accessories\torch.dm" #include "code\modules\clothing\under\accessories\torch_vr.dm"