Merge branch 'master' of github.com:tgstation/tgstation into upstream-2026-06-23

This commit is contained in:
Roxy
2026-06-23 15:51:55 -04:00
1007 changed files with 40287 additions and 33507 deletions
@@ -0,0 +1 @@
/mob/living/simple_animal/hostile/asteroid/polarbear : /mob/living/basic/mining/polarbear{@OLD}
@@ -0,0 +1,2 @@
/mob/living/simple_animal/bot/mulebot : /mob/living/basic/bot/mulebot{@OLD}
/mob/living/simple_animal/bot/mulebot/paranormal : /mob/living/basic/bot/mulebot/paranormal{@OLD}
@@ -0,0 +1 @@
/obj/vehicle/sealed/mecha/vim : /obj/vehicle/sealed/car/vim{@OLD}