Merge polaris sync

This commit is contained in:
Arokha Sieyes
2017-03-28 12:24:46 -04:00
53 changed files with 4642 additions and 4718 deletions
+1 -3
View File
@@ -104,8 +104,6 @@
var/turf/D = locate(T.x, throwy - 1, 1)
for(var/atom/movable/AM as mob|obj in T)
AM.Move(D)
if(istype(T, /turf/simulated))
qdel(T)
for(var/mob/living/carbon/bug in destination)
bug.gib()
@@ -119,7 +117,7 @@
if(M.client)
spawn(0)
if(M.buckled)
M << "\red Sudden acceleration presses you into your chair!"
M << "\red Sudden acceleration presses you into \the [M.buckled]!"
shake_camera(M, 3, 1)
else
M << "\red The floor lurches beneath you!"