From 8344cb0e2ad31cb551382990c917871eb3a61437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= Date: Fri, 8 Jul 2016 19:42:57 +0200 Subject: [PATCH] Adds pants, pants. --- .../client/preference/loadout/loadout_suit.dm | 26 +++-- .../preference/loadout/loadout_uniform.dm | 94 +++++++++++++++++-- 2 files changed, 101 insertions(+), 19 deletions(-) diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm index d5e30f5d704..2da1fddec94 100644 --- a/code/modules/client/preference/loadout/loadout_suit.dm +++ b/code/modules/client/preference/loadout/loadout_suit.dm @@ -6,55 +6,61 @@ //WINTER COATS /datum/gear/suit/coat subtype_path = /datum/gear/suit/coat + cost = 2 /datum/gear/suit/coat/grey display_name = "winter coat" path = /obj/item/clothing/suit/hooded/wintercoat -/datum/gear/suit/coat/sec +/datum/gear/suit/coat/job + subtype_path = /datum/gear/suit/coat + subtype_cost_overlap = FALSE + +/datum/gear/suit/coat/job/sec display_name = "winter coat, security" path = /obj/item/clothing/suit/hooded/wintercoat/security allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot") -/datum/gear/suit/coat/captain +/datum/gear/suit/coat/job/captain display_name = "winter coat, captain" path = /obj/item/clothing/suit/hooded/wintercoat/captain allowed_roles = list("Captain") -/datum/gear/suit/coat/med +/datum/gear/suit/coat/job/med display_name = "winter coat, medical" path = /obj/item/clothing/suit/hooded/wintercoat/medical allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Brig Physician") -/datum/gear/suit/coat/sci +/datum/gear/suit/coat/job/sci display_name = "winter coat, science" path = /obj/item/clothing/suit/hooded/wintercoat/science allowed_roles = list("Scientist", "Research Director") -/datum/gear/suit/coat/engi +/datum/gear/suit/coat/job/engi display_name = "winter coat, engineering" path = /obj/item/clothing/suit/hooded/wintercoat/engineering allowed_roles = list("Chief Engineer", "Engineer", "Mechanic") -/datum/gear/suit/coat/atmos +/datum/gear/suit/coat/job/atmos display_name = "winter coat, atmospherics" path = /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos allowed_roles = list("Chief Engineer", "Life Support Specialist") -/datum/gear/suit/coat/hydro +/datum/gear/suit/coat/job/hydro display_name = "winter coat, hydroponics" path = /obj/item/clothing/suit/hooded/wintercoat/hydro allowed_roles = list("Botanist") -/datum/gear/suit/coat/cargo +/datum/gear/suit/coat/job/cargo display_name = "winter coat, cargo" path = /obj/item/clothing/suit/hooded/wintercoat/cargo allowed_roles = list("Quartermaster", "Cargo Technician") -/datum/gear/suit/coat/miner +/datum/gear/suit/coat/job/miner display_name = "winter coat, miner" path = /obj/item/clothing/suit/hooded/wintercoat/miner - allowed_roles = list("Quartermaster", "Miner") + allowed_roles = list("Miner") + //LABCOATS /datum/gear/suit/labcoat_emt display_name = "labcoat, paramedic" diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index 6855e7728b7..4d9b939fe5a 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/code/modules/client/preference/loadout/loadout_uniform.dm @@ -24,7 +24,7 @@ path = /obj/item/clothing/under/blackskirt /datum/gear/uniform/skirt/job - cost = 3 + cost = 2 subtype_path = /datum/gear/uniform/skirt/job subtype_cost_overlap = FALSE @@ -98,35 +98,111 @@ path = /obj/item/clothing/under/rank/head_of_security/skirt allowed_roles = list("Head of Security") -/datum/gear/uniform/formal - subtype_path = /datum/gear/uniform/formal +/datum/gear/uniform/sec + subtype_path = /datum/gear/uniform/sec + cost = 2 -/datum/gear/uniform/formal/security +/datum/gear/uniform/sec/formal display_name = "formal uniform, security" path = /obj/item/clothing/under/rank/security/formal allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot") -/datum/gear/uniform/formal/warden +/datum/gear/uniform/sec/formal/warden display_name = "formal uniform, warden" path = /obj/item/clothing/under/rank/warden/formal allowed_roles = list("Warden") -/datum/gear/uniform/formal/head_of_security +/datum/gear/uniform/sec/formal/head_of_security display_name = "formal uniform, hos" path = /obj/item/clothing/under/rank/head_of_security/formal allowed_roles = list("Head of Security") -/datum/gear/uniform/corporatesec +/datum/gear/uniform/sec/corporate display_name = "corporate security uniform" path = /obj/item/clothing/under/rank/security/corp allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot") -/datum/gear/uniform/dispatchsec +/datum/gear/uniform/sec/dispatch display_name = "dispatcher's uniform" path = /obj/item/clothing/under/rank/dispatch allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot") -/datum/gear/uniform/casualsec +/datum/gear/uniform/sec/casual display_name = "casual security uniform" path = /obj/item/clothing/under/rank/security2 allowed_roles = list("Head of Security", "Warden", "Security Officer", "Detective", "Security Pod Pilot") + +/datum/gear/uniform/shorts/red + display_name = "shorts, red" + path = /obj/item/clothing/under/shorts/red + +/datum/gear/uniform/shorts/green + display_name = "shorts, green" + path = /obj/item/clothing/under/shorts/green + +/datum/gear/uniform/shorts/blue + display_name = "shorts, blue" + path = /obj/item/clothing/under/shorts/blue + +/datum/gear/uniform/shorts/black + display_name = "shorts, black" + path = /obj/item/clothing/under/shorts/black + +/datum/gear/uniform/shorts/grey + display_name = "shorts, grey" + path = /obj/item/clothing/under/shorts/grey + +/datum/gear/uniform/pants/jeans + display_name = "jeans, classic" + path = /obj/item/clothing/under/pants/classicjeans + +/datum/gear/uniform/pants/mjeans + display_name = "jeans, mustang" + path = /obj/item/clothing/under/pants/mustangjeans + +/datum/gear/uniform/pants/bljeans + display_name = "jeans, black" + path = /obj/item/clothing/under/pants/blackjeans + +/datum/gear/uniform/pants/yfjeans + display_name = "jeans, Young Folks" + path = /obj/item/clothing/under/pants/youngfolksjeans + +/datum/gear/uniform/pants/whitepants + display_name = "pants, white" + path = /obj/item/clothing/under/pants/white + +/datum/gear/uniform/pants/redpants + display_name = "pants, red" + path = /obj/item/clothing/under/pants/red + +/datum/gear/uniform/pants/blackpants + display_name = "pants, black" + path = /obj/item/clothing/under/pants/black + +/datum/gear/uniform/pants/tanpants + display_name = "pants, tan" + path = /obj/item/clothing/under/pants/tan + +/datum/gear/uniform/pants/bluepants + display_name = "pants, blue" + path = /obj/item/clothing/under/pants/blue + +/datum/gear/uniform/pants/trackpants + display_name = "trackpants" + path = /obj/item/clothing/under/pants/track + +/datum/gear/uniform/pants/khakipants + display_name = "pants, khaki" + path = /obj/item/clothing/under/pants/khaki + +/datum/gear/uniform/pants/caopants + display_name = "pants, camo" + path = /obj/item/clothing/under/pants/camo + + +//~~~~~~ +///datum/gear/uniform/pants/~~jeans +// display_name = "leather assless chaps" +// path = /obj/item/clothing/under/pants/chaps +//~~~~~~