-
Notifications
You must be signed in to change notification settings - Fork 4.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
More giant insects and bugs #49170
More giant insects and bugs #49170
Commits on Jun 30, 2020
-
Configuration menu - View commit details
-
Copy full SHA for f537d93 - Browse repository at this point
Copy the full SHA f537d93View commit details
Commits on Jul 15, 2020
-
Configuration menu - View commit details
-
Copy full SHA for c449416 - Browse repository at this point
Copy the full SHA c449416View commit details
Commits on Dec 20, 2020
-
Configuration menu - View commit details
-
Copy full SHA for d7dbb72 - Browse repository at this point
Copy the full SHA d7dbb72View commit details
Commits on May 19, 2021
-
Configuration menu - View commit details
-
Copy full SHA for f673af3 - Browse repository at this point
Copy the full SHA f673af3View commit details
Commits on Jun 1, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 932a2bd - Browse repository at this point
Copy the full SHA 932a2bdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3108432 - Browse repository at this point
Copy the full SHA 3108432View commit details -
Update data/json/items/tool_armor.json
Co-authored-by: Binrui Dong <brett.browning.dong@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 2837517 - Browse repository at this point
Copy the full SHA 2837517View commit details -
Update data/json/items/tool_armor.json
Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
Configuration menu - View commit details
-
Copy full SHA for 80d0905 - Browse repository at this point
Copy the full SHA 80d0905View commit details -
Update data/json/items/tool_armor.json
Co-authored-by: chaohedgehogs <46550455+chaohedgehogs@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 5897e7c - Browse repository at this point
Copy the full SHA 5897e7cView commit details -
Update data/json/items/tool_armor.json
Co-authored-by: chaohedgehogs <46550455+chaohedgehogs@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 0c784b0 - Browse repository at this point
Copy the full SHA 0c784b0View commit details -
Update data/json/items/tool_armor.json
Co-authored-by: Binrui Dong <brett.browning.dong@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 2bb3bc7 - Browse repository at this point
Copy the full SHA 2bb3bc7View commit details -
Added Two-Way Radio to the helmet when on, in-built radio was a common functionality with the helmets I researched.
Configuration menu - View commit details
-
Copy full SHA for c7376e9 - Browse repository at this point
Copy the full SHA c7376e9View commit details
Commits on Jun 2, 2021
-
9x19mm +P+ is about double the price of 9x19mm +P as per my cursory research.
Configuration menu - View commit details
-
Copy full SHA for dc8197e - Browse repository at this point
Copy the full SHA dc8197eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 14c0928 - Browse repository at this point
Copy the full SHA 14c0928View commit details -
Configuration menu - View commit details
-
Copy full SHA for d561acb - Browse repository at this point
Copy the full SHA d561acbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1d4c504 - Browse repository at this point
Copy the full SHA 1d4c504View commit details
Commits on Jun 3, 2021
-
Merge pull request CleverRaven#49149 from faefux/9mmP2-price
9x19mm +P and + prices
Configuration menu - View commit details
-
Copy full SHA for c97f669 - Browse repository at this point
Copy the full SHA c97f669View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7e62432 - Browse repository at this point
Copy the full SHA 7e62432View commit details
Commits on Jun 4, 2021
-
I've added new mobs from my bug's life mod such as: -Aphids -Praying mantises in three sizes -Underground mole crickets -Lady bugs -Grasshoppers in two sizes -Antlion larvae and adult antlions -Water striders in two sizes
Configuration menu - View commit details
-
Copy full SHA for 7260fa5 - Browse repository at this point
Copy the full SHA 7260fa5View commit details -
Configuration menu - View commit details
-
Copy full SHA for a1a1e77 - Browse repository at this point
Copy the full SHA a1a1e77View commit details -
Revert "Revert "9x19mm +P and + prices" (CleverRaven#49155)"
This reverts commit 7e62432.
Configuration menu - View commit details
-
Copy full SHA for 7ca7f34 - Browse repository at this point
Copy the full SHA 7ca7f34View commit details -
Revert "Revert "Revert "9x19mm +P and + prices" (CleverRaven#49155)""
This reverts commit 7ca7f34.
Configuration menu - View commit details
-
Copy full SHA for d7f813f - Browse repository at this point
Copy the full SHA d7f813fView commit details -
Revert "New chitinous creatures"
This reverts commit 7260fa5.
Configuration menu - View commit details
-
Copy full SHA for f626ac5 - Browse repository at this point
Copy the full SHA f626ac5View commit details -
Revert "Revert "New chitinous creatures""
This reverts commit f626ac5.
Configuration menu - View commit details
-
Copy full SHA for 588ac57 - Browse repository at this point
Copy the full SHA 588ac57View commit details -
Revert "Revert "Revert "New chitinous creatures"""
This reverts commit 588ac57.
Configuration menu - View commit details
-
Copy full SHA for bb5258f - Browse repository at this point
Copy the full SHA bb5258fView commit details -
Configuration menu - View commit details
-
Copy full SHA for c52a9ad - Browse repository at this point
Copy the full SHA c52a9adView commit details -
Revert "Revert "Revert "Revert "New chitinous creatures""""
This reverts commit bb5258f.
Configuration menu - View commit details
-
Copy full SHA for 0b476f2 - Browse repository at this point
Copy the full SHA 0b476f2View commit details -
Configuration menu - View commit details
-
Copy full SHA for fb639cc - Browse repository at this point
Copy the full SHA fb639ccView commit details -
Merge pull request #1 from SuddenEyePuncture/bugs-fixes
Update insect_spider.json
Configuration menu - View commit details
-
Copy full SHA for 351c299 - Browse repository at this point
Copy the full SHA 351c299View commit details -
Configuration menu - View commit details
-
Copy full SHA for 33f6b30 - Browse repository at this point
Copy the full SHA 33f6b30View commit details -
Merge pull request #2 from SuddenEyePuncture/bugs-fix-1
Update other.json
Configuration menu - View commit details
-
Copy full SHA for 72fc70b - Browse repository at this point
Copy the full SHA 72fc70bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 586465b - Browse repository at this point
Copy the full SHA 586465bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 31383d0 - Browse repository at this point
Copy the full SHA 31383d0View commit details -
Merge pull request #3 from SuddenEyePuncture/spelling
Spelling fixes
Configuration menu - View commit details
-
Copy full SHA for 40f0caf - Browse repository at this point
Copy the full SHA 40f0cafView commit details -
Thanks for fixing my spelling Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
Configuration menu - View commit details
-
Copy full SHA for 2627d80 - Browse repository at this point
Copy the full SHA 2627d80View commit details
Commits on Jun 5, 2021
-
Spelling fixes Co-authored-by: chaohedgehogs <46550455+chaohedgehogs@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for b6cdcce - Browse repository at this point
Copy the full SHA b6cdcceView commit details -
Spelling fix Co-authored-by: chaohedgehogs <46550455+chaohedgehogs@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for b19d9ed - Browse repository at this point
Copy the full SHA b19d9edView commit details -
Configuration menu - View commit details
-
Copy full SHA for 32f5d99 - Browse repository at this point
Copy the full SHA 32f5d99View commit details -
Configuration menu - View commit details
-
Copy full SHA for f56767e - Browse repository at this point
Copy the full SHA f56767eView commit details -
You can't tame aphids. If you want to transport aphids try scaring them instead. Also, I've lowered aphid's agression and shortened description.
Configuration menu - View commit details
-
Copy full SHA for aba883b - Browse repository at this point
Copy the full SHA aba883bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3d53805 - Browse repository at this point
Copy the full SHA 3d53805View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9855e30 - Browse repository at this point
Copy the full SHA 9855e30View commit details
Commits on Jun 6, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 91d4626 - Browse repository at this point
Copy the full SHA 91d4626View commit details -
Configuration menu - View commit details
-
Copy full SHA for a7f512a - Browse repository at this point
Copy the full SHA a7f512aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 52c2c3e - Browse repository at this point
Copy the full SHA 52c2c3eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7f0e6ea - Browse repository at this point
Copy the full SHA 7f0e6eaView commit details -
Aphids can no longer be tamed. Aphids morale and agression are lowered. I'd given them the fear trigger PLAYER_CLOSE and set their morale regen to true.
Configuration menu - View commit details
-
Copy full SHA for 6af3040 - Browse repository at this point
Copy the full SHA 6af3040View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2640bc9 - Browse repository at this point
Copy the full SHA 2640bc9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0fac78c - Browse repository at this point
Copy the full SHA 0fac78cView commit details -
Apply suggestions from code review
Removed some insects from spawn groups Co-authored-by: Venera3 <72006894+Venera3@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for f7b0ba9 - Browse repository at this point
Copy the full SHA f7b0ba9View commit details -
removed mole crickets and ladybugs from some locations
Configuration menu - View commit details
-
Copy full SHA for 60adaf1 - Browse repository at this point
Copy the full SHA 60adaf1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 68c327e - Browse repository at this point
Copy the full SHA 68c327eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2fafbc3 - Browse repository at this point
Copy the full SHA 2fafbc3View commit details
Commits on Jun 7, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 58cd96e - Browse repository at this point
Copy the full SHA 58cd96eView commit details
Commits on Jun 8, 2021
-
Configuration menu - View commit details
-
Copy full SHA for d6cda5d - Browse repository at this point
Copy the full SHA d6cda5dView commit details -
Merge pull request #6 from SuddenEyePuncture/aphid-agro-fix
Aphids agro fix
Configuration menu - View commit details
-
Copy full SHA for d6832f6 - Browse repository at this point
Copy the full SHA d6832f6View commit details
Commits on Jun 9, 2021
-
Configuration menu - View commit details
-
Copy full SHA for c3f63df - Browse repository at this point
Copy the full SHA c3f63dfView commit details -
Configuration menu - View commit details
-
Copy full SHA for c750a83 - Browse repository at this point
Copy the full SHA c750a83View commit details
Commits on Jun 10, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 59c0c7e - Browse repository at this point
Copy the full SHA 59c0c7eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 10e8689 - Browse repository at this point
Copy the full SHA 10e8689View commit details -
Water striders can't walk on land and attack slower
Configuration menu - View commit details
-
Copy full SHA for 8265a0d - Browse repository at this point
Copy the full SHA 8265a0dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7078173 - Browse repository at this point
Copy the full SHA 7078173View commit details -
Merge pull request #8 from SuddenEyePuncture/Strider-speed-fix
Strider attack speed fix
Configuration menu - View commit details
-
Copy full SHA for d98ee3e - Browse repository at this point
Copy the full SHA d98ee3eView commit details
Commits on Jun 14, 2021
-
Apply suggestions from code review
Added and removed some monster flags Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for b06e5d4 - Browse repository at this point
Copy the full SHA b06e5d4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8ffdf63 - Browse repository at this point
Copy the full SHA 8ffdf63View commit details -
Lowered water striders speed to 50 and removed "aquatic" flag
Configuration menu - View commit details
-
Copy full SHA for acb885d - Browse repository at this point
Copy the full SHA acb885dView commit details -
Configuration menu - View commit details
-
Copy full SHA for e06306a - Browse repository at this point
Copy the full SHA e06306aView commit details -
Merge pull request #9 from SuddenEyePuncture/strider-swim-fix
Fixed striders swimming
Configuration menu - View commit details
-
Copy full SHA for 54b035c - Browse repository at this point
Copy the full SHA 54b035cView commit details -
Made antlions reproduce. Adult antlions are not predators.
Configuration menu - View commit details
-
Copy full SHA for 4b8999f - Browse repository at this point
Copy the full SHA 4b8999fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1df0fd0 - Browse repository at this point
Copy the full SHA 1df0fd0View commit details -
Added reproduction according to Venera's suggestion
Configuration menu - View commit details
-
Copy full SHA for 57cc68b - Browse repository at this point
Copy the full SHA 57cc68bView commit details -
Antlion harvest changed to "arachnid_flying"
Configuration menu - View commit details
-
Copy full SHA for 1bf9ea9 - Browse repository at this point
Copy the full SHA 1bf9ea9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0109cdc - Browse repository at this point
Copy the full SHA 0109cdcView commit details -
Antlion harvest changed to "arachnid_flying"
Configuration menu - View commit details
-
Copy full SHA for f39fd65 - Browse repository at this point
Copy the full SHA f39fd65View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5d6ae30 - Browse repository at this point
Copy the full SHA 5d6ae30View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7ff3f63 - Browse repository at this point
Copy the full SHA 7ff3f63View commit details -
Configuration menu - View commit details
-
Copy full SHA for 86e0827 - Browse repository at this point
Copy the full SHA 86e0827View commit details -
Aphid should reproduce at acceptable rate
Configuration menu - View commit details
-
Copy full SHA for 2af2bd9 - Browse repository at this point
Copy the full SHA 2af2bd9View commit details
Commits on Jun 15, 2021
-
Configuration menu - View commit details
-
Copy full SHA for f08ea6c - Browse repository at this point
Copy the full SHA f08ea6cView commit details -
Configuration menu - View commit details
-
Copy full SHA for f115604 - Browse repository at this point
Copy the full SHA f115604View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8e7ddc9 - Browse repository at this point
Copy the full SHA 8e7ddc9View commit details -
Configuration menu - View commit details
-
Copy full SHA for e21179f - Browse repository at this point
Copy the full SHA e21179fView commit details
Commits on Jun 17, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 8ab4eef - Browse repository at this point
Copy the full SHA 8ab4eefView commit details -
Configuration menu - View commit details
-
Copy full SHA for ac4d144 - Browse repository at this point
Copy the full SHA ac4d144View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6a2d381 - Browse repository at this point
Copy the full SHA 6a2d381View commit details -
Configuration menu - View commit details
-
Copy full SHA for 41209a3 - Browse repository at this point
Copy the full SHA 41209a3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5081fc0 - Browse repository at this point
Copy the full SHA 5081fc0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5110fea - Browse repository at this point
Copy the full SHA 5110feaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4cb3f3a - Browse repository at this point
Copy the full SHA 4cb3f3aView commit details -
Remove obsolete POISON flag from some mobs
Configuration menu - View commit details
-
Copy full SHA for f7434ac - Browse repository at this point
Copy the full SHA f7434acView commit details -
Configuration menu - View commit details
-
Copy full SHA for bf33676 - Browse repository at this point
Copy the full SHA bf33676View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1e635c7 - Browse repository at this point
Copy the full SHA 1e635c7View commit details
Commits on Jun 21, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 16026af - Browse repository at this point
Copy the full SHA 16026afView commit details -
Configuration menu - View commit details
-
Copy full SHA for ed67ee0 - Browse repository at this point
Copy the full SHA ed67ee0View commit details -
Configuration menu - View commit details
-
Copy full SHA for bde8edf - Browse repository at this point
Copy the full SHA bde8edfView commit details -
Aphids give birth to small infertile aphids
Configuration menu - View commit details
-
Copy full SHA for eedd3b9 - Browse repository at this point
Copy the full SHA eedd3b9View commit details
Commits on Jun 27, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 3558ef5 - Browse repository at this point
Copy the full SHA 3558ef5View commit details -
Configuration menu - View commit details
-
Copy full SHA for ad69231 - Browse repository at this point
Copy the full SHA ad69231View commit details -
Praying mantises now have AP for regular attacks
Configuration menu - View commit details
-
Copy full SHA for 2559b22 - Browse repository at this point
Copy the full SHA 2559b22View commit details
Commits on Jul 4, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 4376c55 - Browse repository at this point
Copy the full SHA 4376c55View commit details
Commits on Jul 19, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 181a3d2 - Browse repository at this point
Copy the full SHA 181a3d2View commit details
Commits on Jul 20, 2021
-
Configuration menu - View commit details
-
Copy full SHA for aaa9801 - Browse repository at this point
Copy the full SHA aaa9801View commit details
Commits on Jul 21, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 57e98bf - Browse repository at this point
Copy the full SHA 57e98bfView commit details
Commits on Jul 31, 2021
-
Squashed commit of the following:
commit d730317 Author: Kevin Granade <kevin.granade@gmail.com> Date: Thu Jul 22 23:42:53 2021 -0700 JSON styling commit b1b40ff Merge: cb7f752 2d60945 Author: Kevin Granade <kevin.granade@gmail.com> Date: Thu Jul 22 22:56:23 2021 -0700 Merge remote-tracking branch 'origin/pr/49170' * origin/pr/49170: (52 commits) Remove duplicated antlion egg Update egg.json Update data/json/monster_factions.json Update insect_spider.json Update insect_spider.json Update eggs.json add more eggs Update egg.json Update insect_spider.json aphids reproduction fix lint json Remove poison flag Fixed antlions factions Update mob description Commits Aphid reproduction Antlion harvest Antlion reproduction fixed striders swimming Apply suggestions from code review ... commit 2d60945 Merge: 2d32b3c a78bb5b Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Thu Jul 22 08:35:46 2021 +0300 Remove duplicated antlion egg commit a78bb5b Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Thu Jul 22 08:34:31 2021 +0300 Remove duplicated antlion egg commit 2d32b3c Merge: d1b95a6 959ca88 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Thu Jul 22 08:22:01 2021 +0300 small fixes remove duplications and fixed bugs commit 959ca88 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Thu Jul 22 08:20:26 2021 +0300 Update egg.json commit 37bea30 Merge: 17d3241 d1b95a6 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Thu Jul 22 08:18:55 2021 +0300 Merge branch 'eggs_fix' into small-fixes commit d1b95a6 Merge: 57e98bf b313d9a Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Thu Jul 22 08:01:39 2021 +0300 Merge branch 'CleverRaven:master' into eggs_fix commit 17d3241 Merge: 548860b d0fb1f3 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Wed Jul 21 12:59:18 2021 +0300 Merge branch 'CleverRaven:master' into master commit 548860b Merge: 2b5e1ce 6ca1ebb Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Wed Jul 21 08:03:30 2021 +0300 Merge branch 'CleverRaven:master' into master commit 57e98bf Merge: aaa9801 6ca1ebb Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Wed Jul 21 07:49:37 2021 +0300 Merge branch 'CleverRaven:master' into eggs_fix commit aaa9801 Author: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Tue Jul 20 08:49:12 2021 -0700 Update data/json/monster_factions.json commit 181a3d2 Merge: 4376c55 fa71f58 Author: Kevin Granade <kevin.granade@gmail.com> Date: Sun Jul 18 17:23:23 2021 -0700 Merge branch 'master' into eggs_fix commit 2b5e1ce Merge: 44a6982 e843920 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jul 18 11:22:45 2021 +0300 Aging insects insects age_gorw instead of half_life commit e843920 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sun Jul 18 11:11:19 2021 +0300 Update insect_spider.json commit 73ab069 Merge: e2421bc 44a6982 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jul 18 07:19:10 2021 +0300 Merge pull request #25 from SuddenEyePuncture/master update brunch commit 44a6982 Merge: dd26c6f e2421bc Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jul 18 07:18:45 2021 +0300 Merge branch 'age-grow' into master commit dd26c6f Merge: 0321691 fdcbe01 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jul 18 07:03:28 2021 +0300 Merge pull request #24 from SuddenEyePuncture/more-eggs More eggs commit fdcbe01 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sun Jul 18 06:55:59 2021 +0300 Update insect_spider.json commit 0321691 Merge: 7ca046b 10632a4 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jul 18 06:35:46 2021 +0300 Merge branch 'CleverRaven:master' into master commit e2421bc Merge: c7f2a12 c773f5d Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Mon Jul 12 06:45:53 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit efd2d37 Merge: 0bddfd3 69f8d66 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Mon Jul 12 06:41:36 2021 +0300 Merge branch 'more-eggs' of https://github.com/SuddenEyePuncture/Cataclysm-DDA into more-eggs commit 0bddfd3 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Mon Jul 12 06:36:15 2021 +0300 Update eggs.json commit 7ca046b Merge: c4eaf46 c773f5d Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Mon Jul 12 06:34:36 2021 +0300 Merge branch 'CleverRaven:master' into master commit c4eaf46 Merge: 838d5f4 69f8d66 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jul 11 07:13:36 2021 +0300 Merge pull request #23 from SuddenEyePuncture/more-eggs More eggs commit 69f8d66 Merge: bc570f3 838d5f4 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jul 11 07:07:22 2021 +0300 Merge branch 'master' into more-eggs commit bc570f3 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sun Jul 11 06:59:36 2021 +0300 add more eggs commit b1223eb Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sun Jul 11 06:34:11 2021 +0300 Update egg.json commit c7f2a12 Merge: bbc316b 25cf01e Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sat Jul 10 06:41:21 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit bbc316b Merge: 3d64cc3 6616372 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sun Jul 4 11:12:42 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 838d5f4 Merge: 2559b22 4376c55 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jul 4 11:10:50 2021 +0300 Eggs fix Antlion egg no longer conflict with wasp egg commit 4376c55 Merge: 2559b22 6616372 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jul 4 11:05:26 2021 +0300 Merge branch 'master' into eggs_fix commit 3d64cc3 Merge: c303496 2559b22 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sun Jul 4 09:22:37 2021 +0300 Merge branch 'new-bugs' commit c303496 Merge: 838538f aa471d6 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sun Jul 4 09:21:55 2021 +0300 Merge branch 'rename-mole' commit 838538f Merge: eb2d82f 1d04305 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sun Jul 4 09:11:39 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit eb2d82f Merge: 6d17494 ad69231 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sun Jul 4 09:11:20 2021 +0300 Merge branch 'mantis-AP' commit 6d17494 Merge: 45348a5 add6f7d Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sun Jul 4 06:05:53 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 45348a5 Merge: 4abed49 0f172bb Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sat Jul 3 19:38:52 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 4abed49 Merge: 965567d 25f256e Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sat Jul 3 11:37:43 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 2559b22 Merge: eedd3b9 ad69231 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jun 27 14:49:38 2021 +0300 mantis AP fix Praying mantises now have AP for regular attacks commit ad69231 Merge: 3558ef5 eedd3b9 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jun 27 14:48:58 2021 +0300 Merge branch 'master' into mantis-AP commit 965567d Merge: 16026af a5c3b7f Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sun Jun 27 14:43:15 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 3558ef5 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sun Jun 27 14:41:49 2021 +0300 Update insect_spider.json commit eedd3b9 Merge: 1e635c7 bde8edf Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Mon Jun 21 17:11:20 2021 +0300 Aphid reproduction fix Aphids give birth to small infertile aphids commit bde8edf Merge: ed67ee0 1e635c7 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Mon Jun 21 17:10:28 2021 +0300 Merge branch 'master' into aphid-reproduction-fix commit ed67ee0 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Mon Jun 21 17:06:14 2021 +0300 aphids reproduction fix aphids give birth to small aphids commit 16026af Merge: 8ab4eef 92e1507 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Mon Jun 21 16:53:56 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 1e635c7 Merge: f7434ac bf33676 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Thu Jun 17 16:50:04 2021 +0300 Merge pull request #17 from Tairesh/bugs_life lint json commit bf33676 Author: Ilya Agafonov <tairesh.rus@gmail.com> Date: Thu Jun 17 18:46:34 2021 +0500 lint json commit f7434ac Merge: 5081fc0 4cb3f3a Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Thu Jun 17 16:23:11 2021 +0300 Remove poison flag Remove obsolete POISON flag from some mobs commit 4cb3f3a Merge: 5110fea 5081fc0 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Thu Jun 17 16:22:41 2021 +0300 Merge branch 'master' into poison-remove commit 5110fea Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Thu Jun 17 16:13:47 2021 +0300 Remove poison flag commit 5081fc0 Merge: ac4d144 41209a3 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Thu Jun 17 16:06:45 2021 +0300 Antlion factions fix Antlion factions are apropriate commit 41209a3 Merge: 6a2d381 ac4d144 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Thu Jun 17 16:05:58 2021 +0300 Merge branch 'master' into antlion-fractions commit 6a2d381 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Thu Jun 17 15:53:12 2021 +0300 Fixed antlions factions commit aa471d6 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Thu Jun 17 15:05:41 2021 +0300 Update mob description commit ac4d144 Merge: e21179f 2c1eab2 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Thu Jun 17 14:50:19 2021 +0300 Merge branch 'CleverRaven:master' into master commit 8ab4eef Merge: f08ea6c 2c1eab2 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Thu Jun 17 14:47:21 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit e21179f Merge: 2af2bd9 8e7ddc9 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Tue Jun 15 17:55:52 2021 +0300 Mantis and ladybug rebalance Implement Venera's comments commit 8e7ddc9 Merge: f115604 2af2bd9 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Tue Jun 15 17:54:46 2021 +0300 Merge branch 'master' into mantis-morale commit f115604 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Tue Jun 15 17:34:46 2021 +0300 Commits Changed things according to venera's suggestion commit f08ea6c Merge: 5d6ae30 9a81a10 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Tue Jun 15 14:19:10 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 2af2bd9 Merge: f39fd65 86e0827 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Mon Jun 14 12:20:46 2021 +0300 Aphid reproduction Aphid should reproduce at acceptable rate commit 86e0827 Merge: 7ff3f63 f39fd65 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Mon Jun 14 12:20:14 2021 +0300 Merge branch 'master' into aphid-reproduction commit 7ff3f63 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Mon Jun 14 12:11:55 2021 +0300 Aphid reproduction There are baby infertile aphids now commit 5d6ae30 Merge: 8ffdf63 ca3589f Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Mon Jun 14 11:16:18 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit f39fd65 Merge: 57cc68b 0109cdc Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Mon Jun 14 08:35:38 2021 +0300 Antlion harvest Antlion harvest changed to "arachnid_flying" commit 0109cdc Merge: 1bf9ea9 57cc68b Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Mon Jun 14 08:35:11 2021 +0300 Merge branch 'master' into antlion-harvest commit 1bf9ea9 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Mon Jun 14 08:29:32 2021 +0300 Antlion harvest Antlion harvest changed to "arachnid_flying" commit 57cc68b Merge: 54b035c 1df0fd0 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Mon Jun 14 08:21:32 2021 +0300 Antlion reproduction Added reproduction according to Venera's suggestion commit 1df0fd0 Merge: 4b8999f 54b035c Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Mon Jun 14 08:20:43 2021 +0300 Merge branch 'master' into antlion-agression commit 4b8999f Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Mon Jun 14 08:16:07 2021 +0300 Antlion reproduction Made antlions reproduce. Adult antlions are not predators. commit 54b035c Merge: b06e5d4 e06306a Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Mon Jun 14 07:08:39 2021 +0300 Merge pull request #9 from SuddenEyePuncture/strider-swim-fix Fixed striders swimming commit e06306a Merge: acb885d b06e5d4 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Mon Jun 14 07:07:51 2021 +0300 Merge branch 'master' into strider-swim-fix commit acb885d Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Mon Jun 14 07:05:55 2021 +0300 fixed striders swimming Lowered water striders speed to 50 and removed "aquatic" flag commit 8ffdf63 Merge: 10e8689 033a568 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Mon Jun 14 06:53:04 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit b06e5d4 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Mon Jun 14 06:51:26 2021 +0300 Apply suggestions from code review Added and removed some monster flags Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com> commit d98ee3e Merge: 59c0c7e 7078173 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Thu Jun 10 09:59:54 2021 +0300 Merge pull request #8 from SuddenEyePuncture/Strider-speed-fix Strider attack speed fix commit 7078173 Merge: 8265a0d 59c0c7e Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Thu Jun 10 09:59:34 2021 +0300 Merge branch 'master' into Strider-speed-fix commit 8265a0d Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Thu Jun 10 09:54:22 2021 +0300 Fix water striders behaviour Water striders can't walk on land and attack slower commit 10e8689 Merge: 58cd96e 25abf78 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Thu Jun 10 09:41:47 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 59c0c7e Merge: c750a83 25abf78 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Thu Jun 10 09:39:59 2021 +0300 Merge branch 'CleverRaven:master' into master commit c750a83 Merge: d6832f6 c3f63df Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Wed Jun 9 20:38:36 2021 +0300 Merge pull request #7 from Tairesh/bugs_life lint json commit c3f63df Author: Ilya Agafonov <tairesh.rus@gmail.com> Date: Wed Jun 9 22:35:28 2021 +0500 lint json commit d6832f6 Merge: d6cda5d 58cd96e Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Tue Jun 8 07:20:10 2021 +0300 Merge pull request #6 from SuddenEyePuncture/aphid-agro-fix Aphids agro fix commit d6cda5d Merge: 2fafbc3 31837e9 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Tue Jun 8 07:14:31 2021 +0300 Merge branch 'CleverRaven:master' into master commit 58cd96e Merge: 0fac78c 31837e9 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Mon Jun 7 13:12:11 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 2fafbc3 Merge: f7b0ba9 68c327e Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jun 6 13:53:34 2021 +0300 Mob spawn fix Mob spawn fix commit 68c327e Merge: 60adaf1 f7b0ba9 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jun 6 13:53:08 2021 +0300 Merge branch 'master' into mob-spawn-fix commit 60adaf1 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sun Jun 6 13:22:16 2021 +0300 Changed spawn of insects removed mole crickets and ladybugs from some locations commit f7b0ba9 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jun 6 12:59:00 2021 +0300 Apply suggestions from code review Removed some insects from spawn groups Co-authored-by: Venera3 <72006894+Venera3@users.noreply.github.com> commit 0fac78c Merge: 91d4626 6b9918a Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sun Jun 6 11:15:55 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 2640bc9 Merge: 6af3040 6b9918a Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jun 6 08:30:31 2021 +0300 Merge branch 'CleverRaven:master' into master commit 6af3040 Merge: a7f512a 7f0e6ea Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jun 6 08:29:56 2021 +0300 Aphid rebalance Aphids can no longer be tamed. Aphids morale and agression are lowered. I'd given them the fear trigger PLAYER_CLOSE and set their morale regen to true. commit 7f0e6ea Merge: 52c2c3e a7f512a Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jun 6 08:26:11 2021 +0300 Merge branch 'master' into aphids-fix commit 52c2c3e Merge: 3d53805 b03c725 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jun 6 07:56:10 2021 +0300 Merge branch 'CleverRaven:master' into aphids-fix commit a7f512a Merge: 32f5d99 b03c725 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sun Jun 6 07:48:09 2021 +0300 Merge branch 'CleverRaven:master' into master commit 91d4626 Merge: 9855e30 b03c725 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sun Jun 6 07:45:21 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 9855e30 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sat Jun 5 21:52:00 2021 +0300 description update commit 3d53805 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sat Jun 5 21:36:41 2021 +0300 Update insect_spider.json commit aba883b Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sat Jun 5 20:59:32 2021 +0300 Aphids taming fix You can't tame aphids. If you want to transport aphids try scaring them instead. Also, I've lowered aphid's agression and shortened description. commit f56767e Merge: 0b476f2 d3b1ed2 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Sat Jun 5 20:10:35 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 32f5d99 Merge: b19d9ed d3b1ed2 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sat Jun 5 20:08:34 2021 +0300 Merge branch 'CleverRaven:master' into master commit b19d9ed Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sat Jun 5 05:23:25 2021 +0300 Spelling Spelling fix Co-authored-by: chaohedgehogs <46550455+chaohedgehogs@users.noreply.github.com> commit b6cdcce Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Sat Jun 5 05:21:03 2021 +0300 Spelling Spelling fixes Co-authored-by: chaohedgehogs <46550455+chaohedgehogs@users.noreply.github.com> commit 2627d80 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Fri Jun 4 13:55:54 2021 +0300 Spelling fixes Thanks for fixing my spelling Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru> commit 40f0caf Merge: 586465b 31383d0 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Fri Jun 4 13:51:17 2021 +0300 Merge pull request #3 from SuddenEyePuncture/spelling Spelling fixes commit 31383d0 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Fri Jun 4 13:47:39 2021 +0300 Update insect_spider.json commit 586465b Merge: 72fc70b aa9ed43 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Fri Jun 4 09:21:06 2021 +0300 Merge branch 'CleverRaven:master' into master commit 72fc70b Merge: 351c299 33f6b30 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Fri Jun 4 09:20:24 2021 +0300 Merge pull request #2 from SuddenEyePuncture/bugs-fix-1 Update other.json commit 33f6b30 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Fri Jun 4 09:20:08 2021 +0300 Update other.json commit 351c299 Merge: 0b476f2 fb639cc Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Fri Jun 4 09:17:56 2021 +0300 Merge pull request #1 from SuddenEyePuncture/bugs-fixes Update insect_spider.json commit fb639cc Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Fri Jun 4 09:17:22 2021 +0300 Update insect_spider.json commit 0b476f2 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Fri Jun 4 08:04:09 2021 +0300 Revert "Revert "Revert "Revert "New chitinous creatures"""" This reverts commit bb5258f. commit c52a9ad Merge: bb5258f a1a1e77 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Fri Jun 4 07:45:27 2021 +0300 Merge branch 'master' of https://github.com/SuddenEyePuncture/Cataclysm-DDA into new-bugs commit bb5258f Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Fri Jun 4 07:44:54 2021 +0300 Revert "Revert "Revert "New chitinous creatures""" This reverts commit 588ac57. commit 588ac57 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Fri Jun 4 07:24:06 2021 +0300 Revert "Revert "New chitinous creatures"" This reverts commit f626ac5. commit f626ac5 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Fri Jun 4 07:09:50 2021 +0300 Revert "New chitinous creatures" This reverts commit 7260fa5. commit d7f813f Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Fri Jun 4 07:09:36 2021 +0300 Revert "Revert "Revert "9x19mm +P and + prices" (CleverRaven#49155)"" This reverts commit 7ca7f34. commit 7ca7f34 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Fri Jun 4 07:09:11 2021 +0300 Revert "Revert "9x19mm +P and + prices" (CleverRaven#49155)" This reverts commit 7e62432. commit a1a1e77 Merge: 7260fa5 6ddf008 Author: SuddenEyePuncture <63926439+SuddenEyePuncture@users.noreply.github.com> Date: Fri Jun 4 07:03:09 2021 +0300 Merge branch 'CleverRaven:master' into master commit 7260fa5 Author: SuddenEyePuncture <trezwiy_olkash@mail.ru> Date: Fri Jun 4 07:00:20 2021 +0300 New chitinous creatures I've added new mobs from my bug's life mod such as: -Aphids -Praying mantises in three sizes -Underground mole crickets -Lady bugs -Grasshoppers in two sizes -Antlion larvae and adult antlions -Water striders in two sizes commit 7e62432 Author: eso <eso@esotericist.org> Date: Thu Jun 3 01:18:03 2021 -0700 Revert "9x19mm +P and + prices" (CleverRaven#49155) commit c97f669 Merge: fc3689c 1d4c504 Author: Angela Graves <rivet.the.zombie@gmail.com> Date: Thu Jun 3 00:15:56 2021 -0500 Merge pull request CleverRaven#49149 from faefux/9mmP2-price 9x19mm +P and + prices commit 1d4c504 Author: faefux <49350286+faefux@users.noreply.github.com> Date: Wed Jun 2 22:14:50 2021 +0100 Update 9mm.json commit d561acb Author: faefux <49350286+faefux@users.noreply.github.com> Date: Wed Jun 2 22:12:43 2021 +0100 Update tool_armor.json commit 14c0928 Author: faefux <49350286+faefux@users.noreply.github.com> Date: Wed Jun 2 22:11:17 2021 +0100 Update suits_protection.json commit dc8197e Author: faefux <49350286+faefux@users.noreply.github.com> Date: Wed Jun 2 22:08:56 2021 +0100 Update 9mm.json 9x19mm +P+ is about double the price of 9x19mm +P as per my cursory research. commit c7376e9 Author: faefux <49350286+faefux@users.noreply.github.com> Date: Tue Jun 1 22:20:27 2021 +0100 Update tool_armor.json Added Two-Way Radio to the helmet when on, in-built radio was a common functionality with the helmets I researched. commit 2bb3bc7 Author: faefux <49350286+faefux@users.noreply.github.com> Date: Tue Jun 1 14:45:42 2021 +0100 Update data/json/items/tool_armor.json Co-authored-by: Binrui Dong <brett.browning.dong@gmail.com> commit 0c784b0 Author: faefux <49350286+faefux@users.noreply.github.com> Date: Tue Jun 1 14:23:01 2021 +0100 Update data/json/items/tool_armor.json Co-authored-by: chaohedgehogs <46550455+chaohedgehogs@users.noreply.github.com> commit 5897e7c Author: faefux <49350286+faefux@users.noreply.github.com> Date: Tue Jun 1 14:22:45 2021 +0100 Update data/json/items/tool_armor.json Co-authored-by: chaohedgehogs <46550455+chaohedgehogs@users.noreply.github.com> commit 80d0905 Author: faefux <49350286+faefux@users.noreply.github.com> Date: Tue Jun 1 13:44:49 2021 +0100 Update data/json/items/tool_armor.json Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru> commit 2837517 Author: faefux <49350286+faefux@users.noreply.github.com> Date: Tue Jun 1 13:44:20 2021 +0100 Update data/json/items/tool_armor.json Co-authored-by: Binrui Dong <brett.browning.dong@gmail.com> commit 3108432 Merge: 932a2bd bdc9d52 Author: faefux <49350286+faefux@users.noreply.github.com> Date: Tue Jun 1 01:51:57 2021 +0100 Merge pull request #12 from CleverRaven/master reset commit 932a2bd Author: fae <faefux@tutanota.com> Date: Tue Jun 1 01:41:37 2021 +0100 Flight gear commit f673af3 Merge: d7dbb72 cae2be1 Author: faefux <49350286+faefux@users.noreply.github.com> Date: Wed May 19 18:50:19 2021 +0100 Merge pull request #11 from CleverRaven/master dggd commit d7dbb72 Merge: c449416 bb2b16f Author: faefux <49350286+faefux@users.noreply.github.com> Date: Sun Dec 20 21:51:17 2020 +0000 Merge pull request #10 from CleverRaven/master uptodate commit c449416 Merge: f537d93 9f82fd3 Author: faefux <49350286+faefux@users.noreply.github.com> Date: Wed Jul 15 17:31:27 2020 -0400 Merge pull request #9 from CleverRaven/master merge commit f537d93 Merge: 22867bd 53a0869 Author: faefux <49350286+faefux@users.noreply.github.com> Date: Tue Jun 30 16:37:52 2020 -0400 Merge pull request #8 from CleverRaven/master mergeee
Configuration menu - View commit details
-
Copy full SHA for 6883aea - Browse repository at this point
Copy the full SHA 6883aeaView commit details
Commits on Aug 1, 2021
-
Apply suggestions from code review
Co-authored-by: Venera3 <72006894+Venera3@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for da9243b - Browse repository at this point
Copy the full SHA da9243bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1b0f2b5 - Browse repository at this point
Copy the full SHA 1b0f2b5View commit details -
Configuration menu - View commit details
-
Copy full SHA for bb20232 - Browse repository at this point
Copy the full SHA bb20232View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8595da6 - Browse repository at this point
Copy the full SHA 8595da6View commit details
Commits on Aug 2, 2021
-
Merge pull request #31 from SuddenEyePuncture/honeydew_toxic
honeydew is toxic
Configuration menu - View commit details
-
Copy full SHA for cda5d7f - Browse repository at this point
Copy the full SHA cda5d7fView commit details
Commits on Aug 3, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 90d2f00 - Browse repository at this point
Copy the full SHA 90d2f00View commit details -
Merge pull request #32 from SuddenEyePuncture/cook_comp
update cook components
Configuration menu - View commit details
-
Copy full SHA for 636fc61 - Browse repository at this point
Copy the full SHA 636fc61View commit details
Commits on Aug 14, 2021
-
Configuration menu - View commit details
-
Copy full SHA for b726155 - Browse repository at this point
Copy the full SHA b726155View commit details