From d5e344f178bf4dd15617a16827950e170fcfbed6 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Sat, 18 Apr 2020 18:18:37 +0100 Subject: [PATCH 1/2] colorable collar accessory --- .../loadout/loadout_accessories_vr.dm | 10 ++++++++++ .../under/accessories/accessory_vr.dm | 9 +++++++++ icons/mob/ties_vr.dmi | Bin 713 -> 796 bytes icons/obj/clothing/ties_vr.dmi | Bin 1909 -> 2118 bytes 4 files changed, 19 insertions(+) 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 1e8b1cf17c..efb2379fb0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -1,5 +1,15 @@ // Collars +/datum/gear/choker //A colorable choker + display_name = "choker (colorable, tagless)" + path = /obj/item/clothing/accessory/choker + slot = slot_tie + sort_category = "Accessories" + +/datum/gear/choker/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + /datum/gear/collar display_name = "collar, silver" path = /obj/item/clothing/accessory/collar/silver diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index 6926e68f8a..3f6f66f64b 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -2,6 +2,15 @@ // Collars and such like that // +/obj/item/clothing/accessory/choker //A colorable, tagless choker + name = "plain choker" + desc = "A simple, plain choker. Or maybe it's a collar? It doesn't have a tag." + icon = 'icons/obj/clothing/ties_vr.dmi' + icon_override = 'icons/mob/ties_vr.dmi' + icon_state = "choker_cst" + item_state = "choker_cst" + overlay_state = "choker_cst" + /obj/item/clothing/accessory/collar slot_flags = SLOT_TIE | SLOT_OCLOTHING icon = 'icons/obj/clothing/ties_vr.dmi' diff --git a/icons/mob/ties_vr.dmi b/icons/mob/ties_vr.dmi index e9651101126aa0ea22f8daf5c998fba76993f5f5..7e06a43e11221b7c17a996b6e3a022af8c654a09 100644 GIT binary patch delta 752 zcmX@fI)`n7IG+OtGXn#|FTceukTAW;zSx}OhpU1#ZF{gLpM!qHkfwt%0G^HXs9gki->cG>y zhiPTOrMBitaf?5`%`Gi3nDK1d|5@+%|GvHKQOMlaZd0bux_@wz*=CEbq{+qKF6<57 zck_L{MeqXlr*^!SFAtnz>E!>w0y{ zd;WUHq!klpdw4zf1$yg(r;B4q#hkZy4i>#K;9(8$slUa>_2s|)_p^(A!f(7wFkW@S za_*WZ9(}v^9?oNDU{DFq^Z)CRIc@WKdGor1LEpYUx|ALNt#^BH#IfitVix!Q_D4_q za{tFSF)O>j|H|IKzi18&FEDr@x#)B0#n1cQk34%_bbf!=x$C*Lb}-2gO+d+?&)uKD zuK#p?zJgV}xUD=)E@9W7pZhq=Z&d6%|DJu>e14eto&_&zV*mZT_;c5v&*~lLuDhNG zx(@iXY5K7XDsf8b5`x$C@V zkSKVEGU@@t#U$$I6F#fO;MRqn$L^%tJ~-a2;n z^rET_|Mp*-f61zNpY2!X=V_IG``!oX$A#Z|d-~?Z8Nps`sQ$-jValp<#9-oKkbtMFpUXO@ GgeCx*Dqpn# delta 669 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 literal 1909 zcmaJ?dpy$%8~<&XVJrxnoZ8dhhpZBlx$NT>AJm2s4^E{vDpXdAed@r5w!YRsY$O8bN z=zi4o6`D&K!GT+T|}9>@Kfc&?p)>X`m!&;1vtVtlUO z!p8m*8({Rb)wIXTwSXO~xHal@FmMa9I`B4Y#R>N2I;G;_9b6(EiCc zU>IjJ1dt>5TQNRH8UbUvzE9~WXlO72I%#&jltZ5BkslHlrdT6FG`#!O!MAfe2f{D- zO=A`_D>As#A4jnJIUJ$zRaH$ee3-&PCHl{DH)LS(z-_04n(7imMe5ko8qV8yT)WA!2mjiNbLJQ;JFdkO?YFb2Ff9X+T|W!H_e;Xm!quU(dlQKL$xq(B z^I1=^Z}~u4LSe7Q7@nfn>3fUZY2k}|&qdoNc zA(VCiBeA`q{AyoElElz2G>~qPn`egbak{>d5!`YT<+n4QZqJ>{ZvUDABQXJF9ai?sFxsU)ix9r z3+KyrCFHW{Xd_{~3>pMkR;PaNQV{9GkVt1ei6_dng2nFcZRQhG=ZsbqdVpN97!7~W z>}GJ<@y0_VQKWq5$-2w)ea#kQVw(5thMGFIg3Bf<)@Ek3D!iQSLm~Ix(!tDR?oSvc z$Tgu*s1b{175~uOEA$L9t9k&GC0krIdF9+ZHc@%>c;ij{sNo4N7n50Eh*#YnGbgC& zTJ9ZISR0IaL`hFKJ?V5$ty9*iH!f&+!fS9TF;XdcBtb!T%19LdvvUOtE0_2LBw62b z-WD$|8jC(IP*(;MAb@E%^RtC$GW(#I!WVHj-M6bQHE7Ku@qmCGJ=KVpQnUG1@&@D{ zFxCJL-}X{JHYd)qoN-7?wKb4z^VWEhoM>@00&%FIr+C9()ZAIGa&xoUs?OmIpfO zWgb;-2&V57-+g!|WB!^{+V5nNn`xaDxm0|&Le}h#k7mYg@1yh}@zxdVSNQ z)yrXe9Mrmz6L#1Bi+kv5!9aKvB5-MA$YcP^O zj1Xla5%%0^NDF3)PPfXJdxS1l6xn51_O;- zf5gEO`~e3W8}|!gy`iqb(wEGo1xmGfSRYv}$)yf`&h!ut56R|v@G*LpUeuV!o+o(P z05HHmcsi}~&1+U@7n@%-o`h?J3Ol6KMm?VRUFyukOBT+aixr9p1N z{fEFakXnHfU}g{1ZMtR(Z?iWikXSjy{GXeW=o#EBMoj=gCum0Mj2)D$Fq|kovFE=( a?v<3f;A3h?!N+%U6mUP{<@&&xkoh;(JdEN1 From eb6420e9b81ce4cebb14ef403ddd91673b996537 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Mon, 20 Apr 2020 03:31:17 +0100 Subject: [PATCH 2/2] choker customization! --- .../clothing/under/accessories/accessory_vr.dm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index 3f6f66f64b..2d8086b2b3 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -4,12 +4,26 @@ /obj/item/clothing/accessory/choker //A colorable, tagless choker name = "plain choker" - desc = "A simple, plain choker. Or maybe it's a collar? It doesn't have a tag." + slot_flags = SLOT_TIE | SLOT_OCLOTHING + desc = "A simple, plain choker. Or maybe it's a collar? Use in-hand to customize it." icon = 'icons/obj/clothing/ties_vr.dmi' icon_override = 'icons/mob/ties_vr.dmi' icon_state = "choker_cst" item_state = "choker_cst" overlay_state = "choker_cst" + var/customized = 0 + +/obj/item/clothing/accessory/choker/attack_self(mob/user as mob) + if(!customized) + var/design = input(user,"Descriptor?","Pick descriptor","") in list("plain","simple","ornate","elegant","opulent") + var/material = input(user,"Material?","Pick material","") in list("leather","velvet","lace","fabric","latex","plastic","metal","chain","silver","gold","platinum","steel","bead","ruby","sapphire","emerald","diamond") + var/type = input(user,"Type?","Pick type","") in list("choker","collar","necklace") + name = "[design] [material] [type]" + desc = "A [type], made of [material]. It's rather [design]." + customized = 1 + to_chat(usr,"[src] has now been customized.") + else + to_chat(usr,"[src] has already been customized!") /obj/item/clothing/accessory/collar slot_flags = SLOT_TIE | SLOT_OCLOTHING