handles shrinking maxx/y

Content.IntegrationTests/DMProject/Tests/range.dm

@@ -1,5 +1,6 @@
 //Tests that /proc/range() is iterating along the correct, wonky path
 /proc/test_range()
+	world.maxx = world.maxy = 5
 	//Test that it goes in the right order
 	var/list/correctCoordinates = list(
 		list(3,3),

OpenDreamRuntime/DreamMapManager.cs

@@ -218,27 +218,56 @@
     }
 
     public void SetWorldSize(Vector2i size) {
-        if (size.X < Size.X || size.Y < Size.Y) {
-            return;
-        }
+        Vector2i oldSize = Size;
+
+        var newX = Math.Max(oldSize.X, size.X);
+        var newY = Math.Max(oldSize.Y, size.Y);
 
         DreamObjectArea defaultArea = GetOrCreateArea(_defaultArea);
-        Vector2i oldSize = Size;
 
-        Size = size;
-        foreach (Level existingLevel in _levels) {
-            var oldCells = existingLevel.Cells;
+        Size = (newX, newY);
+
+        if(Size.X > oldSize.X || Size.Y > oldSize.Y) {
+            foreach (Level existingLevel in _levels) {
+                var oldCells = existingLevel.Cells;
 
-            existingLevel.Cells = new Cell[size.X, size.Y];
-            for (int x = 1; x <= size.X; x++) {
-                for (int y = 1; y <= size.Y; y++) {
-                    if (x <= oldSize.X && y <= oldSize.Y) {
-                        existingLevel.Cells[x - 1, y - 1] = oldCells[x - 1, y - 1];
-                        continue;
+                existingLevel.Cells = new Cell[Size.X, Size.Y];
+                for (var x = 1; x <= Size.X; x++) {
+                    for (var y = 1; y <= Size.Y; y++) {
+                        if (x <= oldSize.X && y <= oldSize.Y) {
+                            existingLevel.Cells[x - 1, y - 1] = oldCells[x - 1, y - 1];
+                            continue;
+                        }
+
+                        existingLevel.Cells[x - 1, y - 1] = new Cell(defaultArea);
+                        SetTurf(new Vector2i(x, y), existingLevel.Z, _defaultTurf.ObjectDefinition, new());
                     }
+                }
+            }
+        }
+
+        if (Size.X > size.X || Size.Y > size.Y) {
+            Size = size;
+
+            foreach (Level existingLevel in _levels) {
+                var oldCells = existingLevel.Cells;
+
+                existingLevel.Cells = new Cell[size.X, size.Y];
+                for (var x = 1; x <= oldSize.X; x++) {
+                    for (var y = 1; y <= oldSize.Y; y++) {
+                        if (x > size.X || y > size.Y) {
+                            var deleteCell = oldCells[x - 1, y - 1];
+                            deleteCell.Turf?.Delete();
+                            existingLevel.Grid.SetTile(new Vector2i(x, y), Tile.Empty);
+                            foreach (var movableToDelete in deleteCell.Movables) {
+                                movableToDelete.Delete();
+                            }
 
-                    existingLevel.Cells[x - 1, y - 1] = new Cell(defaultArea);
-                    SetTurf(new Vector2i(x, y), existingLevel.Z, _defaultTurf.ObjectDefinition, new());
+
+                        } else {
+                            existingLevel.Cells[x - 1, y - 1] = oldCells[x - 1, y - 1];
+                        }
+                    }
                 }
             }
         }

TestGame/code.dm

@@ -193,6 +193,16 @@
 			src << "showing main window"
 			winset(src,"mainwindow","is-visible=true")
 
+	verb/manipulate_world_size()
+		var/x = input("New World X?", "World Size", 0) as num|null
+		var/y = input("New World Y?", "World Size", 0) as num|null
+
+		if(!x || !y)
+			return
+
+		world.maxx = x
+		world.maxy = y
+
 /mob/Stat()
 	if (statpanel("Status"))
 		stat("tick_usage", world.tick_usage)