Resolves conflicts.

This commit is contained in:
Desolate
2018-10-11 05:36:22 -05:00
486 changed files with 16260 additions and 10647 deletions
@@ -2159,7 +2159,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
var/obj/item/organ/external/l_foot = character.get_organ("l_foot")
var/obj/item/organ/external/r_foot = character.get_organ("r_foot")
if(!l_foot && !r_foot)
var/obj/structure/stool/bed/chair/wheelchair/W = new /obj/structure/stool/bed/chair/wheelchair (character.loc)
var/obj/structure/chair/wheelchair/W = new /obj/structure/chair/wheelchair (character.loc)
character.buckled = W
character.update_canmove()
W.dir = character.dir