From 831332155a9329dd9546ec41a42d6d19bf13a2de Mon Sep 17 00:00:00 2001 From: Krausus Date: Sun, 21 Jun 2015 21:50:35 -0400 Subject: [PATCH] Fixes generic wardrobe contents This fixes the wardrobe base type creating items, which was fine when wardrobes didn't call their parent's New proc, but was causing literally every wardrobe to contain some junk now that they do. The base wardrobe type's items have been moved to a new "generic" wardrobe, which is now used in the derelicts and an unused away mission, replacing mapped instances of the base type. --- _maps/map_files/MetaStation/z4.dmm | 2 +- _maps/map_files/RandomZLevels/stationCollision.dmm | 2 +- _maps/map_files/cyberiad/z6.dmm | 2 +- .../objects/structures/crates_lockers/closets/wardrobe.dm | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/MetaStation/z4.dmm b/_maps/map_files/MetaStation/z4.dmm index d8409fa724a..e9ad9ae4182 100644 --- a/_maps/map_files/MetaStation/z4.dmm +++ b/_maps/map_files/MetaStation/z4.dmm @@ -593,7 +593,7 @@ "lS" = (/obj/structure/closet/wardrobe/orange,/turf/simulated/floor/plating/airless,/area/space) "lT" = (/obj/structure/window/basic{dir = 4},/turf/space,/area/space) "lU" = (/obj/structure/grille,/turf/simulated/floor/plating,/area/derelict/arrival) -"lV" = (/obj/structure/closet/wardrobe,/turf/simulated/floor,/area/derelict/arrival) +"lV" = (/obj/structure/closet/wardrobe/generic,/turf/simulated/floor,/area/derelict/arrival) "lW" = (/turf/simulated/floor/plating/airless{icon_state = "floorscorched1"},/area/derelict/hallway/primary) "lX" = (/obj/structure/closet,/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary) "lY" = (/turf/simulated/floor,/area/derelict/atmospherics) diff --git a/_maps/map_files/RandomZLevels/stationCollision.dmm b/_maps/map_files/RandomZLevels/stationCollision.dmm index b1757a12302..43bbb2b261d 100644 --- a/_maps/map_files/RandomZLevels/stationCollision.dmm +++ b/_maps/map_files/RandomZLevels/stationCollision.dmm @@ -317,7 +317,7 @@ "ge" = (/obj/item/weapon/storage/secure/safe/sc_ssafe{pixel_x = 4; pixel_y = -26},/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/northblock) "gf" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/captain,/obj/item/clothing/under/rank/captain,/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/blood/splatter,/obj/item/weapon/gun/energy/laser/retro/sc_retro,/turf/simulated/floor{icon_state = "grimy"},/area/awaymission/northblock) "gg" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/airless{icon_state = "floorscorched2"},/area/awaymission/midblock) -"gh" = (/obj/structure/closet/wardrobe,/turf/simulated/floor,/area/awaymission/midblock) +"gh" = (/obj/structure/closet/wardrobe/generic,/turf/simulated/floor,/area/awaymission/midblock) "gi" = (/turf/simulated/floor,/area/awaymission/midblock) "gj" = (/obj/structure/closet/wardrobe/pjs,/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"; tag = ""},/obj/structure/window/reinforced/tinted{dir = 4; icon_state = "twindow"; tag = ""},/obj/machinery/light/small{dir = 1},/turf/simulated/floor,/area/awaymission/midblock) "gk" = (/obj/structure/closet/wardrobe/pink,/turf/simulated/floor,/area/awaymission/midblock) diff --git a/_maps/map_files/cyberiad/z6.dmm b/_maps/map_files/cyberiad/z6.dmm index 50d36ba0a3a..8be2571bced 100644 --- a/_maps/map_files/cyberiad/z6.dmm +++ b/_maps/map_files/cyberiad/z6.dmm @@ -498,7 +498,7 @@ "jM" = (/obj/structure/closet/wardrobe/orange,/turf/simulated/floor/airless,/area/space) "jN" = (/obj/structure/window/basic{dir = 4},/turf/space,/area/space) "jO" = (/obj/structure/grille,/turf/simulated/floor/plating,/area/derelict/arrival) -"jP" = (/obj/structure/closet/wardrobe,/turf/simulated/floor,/area/derelict/arrival) +"jP" = (/obj/structure/closet/wardrobe/generic,/turf/simulated/floor,/area/derelict/arrival) "jQ" = (/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/derelict/hallway/primary) "jR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/window/reinforced,/turf/simulated/floor/airless,/area/space) "jS" = (/obj/structure/window/reinforced,/turf/simulated/floor/airless,/area/space) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index ee2b6d7754c..b5a787d5647 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -4,7 +4,10 @@ icon_state = "blue" icon_closed = "blue" -/obj/structure/closet/wardrobe/New() +/obj/structure/closet/wardrobe/generic + // Identical to the base wardrobe, aside from containing some stuff. + +/obj/structure/closet/wardrobe/generic/New() ..() sleep(2) new /obj/item/clothing/under/color/blue(src)