From 7eb73ca9030b02d6f8279902337b7d3f951ac9d7 Mon Sep 17 00:00:00 2001 From: Chloe Carver-Brown Date: Thu, 27 May 2021 16:40:15 +0100 Subject: [PATCH] pog --- code/game/objects/items/storage/fancy.dm | 6 ++++++ code/modules/clothing/gloves/ring.dm | 8 +++++++- icons/obj/ring.dmi | Bin 815 -> 1105 bytes .../code/modules/client/loadout/__donator.dm | 6 +++--- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 8754a2cc..2d1b0b57 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -392,3 +392,9 @@ icon_type = "silver ring" spawn_type = /obj/item/clothing/gloves/ring/silver +/obj/item/storage/fancy/ringbox/lyricalpaws + name = "Ornate Ring Box" + desc = "A rich royal blue felted box, the inside lined with a beautiful black silk. It was clearly designed to hold a ring of sorts." + icon_state = "paws ringbox" + icon_type = "ornate ring" + spawn_type = /obj/item/clothing/gloves/ring/lyricalpaws diff --git a/code/modules/clothing/gloves/ring.dm b/code/modules/clothing/gloves/ring.dm index 430469a0..245ed606 100644 --- a/code/modules/clothing/gloves/ring.dm +++ b/code/modules/clothing/gloves/ring.dm @@ -29,4 +29,10 @@ name = "silver ring" item_state = "sring" icon_state = "ringsilver" - desc = "A tiny silver ring, sized to wrap around a finger." \ No newline at end of file + desc = "A tiny silver ring, sized to wrap around a finger." + +/obj/item/clothing/gloves/ring/lyricalpaws + name = "Ornate Wedding Ring" + item_state = "dring" + icon_state = "ringpaws" + desc = "A worn golden ring emblazoned with a finely cut Emerald and Ruby alongside each other. The inside of the ring has the phrase 'Per aspera ad astra.' engraved in to it." \ No newline at end of file diff --git a/icons/obj/ring.dmi b/icons/obj/ring.dmi index 3b985fa262eb6be016f49edbf2d4c7b702283790..ef564a9a71cc7e55b33dd53a375fff1ee552e518 100644 GIT binary patch literal 1105 zcmV-X1g`suP)004jp0{{R3ySfFDZ*Bkp zc$}5fu?~YE5C-5Go`UG!Xxp_*qiG!KJJ3M!5)}ia_VEkVG&(dK+d)2#pG(NuwZ1hi ztL_bbNn=5e?8456f|418>-^$$q@jFxKyslspX|vhE2yxgE67G zISfJxfzo9+E}|L#|BuZk?KdA=3d>Ta_d!ZOyaqivvQLzwG6nzu0Q^7nYML)-J-^e~ zzF#k(RwT2af!~Hh%jDf)CoDY3`iQb)9#< z$8LZ8*0liUg8%>k000000NTX!91EPUeZwK=-0}mXkr2X?kH^06(|(gjF9-sgpkqE4 zMq#KN$vjTtSUFO$OyzW{94SBVi!z)IXhYYVeI%nOwA3(>i83T>DCcsX`94)cZ}FrI zz1f^L)Z;Uc9-l=^DI?DFJU1IAD=8BpilQ(Zrc%mO|6Lmmy`D0hctMuUDZ{?@^GLyP zxm+r>P5x{aj906bQri|UX2DAZwcuBxguTT=osu#mOK6|Z4Wmf=vCXqtaFit4k8NMf zg5z&ls{JUzS>#<#arvDTwC}-T81aqr~=`~rP# zCK&P`n~mCmlwd4=ZntU&S_Rb(qy)3zS6S|MO$8Yb`F_98bF&{~A{K|kp(xCLjQLYP zP1E(-?8lfo9>?QxwzrOS7C}c|U1;wHs^2wL)BJSSR8)R7r?-Ev zqe`Iji6yVjmkOV|6fD(;7JRK~Pw-?v1+Kh$r!7HO1+L8@*tsBcZJ}#(00000+#G)Z XU4~fPv0}V`00000NkvXXu0mjfzElx& literal 815 zcmV+~1JL}5P)C0001cP)t-sz`($n z05kspGt2-pGXOIH003qHGv&ES;;I|v!fF54b^rhWX8-^H%mCKr^Z((rLyO@60004WQchCV=- z0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zi zl2jm5sVFlqJt@CJiHkEOv#1y-V#vjrR+N~V3Sq<5rDP`N=I5m-5Uaj8GY9AtqLruT z=MZl;RGk5-jwY-D)zyU6BRiX9=NOV?JYm(Sjwh@hq!45SQ3@f36QvaDOp$pCz6do0004|Nkl@E^6h-l)hCpo+n-K{_Lt@+f|6f>W>@MKy z4KD6k#KqOzGYs>_#~1(rfR|#kkTKr|qTis-*=D;7Y@;tA&e>+S5Pbo0&h~E$`%HQM z6M#VWIRF3v00000$p5$eu|DU^b8kk6$M$;2l)r$$Kbi9UcK`zU2N3`O00000fc$TF zQE<*v0>t}&Daz72#D7n``3NaQnL2~8KEFR%ua8gik9aOBDFx?sUB?U#;r+*C!L$4$ z7)0{2sw!XI)TgKb>Hc2`5&BtkiVD!)fua<=@%=nJ^9YpuvuXSd$Rxmc$=kNA>u5jq zAmV-mv~_Y25yN?U4gvrG0002+3Y^bMsYHIcXsrqRJJWUEAr?z3``$Z{^&4rtLG%pd zRbFpe)184Cq%=x7=hh9Zl+uRJk;tGMhQU`)?!GSYcLG7+i$>sVOz3CReO=)4eY2sT zPM|Yt^8G42*97{d*J?}B?*%&bGfn;mBnA8pAQE7zQ}aAKx8Bc~?zOdc9I5)5@*`k& t@j;~h2yi3iAW|wl2PtO&004k&`~vyvAc>o51DpT=002ovPDHLkV1ixUh${d9 diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index b715a8b3..e2df1e45 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -112,10 +112,10 @@ cost = 0 ckeywhitelist = list("lyricalpaws") -datum/gear/darksabresheath - name = "Dark Sabre Sheath" +datum/gear/lyricalpawsring + name = "Ornate Ring Box" category = SLOT_IN_BACKPACK - path = /obj/item/storage/belt/sabre/chloesabre + path = /obj/item/storage/fancy/ringbox/lyricalpaws ckeywhitelist = list("lyricalpaws") /datum/gear/cherostavikmask