cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Ring/Watch Accessory Transfer (#9489)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-11-19 11:14:32 -07:00
committed by GitHub
parent cc1e6f932e
commit f7e9f8d12b
105 changed files with 799 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
code/modules/client/preference_setup/loadout/loadout_gloves.dm
View File

@@ -74,27 +74,27 @@
/datum/gear/gloves/ring
display_name = "ring selection"
description = "Choose from a number of rings."
path = /obj/item/clothing/gloves/ring
path = /obj/item/clothing/accessory/ring
cost = 1
/datum/gear/gloves/ring/New()
..()
var/ringtype = list()
ringtype["CTI ring"] = /obj/item/clothing/gloves/ring/cti
ringtype["Mariner University ring"] = /obj/item/clothing/gloves/ring/mariner
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, 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
ringtype["CTI ring"] = /obj/item/clothing/accessory/ring/cti
ringtype["Mariner University ring"] = /obj/item/clothing/accessory/ring/mariner
ringtype["engagement ring"] = /obj/item/clothing/accessory/ring/engagement
ringtype["signet ring"] = /obj/item/clothing/accessory/ring/seal/signet
ringtype["masonic ring"] = /obj/item/clothing/accessory/ring/seal/mason
ringtype["ring, glass"] = /obj/item/clothing/accessory/ring/material/glass
ringtype["ring, wood"] = /obj/item/clothing/accessory/ring/material/wood
ringtype["ring, plastic"] = /obj/item/clothing/accessory/ring/material/plastic
ringtype["ring, iron"] = /obj/item/clothing/accessory/ring/material/iron
ringtype["ring, bronze"] = /obj/item/clothing/accessory/ring/material/bronze
ringtype["ring, steel"] = /obj/item/clothing/accessory/ring/material/steel
ringtype["ring, copper"] = /obj/item/clothing/accessory/ring/material/copper
ringtype["ring, silver"] = /obj/item/clothing/accessory/ring/material/silver
ringtype["ring, gold"] = /obj/item/clothing/accessory/ring/material/gold
ringtype["ring, platinum"] = /obj/item/clothing/accessory/ring/material/platinum
gear_tweaks += new/datum/gear_tweak/path(ringtype)
@@ -105,14 +105,14 @@
/datum/gear/gloves/watch
display_name = "wristwatch selector"
description = "Pick from a range of wristwatches."
path = /obj/item/clothing/gloves/watch
path = /obj/item/clothing/accessory/watch
/datum/gear/gloves/watch/New()
..()
var/list/selector_watches = list(
"plain plastic"=/obj/item/clothing/gloves/watch,
"silver"=/obj/item/clothing/gloves/watch/silver,
"gold"=/obj/item/clothing/gloves/watch/gold,
"survival"=/obj/item/clothing/gloves/watch/survival
"plain plastic"=/obj/item/clothing/accessory/watch,
"silver"=/obj/item/clothing/accessory/watch/silver,
"gold"=/obj/item/clothing/accessory/watch/gold,
"survival"=/obj/item/clothing/accessory/watch/survival
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_watches))