From 1b0ea1e22683526c444d4f7235672bf9148293f0 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Wed, 29 Apr 2015 19:05:43 -0400
Subject: [PATCH] Adds in Rings

---
 .../crates_lockers/closets/wardrobe.dm        |   4 +
 code/modules/clothing/gloves/boxing.dm        |   1 +
 code/modules/clothing/gloves/rings.dm         |  97 ++++++++++++++++++
 code/modules/mining/coins.dm                  |  13 +++
 icons/obj/clothing/rings.dmi                  | Bin 0 -> 3041 bytes
 paradise.dme                                  |   1 +
 6 files changed, 116 insertions(+)
 create mode 100644 code/modules/clothing/gloves/rings.dm
 create mode 100644 icons/obj/clothing/rings.dmi

diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index fcead78a565..48dd73532bf 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -105,6 +105,10 @@
 	new /obj/item/weapon/storage/backpack/cultpack (src)
 	new /obj/item/weapon/storage/fancy/candle_box(src)
 	new /obj/item/weapon/storage/fancy/candle_box(src)
+	new /obj/item/clothing/gloves/ring/silver(src)
+	new /obj/item/clothing/gloves/ring/silver(src)
+	new /obj/item/clothing/gloves/ring/gold(src)
+	new /obj/item/clothing/gloves/ring/gold(src)
 	return
 
 
diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm
index f9638c18bce..ee3e0849d80 100644
--- a/code/modules/clothing/gloves/boxing.dm
+++ b/code/modules/clothing/gloves/boxing.dm
@@ -3,6 +3,7 @@
 	desc = "Because you really needed another excuse to punch your crewmates."
 	icon_state = "boxing"
 	item_state = "boxing"
+	species_restricted = null
 	species_fit = list("Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/gloves.dmi'
diff --git a/code/modules/clothing/gloves/rings.dm b/code/modules/clothing/gloves/rings.dm
new file mode 100644
index 00000000000..90b012d0580
--- /dev/null
+++ b/code/modules/clothing/gloves/rings.dm
@@ -0,0 +1,97 @@
+/obj/item/clothing/gloves/ring
+	name = "iron ring"
+	desc = "A band that goes around your finger.  It's considered gauche to wear more than one."
+	gender = "neuter" // not plural anymore
+	transfer_prints = TRUE
+	icon_state = "ironring"
+	item_state = ""
+	icon = 'icons/obj/clothing/rings.dmi'
+	var/material = "iron"
+	var/stud = 0
+	species_restricted = null
+
+	New()
+		..()
+		update_icon()
+
+	update_icon()
+		if(stud)
+			icon_state = "d_[initial(icon_state)]"
+		else
+			icon_state = initial(icon_state)
+	examine()
+		..()
+		usr << "This one is made of [material]."
+		if(stud)
+			usr << "It is adorned with a single gem."
+
+/obj/item/clothing/gloves/ring/attackby(obj/item/I as obj, mob/user as mob, params)
+	if(istype(I, /obj/item/stack/sheet/mineral/diamond))
+		var/obj/item/stack/sheet/mineral/diamond/D = I
+		if(stud)
+			usr << "<span class='notice'>The [src] already has a gem.</span>"
+		else
+			if(D.amount >= 1)
+				D.use(1)
+				stud = 1
+				update_icon()
+				usr << "<span class='notice'>You socket the diamond into the [src].</span>"
+
+// s'pensive
+/obj/item/clothing/gloves/ring/silver
+	name =  "silver ring"
+	icon_state = "silverring"
+	material = "silver"
+
+/obj/item/clothing/gloves/ring/silver/blessed // todo
+	name = "blessed silver ring"
+
+/obj/item/clothing/gloves/ring/gold
+	name =  "gold ring"
+	icon_state = "goldring"
+	material = "gold"
+
+/obj/item/clothing/gloves/ring/gold/blessed
+	name = "wedding band"
+
+// cheap
+/obj/item/clothing/gloves/ring/plastic
+	name =  "white plastic ring"
+	icon_state = "whitering"
+	material = "plastic"
+
+/obj/item/clothing/gloves/ring/plastic/blue
+	name =  "blue plastic ring"
+	icon_state = "bluering"
+
+/obj/item/clothing/gloves/ring/plastic/red
+	name =  "red plastic ring"
+	icon_state = "redring"
+
+/obj/item/clothing/gloves/ring/plastic/random
+	New()
+		var/c = pick("white","blue","red")
+		name = "[c] plastic ring"
+		icon_state = "[c]ring"
+
+// weird
+/obj/item/clothing/gloves/ring/glass
+	name = "glass ring"
+	icon_state = "whitering"
+	material = "glass"
+
+/obj/item/clothing/gloves/ring/plasma
+	name = "plasma ring"
+	icon_state = "plasmaring"
+	material = "plasma"
+
+/obj/item/clothing/gloves/ring/uranium
+	name = "uranium ring"
+	icon_state = "uraniumring"
+	material = "uranium"
+
+// cultish
+/obj/item/clothing/gloves/ring/shadow
+	name = "shadow ring"
+	icon_state = "shadowring"
+	material = "shadows"
diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm
index cc1e966ff46..16c4f90fde1 100644
--- a/code/modules/mining/coins.dm
+++ b/code/modules/mining/coins.dm
@@ -101,6 +101,19 @@
 		overlays = list()
 		string_attached = null
 		user << "<span class='notice'>You detach the string from the coin.</span>"
+	else if(istype(W,/obj/item/weapon/weldingtool))
+		var/obj/item/weapon/weldingtool/WT = W
+		if(WT.welding && WT.remove_fuel(0, user))
+			var/typelist = list("iron" = /obj/item/clothing/gloves/ring,
+								"silver" = /obj/item/clothing/gloves/ring/silver,
+								"gold" = /obj/item/clothing/gloves/ring/gold,
+								"plasma" = /obj/item/clothing/gloves/ring/plasma,
+								"uranium" = /obj/item/clothing/gloves/ring/uranium)
+			var/typekey = typelist[cmineral]
+			if(ispath(typekey))
+				user << "\blue You make [src] into a ring."
+				new typekey(get_turf(loc))
+				qdel(src)
 	else ..()
 
 /obj/item/weapon/coin/attack_self(mob/user as mob)
diff --git a/icons/obj/clothing/rings.dmi b/icons/obj/clothing/rings.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..d378c34e04e0aafa146a7131820cb3df7015a137
GIT binary patch
literal 3041
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
AcmMzZ

literal 0
HcmV?d00001

diff --git a/paradise.dme b/paradise.dme
index ba458be8dd2..e00b85bb140 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -914,6 +914,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\rings.dm"
 #include "code\modules\clothing\head\collectable.dm"
 #include "code\modules\clothing\head\hardhat.dm"
 #include "code\modules\clothing\head\helmet.dm"