2144 Commits

Author	SHA1	Message	Date
blubFisch	f2d00b122b	Merge branch 'develop' into develop-blub	2022-10-04 15:56:38 +01:00
Gerkiz	1b57f00a53	Mtn v3 - only post when wave is >= 1000 to discord	2022-09-30 22:24:01 +02:00
Gerkiz	30f207da55	Refactor Scrap Towny and ix desync issues	2022-09-30 22:23:37 +02:00
blubFisch	b2006912dd	Shorten survival goal	2022-09-28 15:01:04 +01:00
blubFisch	c7ea88d6db	Show player numbers in scoreboard instead of info section	2022-09-28 10:27:58 +01:00
blubFisch	fe5824af78	Merge branch 'develop' into develop	2022-09-28 09:48:14 +01:00
Gerkiz	9b1df4aa7e	Towny - disable show_inventory and where command.	2022-09-26 19:48:50 +02:00
blubFisch	22e70ca40c	Branch off worms_create_oil_patches for Towny and rebalance for oil scarcity	2022-09-23 12:46:44 +01:00
Gerkiz	21c2375e5e	Fish v2 - fix error in difficulty	2022-09-23 10:38:52 +02:00
Gerkiz	44cd85e9ed	Towny fixes	2022-09-22 22:14:23 +02:00
Gerkiz	e9b7789f5a	Towny small changes	2022-09-22 20:42:46 +02:00
Gerkiz	8e79d3c800	Towny small fix	2022-09-22 20:25:08 +02:00
Gerkiz	3d856551b4	Towny - merge upstream changes ... Changes done by blubFisch	2022-09-22 20:20:05 +02:00
Johny	0cc4b2a05a	Stats GUI fix	2022-09-18 11:35:24 +02:00
Johny	10b1fb18de	Locale changes	2022-09-18 11:32:16 +02:00
Johny	eb2aabb731	Stats GUI shows coins spent on train upgrades	2022-09-18 11:10:58 +02:00
Johny	8e7c92df45	Fixing aura market limit and chest icon	2022-09-18 10:31:10 +02:00
danielmartin0	3880a5a446	luacheck	2022-09-13 22:10:53 +01:00
danielmartin0	b3fb6040a3	luacheck	2022-09-13 22:09:25 +01:00
danielmartin0	d10c9206c2	Merge branch 'develop' into develop	2022-09-13 22:03:59 +01:00
Gerkiz	7b7967cabc	Merge branch 'develop' into improv	2022-09-03 21:28:03 +02:00
Gerkiz	b4c5b42548	Misc - various nil checks	2022-09-03 21:26:20 +02:00
Johny	0f5ef9927a	Adding check for overheal	2022-08-29 18:18:07 +02:00
Johny	b7481c49ab	Purchasing train health heals it by the amount increased	2022-08-29 17:14:33 +02:00
Gerkiz	c5018a5840	Merge branch 'develop' into expanse_update	2022-08-18 19:57:38 +02:00
Gerkiz	b1dd8f9835	Mtn v3 - fix bad boo boo	2022-08-18 19:55:43 +02:00
hanakocz	48142adea7	value blacklist adjust	2022-08-18 19:17:06 +02:00
hanakocz	64e037af97	Expanse update - locale, early uranium access, fixes	2022-08-18 19:04:34 +02:00
Gerkiz	5bb04713f5	Mtn v3 - shuffle market prices around the map	2022-08-12 19:11:01 +02:00
Gerkiz	ba83870374	Mtn v3 - restrict newly joined players from using the main loco as taxi	2022-08-12 19:10:48 +02:00
Gerkiz	576ee4cacb	Expanse - delay the infini tree creation	2022-08-12 19:09:58 +02:00
Gerkiz	5601f092a7	Expanse - fixes events being misaligned	2022-08-12 00:06:15 +02:00
Johny	5b35baa45c	Revert "Discharge remote cost decrease" ... This reverts commit 05bcc5ea8ed9110b039d0c99f3ebb539cd7e9958.	2022-08-11 17:24:25 +02:00
Johny	05bcc5ea8e	Discharge remote cost decrease	2022-08-11 16:31:38 +02:00
Johny	7e80029bef	Mystical chest alert when bonus ends	2022-08-11 16:28:36 +02:00
hanakocz	8647526ce0	Expanse fixes + updates.	2022-08-08 02:50:40 +02:00
Gerkiz	7b49ca2ca0	Fish v2 - fix gui button height	2022-08-07 23:02:51 +02:00
Gerkiz	e4325b6d1d	Fish v2 - fix that modded turrets are also included in the turret limit	2022-08-07 21:42:08 +02:00
Gerkiz	6f9fa6ffa7	mtn v3 - fix loco repair bug	2022-08-05 15:49:20 +02:00
danielmartin0	9a920ef0e4	discord bugfix	2022-07-31 21:13:14 +01:00
danielmartin0	c535696c7a	small balance changes	2022-07-31 15:07:53 +01:00
danielmartin0	353fce2dda	bugfixes, more krakens near the end, unguarded silo threat	2022-07-31 13:08:22 +01:00
danielmartin0	2f3b74bd81	last island should have merchants with power armor	2022-07-31 10:43:51 +01:00
danielmartin0	27f8b940e8	tweaks	2022-07-31 10:40:10 +01:00
danielmartin0	de74e8d2b3	tweaks	2022-07-31 10:25:17 +01:00
danielmartin0	0cd02ed024	tweaks	2022-07-31 10:23:59 +01:00
danielmartin0	9774fd4254	v1.3.4 — kraken bugfix, other smoothings	2022-07-30 21:31:00 +01:00
danielmartin0	f580743cfc	info tab fix	2022-07-30 15:28:28 +01:00
danielmartin0	732d52ca3d	market rendering, allows cannons to be fortified when at max hp	2022-07-30 15:09:53 +01:00
danielmartin0	3b84445d34	fix bugs; remove chests; remove captain inventory slots	2022-07-30 14:55:03 +01:00