{"payload":{"feedbackUrl":"https://github.com/orgs/community/discussions/53140","repo":{"id":5973855,"defaultBranch":"master","name":"Cataclysm-DDA","ownerLogin":"CleverRaven","currentUserCanPush":false,"isFork":false,"isEmpty":false,"createdAt":"2012-09-26T22:57:43.000Z","ownerAvatar":"https://avatars.githubusercontent.com/u/4367009?v=4","public":true,"private":false,"isOrgOwned":true},"refInfo":{"name":"","listCacheKey":"v0:1715798050.0","currentOid":""},"activityList":{"items":[{"before":"731bdaad527d0c58abb34738878971cbb5dcdd0e","after":"7f06e9f6eaf5b3096405085910bb21e2fa2b8647","ref":"refs/heads/master","pushedAt":"2024-05-15T18:33:05.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"Maleclypse","name":null,"path":"/Maleclypse","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/54345792?s=80&v=4"},"commit":{"message":"Add tarot cards and Ouija board (#73752)\n\n* Update fluff.json\r\n\r\nAdds tarot cards as a variant of playing cards.\r\nAdds Ouija board to list of board games.\r\n\r\n* Update fluff.json\r\n\r\nAdds tarot cards as a variant of the deck of cards.\r\nAdds Ouija board to pool of board games.\r\n\r\n* Update fluff.json\r\n\r\nFix hard crash\r\n\r\n* Update data/json/items/fluff.json\r\n\r\nCo-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>\r\n\r\n* Update data/json/items/fluff.json\r\n\r\nCo-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>\r\n\r\n* Update data/json/items/fluff.json\r\n\r\nCo-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com>\r\n\r\n* Update data/json/items/fluff.json\r\n\r\nCo-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com>\r\n\r\n* Update data/json/items/fluff.json\r\n\r\nCo-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com>\r\n\r\n---------\r\n\r\nCo-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>\r\nCo-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com>","shortMessageHtmlLink":"Add tarot cards and Ouija board (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2293821477\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73752\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73752/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73752\">#73752</a>)"}},{"before":"2268ffca7eb0dc9608f4ff7635bd6deec3bc4227","after":"3661645190b309135e853118fc850dc80568be97","ref":"refs/heads/clamp_move_cost","pushedAt":"2024-05-15T08:38:04.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"GuardianDll","name":"Anton Simakov","path":"/GuardianDll","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/67688115?s=80&v=4"},"commit":{"message":"Update src/character.cpp\n\nCo-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>","shortMessageHtmlLink":"Update src/character.cpp"}},{"before":"731bdaad527d0c58abb34738878971cbb5dcdd0e","after":"2268ffca7eb0dc9608f4ff7635bd6deec3bc4227","ref":"refs/heads/clamp_move_cost","pushedAt":"2024-05-15T08:24:56.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"GuardianDll","name":"Anton Simakov","path":"/GuardianDll","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/67688115?s=80&v=4"},"commit":{"message":"clamp the multiplicative speed bonus","shortMessageHtmlLink":"clamp the multiplicative speed bonus"}},{"before":null,"after":"731bdaad527d0c58abb34738878971cbb5dcdd0e","ref":"refs/heads/clamp_move_cost","pushedAt":"2024-05-15T08:24:55.000Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"GuardianDll","name":"Anton Simakov","path":"/GuardianDll","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/67688115?s=80&v=4"},"commit":{"message":"Adds Oil Platform specials to spawn in the ocean (#73469)\n\n* Adds Oil Platform specials to spawn in the ocean\r\n\r\n<!-- HOW TO USE: Under each \"#### Heading\" below, enter information relevant to your pull request.\r\nLeave the headings unless they don't apply to your PR.\r\n\r\nPlease read carefully and don't delete the comments delimited by \"< !--\" and \"-- >\"\r\nOnce a pull request is submitted, automatic stylistic and consistency checks will be performed on the PR's changes.\r\nThe results of these can be either seen under the \"Files changed\" section of a PR or in the check's details.\r\n\r\nRules for suggested pull requests:\r\n- If possible, limit yourself to small changes, 500 strings at max. Exceptions are adding or changing maps, and changes, that won't work unless they are done in a single run (even then there can be ways) - violating it puts a lot of unnecessary work on our merge team.\r\n- Do not scope creep. If you make a pull request \"Add new gun\", please do not make anything more than adding the gun and following changes, like changing the stats of the gun, removing another guns from itemgroups or tweaking zombie horse stats - violating it makes future search and debugging stuff much harder, since PR name is not related to what is changed in the game. \"Who the hell removed the quest item from drop in location X in PR, that adds a new plushie\" - may be a quote from a person who was affected by scope creep\r\n- Do not make omnibus PRs. Meaning do not make a single PR, that fixes ten different, not related issues, at once, even if they are all one string - same as previously mentioned scope creep, it doesn't help to search the changes when debugging, despite all power of git blame tool\r\n\r\nNOTE: Please grant permission for repository maintainers to edit your PR.  It is EXTREMELY common for PRs to be held up due to trivial changes being requested and the author being unavailable to make them. -->\r\n\r\n#### Summary\r\nContent \"Adds a new Special, Oil Platforms, to spawn in the ocean.\"\r\n<!-- This section should consist of exactly one line, edit the one above.\r\n1. Replace the word \"Category\" with one of these words: Features, Content, Interface, Mods, Balance, Bugfixes, Performance, Infrastructure, Build, I18N.\r\n2. Replace the text inside the quotes with a brief description of your changes.\r\nOr if you don't want a changelog entry, replace the whole line with just the word \"None\" (with no quotes).\r\nFor more on the meaning of each category, see:\r\nhttps://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/CHANGELOG_GUIDELINES.md\r\nIf approved and merged, your summary will be added to the project changelog:\r\nhttps://github.com/CleverRaven/Cataclysm-DDA/blob/master/data/changelog.txt -->\r\n\r\n#### Purpose of change\r\nThe ocean is completely devoid of content right now, and I understand it might make it very unappealing to work on before anything is actually there to make people interested in going there, so I figured I'd get the machine rolling while trying my hands at doing some mapping for CDDA !\r\n<!-- With a few sentences, describe your reasons for making this change.\r\nIf it relates to an existing issue, you can link it with a # followed by the GitHub issue number, like #1234.\r\nWhen you submit a pull request that completely resolves an issue, use [Github's closing keywords](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue)\r\nto automatically close the issue once your pull request is merged.\r\nIf there is no related issue, explain here what issue, feature, or other concern you are addressing.  If this is a bugfix, include steps to reproduce the original bug, so your fix can be verified. -->\r\n\r\n#### Describe the solution\r\nThis special is UNIQUE with a 5% chance of spawning per overmap, I tried using check_for_locations to prevent it from spawning to close to the short with no luck, so city_distance is what's kind of doing that for now.\r\n\r\nIt features mostly industrial loot  (Tools, electronics, work/diving clothes, heavy machinery, solar pannels), as well as quite a few skill books, medicine, food, some chemistry ingredients, and the potential for 55gal drums containing various fuel, as well as newly added crude oil (which I'd like to make a recipe to turn into fuel with a catalytic cracking reactor in the future).\r\n\r\nThere's a 20% chance for a helicopter spawn on the helipad, which might be a wreck (from the \"helicopters\" spawn group), and four 10% chance for single motor boat spawns by the pillars on the water. There's also up to three inflatable boats floating down below the emergency dockings on the east side.\r\n\r\nBesides the most common types of zombies, It is mostly populated by zombie/feral mechanics or crewmen, swimmer zombies, and there are small chances of zapper/gasoline zombies to spawn. For the latter, there are four hardcoded locations with 5% chance of spawning, and some further chances in the zombie group a week in. Figured it'd work well thematically and could be interesting as either a boon or a bane depending on how you handle it.\r\n\r\nI tried to stick as best as I could to what an oil platform could look like by doing quite a bit of research, the only thing I really skirted around was for the plume; a chimney that usually extends quite a ways out over the ocean to burn excess gas. I didn't want there to be somewhere you could just easily walk to and attract all the zombies to take a dive so easily, so it mostly goes up in height.\r\n\r\nI went with a gravity based structure, the supporting pillars extending all the way to the bottom of the ocean, because I'd like, in a potential follow up, leave some room to add a small chance of it having a submerged hidden lab kind of thing in the concrete slab at the bottom. Such pillars usually are used to house piping that'd connect to underwater pipe-lines, so I figured it'd be good like this for now anyways ! Plus it makes it easier to justify every bit of piping that runs along the platform, which i've tried to do as best as possible.\r\n\r\n<!-- How does the feature work, or how does this fix a bug?  The easier you make your solution to understand, the faster it can get merged. -->\r\n\r\n#### Describe alternatives you've considered\r\n\r\n- As said above, adding a chance for a hidden submerged lab to be connected to the pillars going down - probably for a new project if it seems like a good idea.\r\n\r\n- Adding ramps instead of stairs to the various walkways - seemed like idle zombies liked to kill themselves by walking up and dropping back down.\r\n\r\n- Making it bigger and globally_unique, but I'd rather have both if possible !\r\n\r\n- Adding even more chances for gasoline zombies to spawn as time progresses.\r\n\r\n<!-- Explain any alternative solutions, different approaches, or possibilities you've considered using to solve the same problem. -->\r\n\r\n#### Testing\r\n\r\nSpawning in a new world, teleporting to the ocean, seems to spawn fine.\r\n\r\nGoing around to see if I've made any mistakes, fixed all the ones I could see.\r\n\r\n<!-- Describe what steps you took to test that this PR resolved the bug or added the feature, and what tests you performed to make sure it didn't cause any regressions.  Also include testing suggestions for reviewers and maintainers. See TESTING_YOUR_CHANGES.md -->\r\n\r\n#### Additional context\r\n\r\nScreenshots : (I'm not sure if this'll work but I'll try)\r\n\r\n<blockquote class=\"imgur-embed-pub\" lang=\"en\" data-id=\"a/PHeXLWv\" data-context=\"false\" ><a href=\"//imgur.com/a/PHeXLWv\"></a></blockquote><script async src=\"//s.imgur.com/min/embed.js\" charset=\"utf-8\"></script>\r\n\r\n<!-- Add any other context (such as mock-ups, proof of concepts or screenshots) about the feature or bugfix here. -->\r\n\r\n<!--README: Cataclysm: Dark Days Ahead is released under the Creative Commons Attribution ShareAlike 3.0 license.\r\nThe code and content of the game is free to use, modify, and redistribute for any purpose whatsoever.\r\nBy contributing to the project you agree to the term of the license and that any contribution you make will also be covered by the same license.\r\nSee http://creativecommons.org/licenses/by-sa/3.0/ for details. -->\r\n\r\n* Of course I spot a mistake right after I create the PR\r\n\r\n* Update data/json/furniture_and_terrain/terrain-manufactured.json\r\n\r\n* Update data/json/furniture_and_terrain/terrain-manufactured.json\r\n\r\n* Fixed wrong surface water type, a wrongly aligned pipe, and made the platform a little longer to avoid zombies spawning outside of its berth\r\n\r\n* Added a catalytic cracking reactor, reworked the drum groups to make more sense where they spawn\r\n\r\n* Fixed crude_oil's material and ammo type, removed processed fuel and the rope leading to the crane, replaced forklifts by trolleys, increased minimum city distance and liquid amount in containers\r\n\r\n* Fixed crude_oil's material and ammo type, removed processed fuel and the rope leading to the crane, replaced forklifts by trolleys, increased minimum city distance and liquid amount in containers\r\n\r\n* Accidentally modified the crude lamp oil energy value, this should fix it (Sorry, struggling a little with github here)\r\n\r\n* Update data/json/mapgen/oil_platform/oil_platform_z2.json\r\n\r\n* Update data/json/furniture_and_terrain/terrain-manufactured.json\r\n\r\n* Update data/json/mapgen/oil_platform/oil_platform_z2.json\r\n\r\n* Apply suggestions from code review\r\n\r\n* Switched the tanks leading to the generators from salt water to diesel (didn't make sense)\r\n\r\n* Update overmap_terrain_coverage_whitelist.json\r\n\r\n* Update data/json/items/fuel.json\r\n\r\n---------\r\n\r\nCo-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com>","shortMessageHtmlLink":"Adds Oil Platform specials to spawn in the ocean (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2276922540\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73469\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73469/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73469\">#73469</a>)"}},{"before":"83554d23e2ef5a390074448afdbe79083d3bef53","after":"27059e7dfd3bf98b9cbcde304777d54cfff7fac4","ref":"refs/heads/0.H-branch","pushedAt":"2024-05-15T03:14:12.000Z","pushType":"pr_merge","commitsCount":3,"pusher":{"login":"Maleclypse","name":null,"path":"/Maleclypse","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/54345792?s=80&v=4"},"commit":{"message":"Merge pull request #73773 from Procyonae/Backport70589And70770\n\nBackport #70589 and #70770","shortMessageHtmlLink":"Merge pull request <a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2295672442\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73773\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73773/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73773\">#73773</a> from Procyonae/Backport70589And70770"}},{"before":null,"after":"5b17007be05ad12bd0fc814cd6a8a71903bce64c","ref":"refs/heads/serialize-test-build","pushedAt":"2024-05-15T01:35:19.000Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"kevingranade","name":"Kevin Granade","path":"/kevingranade","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/860276?s=80&v=4"},"commit":{"message":"Serialize game and test build to ease pressure on RAM, especially in CI","shortMessageHtmlLink":"Serialize game and test build to ease pressure on RAM, especially in CI"}},{"before":"7467c42c7c85ad59e349ac3409109805ace64d84","after":"731bdaad527d0c58abb34738878971cbb5dcdd0e","ref":"refs/heads/master","pushedAt":"2024-05-15T01:03:40.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"Maleclypse","name":null,"path":"/Maleclypse","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/54345792?s=80&v=4"},"commit":{"message":"Adds Oil Platform specials to spawn in the ocean (#73469)\n\n* Adds Oil Platform specials to spawn in the ocean\r\n\r\n<!-- HOW TO USE: Under each \"#### Heading\" below, enter information relevant to your pull request.\r\nLeave the headings unless they don't apply to your PR.\r\n\r\nPlease read carefully and don't delete the comments delimited by \"< !--\" and \"-- >\"\r\nOnce a pull request is submitted, automatic stylistic and consistency checks will be performed on the PR's changes.\r\nThe results of these can be either seen under the \"Files changed\" section of a PR or in the check's details.\r\n\r\nRules for suggested pull requests:\r\n- If possible, limit yourself to small changes, 500 strings at max. Exceptions are adding or changing maps, and changes, that won't work unless they are done in a single run (even then there can be ways) - violating it puts a lot of unnecessary work on our merge team.\r\n- Do not scope creep. If you make a pull request \"Add new gun\", please do not make anything more than adding the gun and following changes, like changing the stats of the gun, removing another guns from itemgroups or tweaking zombie horse stats - violating it makes future search and debugging stuff much harder, since PR name is not related to what is changed in the game. \"Who the hell removed the quest item from drop in location X in PR, that adds a new plushie\" - may be a quote from a person who was affected by scope creep\r\n- Do not make omnibus PRs. Meaning do not make a single PR, that fixes ten different, not related issues, at once, even if they are all one string - same as previously mentioned scope creep, it doesn't help to search the changes when debugging, despite all power of git blame tool\r\n\r\nNOTE: Please grant permission for repository maintainers to edit your PR.  It is EXTREMELY common for PRs to be held up due to trivial changes being requested and the author being unavailable to make them. -->\r\n\r\n#### Summary\r\nContent \"Adds a new Special, Oil Platforms, to spawn in the ocean.\"\r\n<!-- This section should consist of exactly one line, edit the one above.\r\n1. Replace the word \"Category\" with one of these words: Features, Content, Interface, Mods, Balance, Bugfixes, Performance, Infrastructure, Build, I18N.\r\n2. Replace the text inside the quotes with a brief description of your changes.\r\nOr if you don't want a changelog entry, replace the whole line with just the word \"None\" (with no quotes).\r\nFor more on the meaning of each category, see:\r\nhttps://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/CHANGELOG_GUIDELINES.md\r\nIf approved and merged, your summary will be added to the project changelog:\r\nhttps://github.com/CleverRaven/Cataclysm-DDA/blob/master/data/changelog.txt -->\r\n\r\n#### Purpose of change\r\nThe ocean is completely devoid of content right now, and I understand it might make it very unappealing to work on before anything is actually there to make people interested in going there, so I figured I'd get the machine rolling while trying my hands at doing some mapping for CDDA !\r\n<!-- With a few sentences, describe your reasons for making this change.\r\nIf it relates to an existing issue, you can link it with a # followed by the GitHub issue number, like #1234.\r\nWhen you submit a pull request that completely resolves an issue, use [Github's closing keywords](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue)\r\nto automatically close the issue once your pull request is merged.\r\nIf there is no related issue, explain here what issue, feature, or other concern you are addressing.  If this is a bugfix, include steps to reproduce the original bug, so your fix can be verified. -->\r\n\r\n#### Describe the solution\r\nThis special is UNIQUE with a 5% chance of spawning per overmap, I tried using check_for_locations to prevent it from spawning to close to the short with no luck, so city_distance is what's kind of doing that for now.\r\n\r\nIt features mostly industrial loot  (Tools, electronics, work/diving clothes, heavy machinery, solar pannels), as well as quite a few skill books, medicine, food, some chemistry ingredients, and the potential for 55gal drums containing various fuel, as well as newly added crude oil (which I'd like to make a recipe to turn into fuel with a catalytic cracking reactor in the future).\r\n\r\nThere's a 20% chance for a helicopter spawn on the helipad, which might be a wreck (from the \"helicopters\" spawn group), and four 10% chance for single motor boat spawns by the pillars on the water. There's also up to three inflatable boats floating down below the emergency dockings on the east side.\r\n\r\nBesides the most common types of zombies, It is mostly populated by zombie/feral mechanics or crewmen, swimmer zombies, and there are small chances of zapper/gasoline zombies to spawn. For the latter, there are four hardcoded locations with 5% chance of spawning, and some further chances in the zombie group a week in. Figured it'd work well thematically and could be interesting as either a boon or a bane depending on how you handle it.\r\n\r\nI tried to stick as best as I could to what an oil platform could look like by doing quite a bit of research, the only thing I really skirted around was for the plume; a chimney that usually extends quite a ways out over the ocean to burn excess gas. I didn't want there to be somewhere you could just easily walk to and attract all the zombies to take a dive so easily, so it mostly goes up in height.\r\n\r\nI went with a gravity based structure, the supporting pillars extending all the way to the bottom of the ocean, because I'd like, in a potential follow up, leave some room to add a small chance of it having a submerged hidden lab kind of thing in the concrete slab at the bottom. Such pillars usually are used to house piping that'd connect to underwater pipe-lines, so I figured it'd be good like this for now anyways ! Plus it makes it easier to justify every bit of piping that runs along the platform, which i've tried to do as best as possible.\r\n\r\n<!-- How does the feature work, or how does this fix a bug?  The easier you make your solution to understand, the faster it can get merged. -->\r\n\r\n#### Describe alternatives you've considered\r\n\r\n- As said above, adding a chance for a hidden submerged lab to be connected to the pillars going down - probably for a new project if it seems like a good idea.\r\n\r\n- Adding ramps instead of stairs to the various walkways - seemed like idle zombies liked to kill themselves by walking up and dropping back down.\r\n\r\n- Making it bigger and globally_unique, but I'd rather have both if possible !\r\n\r\n- Adding even more chances for gasoline zombies to spawn as time progresses.\r\n\r\n<!-- Explain any alternative solutions, different approaches, or possibilities you've considered using to solve the same problem. -->\r\n\r\n#### Testing\r\n\r\nSpawning in a new world, teleporting to the ocean, seems to spawn fine.\r\n\r\nGoing around to see if I've made any mistakes, fixed all the ones I could see.\r\n\r\n<!-- Describe what steps you took to test that this PR resolved the bug or added the feature, and what tests you performed to make sure it didn't cause any regressions.  Also include testing suggestions for reviewers and maintainers. See TESTING_YOUR_CHANGES.md -->\r\n\r\n#### Additional context\r\n\r\nScreenshots : (I'm not sure if this'll work but I'll try)\r\n\r\n<blockquote class=\"imgur-embed-pub\" lang=\"en\" data-id=\"a/PHeXLWv\" data-context=\"false\" ><a href=\"//imgur.com/a/PHeXLWv\"></a></blockquote><script async src=\"//s.imgur.com/min/embed.js\" charset=\"utf-8\"></script>\r\n\r\n<!-- Add any other context (such as mock-ups, proof of concepts or screenshots) about the feature or bugfix here. -->\r\n\r\n<!--README: Cataclysm: Dark Days Ahead is released under the Creative Commons Attribution ShareAlike 3.0 license.\r\nThe code and content of the game is free to use, modify, and redistribute for any purpose whatsoever.\r\nBy contributing to the project you agree to the term of the license and that any contribution you make will also be covered by the same license.\r\nSee http://creativecommons.org/licenses/by-sa/3.0/ for details. -->\r\n\r\n* Of course I spot a mistake right after I create the PR\r\n\r\n* Update data/json/furniture_and_terrain/terrain-manufactured.json\r\n\r\n* Update data/json/furniture_and_terrain/terrain-manufactured.json\r\n\r\n* Fixed wrong surface water type, a wrongly aligned pipe, and made the platform a little longer to avoid zombies spawning outside of its berth\r\n\r\n* Added a catalytic cracking reactor, reworked the drum groups to make more sense where they spawn\r\n\r\n* Fixed crude_oil's material and ammo type, removed processed fuel and the rope leading to the crane, replaced forklifts by trolleys, increased minimum city distance and liquid amount in containers\r\n\r\n* Fixed crude_oil's material and ammo type, removed processed fuel and the rope leading to the crane, replaced forklifts by trolleys, increased minimum city distance and liquid amount in containers\r\n\r\n* Accidentally modified the crude lamp oil energy value, this should fix it (Sorry, struggling a little with github here)\r\n\r\n* Update data/json/mapgen/oil_platform/oil_platform_z2.json\r\n\r\n* Update data/json/furniture_and_terrain/terrain-manufactured.json\r\n\r\n* Update data/json/mapgen/oil_platform/oil_platform_z2.json\r\n\r\n* Apply suggestions from code review\r\n\r\n* Switched the tanks leading to the generators from salt water to diesel (didn't make sense)\r\n\r\n* Update overmap_terrain_coverage_whitelist.json\r\n\r\n* Update data/json/items/fuel.json\r\n\r\n---------\r\n\r\nCo-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com>","shortMessageHtmlLink":"Adds Oil Platform specials to spawn in the ocean (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2276922540\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73469\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73469/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73469\">#73469</a>)"}},{"before":"24f989c424f1e68b61a3f53317899dc0cae16b66","after":"7467c42c7c85ad59e349ac3409109805ace64d84","ref":"refs/heads/master","pushedAt":"2024-05-14T23:28:46.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"dseguin","name":"David Seguin","path":"/dseguin","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/12537966?s=80&v=4"},"commit":{"message":"Typified editmap (#73713)\n\n* typified editmap\r\n\r\n* removed generated junk file\r\n\r\n* this doesn't work\r\n\r\n* Update src/line.cpp\r\n\r\nCo-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com>\r\n\r\n* sorted out line_to\r\n\r\n* unnaming dummy parameter\r\n\r\n* Update src/coordinates.h\r\n\r\nCo-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com>\r\n\r\n* Update src/coordinates.h\r\n\r\nCo-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com>\r\n\r\n* Update src/line.cpp\r\n\r\nCo-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com>\r\n\r\n* Update src/line.h\r\n\r\nCo-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com>\r\n\r\n* Update src/coordinates.h\r\n\r\nCo-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>\r\n\r\n* Nicer parameter name\r\n\r\n---------\r\n\r\nCo-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com>\r\nCo-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>","shortMessageHtmlLink":"Typified editmap (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2291358755\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73713\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73713/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73713\">#73713</a>)"}},{"before":"814ba0710fcffa89cb45f758af9d2b2e0f403d66","after":"24f989c424f1e68b61a3f53317899dc0cae16b66","ref":"refs/heads/master","pushedAt":"2024-05-14T23:27:55.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"dseguin","name":"David Seguin","path":"/dseguin","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/12537966?s=80&v=4"},"commit":{"message":"Added explicit roofs to hub version 2 (#73784)","shortMessageHtmlLink":"Added explicit roofs to hub version 2 (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2295950492\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73784\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73784/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73784\">#73784</a>)"}},{"before":"5a2af37124d35e4f48476d4d4026245d5cdd6342","after":"814ba0710fcffa89cb45f758af9d2b2e0f403d66","ref":"refs/heads/master","pushedAt":"2024-05-14T23:09:34.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"dseguin","name":"David Seguin","path":"/dseguin","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/12537966?s=80&v=4"},"commit":{"message":"Average NPC skill level increases over time (#73745)\n\n* Background NPCs level over time\r\n\r\n* NPC catchup learning uses exp per day instead\r\n\r\n* Update src/npc.cpp\r\n\r\nCo-authored-by: anothersimulacrum <anothersimulacrum@gmail.com>\r\n\r\n---------\r\n\r\nCo-authored-by: anothersimulacrum <anothersimulacrum@gmail.com>","shortMessageHtmlLink":"Average NPC skill level increases over time (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2292261291\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73745\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73745/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73745\">#73745</a>)"}},{"before":"b67f2042528622c9ff3972a7dc7411ceb03dfb26","after":"5a2af37124d35e4f48476d4d4026245d5cdd6342","ref":"refs/heads/master","pushedAt":"2024-05-14T23:07:26.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"dseguin","name":"David Seguin","path":"/dseguin","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/12537966?s=80&v=4"},"commit":{"message":"Include vehicle roofs for map::draw_from_above (#73747)","shortMessageHtmlLink":"Include vehicle roofs for map::draw_from_above (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2292543931\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73747\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73747/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73747\">#73747</a>)"}},{"before":"4b658e394b84042fa84ef4b68484e78bf5b6ea49","after":"b67f2042528622c9ff3972a7dc7411ceb03dfb26","ref":"refs/heads/master","pushedAt":"2024-05-14T23:06:52.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"dseguin","name":"David Seguin","path":"/dseguin","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/12537966?s=80&v=4"},"commit":{"message":"fix draw_critter_above bounds check (#73756)\n\nwhen walking up the z levels, make sure we don't go out of bounds in the\r\ncaches.\r\n\r\nPR #73653 tried to fix this, but the check needs to happen before we\r\nindex the cache array by z-level, not after.\r\n\r\nfixes #73754.","shortMessageHtmlLink":"fix draw_critter_above bounds check (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2294191116\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73756\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73756/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73756\">#73756</a>)"}},{"before":"e141d5c35b44c81c77527f12ef90ba06d8102d73","after":"4b658e394b84042fa84ef4b68484e78bf5b6ea49","ref":"refs/heads/master","pushedAt":"2024-05-14T23:05:30.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"dseguin","name":"David Seguin","path":"/dseguin","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/12537966?s=80&v=4"},"commit":{"message":"fix assert in diary info panel clamp (#73758)\n\nwith -D_GLIBCXX_ASSERTIONS=1, libstdc++ will assert when `lo > hi` in\r\nstd::clamp, and it is described as undefined behavior in\r\nhttps://en.cppreference.com/w/cpp/algorithm/clamp. fix the arguments to\r\navoid it.","shortMessageHtmlLink":"fix assert in diary info panel clamp (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2294225469\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73758\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73758/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73758\">#73758</a>)"}},{"before":"dd720c323e0c7b655847558168ebd727a2958923","after":"e141d5c35b44c81c77527f12ef90ba06d8102d73","ref":"refs/heads/master","pushedAt":"2024-05-14T23:01:20.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"dseguin","name":"David Seguin","path":"/dseguin","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/12537966?s=80&v=4"},"commit":{"message":"nerf into oblivion (#73780)","shortMessageHtmlLink":"nerf into oblivion (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2295933191\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73780\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73780/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73780\">#73780</a>)"}},{"before":"c7d88dcbe8813db3e7a039306076a8986570dacb","after":"dd720c323e0c7b655847558168ebd727a2958923","ref":"refs/heads/master","pushedAt":"2024-05-14T23:00:41.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"dseguin","name":"David Seguin","path":"/dseguin","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/12537966?s=80&v=4"},"commit":{"message":"Fix on select, door controls should keep selection (#73789)","shortMessageHtmlLink":"Fix on select, door controls should keep selection (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2296407607\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73789\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73789/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73789\">#73789</a>)"}},{"before":"fc1c48f1fee750dfbe9d96b1898b93dbf02083cf","after":"c7d88dcbe8813db3e7a039306076a8986570dacb","ref":"refs/heads/master","pushedAt":"2024-05-14T18:51:11.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"kevingranade","name":"Kevin Granade","path":"/kevingranade","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/860276?s=80&v=4"},"commit":{"message":"Fix crash when opening construction menu with no visible entries (#73785)","shortMessageHtmlLink":"Fix crash when opening construction menu with no visible entries (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2295968763\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73785\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73785/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73785\">#73785</a>"}},{"before":"b27e93cf6ccf6ebdde11a382d9dba5e486422f84","after":"83554d23e2ef5a390074448afdbe79083d3bef53","ref":"refs/heads/0.H-branch","pushedAt":"2024-05-14T17:37:09.000Z","pushType":"pr_merge","commitsCount":3,"pusher":{"login":"kevingranade","name":"Kevin Granade","path":"/kevingranade","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/860276?s=80&v=4"},"commit":{"message":"Merge pull request #73775 from Procyonae/Backport70772And70775\n\nBackport #70772 and #70775","shortMessageHtmlLink":"Merge pull request <a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2295873168\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73775\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73775/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73775\">#73775</a> from Procyonae/Backport70772And70775"}},{"before":"11e0d8a2941ca23ff5226a19fbf87267828aada0","after":"b27e93cf6ccf6ebdde11a382d9dba5e486422f84","ref":"refs/heads/0.H-branch","pushedAt":"2024-05-14T17:36:13.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"kevingranade","name":"Kevin Granade","path":"/kevingranade","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/860276?s=80&v=4"},"commit":{"message":"Move hobby randomization after set_body() (#73783)\n\nCo-authored-by: Andrey Andreyevich Bienkowski <hexagonrecursion@gmail.com>","shortMessageHtmlLink":"Move hobby randomization after set_body() (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2295950336\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73783\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73783/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73783\">#73783</a>)"}},{"before":"b5068493de31ca1c4e1aa0b94d386b18cb25493c","after":"11e0d8a2941ca23ff5226a19fbf87267828aada0","ref":"refs/heads/0.H-branch","pushedAt":"2024-05-14T17:35:46.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"kevingranade","name":"Kevin Granade","path":"/kevingranade","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/860276?s=80&v=4"},"commit":{"message":"Oops. We forgot the error code (#73781)\n\nCo-authored-by: Andrey Andreyevich Bienkowski <hexagonrecursion@gmail.com>","shortMessageHtmlLink":"Oops. We forgot the error code (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2295943459\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73781\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73781/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73781\">#73781</a>)"}},{"before":"fd8e73c18263d2c7a89796f9e096e801f8e6198b","after":"b5068493de31ca1c4e1aa0b94d386b18cb25493c","ref":"refs/heads/0.H-branch","pushedAt":"2024-05-14T17:34:39.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"kevingranade","name":"Kevin Granade","path":"/kevingranade","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/860276?s=80&v=4"},"commit":{"message":"fix too big spiritual books (#73779)\n\nCo-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>","shortMessageHtmlLink":"fix too big spiritual books (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2295919876\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73779\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73779/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73779\">#73779</a>)"}},{"before":"9f55fd01a7af1d4e672fab76216faf5162c773af","after":"fd8e73c18263d2c7a89796f9e096e801f8e6198b","ref":"refs/heads/0.H-branch","pushedAt":"2024-05-14T17:34:10.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"kevingranade","name":"Kevin Granade","path":"/kevingranade","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/860276?s=80&v=4"},"commit":{"message":"Initialize the booleans (#73778)\n\nIf melee_actori.is_grab is false grab.exclusive_grab and grab.respect_seatbelts\r\nwere not initialized. This was causing errors under -fsanitize=undefined\r\n\r\nThe solution initialize the booleans to value that match their defaults\r\n\r\n```C++\r\nsrc/mattack_actors.h:75:8: runtime error: load of value 190, which is not a valid value for type 'bool'\r\n    #0 0x5a9b6fe in grab::grab(grab const&) src/mattack_actors.h:75\r\n    #1 0x5ab7635 in melee_actor::melee_actor(melee_actor const&) src/mattack_actors.h:106\r\n    #2 0x5ab8412 in std::__detail::_MakeUniq<melee_actor>::__single_object std::make_unique<melee_actor, melee_actor const&>(melee_actor const&) /usr/include/c++/13/bits/unique_ptr.h:1070\r\n    #3 0x5a87e4c in melee_actor::clone() const src/mattack_actors.cpp:962\r\n    #4 0x207632c in cata::clone_ptr<mattack_actor>::clone_ptr(cata::clone_ptr<mattack_actor> const&) src/clone_ptr.h:18\r\n    #5 0x6085941 in mtype_special_attack::mtype_special_attack(mtype_special_attack const&) src/mattack_common.h:47\r\n    #6 0x6085941 in std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack, true>(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_pair.h:559\r\n    #7 0x6085a2b in void std::__new_allocator<std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::construct<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/new_allocator.h:187\r\n    #8 0x6085a2b in void std::allocator_traits<std::allocator<std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > > >::construct<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::allocator<std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >&, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/alloc_traits.h:537\r\n    #9 0x6085a2b in void std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::_M_construct_node<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_tree.h:597\r\n    #10 0x6085b06 in std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >* std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::_M_create_node<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_tree.h:614\r\n    #11 0x6085b71 in std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::_Auto_node::_Auto_node<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_tree.h:1637\r\n    #12 0x6085c9d in std::_Rb_tree_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::_M_emplace_hint_unique<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::_Rb_tree_const_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_tree.h:2462\r\n    #13 0x608618f in std::_Rb_tree_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, mtype_special_attack, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::emplace_hint<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::_Rb_tree_const_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_map.h:640\r\n    #14 0x608618f in std::pair<std::_Rb_tree_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, bool> std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, mtype_special_attack, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::emplace<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_map.h:601\r\n    #15 0x5ff3881 in MonsterGenerator::add_attack(mtype_special_attack const&) src/monstergenerator.cpp:1312\r\n    #16 0x5ffafa5 in MonsterGenerator::load_monster_attack(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) src/monstergenerator.cpp:1376\r\n    #17 0x4262e91 in operator() src/init.cpp:466\r\n    #18 0x4262e91 in __invoke_impl<void, DynamicDataLoader::initialize()::<lambda(const JsonObject&, const std::string&)>&, const JsonObject&, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&> /usr/include/c++/13/bits/invoke.h:61\r\n    #19 0x4262e91 in __invoke_r<void, DynamicDataLoader::initialize()::<lambda(const JsonObject&, const std::string&)>&, const JsonObject&, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&> /usr/include/c++/13/bits/invoke.h:111\r\n    #20 0x4262e91 in _M_invoke /usr/include/c++/13/bits/std_function.h:290\r\n    #21 0x4290ce9 in std::function<void (JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>::operator()(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const /usr/include/c++/13/bits/std_function.h:591\r\n    #22 0x42693bf in operator() src/init.cpp:227\r\n    #23 0x42693bf in __invoke_impl<void, DynamicDataLoader::add(const std::string&, const std::function<void(const JsonObject&, const std::__cxx11::basic_string<char>&)>&)::<lambda(const JsonObject&, const std::string&, const cata_path&, const cata_path&)>&, const JsonObject&, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, const cata_path&, const cata_path&> /usr/include/c++/13/bits/invoke.h:61\r\n    #24 0x42693bf in __invoke_r<void, DynamicDataLoader::add(const std::string&, const std::function<void(const JsonObject&, const std::__cxx11::basic_string<char>&)>&)::<lambda(const JsonObject&, const std::string&, const cata_path&, const cata_path&)>&, const JsonObject&, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, const cata_path&, const cata_path&> /usr/include/c++/13/bits/invoke.h:111\r\n    #25 0x42693bf in _M_invoke /usr/include/c++/13/bits/std_function.h:290\r\n    #26 0x4290563 in std::function<void (JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, cata_path const&, cata_path const&)>::operator()(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, cata_path const&, cata_path const&) const /usr/include/c++/13/bits/std_function.h:591\r\n    #27 0x42849b9 in DynamicDataLoader::load_object(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, cata_path const&, cata_path const&) src/init.cpp:137\r\n    #28 0x4285ca2 in DynamicDataLoader::load_all_from_json(JsonValue const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, loading_ui&, cata_path const&, cata_path const&) src/init.cpp:540\r\n    #29 0x42867b4 in DynamicDataLoader::load_data_from_path(cata_path const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, loading_ui&) src/init.cpp:521\r\n    #30 0x3ca266a in game::load_data_from_dir(cata_path const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, loading_ui&) src/game.cpp:571\r\n    #31 0x3d211a0 in game::load_packs(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<string_id<MOD_INFORMATION>, std::allocator<string_id<MOD_INFORMATION> > > const&, loading_ui&) src/game.cpp:3265\r\n    #32 0x3d51925 in game::load_world_modfiles(loading_ui&) src/game.cpp:3235\r\n    #33 0x3e05640 in game::setup() src/game.cpp:756\r\n    #34 0x5111d33 in main_menu::new_character_tab() src/main_menu.cpp:972\r\n    #35 0x5127b5a in main_menu::opening_screen() src/main_menu.cpp:863\r\n    #36 0x50f1ece in main src/main.cpp:792\r\n    #37 0x7fdc43fa9b89 in __libc_start_call_main (/lib64/libc.so.6+0x27b89) (BuildId: f888be5f5e7d58e04cabb8c675c7ab94e77dd68c)\r\n    #38 0x7fdc43fa9c4a in __libc_start_main_alias_2 (/lib64/libc.so.6+0x27c4a) (BuildId: f888be5f5e7d58e04cabb8c675c7ab94e77dd68c)\r\n    #39 0x1bec874 in _start (/home/cdda/git/Cataclysm-DDA/cataclysm-tiles+0x1bec874) (BuildId: be24990d1723c8da00f3e8701793ab983cf64dcc)\r\n```\r\n\r\nCo-authored-by: hexagon-recursion <hexagon-recursion@posteo.net>","shortMessageHtmlLink":"Initialize the booleans (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2295898031\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73778\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73778/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73778\">#73778</a>)"}},{"before":"42bd923dba40ff324ca55a0e07d4a4addea002ca","after":"9f55fd01a7af1d4e672fab76216faf5162c773af","ref":"refs/heads/0.H-branch","pushedAt":"2024-05-14T17:33:22.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"kevingranade","name":"Kevin Granade","path":"/kevingranade","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/860276?s=80&v=4"},"commit":{"message":"Fix new line in crash log when SDL message box cannot be created (#70767) (#73777)\n\nCo-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com>","shortMessageHtmlLink":"Fix new line in crash log when SDL message box cannot be created (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2070067312\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/70767\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/70767/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/70767\">#70767</a>"}},{"before":"e73175f8ed500fcc44ef4064b0ba8dea3f55b56c","after":"42bd923dba40ff324ca55a0e07d4a4addea002ca","ref":"refs/heads/0.H-branch","pushedAt":"2024-05-14T17:32:39.000Z","pushType":"pr_merge","commitsCount":3,"pusher":{"login":"kevingranade","name":"Kevin Granade","path":"/kevingranade","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/860276?s=80&v=4"},"commit":{"message":"Merge pull request #73774 from Procyonae/Backport70423And70685\n\nBackport #70423 and #70685","shortMessageHtmlLink":"Merge pull request <a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2295777870\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73774\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73774/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73774\">#73774</a> from Procyonae/Backport70423And70685"}},{"before":"6cdad0ef4765d70a570de24809eb308f076b9ff5","after":"e73175f8ed500fcc44ef4064b0ba8dea3f55b56c","ref":"refs/heads/0.H-branch","pushedAt":"2024-05-14T17:22:37.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"kevingranade","name":"Kevin Granade","path":"/kevingranade","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/860276?s=80&v=4"},"commit":{"message":"fix disappearing arrows (#73771)\n\nCo-authored-by: Jeremy Rose <nornagon@nornagon.net>","shortMessageHtmlLink":"fix disappearing arrows (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2295605206\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73771\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73771/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73771\">#73771</a>)"}},{"before":"13ee2fd63fd23d3e120255c12144c1cba1a0ab88","after":"6cdad0ef4765d70a570de24809eb308f076b9ff5","ref":"refs/heads/0.H-branch","pushedAt":"2024-05-14T17:21:49.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"kevingranade","name":"Kevin Granade","path":"/kevingranade","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/860276?s=80&v=4"},"commit":{"message":"fix lieutenant popup query (#73770)\n\nCo-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>","shortMessageHtmlLink":"fix lieutenant popup query (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2295584999\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73770\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73770/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73770\">#73770</a>)"}},{"before":"ac818d54d367f11b2633a9e51ae9ac10eca1b1b8","after":"13ee2fd63fd23d3e120255c12144c1cba1a0ab88","ref":"refs/heads/0.H-branch","pushedAt":"2024-05-14T17:21:21.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"kevingranade","name":"Kevin Granade","path":"/kevingranade","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/860276?s=80&v=4"},"commit":{"message":"fix health dreams when you are ill (#72881) (#73767)\n\nCo-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>","shortMessageHtmlLink":"fix health dreams when you are ill (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2229711408\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/72881\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/72881/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/72881\">#72881</a>) (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2295536719\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73767\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73767/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73767\">#73767</a>)"}},{"before":"599168eeda79fdf0de1dd440b81c70d64d406134","after":"ac818d54d367f11b2633a9e51ae9ac10eca1b1b8","ref":"refs/heads/0.H-branch","pushedAt":"2024-05-14T17:19:20.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"kevingranade","name":"Kevin Granade","path":"/kevingranade","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/860276?s=80&v=4"},"commit":{"message":"Rename cover (#73766)\n\nCo-authored-by: RenechCDDA <84619419+RenechCDDA@users.noreply.github.com>","shortMessageHtmlLink":"Rename cover (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2295527337\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73766\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73766/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73766\">#73766</a>)"}},{"before":"c03abde63f123624b519c54a40efe9a74a974ef6","after":"fc1c48f1fee750dfbe9d96b1898b93dbf02083cf","ref":"refs/heads/master","pushedAt":"2024-05-14T12:00:03.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"Maleclypse","name":null,"path":"/Maleclypse","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/54345792?s=80&v=4"},"commit":{"message":"[MoM] Feral telekinetics have no inherent armor, they use their powers instead (#73634)\n\n* Initial commit\r\n\r\n* \"show_in_info\": true,\r\n\r\n* Reduce speed bonus from monster Momentum Alteration","shortMessageHtmlLink":"[MoM] Feral telekinetics have no inherent armor, they use their power…"}},{"before":"a0dc93100d80617a1e1cdc9f2b805a5b3ca81595","after":"c03abde63f123624b519c54a40efe9a74a974ef6","ref":"refs/heads/master","pushedAt":"2024-05-14T11:59:26.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"Maleclypse","name":null,"path":"/Maleclypse","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/54345792?s=80&v=4"},"commit":{"message":"[MoM] Add triffid psions (#73636)\n\n* Initial commit\r\n\r\n* Add flame immunity effect\r\n\r\n* Add others\r\n\r\n* Add new species\r\n\r\n* Fix triffid quell fire","shortMessageHtmlLink":"[MoM] Add triffid psions (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2290523548\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73636\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73636/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73636\">#73636</a>)"}},{"before":"0987171c1c9a94924fed96c75437399025f19a74","after":"a0dc93100d80617a1e1cdc9f2b805a5b3ca81595","ref":"refs/heads/master","pushedAt":"2024-05-14T11:57:00.000Z","pushType":"pr_merge","commitsCount":2,"pusher":{"login":"Maleclypse","name":null,"path":"/Maleclypse","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/54345792?s=80&v=4"},"commit":{"message":"Merge pull request #73729 from casswedson/prison-reinforce\n\nfix: reinforce land prison entrace","shortMessageHtmlLink":"Merge pull request <a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"2291547955\" data-permission-text=\"Title is private\" data-url=\"https://github.com/CleverRaven/Cataclysm-DDA/issues/73729\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/CleverRaven/Cataclysm-DDA/pull/73729/hovercard\" href=\"https://github.com/CleverRaven/Cataclysm-DDA/pull/73729\">#73729</a> from casswedson/prison-reinforce"}}],"hasNextPage":true,"hasPreviousPage":false,"activityType":"all","actor":null,"timePeriod":"all","sort":"DESC","perPage":30,"cursor":"djE6ks8AAAAESt52JwA","startCursor":null,"endCursor":null}},"title":"Activity · CleverRaven/Cataclysm-DDA"}