Revert "Merge branch 'master' into robotic-limbs-PT2"

This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
This commit is contained in:
DeltaFire
2020-10-11 00:51:39 +02:00
parent c5bb85d794
commit 27a099c6bf
207 changed files with 3486 additions and 8567 deletions
@@ -214,7 +214,7 @@
/obj/item/stack/tile/carpet/arcade
name = "arcade carpet"
icon_state = "tile-carpet-arcade"
turf_type = /turf/open/floor/carpet/arcade
turf_type = /turf/open/floor
tableVariant = null
/obj/item/stack/tile/carpet/blackred