Skip to content
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

Test PR #41

Merged
merged 687 commits into from
Jul 11, 2023
Merged
Changes from 1 commit
Commits
Show all changes
687 commits
Select commit Hold shift + click to select a range
9176ffb
Move emitter processing to idle() (#66504)
SurFlurer Jun 29, 2023
5ad00bd
Merge pull request #66450 from irwiss/vpart-factory-checks
dseguin Jun 29, 2023
530fa4b
Autostyle on save for VSC (#66446)
bombasticSlacks Jun 29, 2023
37c1f71
Routine tileset updates on 25 June 2023 (#66461)
kevingranade Jun 29, 2023
d678fe6
Fix and re-enable 3D map memory (#66505)
Rewryte Jun 29, 2023
eee86cb
fix: call set_language even when LOCALIZE is off (#66460)
perryprog Jun 29, 2023
f0cadfe
Vegan Trait (#66511)
Holli-Git Jun 29, 2023
5820766
Merge pull request #66496 from anoobindisguise/patch-25
Rivet-the-Zombie Jun 29, 2023
4250d57
Remove redefined door fields (#66523)
irwiss Jun 29, 2023
6089a7d
Cast iron (#66380)
Karol1223 Jun 29, 2023
60d4765
Bypass variant picking on install if there's only one choice
irwiss Jun 29, 2023
93d1f4a
Enable mod tracker for vpart_info (#66526)
irwiss Jun 29, 2023
ee18510
Updated the value in docs
bombasticSlacks Jun 29, 2023
4ea5c45
Fixed a bug that prevented any self-driving capabilities on vehicle w…
deepvelocity Jun 29, 2023
bc5f288
Check for player proximity when building action menu for vehicle inte…
deepvelocity Jun 29, 2023
8c01806
Merge remote-tracking branch 'origin/master'
deepvelocity Jun 29, 2023
f202267
Sync up with master
deepvelocity Jun 29, 2023
63fbc4d
Update src/vehicle_use.cpp
deepvelocity Jun 29, 2023
e1d3ac0
Update src/vehicle_use.cpp
deepvelocity Jun 29, 2023
ac2a4ac
Update src/vehicle_use.cpp
deepvelocity Jun 29, 2023
46db004
Update src/vehicle_use.cpp
deepvelocity Jun 29, 2023
9b0a76f
Update src/vehicle_use.cpp
deepvelocity Jun 29, 2023
ce2aa59
Merge pull request #66531 from bombasticSlacks/fuel-efficiency-docs
Maleclypse Jun 29, 2023
2fbf8e4
Merge pull request #66528 from irwiss/vpart-variant-fixes
Maleclypse Jun 29, 2023
eddecf6
Update EFFECT_ON_CONDITION.md (#66533)
ZhilkinSerg Jun 29, 2023
13d9dec
Rebreathers rework and general revisit (#66271)
randomtyper Jun 30, 2023
54368d9
Don't access out of lightmap bounds (#66431)
irwiss Jun 30, 2023
53bff05
Update migration_oter_ids.json (#66537)
Procyonae Jun 30, 2023
19df0e3
Fix check_clang_tidy.py doc string (#66538)
Qrox Jun 30, 2023
83224ec
Merge pull request #66534 from deepvelocity/master
Rivet-the-Zombie Jun 30, 2023
b556876
fix mine spawns of coal
anoobindisguise Jun 30, 2023
8c00208
Use ram parts in 4x4_car
irwiss Jun 30, 2023
af9935c
no more adobe stadiums
NetSysFire Jun 30, 2023
e5d56d7
ACTIVE active generator
RenechCDDA Jun 30, 2023
6acf2c1
Move generator furniture deconstruct results to new generator item di…
RenechCDDA Jun 30, 2023
54a3bc0
Implement generator recipe
RenechCDDA Jun 30, 2023
d8df649
Update gambesons.json
anoobindisguise Jun 30, 2023
816c192
Faction succession without death (#65732)
RenechCDDA Jun 30, 2023
129f04e
Merge pull request #66542 from irwiss/4x4-rams
Maleclypse Jun 30, 2023
19a9c05
Merge pull request #66541 from anoobindisguise/patch-27
Maleclypse Jun 30, 2023
2b65359
Condom Variants (#66529)
Holli-Git Jun 30, 2023
86c9a54
fbmc pottery cottage palettization (#66522)
PatrikLundell Jun 30, 2023
70b1704
[Xedra Evolved] Magic MTFs (#66512)
GuardianDll Jun 30, 2023
31aec8a
Update world spawns of some existing generators
RenechCDDA Jun 30, 2023
f96d404
Normalize generator's fuel capacity (should be steel jerrycan)
RenechCDDA Jun 30, 2023
f9ad924
Update clear_character to remove mutation categories
RenechCDDA Jun 30, 2023
fefa01a
Update dreamsmithing.json
GuardianDll Jun 30, 2023
a52b005
Merge pull request #66546 from NetSysFire/nomoreadobe
Maleclypse Jun 30, 2023
51f7905
Merge pull request #66561 from RenechCDDA/test_test_test
Maleclypse Jun 30, 2023
e908678
Update basecamp fake char kiln's ammo restriction (#66550)
SurFlurer Jul 1, 2023
747287e
Merge pull request #66558 from anoobindisguise/anoobindisguise-weekly…
Maleclypse Jul 1, 2023
843112f
Merge pull request #66562 from GuardianDll/literally_unplayable
Maleclypse Jul 1, 2023
1873fe5
Routine i18n updates on 01 July 2023
kevingranade Jul 1, 2023
d79d5ad
Increase world spawns of welding consumables (#66557)
anoobindisguise Jul 1, 2023
adb5a77
Camps display required calories for crafting and building upgrades (#…
RenechCDDA Jul 1, 2023
030a610
Fish size cleanup (#66548)
Karol1223 Jul 1, 2023
c7e5c9f
Autopilot tests (#66556)
irwiss Jul 1, 2023
2386ec2
Counter gate move cost (#66429)
Procyonae Jul 1, 2023
8c68400
[Alternative Map Key] Building alternatives now show correctly on the…
VladMasarik Jul 1, 2023
069c761
Typos (#66536)
Procyonae Jul 1, 2023
fef08ae
Merge pull request #66248 from Qrox/assert
dseguin Jul 1, 2023
0f520a5
palettized workshop 1 (#66470)
PatrikLundell Jul 1, 2023
391a7f4
Merge pull request #66551 from RenechCDDA/appliance_generators
dseguin Jul 1, 2023
cef2327
Digitigrade mutation (#65942)
GalacticApple Jul 1, 2023
c94dc03
Change single Talmud to multiple volumes of English Talmud Yerushalmi…
Standing-Storm Jul 1, 2023
9afa65c
Merge pull request #66568 from CleverRaven/i18n
Rivet-the-Zombie Jul 1, 2023
4d78bdb
Add Mind Over Matter to C:DDA repository (#66391)
Standing-Storm Jul 1, 2023
593bafd
Meatball in the spaghetti (#66573)
Karol1223 Jul 1, 2023
46cafbd
Reduce airdrop frequency
worm-girl Jul 1, 2023
b7db497
Fix operator check (#66582)
RenechCDDA Jul 2, 2023
a41c3bc
Add missing buildings to Alternative Map Key (#66578)
VladMasarik Jul 2, 2023
1f26c26
does the stuff. (#66572)
DoctorBoomstick Jul 2, 2023
62e1c2b
added flesh property to snail_garden (#66569)
fyhannes Jul 2, 2023
38735bb
Couple of nest related test fail fixes (#66552)
Procyonae Jul 2, 2023
0e57fb8
Unhardcode "crater", improve appearance of mutable craters (#66499)
Procyonae Jul 2, 2023
1560777
Rebreather recipe fixes (#66580)
randomtyper Jul 2, 2023
e75e3be
accessories obsoletion
GuardianDll Jul 2, 2023
5a96ac8
Turret Weakpoints & Review (#65424)
SolventMercury Jul 2, 2023
d83cfeb
Park benches in parks!? More likely than you may think! (#66544)
Karol1223 Jul 2, 2023
3a72f36
Don't report monsters breaking free from unknown grabbers if the play…
aschuhardt Jul 2, 2023
c8677ef
Fix endless teapot error (#66571)
Demivan Jul 2, 2023
e7aea19
palettized fbmc radio tower (#66574)
PatrikLundell Jul 2, 2023
61d4a83
Add ability to cull more farmed/bred animals (#66575)
RenechCDDA Jul 2, 2023
1546098
Update labeler.yml (#66601)
GuardianDll Jul 2, 2023
a9af914
Update zed_misc.json (#66602)
GuardianDll Jul 2, 2023
ac03725
Update perkmenu.json (#66603)
GuardianDll Jul 2, 2023
c6349a0
Binders! (the trans kind) (#66540)
Holli-Git Jul 2, 2023
969af91
A bunch of random item reworks: 7 (#66588)
Karol1223 Jul 2, 2023
8c98bff
Lessens chance to fall on school start (#66591)
Procyonae Jul 2, 2023
37003bf
Motel changes (#66584)
Procyonae Jul 2, 2023
856af60
item::set_degradation sets value of 0 on items with degradation disabled
irwiss Jul 2, 2023
2888154
Update migration_oter_ids.json
Procyonae Jul 2, 2023
f4c4e0d
palettized firestation1
PatrikLundell Jul 2, 2023
e09ed71
Update reviewers.yml
GuardianDll Jul 2, 2023
662245d
Merge pull request #66605 from GuardianDll/accessories
Rivet-the-Zombie Jul 2, 2023
3c56d63
Add ability to make slime globs into slime samples (#66595)
randomtyper Jul 2, 2023
6c5ffff
EOC Run Until (#66449)
bombasticSlacks Jul 2, 2023
2f2db58
Merge pull request #66617 from GuardianDll/lable_2
Maleclypse Jul 2, 2023
c26c04a
Merge pull request #66610 from Procyonae/CraterCoreMigration
Maleclypse Jul 2, 2023
bc82426
Add lore information on the New England Church Community into the des…
VladMasarik Jul 2, 2023
458a53e
This should add hm-12 to robofac trades (#66592)
Vgoloshivskiy Jul 2, 2023
489e951
pluggin in
GuardianDll Jul 2, 2023
61f2f72
Merge pull request #66615 from PatrikLundell/modular_firestation_1_pa…
Maleclypse Jul 2, 2023
6902759
Make lanterns plug-in-able (#66611)
ashGlaw Jul 2, 2023
c65d3a8
Various Down Bed Fixes (#66457)
theyareclose Jul 2, 2023
a8c8f63
Routine tileset updates on 02 July 2023
casswedson Jul 2, 2023
be25399
Merge pull request #66624 from GuardianDll/arc_welder
Maleclypse Jul 3, 2023
70e3860
[Xedra Evolved] Maintenance (#66618)
GuardianDll Jul 3, 2023
1a42bab
mom: remove invalid spell id reference (#66622)
casswedson Jul 3, 2023
595f4f7
Merge pull request #66527 from ashGlaw/Tactical-Slingshot
Maleclypse Jul 3, 2023
002dab7
Merge pull request #66626 from CleverRaven/tileset-updates
Rivet-the-Zombie Jul 3, 2023
f54889b
palettized modular shelter
PatrikLundell Jul 3, 2023
aebdc6d
Fix text encoding for MindOverMatter README.md
Stephen2 Jul 3, 2023
4da6291
increase search radius for hub01-related missions (#66559)
anoobindisguise Jul 3, 2023
20c5526
Some more nightmares (#66520)
Empyrean-Heaven Jul 3, 2023
842c3a6
[Mom] Change Telekinesis +10% weight passive into Telekinesis lifting…
Standing-Storm Jul 3, 2023
5b306ad
Phone case variants, to infinity, and beyond. (#66462)
DoctorBoomstick Jul 3, 2023
089b2b5
Bastion fort fallback_predecessor, palette tweaks, tourist and closed…
Procyonae Jul 3, 2023
10875c2
fix for first hub mission & more gear for Dr.Prado (#66458)
casswedson Jul 3, 2023
e8ce8ad
Make horses milkable
linewriter1024 Jul 3, 2023
008e16b
Merge pull request #66633 from PatrikLundell/modular_shelter_palettiz…
Maleclypse Jul 3, 2023
412aad1
Merge pull request #66627 from Stephen2/sp-fix
Maleclypse Jul 3, 2023
2d0fe67
Merge pull request #66607 from irwiss/degradation-fix
Maleclypse Jul 3, 2023
42285e4
update to kerosene spawns and refillable lighter (#66585)
Daved27hundred Jul 3, 2023
bf9554b
Update office_tower.json
Procyonae Jul 3, 2023
0d745c8
Create scenario_blacklist.json
Procyonae Jul 3, 2023
19858bf
Map Item Audit (#66218)
Procyonae Jul 3, 2023
945288b
Stops Hub 01 buying back some of their newer stuff (#66634)
Procyonae Jul 4, 2023
753dc92
Update monster_deaths.json
Standing-Storm Jul 4, 2023
a71a911
Merge pull request #66639 from linewriter1024/dev-0-horse-milk
Rivet-the-Zombie Jul 4, 2023
40c6cd7
palettized shelter 1
PatrikLundell Jul 4, 2023
bef1b3b
Merge pull request #66655 from Standing-Storm/Fix-you-cast-%
Maleclypse Jul 4, 2023
1781d66
Dry duffel bags are actually watertight (#66652)
randomtyper Jul 4, 2023
fe6a5f6
Merge pull request #66658 from PatrikLundell/modular_shelter_1_palett…
Maleclypse Jul 4, 2023
c65e9c4
Merge pull request #66645 from Procyonae/NoHopeMilBaseBlacklist
Maleclypse Jul 4, 2023
3766eff
reign in horse milk yield
kevingranade Jul 4, 2023
8eb8c32
bp fault fix removes rust_timer (#66654)
anoobindisguise Jul 4, 2023
e89b591
Tamable Wildlife: Tamable spiders (#66619)
randomtyper Jul 4, 2023
8db7cd6
Merge pull request #66642 from Procyonae/OfficeBuildingStairs
Maleclypse Jul 4, 2023
cd4e6fe
increase spoil time of salted meat
anoobindisguise Jul 4, 2023
69ec2c0
Add MAN_MADE flag to dinosaur exhibit
Standing-Storm Jul 5, 2023
7851510
Merge pull request #66663 from CleverRaven/kevingranade-patch-2
Maleclypse Jul 5, 2023
53dd919
Make "Undamaged" the default for debug spawning vehicles (#66656)
Kamayana Jul 5, 2023
5d7f10c
Xl survivor boots (#66650)
OtpalTS Jul 5, 2023
3af8f36
Merge pull request #66590 from fairyarmadillo/Supplydrop
Maleclypse Jul 5, 2023
062fd68
Dock Construction Updates (#61526)
Beatdotroot Jul 5, 2023
8c07ed6
Fix the epilogue for the New England Church Community (#66668)
MNG-cataclysm Jul 5, 2023
140b11c
Weekly Changelog 2023-06-26 to 2023-07-03 (#66628)
kevingranade Jul 5, 2023
4097f0c
XE Rubik's discussion of vampires text (#66518)
Maleclypse Jul 5, 2023
17a4f06
Remove cata::optional leftovers (#66635)
irwiss Jul 5, 2023
94a1481
Merge pull request #66675 from Standing-Storm/dino-mod-innawood
Rivet-the-Zombie Jul 5, 2023
b987464
Update blackpowder recipes
Miner239 Jul 5, 2023
889cbc7
Update recipe_food.json
GuardianDll Jul 5, 2023
f3edf49
palettized modular shelter 2
PatrikLundell Jul 5, 2023
78a2d74
Update armor.json
GuardianDll Jul 5, 2023
33df002
Update stormshaper.json
GuardianDll Jul 5, 2023
c45a8cf
slow terrain || fungus
dseguin Jul 5, 2023
3bc9c5f
regular masochists aren't sad about anesthesia
anoobindisguise Jul 5, 2023
bd7e2e1
Merge pull request #66681 from PatrikLundell/modular_shelter_2_palett…
Maleclypse Jul 5, 2023
d55d1c4
Merge pull request #66679 from GuardianDll/patch-2
Maleclypse Jul 5, 2023
ef9cf1f
Merge pull request #66682 from GuardianDll/patch-4
Maleclypse Jul 5, 2023
0a1faf0
[MoM] Documentation updates (#66643)
Standing-Storm Jul 5, 2023
e284941
Fixes 66637 and wraps up some typos. (#66648)
DoctorBoomstick Jul 5, 2023
889d445
soapy water can't be drunk
anoobindisguise Jul 5, 2023
b0ae1c2
Fixed the issue of not properly handling pre existing items in the ba…
WhiteCloud0123 Jul 5, 2023
66e88e5
[MoM] Wielding a matrix crystal enhances your powers (#66644)
Standing-Storm Jul 5, 2023
abcc5d7
Merge pull request #66680 from GuardianDll/patch-3
Maleclypse Jul 5, 2023
db87b6b
Merge pull request #66678 from Miner239/patch-1
Maleclypse Jul 5, 2023
551b828
Allow the player to ask Rubik about Zomborgs (#63477)
MNG-cataclysm Jul 5, 2023
415f63d
ew legs (#66687)
Karol1223 Jul 5, 2023
47f8c6e
armor penetration gets used up like damage (#66653)
anoobindisguise Jul 5, 2023
245d2c8
Field Immunity At Effect Level (#66683)
bombasticSlacks Jul 6, 2023
26e163e
bugfixes for armor bionics (#66693)
anoobindisguise Jul 6, 2023
a3126f5
30gal_drum time fix (#66689)
anoobindisguise Jul 6, 2023
51c61a0
CAR goes vrooom (#66686)
Theawesomeboophis Jul 6, 2023
729ebed
Snail Mail Its Tamable Snails (#66702)
LordBarkBread Jul 6, 2023
f85aba9
Merge pull request #66697 from anoobindisguise/patch-28
Maleclypse Jul 6, 2023
90084d2
Vegans don't eat people (#66694)
Procyonae Jul 6, 2023
60193c8
Merge pull request #66692 from anoobindisguise/anoobindisguise-maso-s…
Maleclypse Jul 6, 2023
905ded9
New fish (#66600)
Karol1223 Jul 6, 2023
9160ca4
Merge pull request #66684 from CleverRaven/dseguin-patch-1
Maleclypse Jul 6, 2023
e473500
Redo nomad gear to be more sensible (#66502)
anoobindisguise Jul 6, 2023
79cb8e5
Merge pull request #66690 from anoobindisguise/anoobindisguise-salted…
Rivet-the-Zombie Jul 6, 2023
a70ae71
palettization cleanup
PatrikLundell Jul 6, 2023
8d05f2e
Update mutation_scenarios.json
KittyTac Jul 6, 2023
b583367
Practice throwing with golf ball
ashGlaw Jul 6, 2023
9db8601
The Nestening (Part I) (#66674)
sadenar Jul 6, 2023
6c1a968
Tone Down Assassin Spawns (#66703)
MNG-cataclysm Jul 6, 2023
4245f16
Fix tow cable checking can_mount on the opposite vehicles it should (…
Kamayana Jul 6, 2023
d40b257
[MoM] Change psionic drain to a vitamin, add ways for the player to r…
Standing-Storm Jul 6, 2023
569b87f
ceramics
Karol1223 Jul 6, 2023
4fc9ba6
Cleanup legacy (#66408)
hexagonrecursion Jul 6, 2023
effcb1f
Add skateboard vehicle (#66596)
balinck Jul 6, 2023
d9554a7
Implement export&import of the protagonist and follower NPCs (#66473)
hexagonrecursion Jul 6, 2023
7920ed6
Add antacid tablets (#66698)
anoobindisguise Jul 6, 2023
f56e8f5
Merge pull request #66710 from PatrikLundell/palettization_cleanup
Maleclypse Jul 6, 2023
57bc9f8
Repair Firearm Repair Kit Repair (#66664)
ashGlaw Jul 6, 2023
af5c163
Added cord to electric blankets
ashGlaw Jul 6, 2023
e60b2be
Assorted tile rendering fixes (#66638)
Qrox Jul 6, 2023
390e094
Merge pull request #66711 from KittyTac/patch-14
Maleclypse Jul 6, 2023
eb590a0
Add myself to confirm-bug list (#66714)
harakka Jul 6, 2023
112b97a
Move field halflife initialize to seperate function (#66700)
bombasticSlacks Jul 6, 2023
4869c92
Merge pull request #66713 from ashGlaw/Practice-throwing-with-golfballs
Maleclypse Jul 7, 2023
2d625ef
Added new allergen flags and updated carnivore blacklist (#66669)
fyhannes Jul 7, 2023
94c819d
Merge pull request #66718 from ashGlaw/Electric-Blanket-Power-Cord
Maleclypse Jul 7, 2023
e62f537
Merge pull request #66715 from Karol1223/ceramic-evil
Rivet-the-Zombie Jul 7, 2023
d22e389
Spell Event (#65932)
bombasticSlacks Jul 7, 2023
e4d4b6a
s_restaurant merge (#66563)
Procyonae Jul 7, 2023
820656c
Adjust collapsible solar arrays (#66478)
Alm999 Jul 7, 2023
9cba5c3
Duct tape rework (#65531)
Karol1223 Jul 7, 2023
c347c8a
yeet it (#66726)
Karol1223 Jul 7, 2023
105f568
Quick cardboard roll fixes (#66731)
Karol1223 Jul 7, 2023
cbb6b38
Fix Order
Theawesomeboophis Jul 7, 2023
0f47eeb
Merge pull request #66734 from Theawesomeboophis/car-fix
Maleclypse Jul 8, 2023
64fef50
Routine i18n updates on 08 July 2023
kevingranade Jul 8, 2023
118edf4
Document more fields for our monsters (#66738)
RenechCDDA Jul 8, 2023
7dba942
Nerf lycra (#66737)
anoobindisguise Jul 8, 2023
b69ae48
Merge pull request #66745 from CleverRaven/i18n
Rivet-the-Zombie Jul 8, 2023
7426dc5
change dark wyrm's blood type to foul acidic blood
flybye3o6 Jul 8, 2023
691969d
Always debug spawn undamaged cars both unlocked and faultless (#66739)
Kamayana Jul 8, 2023
bc8f565
Document a bunch of missing fields (#66740)
RenechCDDA Jul 8, 2023
ebe08f3
When placing items in a pet's bag, also consider the maximum length t…
WhiteCloud0123 Jul 8, 2023
e8f219d
gold rings are rigid conflicts layer only
anoobindisguise Jul 9, 2023
f43f044
Merge pull request #66748 from flybye3o6/dark-wyrm
Maleclypse Jul 9, 2023
3fb846e
Merge pull request #66767 from anoobindisguise/patch-31
Rivet-the-Zombie Jul 9, 2023
f8fdee0
quick json fixes
Karol1223 Jul 9, 2023
5317a17
Nerf subdermal carbon CBM (#66769)
anoobindisguise Jul 9, 2023
bec4641
[MoM] Implement jmath, include it in calculations (#66770)
Standing-Storm Jul 9, 2023
243f468
Sluggish Love for Wildlife_Mod (#66755)
LordBarkBread Jul 9, 2023
a566717
Digitigrade Mutation Line-of-Sight Fix (#66764)
GalacticApple Jul 9, 2023
5d00d62
Grain farming expansion and seed adjustments (#65924)
worm-girl Jul 9, 2023
56d008e
Calcium carbonate and antacid tablet creation (#66763)
anoobindisguise Jul 9, 2023
767b562
[MoM] Move arithmetic to math, standardize and update awakening EoCs …
Standing-Storm Jul 9, 2023
e410552
reduce impact of bmi on healthiness (#66494)
anoobindisguise Jul 9, 2023
6585b7f
Merge pull request #66773 from Karol1223/quick-json-cleanup
Maleclypse Jul 9, 2023
1446858
Misc maintenance to innawoods (#66777)
RenechCDDA Jul 9, 2023
2aff806
Also cache weapon_value for bare-handed characters (#66766)
SurFlurer Jul 9, 2023
6141fbd
Material Replacement For Items (#66757)
bombasticSlacks Jul 9, 2023
f506e52
MELEE_DAMAGE and ITEM_DAMAGE_BASH enchantments should affect bashing …
fyhannes Jul 9, 2023
0573277
Use active item cache to only grab corpses (#66753)
SurFlurer Jul 9, 2023
6fac4ab
Update claw bar volume to be consistent with crowbar (#66765)
ampersand55 Jul 9, 2023
b3a81bb
Fix coruscating not draining on use
Standing-Storm Jul 10, 2023
20a0875
Clear tile map memory on part removal (#66775)
irwiss Jul 10, 2023
50471ec
Grab cleanup (#66732)
bombasticSlacks Jul 10, 2023
1f5aaac
Creatures above cast shadows onto tiles below (#66730)
Rewryte Jul 10, 2023
12e1986
Jsonify monster flags (#66722)
dseguin Jul 10, 2023
aa66f1d
[MoM] Add Zener cards (#66788)
Standing-Storm Jul 10, 2023
924ff20
Merge pull request #66790 from Standing-Storm/coruscating_bugfix
Maleclypse Jul 10, 2023
3fc59ed
Better scenario worldbuilding by giving PC knowledge of the nearest c…
RenechCDDA Jul 10, 2023
55526ce
Make portal storm ending more apparent to the player (#66733)
Daved27hundred Jul 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
New fish (CleverRaven#66600)
* fish fish fish

* three more

* dictionary

* sizes according to weight

* Capitalizing the American

Co-authored-by: TheShadowFerret <[email protected]>

* looks_like

* eggz

* hatchies

* requirement group

* spawns

* descriptions

* ew words

* proofreading

Co-authored-by: Antti Riikonen <[email protected]>

---------

Co-authored-by: TheShadowFerret <[email protected]>
Co-authored-by: Antti Riikonen <[email protected]>
3 people authored Jul 6, 2023

Unverified

This user has not yet uploaded their public signing key.
commit 905ded91ce3cc34f1ed0e3316bc38c94ffcb130c
58 changes: 58 additions & 0 deletions data/json/items/comestibles/egg.json
Original file line number Diff line number Diff line change
@@ -549,6 +549,13 @@
"copy-from": "egg_fish",
"rot_spawn": "GROUP_EGG_WHITEFISH"
},
{
"type": "COMESTIBLE",
"id": "egg_whitefish_round",
"name": { "str_sp": "roe" },
"copy-from": "egg_fish",
"rot_spawn": "GROUP_EGG_WHITEFISH_ROUND"
},
{
"type": "COMESTIBLE",
"id": "egg_lbass",
@@ -647,6 +654,13 @@
"copy-from": "egg_fish",
"rot_spawn": "GROUP_EGG_BULLHEAD"
},
{
"type": "COMESTIBLE",
"id": "egg_bullhead_yellow",
"name": { "str_sp": "roe" },
"copy-from": "egg_fish",
"rot_spawn": "GROUP_EGG_BULLHEAD_YELLOW"
},
{
"type": "COMESTIBLE",
"id": "egg_channel_catfish",
@@ -675,6 +689,13 @@
"copy-from": "egg_fish",
"rot_spawn": "GROUP_EGG_PICKEREL"
},
{
"type": "COMESTIBLE",
"id": "egg_pickerel_american",
"name": { "str_sp": "roe" },
"copy-from": "egg_fish",
"rot_spawn": "GROUP_EGG_PICKEREL_AMERICAN"
},
{
"type": "COMESTIBLE",
"id": "egg_muskellunge",
@@ -703,13 +724,50 @@
"copy-from": "egg_fish",
"rot_spawn": "GROUP_EGG_GRASS_CARP"
},
{
"type": "COMESTIBLE",
"id": "egg_goldfish",
"name": { "str_sp": "roe" },
"copy-from": "egg_fish",
"rot_spawn": "GROUP_EGG_GOLDFISH"
},
{
"type": "COMESTIBLE",
"id": "egg_bowfin",
"name": { "str_sp": "roe" },
"copy-from": "egg_fish",
"rot_spawn": "GROUP_EGG_BOWFIN"
},
{
"type": "COMESTIBLE",
"id": "egg_gar_longnose",
"name": { "str_sp": "roe" },
"copy-from": "egg_fish",
"use_action": [ "POISON" ],
"//": "Gar eggs are poisonous - this is not an oversight. This is also why these are omitted from the cooking requirement group.",
"rot_spawn": "GROUP_EGG_GAR_LONGNOSE"
},
{
"type": "COMESTIBLE",
"id": "egg_burbot",
"name": { "str_sp": "roe" },
"copy-from": "egg_fish",
"rot_spawn": "GROUP_EGG_BURBOT"
},
{
"type": "COMESTIBLE",
"id": "egg_sturgeon_lake",
"name": { "str_sp": "roe" },
"copy-from": "egg_fish",
"rot_spawn": "GROUP_EGG_STURGEON_LAKE"
},
{
"type": "COMESTIBLE",
"id": "egg_sturgeon_shortnose",
"name": { "str_sp": "roe" },
"copy-from": "egg_fish",
"rot_spawn": "GROUP_EGG_STURGEON_SHORTNOSE"
},
{
"type": "COMESTIBLE",
"id": "egg_fallfish",
40 changes: 40 additions & 0 deletions data/json/monstergroups/eggs.json
Original file line number Diff line number Diff line change
@@ -342,6 +342,11 @@
"type": "monstergroup",
"monsters": [ { "monster": "mon_fry_whitefish" } ]
},
{
"name": "GROUP_EGG_WHITEFISH_ROUND",
"type": "monstergroup",
"monsters": [ { "monster": "mon_fry_whitefish_round" } ]
},
{
"name": "GROUP_EGG_LBASS",
"type": "monstergroup",
@@ -412,6 +417,11 @@
"type": "monstergroup",
"monsters": [ { "monster": "mon_fry_bullhead" } ]
},
{
"name": "GROUP_EGG_BULLHEAD_YELLOW",
"type": "monstergroup",
"monsters": [ { "monster": "mon_fry_bullhead_yellow" } ]
},
{
"name": "GROUP_EGG_CHANNEL_CATFISH",
"type": "monstergroup",
@@ -432,6 +442,11 @@
"type": "monstergroup",
"monsters": [ { "monster": "mon_fry_pickerel" } ]
},
{
"name": "GROUP_EGG_PICKEREL_AMERICAN",
"type": "monstergroup",
"monsters": [ { "monster": "mon_fry_pickerel_american" } ]
},
{
"name": "GROUP_EGG_MUSKELLUNGE",
"type": "monstergroup",
@@ -452,11 +467,36 @@
"type": "monstergroup",
"monsters": [ { "monster": "mon_fry_grass_carp" } ]
},
{
"name": "GROUP_EGG_GOLDFISH",
"type": "monstergroup",
"monsters": [ { "monster": "mon_fry_goldfish" } ]
},
{
"name": "GROUP_EGG_BOWFIN",
"type": "monstergroup",
"monsters": [ { "monster": "mon_fry_bowfin" } ]
},
{
"name": "GROUP_EGG_GAR_LONGNOSE",
"type": "monstergroup",
"monsters": [ { "monster": "mon_fry_gar_longnose" } ]
},
{
"name": "GROUP_EGG_BURBOT",
"type": "monstergroup",
"monsters": [ { "monster": "mon_fry_burbot" } ]
},
{
"name": "GROUP_EGG_STURGEON_LAKE",
"type": "monstergroup",
"monsters": [ { "monster": "mon_fry_sturgeon_lake" } ]
},
{
"name": "GROUP_EGG_STURGEON_SHORTNOSE",
"type": "monstergroup",
"monsters": [ { "monster": "mon_fry_sturgeon_shortnose" } ]
},
{
"name": "GROUP_EGG_FALLFISH",
"type": "monstergroup",
13 changes: 10 additions & 3 deletions data/json/monstergroups/wilderness.json
Original file line number Diff line number Diff line change
@@ -312,6 +312,14 @@
{ "monster": "mon_fish_eel", "weight": 6, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
{ "monster": "mon_fish_bowfin", "weight": 6, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
{ "monster": "mon_fish_bullhead", "weight": 6, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
{ "monster": "mon_fish_goldfish", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
{ "monster": "mon_fish_gar_longnose", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
{ "monster": "mon_fish_burbot", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
{ "monster": "mon_fish_sturgeon_lake", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
{ "monster": "mon_fish_sturgeon_shortnose", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
{ "monster": "mon_fish_pickerel_american", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
{ "monster": "mon_fish_bullhead_yellow", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
{ "monster": "mon_fish_whitefish_round", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
{ "monster": "mon_fish_brown_trout", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
{ "monster": "mon_fish_brook_trout", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
{ "monster": "mon_fish_lake_trout", "weight": 6, "cost_multiplier": 8, "pack_size": [ 1, 3 ] },
@@ -537,9 +545,7 @@
"name": "GROUP_POND_FISH",
"is_animal": true,
"monsters": [
{ "monster": "mon_fish_bluegill", "weight": 50, "cost_multiplier": 0 },
{ "monster": "mon_fish_carp", "weight": 50, "cost_multiplier": 0 },
{ "monster": "mon_fish_sbass", "weight": 50, "cost_multiplier": 0 },
{ "group": "GROUP_POND_FISH_2", "weight": 200, "cost_multiplier": 0 },
{ "monster": "mon_strider_small", "weight": 30, "cost_multiplier": 0, "pack_size": [ 3, 6 ] },
{ "monster": "mon_water_scorpion_larva", "weight": 30, "cost_multiplier": 0 }
]
@@ -551,6 +557,7 @@
"monsters": [
{ "monster": "mon_fish_bluegill", "weight": 50, "cost_multiplier": 0 },
{ "monster": "mon_fish_carp", "weight": 50, "cost_multiplier": 0 },
{ "monster": "mon_fish_goldfish", "weight": 50, "cost_multiplier": 0 },
{ "monster": "mon_fish_sbass", "weight": 50, "cost_multiplier": 0 }
]
},
141 changes: 141 additions & 0 deletions data/json/monsters/fish.json
Original file line number Diff line number Diff line change
@@ -345,6 +345,24 @@
"upgrades": { "half_life": 14, "into": "mon_fish_whitefish" },
"name": { "str_sp": "fry" }
},
{
"id": "mon_fish_whitefish_round",
"type": "MONSTER",
"copy-from": "mon_fish_tiny",
"name": { "str_sp": "round whitefish" },
"looks_like": "mon_fish_whitefish",
"description": "A round whitefish, closely related to salmon. One can assume they taste just as nice when smoked.",
"volume": "850 ml",
"weight": "355 g",
"reproduction": { "baby_egg": "egg_whitefish_round", "baby_count": 2, "baby_timer": 17 }
},
{
"id": "mon_fry_whitefish_round",
"type": "MONSTER",
"copy-from": "mon_fry",
"upgrades": { "half_life": 14, "into": "mon_fish_whitefish_round" },
"name": { "str_sp": "fry" }
},
{
"id": "mon_fish_lbass",
"type": "MONSTER",
@@ -590,6 +608,24 @@
"upgrades": { "half_life": 14, "into": "mon_fish_bullhead" },
"name": { "str_sp": "fry" }
},
{
"id": "mon_fish_bullhead_yellow",
"type": "MONSTER",
"copy-from": "mon_fish_tiny",
"name": { "str": "yellow bullhead" },
"looks_like": "mon_fish_bullhead",
"description": "A yellow bullhead, a type of catfish. Delicious when battered and fried, though smaller than its brown cousin.",
"volume": "250 ml",
"weight": "454 g",
"reproduction": { "baby_egg": "egg_bullhead_yellow", "baby_count": 2, "baby_timer": 17 }
},
{
"id": "mon_fry_bullhead_yellow",
"type": "MONSTER",
"copy-from": "mon_fry",
"upgrades": { "half_life": 14, "into": "mon_fish_bullhead_yellow" },
"name": { "str_sp": "fry" }
},
{
"id": "mon_fish_channel_catfish",
"type": "MONSTER",
@@ -660,6 +696,23 @@
"upgrades": { "half_life": 14, "into": "mon_fish_pickerel" },
"name": { "str_sp": "fry" }
},
{
"id": "mon_fish_pickerel_american",
"type": "MONSTER",
"copy-from": "mon_fish_tiny",
"name": { "str": "American pickerel" },
"description": "An American pickerel. It looks like a pike, but unlike its chain pickerel cousin, this one is way smaller.",
"volume": "170 ml",
"weight": "200 g",
"reproduction": { "baby_egg": "egg_pickerel_american", "baby_count": 2, "baby_timer": 17 }
},
{
"id": "mon_fry_pickerel_american",
"type": "MONSTER",
"copy-from": "mon_fry",
"upgrades": { "half_life": 14, "into": "mon_fish_pickerel_american" },
"name": { "str_sp": "fry" }
},
{
"id": "mon_fish_muskellunge",
"type": "MONSTER",
@@ -731,6 +784,24 @@
"upgrades": { "half_life": 14, "into": "mon_fish_grass_carp" },
"name": { "str_sp": "fry" }
},
{
"id": "mon_fish_goldfish",
"type": "MONSTER",
"copy-from": "mon_fish_tiny",
"name": { "str_sp": "goldfish" },
"looks_like": "mon_fish_carp",
"description": "Yes, this is that common pet fish. Though, given its size and the fact that it's still alive, you can take a wild guess that this one is feral.",
"volume": "570 ml",
"weight": "300 g",
"reproduction": { "baby_egg": "egg_goldfish", "baby_count": 2, "baby_timer": 17 }
},
{
"id": "mon_fry_goldfish",
"type": "MONSTER",
"copy-from": "mon_fry",
"upgrades": { "half_life": 14, "into": "mon_fish_goldfish" },
"name": { "str_sp": "fry" }
},
{
"id": "mon_fish_bowfin",
"type": "MONSTER",
@@ -748,6 +819,76 @@
"upgrades": { "half_life": 14, "into": "mon_fish_bowfin" },
"name": { "str_sp": "fry" }
},
{
"id": "mon_fish_gar_longnose",
"type": "MONSTER",
"copy-from": "mon_fish_small",
"name": { "str": "longnose gar" },
"looks_like": "mon_fish_pike",
"description": "A large ancient type of fish with a mean jaw and poisonous eggs.",
"volume": "4820 ml",
"weight": "920 g",
"reproduction": { "baby_egg": "egg_gar_longnose", "baby_count": 2, "baby_timer": 17 }
},
{
"id": "mon_fry_gar_longnose",
"type": "MONSTER",
"copy-from": "mon_fry",
"upgrades": { "half_life": 14, "into": "mon_fish_gar_longnose" },
"name": { "str_sp": "fry" }
},
{
"id": "mon_fish_burbot",
"type": "MONSTER",
"copy-from": "mon_fish_tiny",
"name": { "str": "burbot" },
"description": "A relatively large fish that looks like a cross between a catfish and an eel, and is the only freshwater fish from the order that cods hail from.",
"volume": "1400 ml",
"weight": "620 g",
"reproduction": { "baby_egg": "egg_burbot", "baby_count": 2, "baby_timer": 17 }
},
{
"id": "mon_fry_burbot",
"type": "MONSTER",
"copy-from": "mon_fry",
"upgrades": { "half_life": 14, "into": "mon_fish_burbot" },
"name": { "str_sp": "fry" }
},
{
"id": "mon_fish_sturgeon_lake",
"type": "MONSTER",
"copy-from": "mon_fish_large",
"name": { "str": "lake sturgeon" },
"description": "A very large armored bottom-feeder, the lake sturgeon is one of the largest unmutated fish one can find in the freshwater regions of New England.",
"volume": "20220 ml",
"weight": "14500 g",
"reproduction": { "baby_egg": "egg_sturgeon_lake", "baby_count": 2, "baby_timer": 17 }
},
{
"id": "mon_fry_sturgeon_lake",
"type": "MONSTER",
"copy-from": "mon_fry",
"upgrades": { "half_life": 14, "into": "mon_fish_sturgeon_lake" },
"name": { "str_sp": "fry" }
},
{
"id": "mon_fish_sturgeon_shortnose",
"type": "MONSTER",
"copy-from": "mon_fish_small",
"name": { "str": "shortnose sturgeon" },
"looks_like": "mon_fish_sturgeon_lake",
"description": "While the shortnose sturgeon is still large, it is nothing compared to its cousin - the lake sturgeon. What really sets it apart, however, is its signature shorter snout.",
"volume": "2720 ml",
"weight": "980 g",
"reproduction": { "baby_egg": "egg_sturgeon_shortnose", "baby_count": 2, "baby_timer": 17 }
},
{
"id": "mon_fry_sturgeon_shortnose",
"type": "MONSTER",
"copy-from": "mon_fry",
"upgrades": { "half_life": 14, "into": "mon_fish_sturgeon_shortnose" },
"name": { "str_sp": "fry" }
},
{
"id": "mon_fish_fallfish",
"type": "MONSTER",
Loading