Matthew
3526ccf1e4
Merge pull request #756 from plague006/fix/apocalypse_hail_hydra_desync
...
Fix/apocalypse hail hydra desync
2019-02-16 16:48:41 -05:00
plague006
600d6b8865
Clean up conditions, change countdown time
...
Prevent additional saves after apocalypse is active. Give feedback when running command after it is active.
2019-02-16 16:46:18 -05:00
Matthew
b394d74b3c
Merge pull request #761 from plague006/fix/unjail_from_report
...
Fix unjail from report not working
2019-02-16 15:24:27 -05:00
plague006
24d2ad8c6b
Improve fix
2019-02-16 15:11:33 -05:00
plague006
af179c7189
Fix unjailing player not in jail
2019-02-16 15:09:04 -05:00
Matthew
4c9b093d0a
Merge pull request #759 from grilledham/player_list/left_align_rank
...
left align rank cells
2019-02-16 14:50:20 -05:00
plague006
f05c02da81
Hacky fix for how event handles unjailing via the button
2019-02-16 13:43:48 -05:00
plague006
f691c0d67f
Fix unjail button calling wrong function
2019-02-16 13:09:39 -05:00
plague006
63ccee13c1
Update doc for tetris
2019-02-16 12:49:26 -05:00
grilledham
e44658d15a
left align rank cells
2019-02-16 12:24:54 +00:00
Matthew
d0ccce4033
Merge pull request #757 from plague006/donator_transition
...
Have donator handle string and table.
2019-02-15 12:03:54 -05:00
Matthew Heguy
ffff4116c2
Assign type to local
2019-02-15 11:54:33 -05:00
Matthew Heguy
cb6595002a
Have donator handle string and table.
2019-02-15 11:39:30 -05:00
Matthew Heguy
41c88ec682
Move to localised strings, command only runs twice now. no special string
2019-02-14 19:21:43 -05:00
Matthew Heguy
23121cd31d
Fix desync
...
apoc: set data in token rather than relying on passed data to be valid
hydra: move data into Global to allow changes during runtime
2019-02-14 19:02:39 -05:00
Matthew
6e037363d6
Merge pull request #729 from plague006/market_tracking
...
Market tracking
2019-02-14 12:54:49 -05:00
Matthew Heguy
f478b6578b
Expand doc
2019-02-14 12:45:35 -05:00
plague006
39db9fe397
Toggle nth_tick hook
2019-02-14 12:45:34 -05:00
plague006
0f62037355
Switch to new rank system
2019-02-14 12:45:34 -05:00
plague006
927b89d768
Name to index
2019-02-14 12:45:34 -05:00
plague006
22e91d4d3f
Push market buffs from global into Global
...
other misc. tweaks
2019-02-14 12:45:34 -05:00
plague006
e7cd23e3ff
Add destroy command
2019-02-14 12:45:34 -05:00
plague006
a18585860c
Autoformat
2019-02-14 12:44:59 -05:00
plague006
5183f720b5
Track markets and add market removeall command option
2019-02-14 12:44:59 -05:00
Matthew
16c119096f
Merge pull request #745 from plague006/apocalypse
...
Add apocalypse
2019-02-14 12:20:10 -05:00
Matthew Heguy
9b1ac03599
Add safety net to game-ending command
2019-02-14 12:16:05 -05:00
Matthew
d47c950b57
Merge pull request #754 from plague006/position
...
Have Retailer take Position as dictionary or array
2019-02-14 11:56:36 -05:00
Matthew Heguy
ed71415108
Fix dependency
2019-02-14 11:52:23 -05:00
Matthew Heguy
28ab0beff6
Remove admin_only flag
2019-02-14 11:45:11 -05:00
Matthew Heguy
72da0267b9
Add autosave to apocalypse
2019-02-14 11:44:06 -05:00
plague006
fad3df8c13
Use rank system
2019-02-14 11:44:06 -05:00
plague006
8b10cd44b5
Integrate apocalypse as an admin command
2019-02-14 11:44:06 -05:00
plague006
ae03b94fc8
Remove nuke removal, change implementation of spawning biters
2019-02-14 11:44:05 -05:00
Matthew Heguy
fbc57ef0e7
Add apocalypse
2019-02-14 11:44:05 -05:00
Matthew
d48946f357
Merge pull request #713 from plague006/rank_system
...
Overhaul rank system, command, donator, add probation rank
2019-02-14 11:43:04 -05:00
Matthew Heguy
397a84b150
Fix lint warnings
2019-02-14 03:03:51 -05:00
Matthew Heguy
eceb44afe6
Check for nil in syn_ranks_callback
2019-02-13 15:01:38 -05:00
Matthew Heguy
0ded088bc7
Have Retailer take Position as dictionary or array.
2019-02-13 14:27:45 -05:00
Matthew Heguy
98ea714560
Restore functionality of whois
2019-02-13 14:12:40 -05:00
Lynn
7dfd6e92c9
Merge pull request #752 from plague006/digits
...
Change digit to string to prevent error (and desyncs)
2019-02-13 18:25:26 +01:00
Lynn
dd93821f51
Update map_gen/maps/diggy/feature/experience.lua
...
Co-Authored-By: plague006 <plague006@users.noreply.github.com>
2019-02-13 12:18:40 -05:00
Simon
7179cad9db
Merge pull request #753 from Jayefuu/patch-8
...
maps/line_and_trees.lua - Removed default ability to use landfill.
2019-02-13 14:43:35 +01:00
grilledham
3d0fc5acf5
updates to player list to show rank and donator
2019-02-13 12:38:24 +00:00
grilledham
856183f4a0
change how rank colors are returned
2019-02-13 12:37:45 +00:00
Jayefuu
737dc98a6a
Removed default ability to use landfill.
...
Landfill removes challenge of making train paths through ore circles. Used to be disabled by command after map creation but is important enough feature of map that it should be set on init.
2019-02-13 08:23:49 +00:00
Matthew Heguy
17cc882b04
Change digits to strings to prevent future errors
2019-02-13 01:10:26 -05:00
Matthew Heguy
cbe82d4edb
Change digit to string to prevent error
2019-02-13 00:18:17 -05:00
Matthew Heguy
52a0622995
Use locale for new rank system
2019-02-12 20:23:20 -05:00
Matthew Heguy
d6a44388e5
Expose get_rank, localize functions that are called frequently
2019-02-12 20:22:13 -05:00
Matthew Heguy
d0de5951c6
Switch info to use locale for donator rank. Make donator a supplement to rank rather than rank itself.
2019-02-12 20:22:13 -05:00
