update to master

2017-08-29 20:09:18 -07:00
parent 26890c6f81 0b82132443
commit 0d104b2cd4
430 changed files with 1839 additions and 5610 deletions
@@ -19,9 +19,7 @@
 /turf/closed/wall/mineral/plastitanium,
 /area/shuttle/syndicate)
 "aad" = (
-/turf/closed/wall/shuttle{
-	icon_state = "wall3"
-	},
+/turf/closed/wall/mineral/plastitanium,
 /area/shuttle/syndicate)
 "aae" = (
 /obj/effect/landmark/carpspawn,
@@ -79656,9 +79656,7 @@
 /turf/open/floor/mineral/titanium,
 /area/shuttle/abandoned)
 "cVW" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall1"
-	},
+/turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned)
 "cVX" = (
 /obj/structure/tank_dispenser/oxygen{