From 2eea96e388c8f7108dd999eb450de8ee4f038fa2 Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Thu, 4 Sep 2025 12:11:49 +1000 Subject: [PATCH] ring expansion (#7274) more ring in loadout --- .../modules/clothing/gloves/rings/material.dm | 30 +++++++++++++++++++ code/modules/loadout/loadout_gloves.dm | 10 +++++++ 2 files changed, 40 insertions(+) diff --git a/code/modules/clothing/gloves/rings/material.dm b/code/modules/clothing/gloves/rings/material.dm index 8469d14acd9..525564b6a64 100644 --- a/code/modules/clothing/gloves/rings/material.dm +++ b/code/modules/clothing/gloves/rings/material.dm @@ -21,12 +21,33 @@ /obj/item/clothing/gloves/ring/material/wood material_parts = /datum/prototype/material/wood_plank +/obj/item/clothing/gloves/ring/material/sifwood + material_parts = /datum/prototype/material/wood_plank/sif + +/obj/item/clothing/gloves/ring/material/hardwood + material_parts = /datum/prototype/material/wood_plank/hardwood + +/obj/item/clothing/gloves/ring/material/bone + material_parts = /datum/prototype/material/bone + +/obj/item/clothing/gloves/ring/material/chitin + material_parts = /datum/prototype/material/chitin + /obj/item/clothing/gloves/ring/material/plastic material_parts = /datum/prototype/material/plastic /obj/item/clothing/gloves/ring/material/iron material_parts = /datum/prototype/material/iron +/obj/item/clothing/gloves/ring/material/copper + material_parts = /datum/prototype/material/copper + +/obj/item/clothing/gloves/ring/material/bronze + material_parts = /datum/prototype/material/bronze + +/obj/item/clothing/gloves/ring/material/brass + material_parts = /datum/prototype/material/brass + /obj/item/clothing/gloves/ring/material/steel material_parts = /datum/prototype/material/steel @@ -45,12 +66,21 @@ /obj/item/clothing/gloves/ring/material/glass material_parts = /datum/prototype/material/glass +/obj/item/clothing/gloves/ring/material/borosilicate + material_parts = /datum/prototype/material/glass/phoron + /obj/item/clothing/gloves/ring/material/uranium material_parts = /datum/prototype/material/uranium /obj/item/clothing/gloves/ring/material/osmium material_parts = /datum/prototype/material/osmium +/obj/item/clothing/gloves/ring/material/plasteel + material_parts = /datum/prototype/material/plasteel + +/obj/item/clothing/gloves/ring/material/titanium + material_parts = /datum/prototype/material/plasteel/titanium + /obj/item/clothing/gloves/ring/material/mhydrogen material_parts = /datum/prototype/material/hydrogen/mhydrogen diff --git a/code/modules/loadout/loadout_gloves.dm b/code/modules/loadout/loadout_gloves.dm index e094915b0ef..75b71fe526b 100644 --- a/code/modules/loadout/loadout_gloves.dm +++ b/code/modules/loadout/loadout_gloves.dm @@ -86,12 +86,22 @@ ringtype["Signet Ring"] = /obj/item/clothing/gloves/ring/seal/signet ringtype["Masonic Ring"] = /obj/item/clothing/gloves/ring/seal/mason ringtype["Ring - Steel"] = /obj/item/clothing/gloves/ring/material/steel + ringtype["Ring - Plasteel"] = /obj/item/clothing/gloves/ring/material/plasteel + ringtype["Ring - Titanium"] = /obj/item/clothing/gloves/ring/material/titanium ringtype["Ring - Iron"] = /obj/item/clothing/gloves/ring/material/iron + ringtype["Ring - Copper"] = /obj/item/clothing/gloves/ring/material/copper + ringtype["Ring - Bronze"] = /obj/item/clothing/gloves/ring/material/bronze + ringtype["Ring - Brass"] = /obj/item/clothing/gloves/ring/material/brass ringtype["Ring - Silver"] = /obj/item/clothing/gloves/ring/material/silver ringtype["Ring - Gold"] = /obj/item/clothing/gloves/ring/material/gold ringtype["Ring - Platinum"] = /obj/item/clothing/gloves/ring/material/platinum ringtype["Ring - Glass"] = /obj/item/clothing/gloves/ring/material/glass + ringtype["Ring - Borosilicate"] = /obj/item/clothing/gloves/ring/material/borosilicate ringtype["Ring - Wood"] = /obj/item/clothing/gloves/ring/material/wood + ringtype["Ring - Sifwood"] = /obj/item/clothing/gloves/ring/material/sifwood + ringtype["Ring - Hardwood"] = /obj/item/clothing/gloves/ring/material/hardwood + ringtype["Ring - Bone"] = /obj/item/clothing/gloves/ring/material/bone + ringtype["Ring - Chitin"] = /obj/item/clothing/gloves/ring/material/chitin ringtype["Ring - Plastic"] = /obj/item/clothing/gloves/ring/material/plastic ringtype["Ring - Uranium"] = /obj/item/clothing/gloves/ring/material/uranium ringtype["Ring - Osmium"] = /obj/item/clothing/gloves/ring/material/osmium