cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-21 12:16:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8636 from Greenjoe12345/clothingmay22

Browse Source 
clothing port May 2022
This commit is contained in:
Atermonera
2022-05-14 21:11:51 -08:00
committed by GitHub
parent a5a9d81445 3165f0d5a9
commit 032c899201
31 changed files with 306 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+70 -1
View File
@@ -247,13 +247,32 @@
bracelettype["bracelet, platinum"] = /obj/item/clothing/accessory/bracelet/material/platinum
bracelettype["bracelet, glass"] = /obj/item/clothing/accessory/bracelet/material/glass
bracelettype["bracelet, wood"] = /obj/item/clothing/accessory/bracelet/material/wood
bracelettype["bracelet, sivian wood"] = /obj/item/clothing/accessory/bracelet/material/sifwood
bracelettype["bracelet, plastic"] = /obj/item/clothing/accessory/bracelet/material/plastic
bracelettype["bracelet, copper"] = /obj/item/clothing/accessory/bracelet/material/copper
bracelettype["bracelet, bronze"] = /obj/item/clothing/accessory/bracelet/material/bronze
gear_tweaks += new/datum/gear_tweak/path(bracelettype)
/datum/gear/accessory/bracelet/friendship
display_name = "friendship bracelet"
path = /obj/item/clothing/accessory/bracelet/friendship
/datum/gear/accessory/bracelet/slap
display_name = "slap bracelet (recolorable)"
path = /obj/item/clothing/accessory/bracelet/slap
/datum/gear/accessory/bracelet/slap/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/accessory/bracelet/beaded
display_name = "beaded bracelet (recolorable)"
path = /obj/item/clothing/accessory/bracelet/beaded
/datum/gear/accessory/bracelet/beaded/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/accessory/stethoscope
display_name = "stethoscope"
path = /obj/item/clothing/accessory/stethoscope
@@ -331,4 +350,54 @@
/datum/gear/accessory/pressbadge
display_name = "freelance press pass"
path = /obj/item/clothing/accessory/badge/press/independent
path = /obj/item/clothing/accessory/badge/press/independent
/datum/gear/accessory/legbrace
display_name = "leg braces"
path = /obj/item/clothing/accessory/legbrace
/datum/gear/accessory/neckerchief
display_name = "neckerchief, color select"
path = /obj/item/clothing/accessory/neckerchief
/datum/gear/accessory/necklace
display_name = "necklace selection"
description = "Choose from a number of neclkaces."
path = /obj/item/clothing/accessory/necklace
cost = 1
/datum/gear/accessory/necklace/New()
..()
var/necklacetype = list()
necklacetype["necklace, steel"] = /obj/item/clothing/accessory/necklace/steel
necklacetype["necklace, iron"] = /obj/item/clothing/accessory/necklace/iron
necklacetype["necklace, silver"] = /obj/item/clothing/accessory/necklace/silver
necklacetype["necklace, gold"] = /obj/item/clothing/accessory/necklace/gold
necklacetype["necklace, platinum"] = /obj/item/clothing/accessory/necklace/platinum
necklacetype["necklace, glass"] = /obj/item/clothing/accessory/necklace/glass
necklacetype["necklace, wood"] = /obj/item/clothing/accessory/necklace/wood
necklacetype["necklace, sivian wood"] = /obj/item/clothing/accessory/necklace/sifwood
necklacetype["necklace, plastic"] = /obj/item/clothing/accessory/necklace/plastic
necklacetype["necklace, copper"] = /obj/item/clothing/accessory/necklace/copper
necklacetype["necklace, bronze"] = /obj/item/clothing/accessory/necklace/bronze
gear_tweaks += new/datum/gear_tweak/path(necklacetype)
/datum/gear/accessory/neckerchief/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/accessory/watch
display_name = "watch selection"
description = "Choose from a number of wristwatches."
path = /obj/item/clothing/accessory/watch
cost = 1
/datum/gear/accessory/watch/New()
..()
var/watchtype = list()
watchtype["watch"] = /obj/item/clothing/accessory/watch
watchtype["watch, silver"] = /obj/item/clothing/accessory/watch/silver
watchtype["watch, gold"] = /obj/item/clothing/accessory/watch/gold
watchtype["watch, holographic"] = /obj/item/clothing/accessory/watch/holo
watchtype["watch, leather"] = /obj/item/clothing/accessory/watch/leather
gear_tweaks += new/datum/gear_tweak/path(watchtype)
code/modules/client/preference_setup/loadout/loadout_ears.dm
+14
View File
@@ -40,3 +40,17 @@
earrings["dangle, platinum"] = /obj/item/clothing/ears/earring/dangle/platinum
earrings["dangle, diamond"] = /obj/item/clothing/ears/earring/dangle/diamond
gear_tweaks += new/datum/gear_tweak/path(earrings)
/datum/gear/ears/hearingaid
display_name = "hearing aid selection"
description = "A selection of different coloured hearing aids."
path = /obj/item/clothing/ears/hearingaid
/datum/gear/ears/hearingaid/New()
..()
var/hearingaids = list()
hearingaids["hearing aid"] = /obj/item/clothing/ears/hearingaid
hearingaids["black hearing aid"] = /obj/item/clothing/ears/hearingaid/black
hearingaids["silver hearing aid"] = /obj/item/clothing/ears/hearingaid/silver
hearingaids["white hearing aid"] = /obj/item/clothing/ears/hearingaid/white
gear_tweaks += new/datum/gear_tweak/path(hearingaids)
code/modules/client/preference_setup/loadout/loadout_mask.dm
+14
View File
@@ -39,3 +39,17 @@
masks["plague doctor mask"] = /obj/item/clothing/mask/gas/plaguedoctor
masks["gold plague doctor mask"] = /obj/item/clothing/mask/gas/plaguedoctor/gold
gear_tweaks += new/datum/gear_tweak/path(masks)
/datum/gear/mask/cloth
display_name = "cloth mask (recolorable)"
path = /obj/item/clothing/mask/surgical/cloth
cost = 2
/datum/gear/mask/cloth/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/mask/dust
display_name = "dust mask"
path = /obj/item/clothing/mask/surgical/dust
cost = 2
code/modules/clothing/ears/ears.dm
+19 -1
View File
@@ -156,4 +156,22 @@
/obj/item/clothing/ears/skrell/cloth_male/lightblue
name = "light blue headtail cloth"
icon_state = "skrell_cloth_lblue_male"
item_state_slots = list(slot_r_hand_str = "egg2", slot_l_hand_str = "egg2")
item_state_slots = list(slot_r_hand_str = "egg2", slot_l_hand_str = "egg2")
/obj/item/clothing/ears/hearingaid
name = "hearing aid"
desc = "A device that assists the hard of hearing"
icon = 'icons/obj/clothing/ears.dmi'
icon_state = "hearing_aid"
/obj/item/clothing/ears/hearingaid/black
name = "black hearing aid"
icon_state = "hearing_aid_black"
/obj/item/clothing/ears/hearingaid/silver
name = "silver hearing aid"
icon_state = "hearing_aid_silver"
/obj/item/clothing/ears/hearingaid/white
name = "white hearing aid"
icon_state = "hearing_aid_white"
code/modules/clothing/masks/miscellaneous.dm
+13 -2
View File
@@ -46,7 +46,7 @@
gas_transfer_coefficient = 1
body_parts_covered = body_parts_covered & ~FACE
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
icon_state = "steriledown"
icon_state = "[initial(icon_state)]down"
to_chat(usr, "You pull the mask below your chin.")
else
gas_transfer_coefficient = initial(gas_transfer_coefficient)
@@ -56,6 +56,7 @@
to_chat(usr, "You pull the mask up to cover your face.")
update_clothing_icon()
/obj/item/clothing/mask/surgical/verb/toggle()
set category = "Object"
set name = "Adjust mask"
@@ -295,4 +296,14 @@
desc = "A black veil, typically worn at funerals or by goths."
w_class = ITEMSIZE_TINY
body_parts_covered = FACE
icon_state = "veil"
icon_state = "veil"
/obj/item/clothing/mask/surgical/cloth
name = "cloth mask"
desc = "A cloth mask designed to protect the wearer against allergens, illnesses, and social interaction."
icon_state = "cloth"
/obj/item/clothing/mask/surgical/dust
name = "dust mask"
desc = "A dust mask designed to protect the wearer against construction and/or custodial particulate."
icon_state = "dust"
code/modules/clothing/under/accessories/accessory.dm
+132 -1
View File
@@ -365,6 +365,16 @@
slot_flags = SLOT_TIE
slot = ACCESSORY_SLOT_DECOR
/obj/item/clothing/accessory/bracelet/slap
name = "slap bracelet"
desc = "Banned in schools! Popular with children and in poorly managed corporate events!"
icon_state = "slap"
/obj/item/clothing/accessory/bracelet/beaded
name = "beaded bracelet"
desc = "Made from loose beads with a center hole and connected by a piece of string or elastic band through said holes."
icon_state = "beaded"
/obj/item/clothing/accessory/bracelet/friendship
name = "friendship bracelet"
desc = "A beautiful friendship bracelet in all the colors of the rainbow."
@@ -431,6 +441,15 @@
/obj/item/clothing/accessory/bracelet/material/glass/Initialize(var/ml)
. = ..(ml, MAT_GLASS)
/obj/item/clothing/accessory/bracelet/material/sifwood/Initialize(var/ml)
. = ..(ml, MAT_SIFWOOD)
/obj/item/clothing/accessory/bracelet/material/copper/Initialize(var/ml)
. = ..(ml, MAT_COPPER)
/obj/item/clothing/accessory/bracelet/material/bronze/Initialize(var/ml)
. = ..(ml, MAT_BRONZE)
/obj/item/clothing/accessory/halfcape
name = "half cape"
desc = "A tasteful half-cape, suitible for European nobles and retro anime protagonists."
@@ -481,4 +500,116 @@
/obj/item/clothing/accessory/pride/intersex
name = "intersex pride pin"
icon_state = "pride_intersex"
icon_state = "pride_intersex"
//legbrace
/obj/item/clothing/accessory/legbrace
name = "leg braces"
desc = "A set of leg braces to help support weak legs"
icon_state = "legbrace"
gender = PLURAL
//necklaces
/obj/item/clothing/accessory/necklace
icon_state = "necklace"
drop_sound = 'sound/items/drop/ring.ogg'
pickup_sound = 'sound/items/pickup/ring.ogg'
w_class = ITEMSIZE_SMALL
slot_flags = SLOT_MASK | SLOT_TIE
/obj/item/clothing/accessory/necklace/Initialize(var/ml, var/new_material)
. = ..(ml)
if(!new_material)
new_material = MAT_STEEL
material = get_material_by_name(new_material)
if(!istype(material))
qdel(src)
return
name = "[material.display_name] necklace"
desc = "A necklace of high-quality [material.display_name]."
color = material.icon_colour
/obj/item/clothing/accessory/necklace/get_material()
return material
/obj/item/clothing/accessory/necklace/wood/Initialize(var/ml)
. = ..(ml, MAT_WOOD)
/obj/item/clothing/accessory/necklace/plastic/Initialize(var/ml)
. = ..(ml, MAT_PLASTIC)
/obj/item/clothing/accessory/necklace/iron/Initialize(var/ml)
. = ..(ml, MAT_IRON)
/obj/item/clothing/accessory/necklace/steel/Initialize(var/ml)
. = ..(ml, MAT_STEEL)
/obj/item/clothing/accessory/necklace/silver/Initialize(var/ml)
. = ..(ml, MAT_SILVER)
/obj/item/clothing/accessory/necklace/gold/Initialize(var/ml)
. = ..(ml, MAT_GOLD)
/obj/item/clothing/accessory/necklace/platinum/Initialize(var/ml)
. = ..(ml, MAT_PLATINUM)
/obj/item/clothing/accessory/necklace/phoron/Initialize(var/ml)
. = ..(ml, MAT_PHORON)
/obj/item/clothing/accessory/necklace/glass/Initialize(var/ml)
. = ..(ml, MAT_GLASS)
/obj/item/clothing/accessory/necklace/sifwood/Initialize(var/ml)
. = ..(ml, MAT_SIFWOOD)
/obj/item/clothing/accessory/necklace/copper/Initialize(var/ml)
. = ..(ml, MAT_COPPER)
/obj/item/clothing/accessory/necklace/bronze/Initialize(var/ml)
. = ..(ml, MAT_BRONZE)
//neckercheif
/obj/item/clothing/accessory/neckerchief
name = "neckerchief"
desc = "A piece of cloth tied around the neck. A favorite of scouts, sailors and partisans everywhere."
icon_state = "neckerchief"
slot_flags = SLOT_MASK | SLOT_TIE
//watches
/obj/item/clothing/accessory/watch
name = "watch"
desc = "A Ward-Takahashi produced wristwatch, encased in black plastic and featuring a digital display synced to the current system time!"
description_fluff = "For those who want too much time on their wrists instead."
icon_state = "watch"
slot_flags = SLOT_GLOVES | SLOT_TIE
/obj/item/clothing/accessory/watch/examine(mob/user)
. = ..()
if(Adjacent(user))
. += "The watch shows that the time is [stationtime2text()]."
/obj/item/clothing/accessory/watch/silver
name = "silver watch"
desc = "A Gilthari ZeitMeister, a finely tuned wristwatch encased in silver."
description_fluff = "To unleash the telemarketer in you!"
icon_state = "watch_silver"
/obj/item/clothing/accessory/watch/gold
name = "gold watch"
desc = "A Gilthari ZeitMeister, a finely tuned wristwatch encased in <b>REAL</b> faux gold."
description_fluff = "Be the jerk-ass pawn shop owner you'll never be."
icon_state = "watch_gold"
/obj/item/clothing/accessory/watch/holo
name = "holograpic watch"
desc = "A Gilthari ZeitMeister deluxe, with a holographic screen."
description_fluff = "The latest Gilthari technology!"
icon_state = "watch_holo"
/obj/item/clothing/accessory/watch/leather
name = "leather watch"
desc = "A Gilthari ZeitMeister classic, a finely tuned wristwatch with a fancy leather strap."
description_fluff = "Made from real synth leather."
icon_state = "watch_leather"