diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 30af08ecc81..06013165f03 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -1164,17 +1164,9 @@ }, /area/ai_monitored/security/armory) "acN" = ( -/obj/structure/rack, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/turf/open/floor/plasteel/bot{ - dir = 2 - }, -/area/ai_monitored/security/armory) +/obj/structure/chair/stool/bar, +/turf/open/floor/plasteel/bar, +/area/crew_quarters/bar) "acO" = ( /obj/structure/closet/l3closet/security, /obj/machinery/camera{ @@ -22538,7 +22530,7 @@ /turf/open/floor/plasteel/barber, /area/crew_quarters/locker) "aYI" = ( -/obj/structure/chair/stool, +/obj/structure/chair/stool/bar, /obj/effect/landmark/start{ name = "Assistant" }, @@ -59407,7 +59399,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit) "czP" = ( -/obj/structure/chair/stool, +/obj/structure/chair/stool/bar, /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/bar, /area/crew_quarters/bar) @@ -96563,11 +96555,11 @@ aMw aNI aMw aOK -aPY -aPY -aPY -aPY -aPY +acN +acN +acN +acN +acN aQc bae aJC diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 99bdff56bf4..5e0d0478354 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -225,6 +225,12 @@ usr.put_in_hands(C) qdel(src) +/obj/structure/chair/stool/bar + name = "bar stool" + desc = "It has some unsavory stains on it..." + icon_state = "bar" + item_chair = null + /obj/item/chair name = "chair" desc = "Bar brawl essential." diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi index 29fed5de145..89494e7dfde 100644 Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ