Permalink
Commits on Jan 18, 2019
  1. Merge pull request #27289 from KorGgenT/nutrient-rebalance

    ZhilkinSerg committed Jan 18, 2019
    Comestible Nutrient Rebalance (22 of 22)
  2. Merge pull request #27704 from I-am-Erk/npcmd-duration-fix

    ZhilkinSerg committed Jan 18, 2019
    Clarify durations in NPCs.md
  3. Merge pull request #27703 from nsklaus/pickup_highlight

    ZhilkinSerg committed Jan 18, 2019
    fix color of currently highlighted item in pickup window
  4. Merge pull request #27700 from Pupsi-Mupsi/Pupsi-Mupsi-DeadPeople

    ZhilkinSerg committed Jan 18, 2019
    Update MSX++DeadPeopleEdition 2019-01-18
  5. Merge pull request #27701 from Pupsi-Mupsi/Pupsi-Mupsi-duration

    ZhilkinSerg committed Jan 18, 2019
    Bugfix wrong duration parameter / format
  6. Merge pull request #27698 from prutschman/activity-ignorance-fixes

    ZhilkinSerg committed Jan 18, 2019
    Improvements to player_activity regarding distractions
  7. Merge pull request #27688 from jbytheway/wall_connectedness_without_t…

    ZhilkinSerg committed Jan 18, 2019
    …iles
    
    Choose type of map_memory correctly for wall connectedness
  8. Merge pull request #27675 from I-am-Erk/NPC-fixes

    ZhilkinSerg committed Jan 18, 2019
    Minor fixes to NPC backstories
  9. Merge pull request #27673 from I-am-Erk/npc-bgss-flexible

    ZhilkinSerg committed Jan 18, 2019
    Update code for background stories
  10. Allow value lists for option prerequisites

    ZhilkinSerg committed Jan 18, 2019
Commits on Jan 17, 2019
  1. Merge pull request #27426 from fluffy-heretic/stimboost-trait

    ZhilkinSerg committed Jan 17, 2019
    Add "Stimulant Psychosis" trait
  2. Merge pull request #27674 from ralreegorganon/clay-distribution

    ZhilkinSerg committed Jan 17, 2019
    Adjust clay distribution in forests and on riverbanks
  3. Merge pull request #27671 from halfahermit/update-retrodays-bionics-o…

    ZhilkinSerg committed Jan 17, 2019
    …verlays
    
    Update RetroDaysTileset - Add bionics overlays
  4. Merge pull request #27617 from halfahermit/tiles-display-bionics

    ZhilkinSerg committed Jan 17, 2019
    Allow installed bionics to be displayed in tiles mode
  5. Merge pull request #27577 from KorGgenT/drink.json-rebalance

    ZhilkinSerg committed Jan 17, 2019
    Drink.json comestible rebalance (5 of 22)
  6. Merge pull request #27578 from KorGgenT/drink_other.json-rebalance

    ZhilkinSerg committed Jan 17, 2019
    Drink other.json comestible rebalance (6 of 22)
  7. Merge pull request #27582 from KorGgenT/junkfood.json-rebalance

    ZhilkinSerg committed Jan 17, 2019
    Junkfood.json comestible rebalance (10 of 22)
  8. Merge pull request #27583 from KorGgenT/meat_dishes.json-rebalance

    ZhilkinSerg committed Jan 17, 2019
    Meat dishes.json comestible rebalance (12 of 22)
  9. Replaced hardcoded terrain list with checking of terrain flag (#27633)

    ZhilkinSerg authored and kevingranade committed Jan 17, 2019
    * Replaced hardcoded terrain list with checking of terrain flag
Commits on Jan 16, 2019
  1. Merge pull request #27561 from Amneiger/Update-rifle-turret

    ZhilkinSerg committed Jan 16, 2019
    Update rifle turret recipe
  2. Merge pull request #27538 from Honcharuk/Growable-pots

    ZhilkinSerg committed Jan 16, 2019
    [ MOD ]Grow some seeds
  3. Merge pull request #27560 from DracoGriffin/playwithpets

    ZhilkinSerg committed Jan 16, 2019
    [CR] New Pet Menu Option - Play
  4. Merge pull request #27584 from KorGgenT/mushroom.json-rebalance

    ZhilkinSerg committed Jan 16, 2019
    Mushroom.json comestible rebalance (11 of 22)
  5. Merge pull request #27585 from KorGgenT/nuts.json

    ZhilkinSerg committed Jan 16, 2019
    Nuts.json comestible rebalance (13 of 22)
  6. Merge pull request #27593 from KorGgenT/wheat-rebalance

    ZhilkinSerg committed Jan 16, 2019
    Wheat.json comesitble rebalance (21 of 22)
  7. Merge pull request #27558 from CleverRaven/kevingranade-no-more-mr-st…

    ZhilkinSerg committed Jan 16, 2019
    …em-cell
    
    No more Mr. Stem Cell
  8. Merge pull request #27638 from davidpwbrown/chitchat_snippets

    ZhilkinSerg committed Jan 16, 2019
    Added variation to NPC chat snippets
  9. Merge branch 'master' into kevingranade-no-more-mr-stem-cell

    ZhilkinSerg committed Jan 16, 2019
  10. Merge pull request #27592 from KorGgenT/veggy_dishes.json-rebalance

    ZhilkinSerg committed Jan 16, 2019
    Veggy dishes.json comestible rebalance (20 of 22)
  11. Merge pull request #27590 from KorGgenT/sandwich.json-rebalance

    ZhilkinSerg committed Jan 16, 2019
    Sandwich.json comestible rebalance (18 of 22)
  12. Merge pull request #27591 from KorGgenT/soup.json-rebalance

    ZhilkinSerg committed Jan 16, 2019
    Soup.json comestible rebalance (19 of 22)
  13. Merge pull request #27589 from KorGgenT/raw_veggy.json-rebalance

    ZhilkinSerg committed Jan 16, 2019
    Raw veggy.json comestible rebalance (17 of 22)
  14. Merge pull request #27588 from KorGgenT/raw_fruit.json

    ZhilkinSerg committed Jan 16, 2019
    Raw fruit.json comestible rebalance (16 of 22)
  15. Merge pull request #27587 from KorGgenT/protein.json-rebalance

    ZhilkinSerg committed Jan 16, 2019
    Protein.json comestible rebalance (15 of 22)