From d0c2d997af374f38533e5d6a01d7a21e68538e27 Mon Sep 17 00:00:00 2001 From: MarinaGryphon Date: Sat, 3 Jul 2021 04:37:07 -0500 Subject: [PATCH] Adds nail polish remover. --- .../loadout/loadout_cosmetics_vr.dm | 7 ++- code/modules/makeup/nailpolish.dm | 45 ++++++++++++++++++ icons/obj/nailpolish_vr.dmi | Bin 1434 -> 2427 bytes 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_cosmetics_vr.dm b/code/modules/client/preference_setup/loadout/loadout_cosmetics_vr.dm index 8a1935d3549..7ff9876a4a9 100644 --- a/code/modules/client/preference_setup/loadout/loadout_cosmetics_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_cosmetics_vr.dm @@ -1,5 +1,6 @@ /datum/gear/cosmetic/nailpolish display_name = "nail polish (colorable)" + description = "Nail polish, available in every color of the rainbow! Doesn't come with nail polish remover." path = /obj/item/weapon/nailpolish /datum/gear/cosmetic/nailpolish/New() @@ -11,4 +12,8 @@ polish.set_colour(polish.color) polish.color = null return polish - \ No newline at end of file + +/datum/gear/cosmetic/nailpolish_remover + display_name = "nail polish remover" + description = "Nail polish remover, for when the fun's over. Doesn't come with nail polish." + path = /obj/item/weapon/nailpolish_remover \ No newline at end of file diff --git a/code/modules/makeup/nailpolish.dm b/code/modules/makeup/nailpolish.dm index 95e0fd24cd1..ee901825e6b 100644 --- a/code/modules/makeup/nailpolish.dm +++ b/code/modules/makeup/nailpolish.dm @@ -2,6 +2,7 @@ /obj/item/weapon/nailpolish name = "nail polish" + desc = "Nail polish, to paint your nails with. Or someone else's!" icon = 'icons/obj/nailpolish_vr.dmi' icon_state = "nailpolish" var/colour = "#FF0000" @@ -100,7 +101,51 @@ return body_part.nail_polish = polish target.update_icons_body() + +/obj/item/weapon/nailpolish_remover + name = "nail polish remover" + desc = "Paint thinner, acetone, nail polish remover; whatever you call it, it gets the job done." + drop_sound = 'sound/items/drop/helm.ogg' + pickup_sound = 'sound/items/pickup/helm.ogg' + icon = 'icons/obj/nailpolish_vr.dmi' + icon_state = "nailpolishremover" + var/open = FALSE + +/obj/item/weapon/nailpolish_remover/attack_self(var/mob/user) + open = !open + to_chat(user, SPAN_NOTICE("You [open ? "open" : "close"] \the [src].")) + update_icon() + +/obj/item/weapon/nailpolish_remover/update_icon() + . = ..() + icon_state = "[initial(icon_state)][open ? "open" : null]" + +/obj/item/weapon/nailpolish_remover/attack(var/mob/user, var/mob/living/carbon/human/target) + if(!open) + return + + if(!istype(target)) + return + var/bp = user.zone_sel.selecting + var/obj/item/organ/external/body_part = target.get_organ(bp) + if(!body_part) + to_chat(user, SPAN_WARNING("[target] is missing that limb!")) + return + if(!body_part.nail_polish) + to_chat(user, SPAN_NOTICE("[target]'s [body_part.name] has no nail polish to remove!")) + return + if(user == target) + user.visible_message("\The [user] removes their nail polish with \the [src].", "You remove your nail polish with \the [src].") + else + if(do_after(user, 2 SECONDS, target)) + user.visible_message("\The [user] removes \the [target]'s nail polish with \the [src].", "You remove \the [target]'s nail polish with \the [src].") + else + to_chat(user, SPAN_NOTICE("Both you and [target] must stay still!")) + return + body_part.nail_polish = null + target.update_icons_body() + /datum/nail_polish var/icon = 'icons/obj/nailpolish_vr.dmi' var/icon_state diff --git a/icons/obj/nailpolish_vr.dmi b/icons/obj/nailpolish_vr.dmi index 1adfe631970ec349adad3de9e813e727163a5ae9..e3bddf098e801b637000bf126900fdbb08d565ef 100644 GIT binary patch literal 2427 zcma);dol7-Au%L`VYw~WR1y(NG#Sa)b#s}y zZTV7e%XLDzjC^HS6K10Ce&638zrTLxd>`k$-_Q4X{_}jD*Ll6pd8fkduSh_SKmY)c zu(q;r66mY{98nR${g8oC7fAKpYsfGQ?@+H0zu+*xpg;hK%+KztfzV;HNi+Jm2j+(7 z5LBOxXM=bnqyAxp$#9@64&ZJ}>(t)J*M5%I{-4 z$}hNQ+w!e$J^lclU|HWiZENhXGqK@Mup@T08OJ8uki8NFIpQM2 zMqOL2Xj7Il{DNXc*R2h`FbUdFH?{abIJD&D9X{9
  • KZrt5!aXLrK-TZ}b-^PBZ> z&;yOOXcv8!hMC(gFZKSv;QXl%gyu{oovS&Xvjump1KyB3|L~GNApJiqt3Kmxf3IGcmX=mcizG@ZNON)7!D86NVjT3wu*9#- zj35g5>Oh0tuJqhKJG9^QrT7Cztqp(|_(No}(e4e<;NyTO4*%oFh*%jW7lnT=?n2Yc zEjcLrCG}%iF%nOHDzmJdsB}F0p%+2cq(_xjtETsu^aavXDYNc>L){p!{wkb~X#+e^ zqkQshN&kprbfMv^jXXX`9BxiqiC~2~hPo}lNuSzhXD>EZhMwUb#DlHQdV!qYM#}w> zmz@m;dC;(Kxg}yu>`YTRt(hi|(BI=>oIEe|kql_M7Ub>$23EQeNW(2Er@SHVIr{Bf z2sp`SBEe=M*2DCjP;)Tu1~*NsEqBak#GFwxG+kg|tjd3fZE7dsNlOH+C&2lw7L?&Ku@yXArtM+MBzs zwQ%ZdAKl4or86}I_lwXunI_Xdo*cK+OG$m0Q+3tYl5)duCm;%rLX;W7VDNgi@*Sk= z?}##m^*;kEATX(bIdW(~)`%;r#0?}u)drBR&2bHS(cG_ywajM%yVUN#K|em}YJyDf z@aFo`p!&gl_KTd%Nr}?zo(mP!Bs1xGt`^L0Dezj4gkHb7p!Mikv}#4fi$;Of>xFLfjT!nh_!u+wGXxFR6F8 zJn!U3?;)RUk9ycYxh{F?3xFT0YTlt%pk;dZ!Zt6=xu8&bEwu-53l>G>rQ-&hqg7L2 zSaTnnvN_fA1CfanLiLS2jNRfG3dVn3qnx!SEscGI(LQ1j%kApcP{j8hJ|nl*7#9aF z{JCtd-ayoep$!)z@kji()XCA3!1T7U5yMvBaTAHB!fj%RS$x%H1yohkgp4%1A4JSP$yRO%V(J=i&aN@iPZZuH*^~T+4&`U205*iht9p9yWKVhEL{{%; zcC|gJ28hVXql;T!i?qV}3eH!Yk}AIzxFG#Mud7%}--OD;iIen3|CX zYQ>4erNGfdp5r(Qm@aJi^&3ONh>E)$3Z8-*=w(K}dJ=*Ks2iZR<5jFl1W)x z;fK06K;HNKxMIJ23MvlQN-IgEFgn_ZVq*6a3M^VZinch8;{#3Ioo>~acYpkugMH20 z*BWy>e5l#b#01i~KQ?6UqZRi<6Jyj_Ja^>#7XPK1Qv16N-6FZkoh62D-!}39q`pS8 z!q*M6)CiDZ##7-_w&xP9>MYX@na4rR!4X`W$WvVs@b#1XUf=AQuj zsqU9wb;G+}mOEC@ki&O{-7_F|1KT)ncr=MbdUH)x9tt&Ylz-hj>g*ueMYBbliz$?U zzTD~;^!&74Qc;_7*Df+e#&Kbk%~mTZDS?-d6!10?R2I4xoBxb8eR6div);sPUG9e8 zl3B>9+F!`;(M)mY?VNkpy3L#J+PwI4X00!xILu!_%ZRuOU9WbT@=s;xaBn|$GONEX zOKS#~9`w_&EgH)ktzdAb(oH&NGNkj}TMZtK$N{hBw|zHwSoEcHhh))2CmNgmwdb7U z%_Tmbpxj9tO2Xs@Pe5_nnCS-Ls=k@wTkU0CRVa0N{Hp0$@b&e2XeFZDU(l9p8*rVA zgqN3BjrT<8V64Jk2dKJo=eMU4zLC0nflKFD+r~dd1E20c3azb{W3TIP`F`J?sn-HHV1%V4m*$8nw z=efB?p@60Gla`ePncmUw(4lnJwD;#IU7v4s)l2*X$)%jZ!W`X}udfRg+d&RO-R6}e z9h6nc^dGhT$_i1aZ1#EXmQe^rLCGi*?_g4P`)v-IRI`SVS#|hTwGwrpV9%=)(Nif- z5GNZ^m7~S+Gr}cLBC%n<#mx1V$e-TcIinC*A;S}gTM}YxLrt=ZQzu`Ga0l^XVvA9* z#CShZD;_MXt^OVnBs?&g`~0c?TrmiE;#6g@5ojlM{-j)6cXpf3(alXE7BUK=- qVh2DZB*#wUue0gVbN&zppbIyX_6ku&>Z&7LH5&t)l&!%($ delta 1416 zcmZuvcTm#@6b>K-p~q5&Wg3PkXd48SAz_5XD8oY_5)8;PKonC5BS`%*3=Ogs5D2^;l4kc+%-t`y^6hBUDy??mE2PV-tG%;!{CiVZXT>P% z054jkF%eXzF-V;IanG$PP>LvFZgq{&qS97o)6{?Bk|?LZ$66&^FkE|AdxW03TlxeR z=k0mR;KiCbyRpzzvxFAn1lTb1Lu)1lrYrggJR9l&x`~I75Wiz$e6h){U`fxWen(j(7v2T=zuYQ_`I@ zf>JzQjuDSX=`Y$11Hla_P{~Nbz>QJm?!+?+Tz{&znzZ&4)5t7>UAh@6B#+VY@~!-#z1fAHQ}y zRz8F`FZWH~e}weeFf&^1bb8-Qll3=`fnXQjiXTE=>TAIzi~i!MR$LauB;5>>)TH*6 z|3CDmE%~GD+XDiL7*5o&Vh2K3!004jC7Rh)+X@Al=az0rRWKw-)oT>QO}J-f292yH_nu%1b(PgWCqUv4v%GWR8?!-kA!J6?6;?hyg3};%t#Wa~rm{w1@ zFm7>~-MV(L$*$XZsfsF5n!^*+81^fAxroQqB7F|FCzxR4{*nuQBi?!+akGMAvP>lE z#U4Jw0?@*X+@Qdkegl@?_lyM<*nOZk)*isdnsd=uN zJ;ALeU<)n5FJ6HFfiT`#OG2ZTDtAjn04FT>Q_~66{GFYust?+XC%o;+fWnTTz*yr9 zTjY4VPQUhZrPmn7aO#?9C7WF5S@Mg3d#7vBhkaJQnd)lJf-+@5$$g|L zit?9VE=q+gq(K&dv<=%Lb!-c^O|KJOzg0s+7x`FzmPw3;g#Azii#eK#*fqKz-ZME; z?e z^DPbuA8}Mrx+KSLjphsb*Ux-V;FMFZzmQXId9DjM?!4`-_6NevKKJfn=*T{72HOcX z2T(Ii!N^YU;N|!*A7DwjnX2_C@8b2ar8GHllx|Phss!6~6$3cSadrQy%l`C-D2Y5# yFQerQbkCVu&`$^4W2>hzW{STQOE$f0E0*rm$;=GhYpD3;ex$1hjOu(rD)k?ts+kM`