From 3f155a9f137e6ae618bf131aa04715aab97709ed Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Thu, 13 Feb 2020 21:55:32 -0500 Subject: [PATCH 1/5] less shitty rings stolen from RP --- icons/obj/ring.dmi | Bin 550 -> 812 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/ring.dmi b/icons/obj/ring.dmi index 52fe249394d60452225592422e0862afb6ff222d..e24f1fab4c93fdee3bb6bb11d998453809dde4f1 100644 GIT binary patch delta 602 zcmV-g0;TI) z<+(}XsvG6PY5&)C|NsC0%m8Np|JLU7|Kpzj#zMxG7vi%!|KOhg(rduLz@VU@ii(Q4 zxw)#Us%&g*uCA`a!ot_r*Rucr%>VzjwYB5p%- z{Dnl3PRV}(rAb6VRCt{2mrHYkFcgL3qmqXeu#6!A6jE&Y|G%(_*d4*uowzvPLKjCl z-()g(xQqb+0C+1lGYRu;Ao>gHoNczdz&82-;+$=EGtmbS=WPEmvrm+#KLH3Np925@ z00000fb_5B&-FQ7o_aGnJh#_FqWld6{z;UlzXN{|NI!@G000000088#-C4#tUlSnS z|AiF7JH-D_y!l8arC2+Ius$DOtk<6}@>4vQxl)qzq9|ephtPjqEqIlmf%{l6w!X_LB#zCsEXA= zL=1oD>vIqQ00000fOp_>(OR$Mb#08Ht5;SvjdzItpzYe$JCOBX)%B)z{0utPc>}sL zuu3T#zWZf^ZcwT-#yLl1@Hl}W@VzY14#VK9M|Y@~07*qoM6N<$g65ek;s5{u delta 338 zcmV-Y0j>V52Brj%7&Zh00000n5PbLm001FSOjJd{z`&URGyecH%m6bp05bpp0A>I) z|I7ep|NqwJ^T5EsAgt!9k*LXk0QpHoK~!jg?UpeP!XOxh=~TNFJ%K%fT)@R6kfvLg zI(IQRx|le2ap1P1OADRg8QYlmh2;&r{QMB!F9ad~L?)#~w2)P`F99vKN*zi-i=9%c z1hhD5t&f1lD_GtDeg}jQLe>QQt!FN-5sfEP=hC(XG;VNqw18egymLN(AcPPy1^&jP z=Yf#uBns*DC5Z2Ppr3x6&kX9?-w^7inHl7!A4T*$;4sFFBB2Ml5t9;94Ep!_nnA)t z@{f>$*TfWZumC~`A!}!IgSO}9`j~2KBMppiP*^)e7T|}a9g4UT{J3@opY>A%^ax?z kM>lbn_tDo#$b!58+h}<{9 From 5c246fd389f4390c9e3795c2d92708b7070164e1 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 14 Feb 2020 03:00:31 +0000 Subject: [PATCH 2/5] diamond ring changes More code I stole from RP --- code/modules/clothing/gloves/ring.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/gloves/ring.dm b/code/modules/clothing/gloves/ring.dm index 54aaa58849..22781abeea 100644 --- a/code/modules/clothing/gloves/ring.dm +++ b/code/modules/clothing/gloves/ring.dm @@ -17,8 +17,11 @@ /obj/item/clothing/gloves/ring/diamond name = "diamond ring" - desc = "A tiny gold ring, studded with a diamond. Cultures have used these rings in courtship for a millenia." + desc = "An expensive ring, studded with a diamond. Cultures have used these rings in courtship for a millenia." icon_state = "ringdiamond" + +/obj/item/clothing/gloves/ring/diamond/attack_self(mob/user) + user.visible_message("\The [user] gets down on one knee, presenting \the [src].","You get down on one knee, presenting \the [src].") /obj/item/clothing/gloves/ring/silver name = "silver ring" From 6046d5b0b517acfe4dc2c21cbe7146bb4af6d90b Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Thu, 13 Feb 2020 22:49:27 -0500 Subject: [PATCH 3/5] rings on hands --- icons/mob/hands.dmi | Bin 9070 -> 9409 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index b69c6c88b1c9d20ba46a0f5a830f6eab4493b9c6..0475117d1433351deb68d07cb0798e7d69761476 100644 GIT binary patch literal 9409 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 literal 9070 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 Y=B48FbG?&~cL$kXx4Kqibmz(c0kY*4lK=n! From 2924be6a8007e073904689d44d38018de2fe5f6d Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Fri, 14 Feb 2020 03:52:10 +0000 Subject: [PATCH 4/5] now with visible rings on hand(s) --- code/modules/clothing/gloves/ring.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/clothing/gloves/ring.dm b/code/modules/clothing/gloves/ring.dm index 22781abeea..8354f13bd2 100644 --- a/code/modules/clothing/gloves/ring.dm +++ b/code/modules/clothing/gloves/ring.dm @@ -5,6 +5,7 @@ w_class = WEIGHT_CLASS_TINY icon = 'icons/obj/ring.dmi' icon_state = "ringgold" + item_state = "gring" body_parts_covered = 0 attack_verb = list("proposed") transfer_prints = TRUE @@ -19,6 +20,7 @@ name = "diamond ring" desc = "An expensive ring, studded with a diamond. Cultures have used these rings in courtship for a millenia." icon_state = "ringdiamond" + item_state = "dring" /obj/item/clothing/gloves/ring/diamond/attack_self(mob/user) user.visible_message("\The [user] gets down on one knee, presenting \the [src].","You get down on one knee, presenting \the [src].") @@ -27,3 +29,4 @@ name = "silver ring" desc = "A tiny silver ring, sized to wrap around a finger." icon_state = "ringsilver" + item_state = "sring" From 8bf302563698628cf8a9d0a640c6198a0f7f7b85 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Thu, 13 Feb 2020 22:53:14 -0500 Subject: [PATCH 5/5] mislabeled ring rings on hands --- icons/mob/hands.dmi | Bin 9409 -> 9410 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 0475117d1433351deb68d07cb0798e7d69761476..63263b835ca57b2498dadee68312dae99ea1411b 100644 GIT binary patch delta 283 zcmV+$0p$L{Ny15xBmp^*B{_ecs{9=zeX;ES?qAc}>Ak&Bb8gk0CAk==rsK;_RkJgB zpqdV^sv6kYAwNG-)|siMmA5|LIjvM>oFuC0sH&UjPfk?R{?`SU#d!wx47vyCI)B{_fHn!lr^&nNr8yEVO?-rEZ`=T_ZWl8b?AI=<{wH9M0B zs_F2ms)3yy^7D|g&P+9}y!G+UX{9RTBvDOARoz5?a-y2{zb?2e&NHZI&^MmJh|l%e%8D%8R##vV+m4!)H9E`EH+!|F)1{&2+^Pw0%xC2S?IF{Kvt|KYBh)~Y;Q#;t