diff --git a/GainStation13/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/GainStation13/code/game/objects/structures/crates_lockers/closets/utility_closets.dm new file mode 100644 index 0000000000..6ecfba12f9 --- /dev/null +++ b/GainStation13/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -0,0 +1,14 @@ +/obj/structure/closet/emcloset/empty + should_populate_contents = FALSE + +/obj/structure/closet/firecloset/empty + should_populate_contents = FALSE + +/obj/structure/closet/toolcloset/empty + should_populate_contents = FALSE + +/obj/structure/closet/radiation/empty + should_populate_contents = FALSE + +/obj/structure/closet/l3closet/empty + should_populate_contents = FALSE \ No newline at end of file diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 832995ded8..0729b43d76 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -56,7 +56,18 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ )), \ null, \ new/datum/stack_recipe("rack parts", /obj/item/rack_parts), \ - new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ + // GS13 EDIT + // adds empty, craftable lockers + //new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), + new/datum/stack_recipe_list("closets", list( \ + new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), + new/datum/stack_recipe("emergency closet", /obj/structure/closet/emcloset/empty, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("fire-safety closet", /obj/structure/closet/firecloset/empty, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("tool closet", /obj/structure/closet/toolcloset/empty, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("radiation closet", /obj/structure/closet/radiation/empty, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("biohazard gear closet", /obj/structure/closet/l3closet/empty, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ + )), \ + // GS13 END EDIT null, \ new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("trash bin", /obj/structure/closet/crate/bin, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE),\ diff --git a/tgstation.dme b/tgstation.dme index 475b49a44a..ee5ff175ba 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3989,6 +3989,7 @@ #include "GainStation13\code\game\objects\structures\table_racks.dm" #include "GainStation13\code\game\objects\structures\beds_chairs\bed.dm" #include "GainStation13\code\game\objects\structures\beds_chairs\chair.dm" +#include "GainStation13\code\game\objects\structures\crates_lockers\closets\utility_closets.dm" #include "GainStation13\code\game\objects\structures\crates_lockers\closets\secure\psychology.dm" #include "GainStation13\code\game\objects\structures\crates_lockers\crates\wooden.dm" #include "GainStation13\code\game\turfs\closed.dm"