Commit Graph

1756 Commits

Author SHA1 Message Date
CmonMate497
4f8ee738aa Changed cutoff time for furnaces and burners
Changed it to 10 mins as sometimes its really annoying when someone joins for 5 minutes doing nothing then leaves
2019-08-24 12:54:42 +01:00
Cooldude2606
ab869bf5e8 Merge branch 'patch/5.9.2' 2019-08-23 15:14:50 +01:00
Cooldude2606
1c23daa1ed Rename doc to docs 2019-08-23 15:14:36 +01:00
Cooldude2606
30d63427d7 Merge branch 'patch/5.9.1' 2019-08-22 21:04:58 +01:00
Cooldude2606
db102a79ff Fixed instant respawn and death markers 2019-08-22 20:44:01 +01:00
Cooldude2606
b95f6b99c4 Fixed destroy_if_valid for rocket gui 2019-08-22 20:36:35 +01:00
Cooldude2606
a7e6f155ae Fixed warp creation 2019-08-22 20:32:52 +01:00
Cooldude2606
792dcc0330 Fixed multiple spawn warps being created 2019-08-22 20:30:52 +01:00
Cooldude2606
7e06bfea13 Merge branch 'release/5.9.0' 2019-08-09 18:36:44 +01:00
Cooldude2606
4753922fb7 Bug fixes 2019-08-09 18:36:23 +01:00
Cooldude2606
d4bcdb17d0 Readme update 2019-08-09 18:33:24 +01:00
Cooldude2606
52cc5481cf Merge pull request #120 from CmonMate497/patch-5
Gave myself a colour
2019-08-09 18:15:16 +01:00
Cooldude2606
ee759dd017 Merge pull request #119 from CmonMate497/patch-4
Update permission_groups.lua
2019-08-09 18:14:54 +01:00
Cooldude2606
f0fb99ed43 Merge branch 'feature/docs' into dev 2019-08-09 18:13:02 +01:00
Cooldude2606
84a9c869a3 Core 2019-08-09 18:12:00 +01:00
Cooldude2606
129b39bbb9 require overright 2019-08-09 16:44:27 +01:00
CmonMate497
88cd5ad2f8 Update preset_player_colours.lua 2019-08-01 14:18:03 +01:00
CmonMate497
211f9b3398 Update permission_groups.lua 2019-08-01 13:56:41 +01:00
Cooldude2606
6bab92f87f ext_require failed to erquire 2019-07-25 15:46:49 +01:00
Cooldude2606
9c5501f6a9 Addons 2019-07-23 18:01:39 +01:00
Cooldude2606
9ecd0cca0d Config 2019-07-23 17:46:49 +01:00
Cooldude2606
604fb66f46 Commands 2019-07-22 18:34:42 +01:00
Cooldude2606
57b1c530bf Guis 2019-07-22 17:53:13 +01:00
Cooldude2606
0499ad35ab Dependenices 2019-07-22 17:38:56 +01:00
Cooldude2606
e0b7174ece Removed unused resources 2019-07-22 16:38:34 +01:00
Cooldude2606
3ec20c45de feature/control-separation 2019-07-22 16:31:05 +01:00
Cooldude2606
aaded0af6b Added warps to control 2019-07-22 16:24:57 +01:00
Cooldude2606
6be712788f Added Rockets to control 2019-07-21 23:06:57 +01:00
Cooldude2606
5a9392f108 Added Tasks to control 2019-07-21 20:28:28 +01:00
Cooldude2606
841424bf76 Merge pull request #118 from CmonMate497/patch-2
Update jail.lua
2019-07-21 00:11:08 +01:00
Cooldude2606
f5619165f6 Added production to control 2019-07-20 23:44:48 +01:00
CmonMate497
2b3d58fa56 Update jail.lua 2019-07-20 19:54:16 +01:00
Cooldude2606
0c88dedb89 Merge pull request #114 from bbassie/blame-mark
Blame more people that can fuck up
2019-07-09 17:04:06 +01:00
Cooldude2606
9b43ce7ec6 Merge pull request #113 from bbassie/warp-fixes
Spelling fixes
2019-07-09 17:03:29 +01:00
bbassie
ae748471c7 Blame more people that can fuck up 2019-07-04 09:06:27 +02:00
bbassie
36aae4fd12 More spelling fixes 2019-07-03 16:16:39 +02:00
bbassie
786525f58f more spelling errors 2019-07-03 14:02:38 +02:00
bbassie
83590e72e4 Warp list gui spelling fixes and task list remainders 2019-07-03 13:09:38 +02:00
Cooldude2606
5d0ef2f11a Added warnings to control 2019-06-29 01:28:17 +01:00
Cooldude2606
c8c0bba860 Moved jail to control 2019-06-21 22:54:12 +01:00
Cooldude2606
fec4f0c184 Moved reports to control 2019-06-21 22:00:15 +01:00
Cooldude2606
abab40fcf1 Merge branch 'patch/5.8.1' 2019-06-18 21:58:02 +01:00
Cooldude2606
4626f0d58f Merge branch 'patch/5.8.1' into dev 2019-06-18 21:58:02 +01:00
Cooldude2606
6434b79df2 Fixed rocket Gui Toggle Section 2019-06-15 15:47:46 +01:00
Cooldude2606
2372a55b28 Merge branch 'release/5.8.0' 2019-06-14 20:40:31 +01:00
Cooldude2606
0d095e3f2b Merge branch 'release/5.8.0' into dev 2019-06-14 20:40:30 +01:00
Cooldude2606
57d14c6b0f Added version to readme 2019-06-14 20:40:14 +01:00
Cooldude2606
02290e9fc9 Fixed limit bybass on warps 2019-06-14 20:38:32 +01:00
Cooldude2606
5874085f62 Added doc comments 2019-06-14 20:33:43 +01:00
Cooldude2606
1d31ab09ad Added common header creation 2019-06-14 20:31:43 +01:00