cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-05 15:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wrist Slot (Wear watches with gloves!) (#10951)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2021-02-01 18:12:37 +08:00
committed by GitHub
parent a9e6e0db73
commit f88fdd706d
64 changed files with 684 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/client/preference_setup/loadout/loadout_accessories.dm
View File

@@ -4,11 +4,6 @@
slot = slot_tie
sort_category = "Accessories"
/datum/gear/accessory/bracelet
display_name = "bracelet (colourable)"
path = /obj/item/clothing/accessory/bracelet
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/suspenders
display_name = "suspenders"
path = /obj/item/clothing/accessory/suspenders

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

@@ -63,21 +63,6 @@
ringtype["ring, plastic"] = /obj/item/clothing/ring/material/plastic
gear_tweaks += new/datum/gear_tweak/path(ringtype)
/datum/gear/gloves/watch
display_name = "watch selection"
description = "A selection of watches."
path = /obj/item/clothing/gloves/watch
/datum/gear/gloves/watch/New()
..()
var/watchtype = list()
watchtype["watch"] = /obj/item/clothing/gloves/watch
watchtype["silver watch"] = /obj/item/clothing/gloves/watch/silver
watchtype["gold watch"] = /obj/item/clothing/gloves/watch/gold
watchtype["spy watch"] = /obj/item/clothing/gloves/watch/spy
watchtype["pocketwatch"] = /obj/item/pocketwatch
gear_tweaks += new/datum/gear_tweak/path(watchtype)
/datum/gear/gloves/circuitry
display_name = "gloves, circuitry (empty)"
path = /obj/item/clothing/gloves/circuitry

31
code/modules/client/preference_setup/loadout/loadout_wrists.dm Normal file
View File

@@ -0,0 +1,31 @@
/datum/gear/wrists
display_name = "bracelet"
path = /obj/item/clothing/wrists/bracelet
cost = 1
slot = slot_wrists
sort_category = "Wristwear"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/wrists/beaded
display_name = "beaded bracelet"
path = /obj/item/clothing/wrists/beaded
/datum/gear/wrists/slap
display_name = "slap bracelet"
path = /obj/item/clothing/wrists/slap
/datum/gear/wrists/watch
display_name = "watch selection"
description = "A selection of watches."
path = /obj/item/clothing/wrists/watch
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
/datum/gear/wrists/watch/New()
..()
var/watchtype = list()
watchtype["watch"] = /obj/item/clothing/wrists/watch
watchtype["silver watch"] = /obj/item/clothing/wrists/watch/silver
watchtype["gold watch"] = /obj/item/clothing/wrists/watch/gold
watchtype["spy watch"] = /obj/item/clothing/wrists/watch/spy
watchtype["pocketwatch"] = /obj/item/pocketwatch
gear_tweaks += new/datum/gear_tweak/path(watchtype)

26
code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm
View File

@@ -30,36 +30,34 @@
crest["crest, ruby"] = /obj/item/clothing/head/crest/ruby
gear_tweaks += new/datum/gear_tweak/path(crest)
/datum/gear/gloves/armchains
/datum/gear/wrists/armchains
display_name = "golden deep armchains"
path = /obj/item/clothing/gloves/armchain
cost = 1
path = /obj/item/clothing/wrists/armchain
whitelisted = list(SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
sort_category = "Xenowear - IPC"
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/gloves/armchains/New()
/datum/gear/wrists/armchains/New()
..()
var/armchains = list()
armchains["arm chains, cobalt"] = /obj/item/clothing/gloves/armchain
armchains["arm chains, emerald"] = /obj/item/clothing/gloves/armchain/emerald
armchains["arm chains, ruby"] = /obj/item/clothing/gloves/armchain/ruby
armchains["arm chains, cobalt"] = /obj/item/clothing/wrists/armchain
armchains["arm chains, emerald"] = /obj/item/clothing/wrists/armchain/emerald
armchains["arm chains, ruby"] = /obj/item/clothing/wrists/armchain/ruby
gear_tweaks += new/datum/gear_tweak/path(armchains)
/datum/gear/gloves/bracers
/datum/gear/wrists/bracers
display_name = "golden deep bracers"
path = /obj/item/clothing/gloves/goldbracer
cost = 1
path = /obj/item/clothing/wrists/goldbracer
whitelisted = list(SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
sort_category = "Xenowear - IPC"
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/gloves/bracers/New()
/datum/gear/wrists/bracers/New()
..()
var/bracers = list()
bracers["arm chains, cobalt"] = /obj/item/clothing/gloves/goldbracer
bracers["arm chains, emerald"] = /obj/item/clothing/gloves/goldbracer/emerald
bracers["arm chains, ruby"] = /obj/item/clothing/gloves/goldbracer/ruby
bracers["arm chains, cobalt"] = /obj/item/clothing/wrists/goldbracer
bracers["arm chains, emerald"] = /obj/item/clothing/wrists/goldbracer/emerald
bracers["arm chains, ruby"] = /obj/item/clothing/wrists/goldbracer/ruby
gear_tweaks += new/datum/gear_tweak/path(bracers)
/datum/gear/ears/antennae