diff --git a/code/defines/obj/closet.dm b/code/defines/obj/closet.dm index 46e71245051..497b83b0822 100644 --- a/code/defines/obj/closet.dm +++ b/code/defines/obj/closet.dm @@ -362,7 +362,13 @@ req_access = list(access_kitchen) /obj/secure_closet/meat - name = "Meat Locker" + name = "Meat Fridge" + icon_state = "fridge1" + icon_closed = "fridge" + icon_locked = "fridge1" + icon_opened = "fridgeopen" + icon_broken = "fridgebroken" + icon_off = "fridge1" /obj/secure_closet/fridge name = "Refrigerator" diff --git a/code/game/objects/closets/kitchen.dm b/code/game/objects/closets/kitchen.dm index d3710af4124..778e98a3423 100644 --- a/code/game/objects/closets/kitchen.dm +++ b/code/game/objects/closets/kitchen.dm @@ -5,36 +5,41 @@ new /obj/item/clothing/head/chefhat(src) new /obj/item/clothing/under/rank/chef(src) new /obj/item/clothing/under/rank/chef(src) + new /obj/item/weapon/reagent_containers/food/snacks/flour(src) + new /obj/item/weapon/reagent_containers/food/snacks/flour(src) + new /obj/item/weapon/reagent_containers/food/snacks/flour(src) + new /obj/item/weapon/reagent_containers/food/snacks/flour(src) + new /obj/item/weapon/reagent_containers/food/snacks/flour(src) + new /obj/item/weapon/reagent_containers/food/snacks/flour(src) + new /obj/item/weapon/reagent_containers/food/snacks/flour(src) + new /obj/item/weapon/reagent_containers/food/snacks/flour(src) + new /obj/item/weapon/reagent_containers/food/snacks/flour(src) + new /obj/item/weapon/reagent_containers/food/snacks/flour(src) + new /obj/item/weapon/reagent_containers/food/snacks/flour(src) + new /obj/item/weapon/reagent_containers/food/snacks/flour(src) + new /obj/item/weapon/reagent_containers/food/snacks/flour(src) + new /obj/item/weapon/reagent_containers/food/snacks/flour(src) + new /obj/item/weapon/reagent_containers/food/snacks/flour(src) + new /obj/item/weapon/reagent_containers/food/snacks/flour(src) + new /obj/item/weapon/tray(src) + new /obj/item/weapon/tray(src) + new /obj/item/weapon/tray(src) + new /obj/item/weapon/tray(src) + new /obj/item/weapon/tray(src) + new /obj/item/weapon/tray(src) + new /obj/item/weapon/kitchenknife(src) + /*new /obj/item/clothing/head/chefhat(src) + new /obj/item/clothing/head/chefhat(src) + new /obj/item/clothing/under/rank/chef(src) + new /obj/item/clothing/under/rank/chef(src) new /obj/item/weapon/kitchen/utensil/fork(src) new /obj/item/weapon/kitchen/utensil/knife(src) new /obj/item/weapon/kitchen/utensil/spoon(src) - new /obj/item/weapon/kitchen/rollingpin(src) + new /obj/item/weapon/kitchen/rollingpin(src)*/ /obj/secure_closet/meat/New() ..() sleep(2) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/tray(src) - new /obj/item/weapon/tray(src) - new /obj/item/weapon/tray(src) - new /obj/item/weapon/tray(src) - new /obj/item/weapon/tray(src) - new /obj/item/weapon/tray(src) new /obj/item/kitchen/egg_box(src) new /obj/item/kitchen/egg_box(src) new /obj/item/weapon/reagent_containers/food/snacks/monkeymeat(src) diff --git a/maps/tgstation.2.0.5.dmm b/maps/tgstation.2.0.5.dmm index ebaeb6265b7..50410240aaf 100644 --- a/maps/tgstation.2.0.5.dmm +++ b/maps/tgstation.2.0.5.dmm @@ -3221,7 +3221,7 @@ "bjW" = (/obj/machinery/atmospherics/pipe/simple{dir = 9},/obj/grille,/turf/space,/area/turret_protected/ai_upload_foyer) "bjX" = (/obj/machinery/door/airlock/vault{icon_state = "door_locked"; locked = 1; req_access_txt = "53"},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/security/nuke_storage) "bjY" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/disposalpipe/segment{dir = 1},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/hallway/primary/central) -"bjZ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/kitchen) +"bjZ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{pixel_y = 24},/obj/secure_closet/kitchen,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/kitchen) "bka" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light_switch{pixel_y = 28},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/kitchen) "bkb" = (/obj/disposalpipe/segment{dir = 1},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/kitchen) "bkc" = (/obj/machinery/gibber,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/kitchen)