Merge branch 'ARF-SS13:master' into master

ARF-SS13 · Oct 21, 2024 · 3cccfb4 · 3cccfb4
2 parents a722a94 + aaafd24
commit 3cccfb4
Show file tree

Hide file tree

Showing 45 changed files with 2,645 additions and 1,861 deletions.
diff --git a/AAADevTool/AAA_DEVELOPMENT_CONFIG.json b/AAADevTool/AAA_DEVELOPMENT_CONFIG.json
@@ -1,3 +1,3 @@
 {
-	"sanic speed" : false
+	"sanic speed" : true
 }
diff --git a/_maps/map_files/coyote_bayou/Newboston-Upper.dmm b/_maps/map_files/coyote_bayou/Newboston-Upper.dmm
@@ -140,6 +140,12 @@
 	opacity = 0
 	},
 /obj/structure/flora/ausbushes/lavendergrass,
+/obj/second_wind_movable_home_point{
+	flavor = "The Tribal Bodysnatcher";
+	flavor_name = "Tribal Recovery pad";
+	plane = -2;
+	pixel_y = 19
+	},
 /turf/open/indestructible/ground/outside/civ/grass3{
 	color = "#777777";
 	barefootstep = "grass";