Merge branch 'master' into beakerpH_tweaks

This commit is contained in:
Fermi
2019-09-27 11:50:31 +01:00
70 changed files with 1100 additions and 414 deletions
@@ -1,12 +0,0 @@
/obj/structure/chair/sofa
name = "old ratty sofa"
icon_state = "sofamiddle"
icon = 'icons/obj/sofa.dmi'
buildstackamount = 1
/obj/structure/chair/sofa/left
icon_state = "sofaend_left"
/obj/structure/chair/sofa/right
icon_state = "sofaend_right"
/obj/structure/chair/sofa/corner
icon_state = "sofacorner"