Merge remote-tracking branch 'citadel/master' into mobility_flags

This commit is contained in:
kevinz000
2020-02-27 20:11:36 -07:00
196 changed files with 170125 additions and 14092 deletions
@@ -407,7 +407,7 @@
buildstackamount = 1
/obj/structure/chair/stool/bar/alien
name = "bronze bar stool"
name = "alien bar stool"
desc = "A hard bar stool made of advanced alien alloy."
icon_state = "baralien"
icon = 'icons/obj/abductor.dmi'