Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311

2018-01-01 07:00:34 -06:00
parent 86c5f3cb0b 6bafa75ee8
commit 168519c328
123 changed files with 2367 additions and 3835 deletions
@@ -528,7 +528,7 @@
 							playsound(loc, 'sound/effects/bang.ogg', 100, 1)
 							var/turf/open/floor/F
 							for(F in orange(1, src))
-								F.ChangeTurf(F.baseturf)
+								F.ScrapeAway()
 							say("Something slams into the floor around [src], exposing it to space!")
 							if(hull)
 								sleep(10)