Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit

2026-08-27 23:27:34 +01:00 · 2024-09-08 00:59:39 +02:00
parent 410024afef 4b4ae0958f
commit 4c4930c71d
1728 changed files with 273718 additions and 2237 deletions
@@ -1,7 +1,14 @@
+<<<<<<< HEAD
 local SSlua = dm.global_vars:get_var("SSlua")

 for _, state in SSlua:get_var("states") do
 	if state:get_var("internal_id") == dm.state_id then
+=======
+local SSlua = dm.global_vars.SSlua
+
+for _, state in SSlua.states do
+	if state.internal_id == _state_id then
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 		return { state = state }
 	end
 end