688 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
grilledham	66483f5a52	added map_gen_not_threaded	2018-01-15 17:25:46 +00:00
grilledham	10d9023457	change map gen to use actions that are reused	2018-01-15 17:25:29 +00:00
grilledham	4585779a6b	Allow actions in thread_queue to be kept alive if they return true	2018-01-15 17:24:48 +00:00
grilledham	ad1877ece7	Added helpful comments to template	2018-01-15 17:23:36 +00:00
Valansch	215d68c946	Merge pull request #148 from Valansch/dev_usergroups_autoupdate_cleanup ... Dev usergroups autoupdate cleanup	2018-01-09 20:49:26 +01:00
Valansch	8ce0010022	Merge pull request #147 from Valansch/reenable_on_tick ... Reenable on tick	2018-01-09 20:49:14 +01:00
Valansch	0d4acf5951	Merge pull request #146 from Valansch/dev_antigrief_fix ... fixed that antigrief would kick players nading ghosts	2018-01-09 20:48:32 +01:00
Valansch	36e0db3487	Fixed typo	2018-01-07 23:28:55 +01:00
Valansch	562bd6bd5e	removed deprecated user groups code again?	2018-01-07 22:28:00 +01:00
Valansch	f66765bcf5	enabled on_tick stuff again	2018-01-07 11:20:57 +01:00
Valansch	9d491f7cac	fixed that antigrief would kick players nading ghosts	2018-01-07 11:14:36 +01:00
Valansch	eedfcb49fa	Merge pull request #143 from Valansch/dev_anti_grief_tools ... Dev anti grief tools	2017-12-29 15:34:47 +01:00
Valansch	8d138c6526	Merge pull request #142 from Valansch/dev_artillery_control ... implemented auto kick/ban	2017-12-29 15:34:25 +01:00
Triston	c4477fed7a	Merge pull request #144 from Valansch/island_0.16_tweaks ... Tile/Entity name 0.16 port	2017-12-28 18:33:34 -05:00
Maik Wild	9bf96adac3	made allowed_to_nuke not accept strings	2017-12-28 23:03:50 +01:00
Maik Wild	468878b289	stone-rock ==> rock-big	2017-12-28 22:53:39 +01:00
Maik Wild	d98022947b	added a dismembered hooker	2017-12-28 22:47:41 +01:00
Maik Wild	85a310847e	removed red planet	2017-12-28 22:45:49 +01:00
Maik Wild	ba1f81c3e6	Renamed rocks and grass to 0.16 compatibe names	2017-12-28 22:45:27 +01:00
Maik Wild	b50f1b68af	added build.sh to gitignore	2017-12-28 21:54:43 +01:00
Maik Wild	1dd02d2e76	changed additional variable names from sand-1 to sand	2017-12-28 21:54:19 +01:00
Maik Wild	9cffe0e5e8	further tile name changes	2017-12-28 21:32:22 +01:00
Maik Wild	adda0b94a5	fixed missing )	2017-12-28 21:02:36 +01:00
Maik Wild	3163d8c4e8	Added log output in case of error in Thread.lua	2017-12-28 20:55:45 +01:00
Maik Wild	8207c277bb	fixed accidental name changes	2017-12-28 20:53:48 +01:00
Maik Wild	13bd4969f0	ported tile names from 0.15 to 0.16	2017-12-28 19:11:25 +01:00
Maik Wild	e52341219a	island resort: implemented run_chart_update. Ported commit 68397ed7f96	2017-12-28 18:17:29 +01:00
Maik Wild	5846f1c3c5	removed artillery remote from market	2017-12-27 01:38:21 +01:00
Maik Wild	5e2a47bc19	fixed that antigrief would kick players for using fish	2017-12-27 01:33:29 +01:00
Maik Wild	6c16927d66	fixed capsule use resulting in ban	2017-12-26 00:09:32 +01:00
Maik Wild	63408254cf	fix /kill crash #125	2017-12-25 23:09:40 +01:00
Maik Wild	c1231f0ee9	made user groups only save on server	2017-12-25 23:08:32 +01:00
Maik Wild	4a47033955	implemented auto kick/ban	2017-12-25 23:00:24 +01:00
Valansch	53765632ea	Merge pull request #141 from Valansch/detrain_crash_fix ... Detrain crash fix (+walkabout fix)	2017-12-25 22:16:22 +01:00
Valansch	94dda4837f	Merge pull request #139 from grilledham/img_to_map ... Updated img to map converter for 0.16	2017-12-25 22:15:21 +01:00
Valansch	afdd82894e	Merge pull request #138 from Valansch/dev_reactor_meltdown ... implemented reactor meltdown	2017-12-25 22:14:11 +01:00
Maik Wild	576900ef26	fixed walkabout crash	2017-12-25 22:11:24 +01:00
Maik Wild	68ccbfa54a	fixed math.floor(temp)	2017-12-25 04:07:35 +01:00
grilledham	92e12b37dd	Updated tile_map for 0.16 tile names	2017-12-24 16:07:58 +00:00
grilledham	b92ac4e95b	Added template	2017-12-24 16:07:07 +00:00
Maik Wild	2e7da62f70	Implemented reactor alerts	2017-12-23 17:23:49 +01:00
Maik Wild	500209fe9d	removed /detrain	2017-12-23 02:26:19 +01:00
Maik Wild	76cddc23dd	Changed reactor warning and meltdown behaviour	2017-12-22 22:10:09 +01:00
Maik Wild	05e23f99b2	1000°C fix and wasteland fix	2017-12-22 19:05:29 +01:00
Maik Wild	2c077d82a5	fixed stutter caused by reactors, changes: reactor takes dmg only at 1000°C, warning above 800°C	2017-12-22 14:58:48 +01:00
Maik Wild	fb19e52a5e	implemented reactor meltdown	2017-12-21 16:37:02 +01:00
Triston	b03567f507	Merge pull request #137 from Valansch/artillery_control ... Artillery control	2017-12-19 14:38:35 -05:00
Triston	0d4322af03	Merge pull request #136 from Valansch/air_patch ... Air patch	2017-12-19 13:16:40 -05:00
Maik Wild	efbae41a7b	removed artillery targeting remote from recipe	2017-12-19 18:10:55 +01:00
Maik Wild	4da87bef95	some fish market refactoring, removed buffs from fish market and implemented artillery targeting remote as market item	2017-12-19 18:10:15 +01:00