diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 447913d225b..818b0a53017 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -3,6 +3,9 @@ desc = "You sit in this. Either by will or force." icon_state = "chair" +/obj/structure/stool/MouseDrop(atom/over_object) + return + /obj/structure/stool/bed/chair/New() if(anchored) src.verbs -= /atom/movable/verb/pull diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index 7c40b55bdb4..2b36add1fc5 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -32,4 +32,30 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) new /obj/item/stack/sheet/metal(src.loc) del(src) - return \ No newline at end of file + return + +/obj/structure/stool/MouseDrop(atom/over_object) + if (istype(over_object, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = over_object + var/obj/item/weapon/stool/S = new/obj/item/weapon/stool() + S.origin = src + src.loc = S + H.put_in_hands(S) + H.visible_message("\red [H] grabs [src] from the floor!", "\red You grab [src] from the floor!") + +/obj/item/weapon/stool + name = "stool" + desc = "Uh-hoh, bar is heating up." + icon = 'icons/obj/objects.dmi' + icon_state = "stool" + force = 10 + throwforce = 20 + w_class = 5.0 + var/obj/structure/stool/origin = null + +/obj/item/weapon/stool/attack_self(mob/user as mob) + ..() + origin.loc = get_turf(src) + user.u_equip(src) + user.visible_message("\red [user] puts [src] down.", "\blue You put [src] down.") + del src diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index a12488c72f6..8dac28f7264 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index 573b818c731..15c2938bbf1 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ