1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-10 00:43:27 +02:00
Commit Graph

3822 Commits

Author SHA1 Message Date
blubFisch
04fda19e80 Remove unused 2022-10-10 11:31:30 +01:00
blubFisch
8fadad6e1d Scale starter PvP shield with highest tech on map 2022-10-10 11:30:47 +01:00
Gerkiz
b08b54642f Auto stash before merge of "develop" and "origin/develop" 2022-10-09 17:06:53 +02:00
Gerkiz
aac4408433
Merge pull request #329 from blubFisch/develop-blub
Small stuff
2022-10-09 17:05:21 +02:00
blubFisch
6c4621e3c7 Prevent players from being in vehicles while AFK shield 2022-10-09 16:02:27 +01:00
blubFisch
26750ed6bd Fix a wrong message 2022-10-09 15:45:14 +01:00
Piratux
93636fd1c3 Cave terrain fixes 2022-10-09 16:48:16 +03:00
blubFisch
f989cbf6a3 Refactor 2022-10-09 12:25:22 +01:00
hanakocz
1c76edc32d
Merge pull request #328 from blubFisch/develop-blub
Add break/AFK protection shield + some small changes
2022-10-09 13:24:26 +02:00
blubFisch
5d66ef4060 Revert "Add safety for inv clearing"
This reverts commit 9f7b1e0d8a.
2022-10-09 12:21:37 +01:00
blubFisch
9f7b1e0d8a Add safety for inv clearing 2022-10-09 12:19:06 +01:00
blubFisch
6513afeea5 Clear inv after town falls offline 2022-10-09 11:40:00 +01:00
blubFisch
6015439277 Add changelog 2022-10-09 11:33:58 +01:00
blubFisch
f5d04d8c63 Add break/AFK protection shield 2022-10-09 11:11:38 +01:00
Gerkiz
b65064c9d3
Merge pull request #327 from blubFisch/develop-blub
Bunch of small fixes/changes
2022-10-09 11:23:01 +02:00
blubFisch
d672332b33 DRY up town fall messages + 1 fix 2022-10-08 19:09:23 +01:00
blubFisch
2dd5843932 More safe way to fix ghost desync 2022-10-08 18:47:26 +01:00
blubFisch
819b90362c Fix undefined 2022-10-08 17:29:41 +01:00
blubFisch
362eeda9e8 Merge branch 'develop-blub' of github.com:blubFisch/ComfyFactorio into develop-blub 2022-10-08 16:58:59 +01:00
blubFisch
70f872f460 Don't build near gates 2022-10-08 16:58:45 +01:00
Gerkiz
82cd26046f
Merge branch 'develop' into develop-blub 2022-10-08 17:37:14 +02:00
blubFisch
c381b29724 Proper fix for ghost related DESYNC 2022-10-08 16:37:03 +01:00
blubFisch
34f9c9b2b4 Gradual PvP Shield rollout 2022-10-08 16:17:10 +01:00
blubFisch
9c83a364de Cheaper lasers 2022-10-08 14:10:44 +01:00
blubFisch
94a151a094 Increase town distance (protection zone compat) 2022-10-08 13:25:05 +01:00
blubFisch
2ebf9ec808 1 more performance boost 2022-10-08 13:21:47 +01:00
blubFisch
3a1caac80c luacheck 2022-10-08 12:46:38 +01:00
blubFisch
0b6e9ddb2f Less rocks 2022-10-08 12:45:38 +01:00
blubFisch
5e8ac2bf5f Fix deserting combat robots (+others) 2022-10-08 12:39:47 +01:00
blubFisch
52d464bce6 Add hints 2022-10-08 12:15:01 +01:00
blubFisch
7041361a08 Add hint 2022-10-08 12:12:29 +01:00
blubFisch
971afaf438 Bigger zone 2022-10-08 12:09:47 +01:00
blubFisch
cb782c20e3 No free uranium 2022-10-08 12:09:24 +01:00
blubFisch
730bc3c11f Limit backpack slots 2022-10-08 12:06:46 +01:00
blubFisch
1b8bc9f986 Merge branch 'develop-blub' of github.com:blubFisch/ComfyFactorio into develop-blub 2022-10-08 12:01:48 +01:00
blubFisch
d7fc81fcb1 Simplification and massive performance boost for building restrictions 2022-10-08 12:01:32 +01:00
hanakocz
3fbbda99f9
Merge pull request #326 from blubFisch/develop-blub
Bunch of small adjustments
2022-10-07 11:32:42 +02:00
hanakocz
49a2758249
Merge branch 'develop' into develop-blub 2022-10-07 11:09:12 +02:00
blubFisch
0e32c7d475 Rebrand to "PvP Shield" 2022-10-07 08:55:25 +01:00
blubFisch
1411dae640 Show protection info to other forces 2022-10-07 08:50:58 +01:00
blubFisch
8965ff94b5 Cheaper lasers 2022-10-07 08:50:19 +01:00
blubFisch
7bde2a7f9f Start with 20 laser slots 2022-10-07 08:46:29 +01:00
hanakocz
461e1b7a46
Merge pull request #325 from ComfyFactory/spiral_troopers_fix
remove non-existent item
2022-10-06 22:34:04 +02:00
hanakocz
9bd70819b5 remove non-existent item 2022-10-06 22:27:20 +02:00
Piratux
72b5391ce8 Cars and nuclear enabled + cleanup
Changes:
- Car and nuclear fuel related technologies are now enabled.
- Cliff base now contains tank instead of car after 25 islands.
2022-10-06 14:47:17 +03:00
Gerkiz
23248b5c77
Merge pull request #324 from blubFisch/develop-blub
Some fixes
2022-10-06 09:07:49 +02:00
blubFisch
34290d4d11 Fix for failed zone removal 2022-10-06 07:56:30 +01:00
blubFisch
f853abd030 Fix towny start research 2022-10-06 07:41:10 +01:00
blubFisch
c56de7dd7d Fix a non-update of protection zones and text updates 2022-10-06 07:34:41 +01:00
blubFisch
ff3535205b Rework starting items 2022-10-05 21:03:01 +01:00