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

1775 Commits

Author SHA1 Message Date
Maxim Martyanov
340ee13fb9
Renamed variables to match codestyle and moved block to it's logical location 2020-07-21 14:00:13 +03:00
Maxim Martyanov
621c1486bf
Make grief prevention more aggressive: kill player's character and hold all crafting queue in corpse (via pre-death inventory resize by bonus multiplier, same used in RPG system and returned by this system back to normal sizes), instead relying on Factorio's item placement, so no items are lost from team.
Corrected shown message on player abuse attempt.
P.S. Not a Lua developer at all, so styleguide may be broken.
2020-07-21 09:40:32 +03:00
hanakocz
42c93a6825 new module - charging station (accumulators -> armor) 2020-07-21 04:56:09 +02:00
hanakocz
9966b58fa4 rpg fix for getting xp, bonus hp -> bonus xp even if killed by turret 2020-07-20 19:41:05 +02:00
Gerkiz
2442340ed6
Merge pull request #181 from hanakocz/master
rpg - personal tax variable + health bonused units always grant bonus xp
2020-07-19 16:45:40 +02:00
hanakocz
874064afe0 rpg - personal tax variable + health bonused units always grant bonus xp 2020-07-19 16:43:56 +02:00
Gerkiz
790c334dda
Merge pull request #180 from hanakocz/master
fix for biter_health_booster deleting worms and spawners from the table
2020-07-19 16:37:24 +02:00
hanakocz
6a3e9253ef
Merge pull request #19 from M3wM3w/master
minor adjustment
2020-07-19 12:16:39 +02:00
Gerkiz
92c5373f31 minor adjustment 2020-07-19 12:06:53 +02:00
hanakocz
408893ca6e
Merge pull request #18 from M3wM3w/master
update from main
2020-07-19 05:07:32 +02:00
Gerkiz
b5b9cf4437 move rpg to modules and rename to rpg_v2 2020-07-18 22:18:57 +02:00
hanakocz
7281f40cfe
Merge pull request #17 from M3wM3w/master
update from main
2020-07-18 17:59:32 +02:00
hanakocz
7e90fe9ae7 health_pool fix 2020-07-18 17:55:02 +02:00
Gerkiz
b8d9f5bbae cave choppy fixes 2020-07-18 17:08:56 +02:00
Gerkiz
4d06dbc2cb flamethrower bug fix 2020-07-18 16:36:24 +02:00
Gerkiz
8bc37712ff fixes 2020-07-17 16:59:15 +02:00
hanakocz
f220b2ddda
Merge pull request #16 from M3wM3w/master
update from main
2020-07-16 03:27:30 +02:00
Gerkiz
7da400db14 minor changes 2020-07-14 21:51:04 +02:00
Gerkiz
1f017f687a refactor and new map 2020-07-14 21:50:56 +02:00
Gerkiz
c2829984fe minor fix 2020-07-12 21:11:43 +02:00
Gerkiz
92ced6c64a minor fix 2020-07-12 21:01:11 +02:00
Gerkiz
a5061c02ba revert fish_defender to old version 2020-07-12 20:57:41 +02:00
Gerkiz
22a40f19fa fish_defender_v2 2020-07-12 20:54:44 +02:00
Gerkiz
383f172661 remove unused function 2020-07-12 18:59:30 +02:00
Gerkiz
edbef96f78 fixes 2020-07-12 18:58:00 +02:00
hanakocz
341879f7c9
Merge pull request #15 from M3wM3w/master
update from main
2020-07-12 06:22:26 +02:00
Gerkiz
e43cb5b7f2 refactor and move on_init to antigrief 2020-07-11 20:57:54 +02:00
Gerkiz
0aea9c28b4 tweaks and fixes 2020-07-11 17:04:53 +02:00
Gerkiz
647d52859c minor changes to fishy and mtn 2020-07-11 09:32:36 +02:00
Gerkiz
cda53a6bdd locale update 2020-07-10 16:14:54 +02:00
Gerkiz
4cfe885df6 minor changes 2020-07-10 16:08:50 +02:00
Gerkiz
473f75f7a6 desync fixes 2020-07-10 13:52:55 +02:00
Gerkiz
78cba7f311 minor changes 2020-07-09 14:26:07 +02:00
Gerkiz
df097d7520 more tweaks 2020-07-08 22:57:43 +02:00
Gerkiz
6f368def27 fixed weird stutter on join.... 2020-07-08 00:08:19 +02:00
Gerkiz
6335126c6c refactor 2020-07-07 23:42:44 +02:00
Gerkiz
af533a2e46 minor adjustment 2020-07-07 17:49:51 +02:00
Gerkiz
2ad31cc5ec remove unused code 2020-07-07 17:44:04 +02:00
Gerkiz
50d30c0890 Compare base version
Will be removed when 1.0 is released.
2020-07-07 17:06:10 +02:00
Gerkiz
0f6917a5a7
Merge pull request #179 from Bilka2/name-in-autostash-flying-text
Use localized item names for autostash flying text
2020-07-07 17:02:56 +02:00
Gerkiz
29561ec862 fixed minor issues with 0.17 and 0.18 2020-07-07 16:31:01 +02:00
Gerkiz
76e62404d2 fixed random bug with admin panel 2020-07-07 16:30:32 +02:00
Gerkiz
7f2cbcfb4f antigrief - added more logging 2020-07-07 16:30:17 +02:00
Gerkiz
e24dc9ee92 mtn fortress fixes 2020-07-07 16:30:04 +02:00
Gerkiz
bb52c38a0c minor fix 2020-07-06 23:28:24 +02:00
Gerkiz
95978014f5 log if a player is canceling a craft bigger than 40 2020-07-06 23:22:21 +02:00
Gerkiz
850cd4c08d don't let self be selected when performing actions from gui 2020-07-06 23:22:03 +02:00
Gerkiz
f42eafa072 fixed that soft_reset did not reset the tech 2020-07-06 23:21:45 +02:00
Gerkiz
31d388f590 fix that jail_data could jail a nil player 2020-07-06 23:21:32 +02:00
Gerkiz
c8feb9649d fix show_inventory on refresh 2020-07-06 23:21:22 +02:00