forked from CleverRaven/Cataclysm-DDA
    
        
        - 
                Notifications
    You must be signed in to change notification settings 
- Fork 0
c #14
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
          
     Open
      
      
            faefux
  wants to merge
  10,000
  commits into
  faefux:pants-descs
  
    
      
        
          
  
    
      Choose a base branch
      
     
    
      
        
      
      
        
          
          
        
        
          
            
              
              
              
  
           
        
        
          
            
              
              
           
        
       
     
  
        
          
            
          
            
          
        
       
    
      
from
CleverRaven:master
  
      
      
   
  
    
  
  
  
 
  
      
    base: pants-descs
Could not load branches
            
              
  
    Branch not found: {{ refName }}
  
            
                
      Loading
              
            Could not load tags
            
            
              Nothing to show
            
              
  
            
                
      Loading
              
            Are you sure you want to change the base?
            Some commits from the old base branch may be removed from the timeline,
            and old review comments may become outdated.
          
          
                
     Open
            
            c #14
Conversation
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
    …cles READY dimensional travel for vehicles
Allow inverting lake generation, specifying generated lake terrains
Routine i18n updates on 11 October 2025
Add "actually_dead" debug argument for end screen handling
Clear faults after every test shot in vehicle_turret test
I was going to include these as the default loaded values, but decided against it, and never populated them back to the JSON.
…s, add newly added spells, make bloodrager code a tiny bit better
Fix default forest and urbanity thresholds
Tents can be repaired
Few translation fixes
This makes it easier to examine changes to the various noise layers. This isn't quite accurate to how the noise layers actually work in practice, because they are variously weighted by distance from the overmap 0,0. In particular, this affects the ocean noise map. In the future, the distance-based noise map adjustments should be integrated into the noise functions.
Move degrade/damage/age/fault functions from item.cpp to item_degrade.cpp
Move game io functions from game.cpp to game_io.cpp
* Initial commit * Add damaging a target that is already on fire * Fix field increasing * Add learning infrastructure * Text edit * Documentation * Profession adjustments
Co-authored-by: mqrause <[email protected]>
* fix oatmeal have oatmeal spawn in one box * add armguard hard add armguard hard to wardrobes with same probability as leg guard hard * appease json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
#83192) (#83509) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Anton Simakov <[email protected]>
[Magiclysm/XE] Fix Paradox Survivor incompatibility
* No purifier in no hope * Update items.json * Update data/mods/No_Hope/blacklist.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update migrations.json * Update items.json --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Update food_service.json * Update data/json/itemgroups/food_service.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/itemgroups/food_service.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/itemgroups/food_service.json * Update data/json/itemgroups/food_service.json * Update data/json/itemgroups/food_service.json --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…spell (#83493) * Update magic.cpp * Use trait flag instead * Update src/magic.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/magic.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/magic.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* initial commit * revert fruit juice abstraction * adjust the charges back to 1 * fix weight * fix copy from
* Initial commit * Fleshy shambler faction * Increase numbers * Fix faction relations
Reduce deconstruct times for kevlar vests
* initial commit * fix names and descriptions * Update data/json/items/tool/science.json Co-authored-by: Karol1223 <[email protected]> * Update data/json/items/tool/science.json Co-authored-by: Karol1223 <[email protected]> * Update data/json/snippets/microscope.json Co-authored-by: Karol1223 <[email protected]> * revert the microscope changes, update the EoC function, update the snippets * make messages more consistent * fix typo * fix uncrafts and nests * Update data/json/items/tool/science.json Co-authored-by: Karol1223 <[email protected]> * fix organism distribution, add fungi snippet --------- Co-authored-by: Karol1223 <[email protected]>
  
    Sign up for free
    to join this conversation on GitHub.
    Already have an account?
    Sign in to comment
  
      Labels
    None yet
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
Summary
Category "Brief description"
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context