cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-15 04:32:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes various reported bugs, more consistency

Browse Source
This commit is contained in:
Cerebulon
2022-10-10 19:43:27 +01:00
parent 805608c9f1
commit 0ac100f6ef
4 changed files with 67 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
code/modules/client/preference_setup/loadout/loadout_suit.dm
View File

@@ -34,6 +34,7 @@
/datum/gear/suit/bomber
display_name = "jacket, bomber selection"
description = "A selection of jackets styled on early aviation gear."
path = /obj/item/clothing/suit/storage/toggle/bomber
cost = 2
@@ -47,6 +48,7 @@
/datum/gear/suit/leather_jacket
display_name = "jacket, leather selection"
description = "A selection of leather jackets in various styles."
path = /obj/item/clothing/suit/storage/toggle/leather_jacket
/datum/gear/suit/leather_jacket/New()
@@ -61,6 +63,7 @@
/datum/gear/suit/leather_vest
display_name = "jacket, leather vest selection"
description = "A selection of sleeveless leather jackets in various styles."
path = /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless
/datum/gear/suit/leather_vest/New()
@@ -74,6 +77,7 @@
/datum/gear/suit/mil
display_name = "military jacket selection"
description = "A selection of jackets resembling vintage military gear."
path = /obj/item/clothing/suit/storage/miljacket
/datum/gear/suit/mil/New()
@@ -90,6 +94,7 @@
/datum/gear/suit/trenchcoat
display_name = "trenchcoat selection"
description = "A selection of long raincoats."
path = /obj/item/clothing/suit/storage/trench
/datum/gear/suit/trenchcoat/New()
@@ -121,6 +126,7 @@
/datum/gear/suit/hoodie
display_name = "hoodie selection"
description = "A selection of hooded sweatshirts."
path = /obj/item/clothing/suit/storage/toggle/hoodie
cost = 2
@@ -134,6 +140,7 @@
/datum/gear/suit/labcoat
display_name = "labcoat, colored selection"
description = "A selection of labcoats in standard, and non-standard colours."
path = /obj/item/clothing/suit/storage/toggle/labcoat
cost = 2
@@ -177,6 +184,7 @@
/datum/gear/suit/poncho
display_name = "poncho selection"
description = "A selection of ponchos in basic and departmental colours."
path = /obj/item/clothing/accessory/poncho
/datum/gear/suit/poncho/New()
@@ -187,11 +195,12 @@
ponchos[initial(poncho.name)] = poncho
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(ponchos))
/datum/gear/suit/cloak
/datum/gear/suit/cloak_department
display_name = "cloak, departmental selection"
description = "A selection of cloaks in departmental colours."
path = /obj/item/clothing/accessory/poncho/roles/cloak/cargo
/datum/gear/suit/cloak/New()
/datum/gear/suit/cloak_department/New()
..()
var/list/cloaks = list()
for(var/cloak_style in (typesof(/obj/item/clothing/accessory/poncho/roles/cloak)))
@@ -212,7 +221,8 @@
path = /obj/item/clothing/suit/unathi/robe
/datum/gear/suit/suit_jackets
display_name = "suit jacket selection"
display_name = "jacket, suit selection"
description = "A selection of stylish suit jackets."
path = /obj/item/clothing/suit/storage/toggle/internalaffairs
/datum/gear/suit/suit_jackets/New()
@@ -229,6 +239,7 @@
/datum/gear/suit/forensics
display_name = "jacket, forensics selection (Detective)"
description = "A selection of windbreakers in security colours."
path = /obj/item/clothing/suit/storage/forensics/red/long
allowed_roles = list("Detective")
@@ -243,6 +254,7 @@
/datum/gear/suit/wintercoat
display_name = "winter coat selection"
description = "A selection of heavy winter coats to keep you toasty in extreme weather."
path = /obj/item/clothing/suit/storage/hooded/wintercoat
cost = 2
@@ -256,6 +268,7 @@
/datum/gear/suit/varsity
display_name = "jacket, varsity selection"
description = "A selection of two-tone cotton jackets."
path = /obj/item/clothing/suit/varsity
/datum/gear/suit/varsity/New()
@@ -268,6 +281,7 @@
/datum/gear/suit/track
display_name = "jacket, track selection"
description = "A selection of lightweight sports jackets."
path = /obj/item/clothing/suit/storage/toggle/track
/datum/gear/suit/track/New()
@@ -280,6 +294,7 @@
/datum/gear/suit/flannel
display_name = "flannel selection"
description = "A selection of comfortable plaid shirts."
path = /obj/item/clothing/suit/storage/flannel
/datum/gear/suit/flannel/New()
@@ -292,6 +307,7 @@
/datum/gear/suit/denim_jacket
display_name = "jacket, denim selection"
description = "A selection of denim jackets in a variety of styles."
path = /obj/item/clothing/suit/storage/toggle/denim_jacket
/datum/gear/suit/denim_jacket/New()
@@ -312,6 +328,7 @@
/datum/gear/suit/dep_jacket
display_name = "jacket, departmental selection"
description = "A selection of light jackets in departmental colours."
path = /obj/item/clothing/suit/storage/toggle/sec_dep_jacket
/datum/gear/suit/dep_jacket/New()
@@ -326,6 +343,7 @@
/datum/gear/suit/light_jacket
display_name = "jacket, light selection"
description = "A selection of lightweight outdoor jackets."
path = /obj/item/clothing/suit/storage/toggle/light_jacket
/datum/gear/suit/light_jacket/New()
@@ -350,6 +368,7 @@
/datum/gear/suit/insulated
display_name = "jacket, insulated selection"
description = "A selection of jackets made to keep you nice and toasty on cold winter days. Or at least alive."
path = /obj/item/clothing/suit/storage/insulated
cost = 2

40
code/modules/client/preference_setup/loadout/loadout_uniform.dm
View File

@@ -12,6 +12,7 @@
/datum/gear/uniform/cheongsam
description = "Various color variations of an old earth dress style. They are pretty close fitting around the waist."
display_name = "cheongsam selection"
path = /obj/item/clothing/under/cheongsam
/datum/gear/uniform/cheongsam/New()
..()
@@ -24,6 +25,7 @@
/datum/gear/uniform/croptop
description = "Light shirts which shows the midsection of the wearer."
display_name = "croptop selection"
path = /obj/item/clothing/under/croptop
/datum/gear/uniform/croptop/New()
..()
@@ -42,15 +44,20 @@
path = /obj/item/clothing/under/kilt
/datum/gear/uniform/cuttop
display_name = "cut top, grey"
display_name = "cut top selection"
description = "Loose, low-cut shirts with matching shorts."
path = /obj/item/clothing/under/cuttop
/datum/gear/uniform/cuttop/red
display_name = "cut top, red"
path = /obj/item/clothing/under/cuttop/red
/datum/gear/uniform/cuttop/New()
..()
var/cuttoptype = list()
cuttoptype["cut top, grey"] = /obj/item/clothing/under/cuttop
cuttoptype["cut top, red"] = /obj/item/clothing/under/cuttop/red
gear_tweaks += new/datum/gear_tweak/path(cuttoptype)
/datum/gear/uniform/jumpsuit
display_name = "jumpclothes selection"
description = "Basic solid-colour durable jumpsuits."
path = /obj/item/clothing/under/color/grey
/datum/gear/uniform/jumpsuit/New()
@@ -63,6 +70,7 @@
/datum/gear/uniform/colorable_jumpsuit
display_name = "jumpsuit, colorable"
description = "A durable jumpsuit, in any colour."
path = /obj/item/clothing/under/colorable
/datum/gear/uniform/colorable_jumpsuit/New()
@@ -87,6 +95,7 @@
/datum/gear/uniform/skirt
display_name = "skirt, selection"
description = "Skirts to cover your lower body, in various styles."
path = /obj/item/clothing/under/skirt
/datum/gear/uniform/skirt/New()
@@ -99,6 +108,7 @@
/datum/gear/uniform/pants
display_name = "pants, selection"
description = "A variety of pants, jeans, chaps, and other long-legged lower body apparel."
path = /obj/item/clothing/under/pants/white
/datum/gear/uniform/pants/New()
@@ -111,6 +121,7 @@
/datum/gear/uniform/shorts
display_name = "shorts, selection"
description = "A variety of shorts, jorts, and other short-legged lower body apparel."
path = /obj/item/clothing/under/shorts/jeans
/datum/gear/uniform/shorts/New()
@@ -144,6 +155,7 @@
/datum/gear/uniform/job_turtle
display_name = "turtleneck, departmental selection"
description = "High-necked sweaters in a variety of departmental colours."
path = /obj/item/clothing/under/rank/scientist/turtleneck
/datum/gear/uniform/job_turtle/New()
@@ -177,6 +189,7 @@
/datum/gear/uniform/suit_lawyer
display_name = "suit, one-piece selection"
description = "A selection of suits without removable jackets."
path = /obj/item/clothing/under/lawyer
/datum/gear/uniform/suit_lawyer/New()
@@ -189,6 +202,7 @@
/datum/gear/uniform/suit_jacket
display_name = "suit, modular selection"
description = "A selection of suits with removable jackets, waistcoats, etc."
path = /obj/item/clothing/under/suit_jacket
/datum/gear/uniform/suit_jacket/New()
@@ -221,6 +235,7 @@
/datum/gear/uniform/scrub
display_name = "scrubs selection"
description = "Medical gear made of a special fiber that provides minor protection against biohazards."
path = /obj/item/clothing/under/rank/medical/scrubs
/datum/gear/uniform/scrub/New()
@@ -262,6 +277,7 @@
/datum/gear/uniform/uniform_security
display_name = "uniform, security selection"
description = "A selection of standard uniforms for security officers and detectives."
path = /obj/item/clothing/under/rank/security/corp
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective")
@@ -277,6 +293,7 @@
/datum/gear/uniform/uniform_warden
display_name = "uniform, warden selection"
description = "A selection of standard uniforms for security wardens."
path = /obj/item/clothing/under/rank/warden/corp
allowed_roles = list("Head of Security","Warden")
@@ -290,6 +307,7 @@
/datum/gear/uniform/uniform_hos
display_name = "uniform, head of security selection"
description = "A selection of standard uniforms for heads of security."
path = /obj/item/clothing/under/rank/security/corp
allowed_roles = list("Head of Security")
@@ -303,6 +321,7 @@
/datum/gear/uniform/uniform_hop
display_name = "uniform, head of personnel selection"
description = "A selection of formal uniforms for the Head of Personnel."
path = /obj/item/clothing/under/rank/security/corp
allowed_roles = list("Head of Personnel")
@@ -355,6 +374,7 @@
/datum/gear/uniform/dresses/maid
display_name = "uniform, maid selection"
description = "A variety of maid uniform styles."
path = /obj/item/clothing/under/dress/maid
/datum/gear/uniform/dresses/maid/New()
@@ -367,6 +387,7 @@
/datum/gear/uniform/utility
display_name = "jumpsuit, utility selection"
description = "A selection of especially hard-wearing jumpclothes for heavy duties."
path = /obj/item/clothing/under/utility
/datum/gear/uniform/utility/New()
@@ -392,12 +413,13 @@
/datum/gear/uniform/brandsuit
display_name = "jumpsuit/uniform, corporate selection"
description = "Liveried durable jumpclothes and other Trans-Stellar corporate uniforms."
path = /obj/item/clothing/under/corp/aether
/datum/gear/uniform/brandsuit/New()
..()
var/list/brandsuits = list()
for(var/brandsuit in typesof(/obj/item/clothing/under/corp, /obj/item/clothing/under/hedbergtech))
for(var/brandsuit in typesof(/obj/item/clothing/under/corp, /obj/item/clothing/under/hedbergtech) - /obj/item/clothing/under/corp)
var/obj/item/clothing/under/corp/brandsuit_type = brandsuit
brandsuits[initial(brandsuit_type.name)] = brandsuit_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(brandsuits))
@@ -462,11 +484,11 @@
path = /obj/item/clothing/under/dress/sari/green
/datum/gear/uniform/wrappedcoat
display_name = "modern wrapped coat"
display_name = "outfit, modern wrapped coat"
path = /obj/item/clothing/under/moderncoat
/datum/gear/uniform/ascetic
display_name = "plain ascetic garb"
display_name = "outfit, plain ascetic garb"
path = /obj/item/clothing/under/ascetic
/datum/gear/uniform/pleated
@@ -518,7 +540,7 @@
path =/obj/item/clothing/under/dress/goldwrap
/datum/gear/uniform/pinktutu
display_name = "pink tutu"
display_name = "skirt, pink tutu"
path = /obj/item/clothing/under/dress/pinktutu
/datum/gear/uniform/festivedress
@@ -562,7 +584,7 @@
path = /obj/item/clothing/under/cyberpunkharness
/datum/gear/uniform/cyberpunkpants
display_name = "cyberpunk split-side ensemble"
display_name = "outfit, cyberpunk split-side ensemble"
path = /obj/item/clothing/under/cyberpunkpants
/datum/gear/uniform/whitegown

2
code/modules/clothing/suits/miscellaneous.dm
View File

@@ -313,7 +313,7 @@
/obj/item/clothing/suit/storage/greyjacket
name = "grey jacket"
desc = "A fancy twead grey jacket."
desc = "A fancy tweed grey jacket."
icon_state = "gentlecoat"
item_state_slots = list(slot_r_hand_str = "leather_jacket", slot_l_hand_str = "leather_jacket")
flags_inv = HIDEHOLSTER