cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes loadout skirts all spawning as black skirts

Browse Source
This commit is contained in:
Yoshax
2016-05-23 19:35:13 +01:00
parent 3484d3c3d3
commit 02fa5585c5
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,72 +88,72 @@
shorts[initial(short_type.name)] = short_type shorts[initial(short_type.name)] = short_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(shorts)) gear_tweaks += new/datum/gear_tweak/path(sortAssoc(shorts))
/datum/gear/uniform/skirt/ce /datum/gear/uniform/job_skirt/ce
display_name = "skirt, ce" display_name = "skirt, ce"
path = /obj/item/clothing/under/rank/engineer/chief_engineer/skirt path = /obj/item/clothing/under/rank/engineer/chief_engineer/skirt
allowed_roles = list("Chief Engineer") allowed_roles = list("Chief Engineer")
/datum/gear/uniform/skirt/atmos /datum/gear/uniform/job_skirt/atmos
display_name = "skirt, atmos" display_name = "skirt, atmos"
path = /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt path = /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt
allowed_roles = list("Chief Engineer","Atmospheric Technician") allowed_roles = list("Chief Engineer","Atmospheric Technician")
/datum/gear/uniform/skirt/eng /datum/gear/uniform/job_skirt/eng
display_name = "skirt, engineer" display_name = "skirt, engineer"
path = /obj/item/clothing/under/rank/engineer/skirt path = /obj/item/clothing/under/rank/engineer/skirt
allowed_roles = list("Chief Engineer","Station Engineer") allowed_roles = list("Chief Engineer","Station Engineer")
/datum/gear/uniform/skirt/roboticist /datum/gear/uniform/job_skirt/roboticist
display_name = "skirt, roboticist" display_name = "skirt, roboticist"
path = /obj/item/clothing/under/rank/roboticist/skirt path = /obj/item/clothing/under/rank/roboticist/skirt
allowed_roles = list("Research Director","Roboticist") allowed_roles = list("Research Director","Roboticist")
/datum/gear/uniform/skirt/cmo /datum/gear/uniform/job_skirt/cmo
display_name = "skirt, cmo" display_name = "skirt, cmo"
path = /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt path = /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
allowed_roles = list("Chief Medical Officer") allowed_roles = list("Chief Medical Officer")
/datum/gear/uniform/skirt/chem /datum/gear/uniform/job_skirt/chem
display_name = "skirt, chemist" display_name = "skirt, chemist"
path = /obj/item/clothing/under/rank/medical/chemist/skirt path = /obj/item/clothing/under/rank/medical/chemist/skirt
allowed_roles = list("Chief Medical Officer","Chemist") allowed_roles = list("Chief Medical Officer","Chemist")
/datum/gear/uniform/skirt/viro /datum/gear/uniform/job_skirt/viro
display_name = "skirt, virologist" display_name = "skirt, virologist"
path = /obj/item/clothing/under/rank/medical/virologist/skirt path = /obj/item/clothing/under/rank/medical/virologist/skirt
allowed_roles = list("Chief Medical Officer","Medical Doctor") allowed_roles = list("Chief Medical Officer","Medical Doctor")
/datum/gear/uniform/skirt/med /datum/gear/uniform/job_skirt/med
display_name = "skirt, medical" display_name = "skirt, medical"
path = /obj/item/clothing/under/rank/medical/skirt path = /obj/item/clothing/under/rank/medical/skirt
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic") allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
/datum/gear/uniform/skirt/sci /datum/gear/uniform/job_skirt/sci
display_name = "skirt, scientist" display_name = "skirt, scientist"
path = /obj/item/clothing/under/rank/scientist/skirt path = /obj/item/clothing/under/rank/scientist/skirt
allowed_roles = list("Research Director","Scientist", "Xenobiologist") allowed_roles = list("Research Director","Scientist", "Xenobiologist")
/datum/gear/uniform/skirt/cargo /datum/gear/uniform/job_skirt/cargo
display_name = "skirt, cargo" display_name = "skirt, cargo"
path = /obj/item/clothing/under/rank/cargotech/skirt path = /obj/item/clothing/under/rank/cargotech/skirt
allowed_roles = list("Quartermaster","Cargo Technician") allowed_roles = list("Quartermaster","Cargo Technician")
/datum/gear/uniform/skirt/qm /datum/gear/uniform/job_skirt/qm
display_name = "skirt, QM" display_name = "skirt, QM"
path = /obj/item/clothing/under/rank/cargo/skirt path = /obj/item/clothing/under/rank/cargo/skirt
allowed_roles = list("Quartermaster") allowed_roles = list("Quartermaster")
/datum/gear/uniform/skirt/warden /datum/gear/uniform/job_skirt/warden
display_name = "skirt, warden" display_name = "skirt, warden"
path = /obj/item/clothing/under/rank/security/warden/skirt path = /obj/item/clothing/under/rank/security/warden/skirt
allowed_roles = list("Head of Security", "Warden") allowed_roles = list("Head of Security", "Warden")
/datum/gear/uniform/skirt/security /datum/gear/uniform/job_skirt/security
display_name = "skirt, security" display_name = "skirt, security"
path = /obj/item/clothing/under/rank/security/skirt path = /obj/item/clothing/under/rank/security/skirt
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer") allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
/datum/gear/uniform/skirt/head_of_security /datum/gear/uniform/job_skirt/head_of_security
display_name = "skirt, hos" display_name = "skirt, hos"
path = /obj/item/clothing/under/rank/security/head_of_security/skirt path = /obj/item/clothing/under/rank/security/head_of_security/skirt
allowed_roles = list("Head of Security") allowed_roles = list("Head of Security")

5
code/modules/clothing/under/shorts.dm
View File

@@ -116,26 +116,31 @@
name = "khaki skirt" name = "khaki skirt"
desc = "A skirt that is a khaki color." desc = "A skirt that is a khaki color."
icon_state = "skirt_khaki" icon_state = "skirt_khaki"
worn_state = "skirt_khaki"
/obj/item/clothing/under/skirt/black /obj/item/clothing/under/skirt/black
name = "short black skirt" name = "short black skirt"
desc = "A skirt that is a shiny black." desc = "A skirt that is a shiny black."
icon_state = "skirt_short_black" icon_state = "skirt_short_black"
worn_state = "skirt_short_black"
/obj/item/clothing/under/skirt/blue /obj/item/clothing/under/skirt/blue
name = "short blue skirt" name = "short blue skirt"
desc = "A skirt that is a shiny blue." desc = "A skirt that is a shiny blue."
icon_state = "skirt_short_blue" icon_state = "skirt_short_blue"
worn_state = "skirt_short_blue"
/obj/item/clothing/under/skirt/red /obj/item/clothing/under/skirt/red
name = "short red skirt" name = "short red skirt"
desc = "A skirt that is a shiny red." desc = "A skirt that is a shiny red."
icon_state = "skirt_short_red" icon_state = "skirt_short_red"
worn_state = "skirt_short_red"
/obj/item/clothing/under/skirt/swept /obj/item/clothing/under/skirt/swept
name = "swept skirt" name = "swept skirt"
desc = "A skirt that is swept to one side." desc = "A skirt that is swept to one side."
icon_state = "skirt_swept" icon_state = "skirt_swept"
worn_state = "skirt_swept"
/obj/item/clothing/under/skirt/plaid_blue /obj/item/clothing/under/skirt/plaid_blue
name = "blue plaid skirt" name = "blue plaid skirt"