Merge branch 'master' into pr/5350

ARF-SS13 · Sep 23, 2024 · 6ad19f5 · 6ad19f5
2 parents e2959ee + c56bb94
commit 6ad19f5
Show file tree

Hide file tree

Showing 25 changed files with 3,881 additions and 7,869 deletions.
diff --git a/AAADevTool/AAA_DEVELOPMENT_CONFIG.json b/AAADevTool/AAA_DEVELOPMENT_CONFIG.json
@@ -1,3 +1,3 @@
 {
-	"sanic speed" : true
+	"sanic speed" : false
 }
diff --git a/_maps/map_files/coyote_bayou/Newboston.dmm b/_maps/map_files/coyote_bayou/Newboston.dmm
@@ -35234,6 +35234,19 @@
 /obj/item/stack/sheet/mineral/wood/fifty,
 /turf/open/indestructible/ground/inside/dirt,
 /area/f13/building)
+"tbc" = (
+/obj/structure/decoration/vent{
+	icon = 'icons/obj/structures.dmi';
+	icon_state = "manhole_closed"
+	},
+/obj/structure/ladder/unbreakable{
+	height = 2;
+	id = "S2"
+	},
+/turf/open/indestructible/ground/outside/road{
+	color = "#999999"
+	},
+/area/f13/wasteland/city/newboston/outdoors)
 "tbk" = (
 /mob/living/simple_animal/hostile/retaliate/aethergiest{
 	color = "#0099ff";
@@ -78066,7 +78079,7 @@ uWY
 tLM
 uWY
 mLI
-cJp
+tbc
 uWY
 uWY
 tLM