From 2accd60a5bc58523e537423dfab4ceee01ba526d Mon Sep 17 00:00:00 2001 From: Mark9013100 Date: Fri, 15 Apr 2016 13:27:28 -0400 Subject: [PATCH] Moves detective clothing from the cabinet to wardrobe --- .../crates_lockers/closets/secure/security.dm | 12 ---------- .../crates_lockers/closets/wardrobe.dm | 22 +++++++++++++++---- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 7ad61584af9..5a692dc1c4a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -259,20 +259,8 @@ New() ..() - new /obj/item/clothing/under/det(src) - new /obj/item/clothing/under/det/grey(src) - new /obj/item/clothing/under/det/black(src) - new /obj/item/clothing/under/det/waistcoat(src) - new /obj/item/clothing/under/det/grey/waistcoat(src) - new /obj/item/clothing/suit/storage/det_trench(src) - new /obj/item/clothing/suit/storage/det_trench/grey(src) - new /obj/item/clothing/suit/storage/forensics/blue(src) - new /obj/item/clothing/suit/storage/forensics/red(src) new /obj/item/clothing/accessory/badge/holo/detective(src) new /obj/item/clothing/gloves/black(src) - new /obj/item/clothing/head/det(src) - new /obj/item/clothing/head/det/grey(src) - new /obj/item/clothing/shoes/laceup(src) new /obj/item/weapon/storage/belt/detective(src) new /obj/item/weapon/storage/box/evidence(src) new /obj/item/device/radio/headset/headset_sec(src) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 83b94e39aa3..0c49681489c 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -66,18 +66,32 @@ ..() new /obj/item/clothing/head/det(src) new /obj/item/clothing/head/det(src) - new /obj/item/clothing/shoes/brown(src) - new /obj/item/clothing/shoes/brown(src) - new /obj/item/clothing/under/det(src) - new /obj/item/clothing/under/det(src) new /obj/item/clothing/head/det/grey(src) new /obj/item/clothing/head/det/grey(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/clothing/shoes/laceup(src) + new /obj/item/clothing/shoes/laceup(src) + new /obj/item/clothing/under/det(src) + new /obj/item/clothing/under/det(src) + new /obj/item/clothing/under/det/waistcoat(src) + new /obj/item/clothing/under/det/waistcoat(src) new /obj/item/clothing/under/det/grey(src) new /obj/item/clothing/under/det/grey(src) + new /obj/item/clothing/under/det/grey/waistcoat(src) + new /obj/item/clothing/under/det/grey/waistcoat(src) new /obj/item/clothing/under/det/black(src) new /obj/item/clothing/under/det/black(src) new /obj/item/clothing/under/det/corporate(src) new /obj/item/clothing/under/det/corporate(src) + new /obj/item/clothing/suit/storage/det_trench(src) + new /obj/item/clothing/suit/storage/det_trench(src) + new /obj/item/clothing/suit/storage/det_trench/grey(src) + new /obj/item/clothing/suit/storage/det_trench/grey(src) + new /obj/item/clothing/suit/storage/forensics/blue(src) + new /obj/item/clothing/suit/storage/forensics/blue(src) + new /obj/item/clothing/suit/storage/forensics/red(src) + new /obj/item/clothing/suit/storage/forensics/red(src) return /obj/structure/closet/wardrobe/pink