From 027dae53692efc9ac042348e60bfa17e7e93a441 Mon Sep 17 00:00:00 2001
From: Cameron653 <killer65311@gmail.com>
Date: Fri, 20 May 2016 21:39:50 -0400
Subject: [PATCH] Ports wedding rings from Citadel

---
 .../loadout/loadout_gloves_vr.dm                 |   8 ++++++++
 code/modules/clothing/gloves/miscellaneous_vr.dm |  15 +++++++++++++++
 icons/mob/hands_vr.dmi                           | Bin 0 -> 266 bytes
 icons/obj/clothing/gloves_vr.dmi                 | Bin 0 -> 348 bytes
 vorestation.dme                                  |   2 ++
 5 files changed, 25 insertions(+)
 create mode 100644 code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm
 create mode 100644 code/modules/clothing/gloves/miscellaneous_vr.dm
 create mode 100644 icons/mob/hands_vr.dmi
 create mode 100644 icons/obj/clothing/gloves_vr.dmi

diff --git a/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm b/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm
new file mode 100644
index 0000000000..7e0b35e11d
--- /dev/null
+++ b/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm
@@ -0,0 +1,8 @@
+/datum/gear/gloves/goldring
+	display_name = "wedding ring, gold"
+	path = /obj/item/clothing/gloves/weddingring
+
+/datum/gear/gloves/silverring
+	display_name = "wedding ring, silver"
+	path = /obj/item/clothing/gloves/weddingring/silver
+
diff --git a/code/modules/clothing/gloves/miscellaneous_vr.dm b/code/modules/clothing/gloves/miscellaneous_vr.dm
new file mode 100644
index 0000000000..38a2304513
--- /dev/null
+++ b/code/modules/clothing/gloves/miscellaneous_vr.dm
@@ -0,0 +1,15 @@
+/obj/item/clothing/gloves/weddingring
+	name = "golden wedding ring"
+	desc = "For showing your devotion to another person. It has a golden glimmer to it."
+	icon_state = "wedring_g"
+	item_state = "wedring_g"
+	var/partnername = ""
+
+/obj/item/clothing/gloves/weddingring/attack_self(mob/user)
+	partnername = copytext(sanitize(input(user, "Would you like to change the holoengraving on the ring?", "Name your betrothed", "Bae") as null|text),1,MAX_NAME_LEN)
+	name = "[initial(name)] - [partnername]"
+
+/obj/item/clothing/gloves/weddingring/silver
+	name = "silver wedding ring"
+	icon_state = "wedring_s"
+	item_state = "wedring_s"
diff --git a/icons/mob/hands_vr.dmi b/icons/mob/hands_vr.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..876a4e6a87a278608f1721012175cee65488449c
GIT binary patch
literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeG3?%1&o4*=J@dWsUxE?rg;QxQ)YuBy;8D1P2
ztUz(bk|4ie28U-i(tw<zs*s2hm(=3qqRfJl%=|nChKf1CVFg8{-@gPGeEj-E%Uf6L
z+?n&i8$t~(8b5fXbKXbuBtub8?+y#&Amhu%UJ7#_O*%3uL?L*kjp<SiV|`n@*v@Wa
z)y*p;mQ3t6UaMhfE_%f5NJwOl_tH&GtLJmy5M=1j)=+<w_~<Lpc0ErQ#}JRs<OB&;
zW#J7C9PNx{M>Hf@n}s(VkdRSWlz8BdA(z|11U4Dww+#n*8Nz=s+`RSvdIwM^gQu&X
J%Q~loCIA}rW9I+>

literal 0
HcmV?d00001

diff --git a/icons/obj/clothing/gloves_vr.dmi b/icons/obj/clothing/gloves_vr.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..5d98bbb017b4b05b60d3d3d45a51f9f75f0c8717
GIT binary patch
literal 348
zcmV-i0i*tjP)<h;3K|Lk000e1NJLTq002M$001Ba0{{R3P_tvV0000FP)t-sz`(%&
z|1;Ou0M^#lz`(%A+gQ~A0004WQchC<K<3zH0001TdQ@0+L}hbha%pgMX>V=-0C=2J
zR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5
zsXR5MC^IiTK3$26GbOXA7$|1Q#hF%=n41b=W2h{~rBYeJ)z1a&2mp><C?OO(4Lkq<
z0DVbBK~y-6?UBI|fG`LI(O7^fAykkVN(lYeB;*kT(Kx>K9=w(t?g03bmKgUb5JhtX
zMC>dAQFaCZ*jbRs8p!sVnnfUH&IZtV0=mw04+K46D|rIwd<mE%N1(<`E#?IvO=F+Z
uAL*;sn8h^Zo+VAQHSqFP4;r5J>rn^x9S?t1+~be{0000<MNUMnLSTZK8H-T>

literal 0
HcmV?d00001

diff --git a/vorestation.dme b/vorestation.dme
index a15365c1b6..ac72725f16 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1047,6 +1047,7 @@
 #include "code\modules\client\preference_setup\loadout\loadout_eyes.dm"
 #include "code\modules\client\preference_setup\loadout\loadout_general.dm"
 #include "code\modules\client\preference_setup\loadout\loadout_gloves.dm"
+#include "code\modules\client\preference_setup\loadout\loadout_gloves_vr.dm"
 #include "code\modules\client\preference_setup\loadout\loadout_head.dm"
 #include "code\modules\client\preference_setup\loadout\loadout_mask.dm"
 #include "code\modules\client\preference_setup\loadout\loadout_shoes.dm"
@@ -1069,6 +1070,7 @@
 #include "code\modules\clothing\gloves\boxing.dm"
 #include "code\modules\clothing\gloves\color.dm"
 #include "code\modules\clothing\gloves\miscellaneous.dm"
+#include "code\modules\clothing\gloves\miscellaneous_vr.dm"
 #include "code\modules\clothing\head\collectable.dm"
 #include "code\modules\clothing\head\hardhat.dm"
 #include "code\modules\clothing\head\helmet.dm"