philipmi
28ce8e6c63
Merge branch 'olliy1or-patch-1' of https://github.com/olliy1or/capturetheflag
...
Conflicts:
mods/ctf/ctf_classes/classes.lua
2021-05-24 22:06:21 +02:00
philipmi
1419e63743
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
...
Conflicts:
mods/ctf/ctf_classes/classes.lua
2021-05-24 15:29:15 +02:00
Axaxax88
aa37d0375d
Minor changes in classes.lua ( #884 )
...
I changed the descriptions of some classes and removed bronze tools from medic crafting whitelist.
2021-05-17 08:06:26 -07:00
_Lucy
55ab1b46e1
Increase paxel digging limit ( #881 )
...
Increase paxel digging limit to 50
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-05-15 08:16:28 -07:00
philipmi
a993113194
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-05-12 16:07:14 +02:00
savilli
69d5c40c73
Add sword group to sword damage_groups ( #879 )
...
* Add sword marker to damage_groups
* Update init.lua
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-05-08 08:49:53 -07:00
philipmi
fd79c14b85
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-05-07 21:20:30 +02:00
savilli
0f5f921c0d
Fix ctf_marker crash ( #877 )
2021-05-04 13:59:33 -07:00
olliy
3279f45c6c
Update mods/ctf/ctf_classes/ranged.lua
...
Co-authored-by: David Leal <halfpacho@gmail.com>
2021-04-30 22:08:03 +05:00
olliy
b2ea5c6c8a
Update classes.lua
2021-04-30 01:20:51 +05:00
olliy
bdfc9d5ecd
Update ranged.lua
2021-04-30 01:17:13 +05:00
philipmi
c1b3604a97
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-04-07 16:58:38 +02:00
LoneWolfHT
f774ecff0f
Kill the trailing whitespace
2021-04-05 08:24:00 -07:00
LoneWolfHT
c0f224a5bc
Medic paxel improvements
2021-04-04 09:06:40 -07:00
Lars Müller
c5560f7a2d
Use huds with more player notifications ( #853 )
2021-04-01 10:17:17 -07:00
LoneWolfHT
bc519e605a
Fix crash when no paxel stop reason is given
2021-04-01 09:52:13 -07:00
philipmi
cd355bc9cd
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-03-31 18:36:17 +02:00
Lars Müller
87f7212f43
Replace chat with HUD events, add BS 5 palette ( #848 )
...
* Replace chat with HUD events, add BS 5 palette
* Use HUD events for paxel too
* Move paxel_stop function up
2021-03-29 14:00:46 -07:00
philipmi
ed65ddb6d0
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
...
Conflicts:
mods/other/random_messages/init.lua
2021-03-22 11:25:11 +01:00
LoneWolfHT
1568de3449
Fix crash
2021-03-19 08:31:52 -07:00
WINNIE
05fdcaa31e
Lower Paxel Cooldown ( #832 )
2021-03-17 08:26:58 -07:00
LoneWolfHT
36a6f4117a
Fix crash fix not fixing crash
2021-03-16 16:41:34 -07:00
philipmi
327504b131
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-03-16 20:15:20 +01:00
David Leal
1ef6ddadfd
Fix changing to the same class being treated as a change to a different class ( #829 )
...
* Fix running cooldown when changing...
...to the same class.
* Implement savilli's suggestion
Co-authored-by: savilli <savilli@users.noreply.github.com>
* Move return and remove unneeded check
* Completely remove an if check as now unneeded
* Remove whitespace from empty line
Co-authored-by: savilli <savilli@users.noreply.github.com>
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-03-15 20:08:01 -07:00
LoneWolfHT
844436ca3d
Fix crash with shooter_hook
2021-03-15 08:30:54 -07:00
philipmi
62e0fe449e
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-03-15 09:47:38 +01:00
-sniper-
723301dd12
Sword marker: Decrease cooldowns, fix trivial bug ( #826 )
...
* Improve sword markers
* Fix timer
* checks every 2 seconds
* Edit string sent to chat
* Clean up and increase sword special cooldown
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-03-12 09:02:30 -08:00
philipmi
efbe6dc7b4
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-03-10 16:29:13 +01:00
Xenon
30e9ac02fb
Add /mr command ( #824 )
...
* Add /mr command
Add option to remove your placed marker
* Change marker message
2021-03-09 20:53:11 -08:00
philipmi
9de5000fb8
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
...
Conflicts:
mods/ctf/ctf_map/ctf_map_core/chest.lua
mods/ctf/ctf_stats/init.lua
2021-02-25 17:34:31 +01:00
Toby1710
0282bce349
Change grapple hook warning message ( #808 )
...
Co-authored-by: Toby1710 <69259430+Toby1710@users.noreply.github.com>
2021-02-25 06:27:49 -08:00
philipmi
55f833c68b
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-21 18:21:41 +01:00
Toby1710
c56c4a9de2
Add message when player can't heal another player ( #805 )
...
* Add message when player can't heal
* Edit message
2021-02-20 18:52:13 -08:00
Apelta
fe53e06966
Remove antisabotage in favor of human moderation ( #806 )
...
* Purge antisabotage for active moderation
Not needed with more active moderation (guardians, moderator increases as of recent)
* Fix luacheck
2021-02-20 11:31:34 -08:00
philipmi
380a252c7e
Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
2021-02-19 13:23:29 +01:00
Toby1710
5bdb99d184
Change class item warning ( #802 )
2021-02-17 14:01:25 -08:00
philipmi
faf74cbcb0
Improve shooter_rocket
2021-02-15 14:11:08 +01:00
philipmi
04c75c989d
Re-add rocketeer class
2021-02-07 21:53:20 +01:00
David Leal
a412c02e20
Remove grapple if player changes class after throwing ( #740 )
...
* Remove hook if player has changed...
...their class after firing the hook.
* Make grapple don't return to...
...player inventory and improve message.
* Update ranged.lua
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-01-07 17:35:34 -08:00
LoneWolfHT
22b7ee1ce5
Make special tools bronze instead of steel
2021-01-06 12:58:20 -08:00
LoneWolfHT
3b291eab0d
Increase paxel antipillar speed 5x
2021-01-06 12:58:20 -08:00
Apelta
10881d4211
Fix antisabotage bugs and make to work with paxel( #731 )
...
* Fix crucial bugs with antisabotage
Fix possible crashes, infinite items, and any related issues
* Make sabotage into function to be used with paxel
* Fix paxel to work with antisabotage
* Fix whitespace for luacheck
* Update mods/pvp/antisabotage/init.lua
Remove unnecessary newline
Co-authored-by: David Leal <halfpacho@gmail.com>
* Update function
* Update function name
* Add check for antisabotage
* Remove whitespace for luacheck
* Add antisabotage as an optional dependency
* Remove more whitespace
Co-authored-by: David Leal <halfpacho@gmail.com>
* Fix optional depends
dev wiki lied to me :(
Co-authored-by: David Leal <halfpacho@gmail.com>
* Fix up a comment P.1
* Move a line in mod.conf
* Fix up comments and spacing
Co-authored-by: David Leal <halfpacho@gmail.com>
Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
2021-01-05 20:14:55 -08:00
LoneWolfHT
fbf0126599
Allow more than two teams in a match at once ( #724 )
...
* Fix bugs with more than two teams
* Fix team allocation
* Fix bugz
* Fix crash
* Fix crash with crash fix
2020-12-25 10:37:02 -08:00
LoneWolfHT
ec0edc15ba
Fix knight swords not allowing to open team chest
2020-12-13 11:05:59 -08:00
LoneWolfHT
47d9473e2e
Change knight sword ability trigger to Sneak+RMB
2020-12-12 15:32:52 -08:00
LoneWolfHT
779cb41de4
Give knights a sword with a special ability ( #711 )
2020-12-07 11:26:12 -08:00
LoneWolfHT
98928211f6
Improve Smoke Grenades
2020-12-05 10:58:59 -08:00
LoneWolfHT
4922c3115f
Revert "Add hudbars mod"
...
This reverts commit 707387a580
.
2020-12-05 10:58:59 -08:00
LoneWolfHT
0e79443fb5
Allow setting dont_heal from other mods
2020-12-05 10:58:59 -08:00
LoneWolfHT
5e9d341aa6
Make medics unable to heal damage from any trap
2020-12-05 10:58:59 -08:00