From b8b1bd82a43fa0151bf8be460ac5b1bcd41649df Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Tue, 18 Feb 2014 11:12:27 +1300 Subject: [PATCH] Wardrobe fix Fixes #4447 - Added a parent call to each wardrobe subtypes New() proc. Wardrobes weren't calling obj/structure/closet/New(), so weren't adding items in the same location to their contents when first created. - Removed wardrobe/New() proc. So all subtypes don't inherit an extra set of blue uniforms and brown shoes. Only one wardrobe on the map is of this type, and it's on the derelict, so didn't think it was worth making a map change. --- .../crates_lockers/closets/wardrobe.dm | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 28e0958206..b9b444052b 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -4,22 +4,13 @@ icon_state = "blue" icon_closed = "blue" -/obj/structure/closet/wardrobe/New() - new /obj/item/clothing/under/color/blue(src) - new /obj/item/clothing/under/color/blue(src) - new /obj/item/clothing/under/color/blue(src) - new /obj/item/clothing/shoes/brown(src) - new /obj/item/clothing/shoes/brown(src) - new /obj/item/clothing/shoes/brown(src) - return - - /obj/structure/closet/wardrobe/red name = "security wardrobe" icon_state = "red" icon_closed = "red" /obj/structure/closet/wardrobe/red/New() + ..() new /obj/item/clothing/under/rank/security(src) new /obj/item/clothing/under/rank/security(src) new /obj/item/clothing/under/rank/security(src) @@ -44,6 +35,7 @@ icon_closed = "pink" /obj/structure/closet/wardrobe/pink/New() + ..() new /obj/item/clothing/under/color/pink(src) new /obj/item/clothing/under/color/pink(src) new /obj/item/clothing/under/color/pink(src) @@ -58,6 +50,7 @@ icon_closed = "black" /obj/structure/closet/wardrobe/black/New() + ..() new /obj/item/clothing/under/color/black(src) new /obj/item/clothing/under/color/black(src) new /obj/item/clothing/under/color/black(src) @@ -77,6 +70,7 @@ icon_closed = "black" /obj/structure/closet/wardrobe/chaplain_black/New() + ..() new /obj/item/clothing/under/rank/chaplain(src) new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/suit/nun(src) @@ -97,6 +91,7 @@ icon_closed = "green" /obj/structure/closet/wardrobe/green/New() + ..() new /obj/item/clothing/under/color/green(src) new /obj/item/clothing/under/color/green(src) new /obj/item/clothing/under/color/green(src) @@ -111,6 +106,7 @@ icon_closed = "green" /obj/structure/closet/wardrobe/xenos/New() + ..() new /obj/item/clothing/suit/unathi/mantle(src) new /obj/item/clothing/suit/unathi/robe(src) new /obj/item/clothing/shoes/sandal(src) @@ -126,6 +122,7 @@ icon_closed = "orange" /obj/structure/closet/wardrobe/orange/New() + ..() new /obj/item/clothing/under/color/orange(src) new /obj/item/clothing/under/color/orange(src) new /obj/item/clothing/under/color/orange(src) @@ -141,6 +138,7 @@ icon_closed = "wardrobe-y" /obj/structure/closet/wardrobe/yellow/New() + ..() new /obj/item/clothing/under/color/yellow(src) new /obj/item/clothing/under/color/yellow(src) new /obj/item/clothing/under/color/yellow(src) @@ -156,6 +154,7 @@ icon_closed = "yellow" /obj/structure/closet/wardrobe/atmospherics_yellow/New() + ..() new /obj/item/clothing/under/rank/atmospheric_technician(src) new /obj/item/clothing/under/rank/atmospheric_technician(src) new /obj/item/clothing/under/rank/atmospheric_technician(src) @@ -178,6 +177,7 @@ icon_closed = "yellow" /obj/structure/closet/wardrobe/engineering_yellow/New() + ..() new /obj/item/clothing/under/rank/engineer(src) new /obj/item/clothing/under/rank/engineer(src) new /obj/item/clothing/under/rank/engineer(src) @@ -199,6 +199,7 @@ icon_closed = "white" /obj/structure/closet/wardrobe/white/New() + ..() new /obj/item/clothing/under/color/white(src) new /obj/item/clothing/under/color/white(src) new /obj/item/clothing/under/color/white(src) @@ -214,6 +215,7 @@ icon_closed = "white" /obj/structure/closet/wardrobe/pjs/New() + ..() new /obj/item/clothing/under/pj/red(src) new /obj/item/clothing/under/pj/red(src) new /obj/item/clothing/under/pj/blue(src) @@ -231,6 +233,7 @@ icon_closed = "white" /obj/structure/closet/wardrobe/toxins_white/New() + ..() new /obj/item/clothing/under/rank/scientist(src) new /obj/item/clothing/under/rank/scientist(src) new /obj/item/clothing/under/rank/scientist(src) @@ -252,6 +255,7 @@ icon_closed = "black" /obj/structure/closet/wardrobe/robotics_black/New() + ..() new /obj/item/clothing/under/rank/roboticist(src) new /obj/item/clothing/under/rank/roboticist(src) new /obj/item/clothing/suit/storage/labcoat(src) @@ -269,6 +273,7 @@ icon_closed = "white" /obj/structure/closet/wardrobe/chemistry_white/New() + ..() new /obj/item/clothing/under/rank/chemist(src) new /obj/item/clothing/under/rank/chemist(src) new /obj/item/clothing/shoes/white(src) @@ -284,6 +289,7 @@ icon_closed = "white" /obj/structure/closet/wardrobe/genetics_white/New() + ..() new /obj/item/clothing/under/rank/geneticist(src) new /obj/item/clothing/under/rank/geneticist(src) new /obj/item/clothing/shoes/white(src) @@ -299,6 +305,7 @@ icon_closed = "white" /obj/structure/closet/wardrobe/virology_white/New() + ..() new /obj/item/clothing/under/rank/virologist(src) new /obj/item/clothing/under/rank/virologist(src) new /obj/item/clothing/shoes/white(src) @@ -316,6 +323,7 @@ icon_closed = "white" /obj/structure/closet/wardrobe/medic_white/New() + ..() new /obj/item/clothing/under/rank/medical(src) new /obj/item/clothing/under/rank/medical(src) new /obj/item/clothing/under/rank/medical/blue(src) @@ -336,6 +344,7 @@ icon_closed = "grey" /obj/structure/closet/wardrobe/grey/New() + ..() new /obj/item/clothing/under/color/grey(src) new /obj/item/clothing/under/color/grey(src) new /obj/item/clothing/under/color/grey(src) @@ -354,6 +363,7 @@ icon_closed = "mixed" /obj/structure/closet/wardrobe/mixed/New() + ..() new /obj/item/clothing/under/color/blue(src) new /obj/item/clothing/under/color/yellow(src) new /obj/item/clothing/under/color/green(src)