Skip to content

Commit

Permalink
Merge pull request tgstation#16915 from coiax/holodeck-chairs
Browse files Browse the repository at this point in the history
Wooden holodeck chairs can no longer be picked up
  • Loading branch information
ChangelingRain committed Apr 17, 2016
2 parents d682fcc + 336612f commit d1e90e4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/game/objects/structures/beds_chairs/chair.dm
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
/obj/structure/chair/MouseDrop(over_object, src_location, over_location)
. = ..()
if(over_object == usr && Adjacent(usr))
if(!item_chair || !ishuman(usr) || buckled_mobs.len)
if(!item_chair || !ishuman(usr) || buckled_mobs.len || src.flags & NODECONSTRUCT)
return
usr.visible_message("<span class='notice'>[usr] grabs \the [src.name].</span>", "<span class='notice'>You grab \the [src.name].</span>")
var/C = new item_chair(loc)
Expand Down

0 comments on commit d1e90e4

Please sign in to comment.