Commit Graph

284 Commits

Author SHA1 Message Date
6d9bce7977 Merge branch 'dev' into dev2 2023-10-04 11:02:56 +09:00
7ef3c9a0cb update 2023-10-04 11:01:54 +09:00
785105d38b waterfill role 2023-10-03 19:19:27 +09:00
4015e5058a fix no recipe module insertion 2023-09-30 18:40:15 +09:00
6e9a64e88a gui event 2023-09-24 05:20:13 +09:00
3616efd4f0 fix 2023-09-23 15:28:38 +09:00
8625082718 Merge branch 'dev' into dev3 2023-09-23 14:19:27 +09:00
f0042631ce role 2023-09-23 05:09:01 +09:00
17d07ac228 addon module inserter gui 2023-09-23 05:07:20 +09:00
oof2win2
1ad8e670e8 feat(config): change default nuke research to enabled 2023-09-07 21:40:43 +02:00
oof2win2
266e7f2a4b feat(nukeprotect): disable nukes completely on config 2023-09-06 20:42:25 +02:00
DrahcPro
0c6f61938f Merge branch 'dev' into dev 2023-08-15 20:15:17 +02:00
DrahcPro
562b1cf5fc Quick fix to resolve merge conflict 2023-08-15 20:09:03 +02:00
46f6215d94 Feature Update (#237)
See PR for details, there are too many to be included here.
2023-08-15 18:47:34 +01:00
DrahcPro
6415190b6a Added local language detection
Added language.cfg for all locale folders from the base game
Added language.lua with the functions which detect the local language
Added language.lua to _file_loader.lua
2023-08-08 20:00:24 +02:00
oof2win2
3f42681ddc feat: role deference in Roles module itself 2023-02-25 15:36:33 +00:00
Cooldude2606
1b833edc4c Merge pull request #229 from oof2win2/feature/nukeprotect
Implement nuke protect, fix move_items
2022-12-09 21:09:26 +00:00
oof2win2
875e1b2bf6 feat: nukeprotect modularity 2022-11-12 22:39:58 +01:00
oof2win2
d0d59d35d8 fix(config): roles 2022-11-12 22:39:37 +01:00
Windsinger
6a98444710 Update deconlog.lua
added requested changes in /config/deconlog.lua
2022-10-23 18:54:01 +02:00
oof2win2
f1268ddf9e refactor(nukeprotect): better config setup 2022-05-15 10:15:59 +02:00
oof2win2
5ec5a0efad feat(addons): implement nukeprotect 2022-05-14 23:24:54 +02:00
Cooldude2606
7958f045d1 Merge pull request #228 from oof2win2/feature/graftorio
Add graftorio
2022-05-14 21:36:29 +01:00
oof2win2
2c21f989ae fix(graftorio): config issues 2022-05-14 22:29:11 +02:00
oof2win2
8195107572 feat: add graftorio 2022-05-14 16:06:37 +02:00
oof2win2
872e0a9d58 🐛 workflow fix? 2021-12-31 15:46:12 +01:00
oof2win2
ecc263faf8 config file for deconlog 2021-12-31 15:37:01 +01:00
oof2win2
2c4ff3f9e0 roles bypass 2021-12-29 03:12:41 +01:00
oof2win2
2db9e2619a basic decon log 2021-12-29 03:01:26 +01:00
Cooldude2606
380b114b97 Added protection auto jail 2021-05-10 20:57:04 +01:00
Cooldude2606
83a2b1d631 Added playtime to some alerts 2021-05-10 20:22:45 +01:00
Cooldude2606
f074dc885a Removed outdated wiki link 2021-05-06 15:19:07 +01:00
Cooldude2606
6e00b2cd40 Fixed left flow guis 2021-05-06 00:56:50 +01:00
Cooldude2606
0c0dba384b Fixed issues in expcore 2021-05-06 00:28:52 +01:00
Cooldude2606
2e1e024ac7 Merge branch 'dev' into feature/entity-alert 2021-04-26 00:21:48 +01:00
Cooldude2606
2df7482a77 Implemented requested changes 2021-04-26 00:20:55 +01:00
Cooldude2606
7dbb22f575 Merge branch 'dev' into feature/spectate 2021-04-25 23:53:34 +01:00
Cooldude2606
40ce5889e4 Merge pull request #210 from Cooldude2606/feature/admin-markers
Admin map markers
2021-04-25 20:20:46 +01:00
Cooldude2606
0b7d2c949f Merge pull request #208 from Cooldude2606/feature/refactor-spawn-area
Refactor of spawn area, now includes water.
2021-04-25 20:19:26 +01:00
Cooldude2606
62f3e75f28 Merge branch 'dev' into feature/admin-markers 2021-04-25 20:18:32 +01:00
Cooldude2606
f8b22d7768 Implimented Changes 2021-04-25 20:15:25 +01:00
Cooldude2606
9d31d3283a Merge pull request #206 from Cooldude2606/feature/inv-search
Inventory Search Commands
2021-04-24 21:26:23 +01:00
Cooldude2606
fe4341bd1a Merge branch 'dev' into feature/afk-kick 2021-04-24 21:25:11 +01:00
Cooldude2606
d83f1e3aea Fixed protection issues 2021-04-24 21:05:11 +01:00
Cooldude2606
7fb1a14cb3 Changed ignore_role to ignore_permission 2021-04-24 01:53:05 +01:00
Cooldude2606
cdded68ffb Added discord alert 2021-04-24 01:47:43 +01:00
Cooldude2606
43cb24f396 Added protection control 2021-04-24 01:43:58 +01:00
Cooldude2606
bb46d44ea3 Added admin markers 2021-04-15 23:24:27 +01:00
Cooldude2606
49e056fee1 Fixed doc comments 2021-04-15 22:03:32 +01:00
Cooldude2606
0866e9f9c3 Refactored spawn area 2021-04-15 21:55:41 +01:00