Merge branch 'dev' into dev7

This commit is contained in:
Cooldude2606 authored and GitHub committed 2023-12-21 21:32:01 +00:00
commit 8b9804543b
7 files changed
+241 -23

No files matched your search

+1
View File
@@ -233,6 +233,7 @@ Roles.new_role('Member','Mem')
'command/waterfill',
'command/clear-item-on-ground',
'command/clear-blueprint'
'gui/surveillance'
}
local hours3, hours15 = 3*216000, 15*60