From af10c9d0c909713ada6694feb489a84376298b77 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Mon, 6 Sep 2021 13:28:43 +1000 Subject: [PATCH 1/2] Expands the ring selection --- code/__defines/materials.dm | 7 +++ .../loadout/loadout_gloves.dm | 13 ++-- code/modules/clothing/rings/material.dm | 62 +++++++++++++------ 3 files changed, 58 insertions(+), 24 deletions(-) diff --git a/code/__defines/materials.dm b/code/__defines/materials.dm index 75e0ec5bccd..8089ff588b6 100644 --- a/code/__defines/materials.dm +++ b/code/__defines/materials.dm @@ -48,7 +48,14 @@ #define MAT_PAINITE "painite" #define MAT_BOROSILICATE "borosilicate glass" #define MAT_SANDSTONE "sandstone" +<<<<<<< HEAD #define MAT_FLINT "flint" +======= +#define MAT_PLATINUM "platinum" +#define MAT_TRITIUM "tritium" +#define MAT_DEUTERIUM "deuterium" + +>>>>>>> 3ab6620fc18... Merge pull request #8272 from lbnesquik/Kot-material-rings-loadout #define DEFAULT_TABLE_MATERIAL MAT_PLASTIC #define DEFAULT_WALL_MATERIAL MAT_STEEL diff --git a/code/modules/client/preference_setup/loadout/loadout_gloves.dm b/code/modules/client/preference_setup/loadout/loadout_gloves.dm index 2564b8d98e5..fe56eea8684 100644 --- a/code/modules/client/preference_setup/loadout/loadout_gloves.dm +++ b/code/modules/client/preference_setup/loadout/loadout_gloves.dm @@ -92,14 +92,17 @@ ringtype["engagement ring"] = /obj/item/clothing/gloves/ring/engagement 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, iron"] = /obj/item/clothing/gloves/ring/material/iron - 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, wood"] = /obj/item/clothing/gloves/ring/material/wood ringtype["ring, plastic"] = /obj/item/clothing/gloves/ring/material/plastic + ringtype["ring, iron"] = /obj/item/clothing/gloves/ring/material/iron + ringtype["ring, bronze"] = /obj/item/clothing/gloves/ring/material/bronze + ringtype["ring, steel"] = /obj/item/clothing/gloves/ring/material/steel + ringtype["ring, copper"] = /obj/item/clothing/gloves/ring/material/copper + 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 + gear_tweaks += new/datum/gear_tweak/path(ringtype) /datum/gear/gloves/circuitry diff --git a/code/modules/clothing/rings/material.dm b/code/modules/clothing/rings/material.dm index 218065b2533..8fdbda704e2 100644 --- a/code/modules/clothing/rings/material.dm +++ b/code/modules/clothing/rings/material.dm @@ -20,28 +20,52 @@ return material /obj/item/clothing/gloves/ring/material/wood/New(var/newloc) - ..(newloc, "wood") + ..(newloc, MAT_WOOD) /obj/item/clothing/gloves/ring/material/plastic/New(var/newloc) - ..(newloc, "plastic") + ..(newloc, MAT_PLASTIC) /obj/item/clothing/gloves/ring/material/iron/New(var/newloc) - ..(newloc, "iron") - -/obj/item/clothing/gloves/ring/material/steel/New(var/newloc) - ..(newloc, "steel") - -/obj/item/clothing/gloves/ring/material/silver/New(var/newloc) - ..(newloc, "silver") - -/obj/item/clothing/gloves/ring/material/gold/New(var/newloc) - ..(newloc, "gold") - -/obj/item/clothing/gloves/ring/material/platinum/New(var/newloc) - ..(newloc, "platinum") - -/obj/item/clothing/gloves/ring/material/phoron/New(var/newloc) - ..(newloc, "phoron") + ..(newloc, MAT_IRON) /obj/item/clothing/gloves/ring/material/glass/New(var/newloc) - ..(newloc, "glass") + ..(newloc, MAT_GLASS) + +/obj/item/clothing/gloves/ring/material/steel/New(var/newloc) + ..(newloc, MAT_STEEL) + +/obj/item/clothing/gloves/ring/material/silver/New(var/newloc) + ..(newloc, MAT_SILVER) + +/obj/item/clothing/gloves/ring/material/gold/New(var/newloc) + ..(newloc, MAT_GOLD) + +/obj/item/clothing/gloves/ring/material/platinum/New(var/newloc) + ..(newloc, MAT_PLATINUM) + +/obj/item/clothing/gloves/ring/material/phoron/New(var/newloc) + ..(newloc, MAT_PHORON) + +/obj/item/clothing/gloves/ring/material/titanium/New(var/newloc) + ..(newloc, MAT_TITANIUM) + +/obj/item/clothing/gloves/ring/material/copper/New(var/newloc) + ..(newloc, MAT_COPPER) + +/obj/item/clothing/gloves/ring/material/bronze/New(var/newloc) + ..(newloc, MAT_BRONZE) + +/obj/item/clothing/gloves/ring/material/uranium/New(var/newloc) + ..(newloc, MAT_URANIUM) + +/obj/item/clothing/gloves/ring/material/osmium/New(var/newloc) + ..(newloc, MAT_OSMIUM) + +/obj/item/clothing/gloves/ring/material/lead/New(var/newloc) + ..(newloc, MAT_LEAD) + +/obj/item/clothing/gloves/ring/material/diamond/New(var/newloc) + ..(newloc, MAT_DIAMOND) + +/obj/item/clothing/gloves/ring/material/tin/New(var/newloc) + ..(newloc, MAT_TIN) From 27bf0c07d4900f1e2a500d1cf76006687c9fb334 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Fri, 22 Oct 2021 14:22:58 -0400 Subject: [PATCH 2/2] Fix merge --- code/__defines/materials.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/__defines/materials.dm b/code/__defines/materials.dm index 8089ff588b6..6cfae3ed57d 100644 --- a/code/__defines/materials.dm +++ b/code/__defines/materials.dm @@ -48,14 +48,11 @@ #define MAT_PAINITE "painite" #define MAT_BOROSILICATE "borosilicate glass" #define MAT_SANDSTONE "sandstone" -<<<<<<< HEAD #define MAT_FLINT "flint" -======= #define MAT_PLATINUM "platinum" #define MAT_TRITIUM "tritium" #define MAT_DEUTERIUM "deuterium" ->>>>>>> 3ab6620fc18... Merge pull request #8272 from lbnesquik/Kot-material-rings-loadout #define DEFAULT_TABLE_MATERIAL MAT_PLASTIC #define DEFAULT_WALL_MATERIAL MAT_STEEL