0000000000000000000000000000000000000000 059ec54d51d7554ef497a9e64ae272a571e1f9e7 Rando Wiltschek <randomw@gmx.net> 1483178268 +0100	clone: from https://github.com/OrionFive/Hospitality.git
059ec54d51d7554ef497a9e64ae272a571e1f9e7 059ec54d51d7554ef497a9e64ae272a571e1f9e7 Rando Wiltschek <randomw@gmx.net> 1483178508 +0100	checkout: moving from master to A15
059ec54d51d7554ef497a9e64ae272a571e1f9e7 4796e5e2a841d6fedceaa4912391818a75d76a6d Rando Wiltschek <randomw@gmx.net> 1483178525 +0100	commit: Updated ignore file and added license info to readme.
4796e5e2a841d6fedceaa4912391818a75d76a6d 99141e8b43d821c4a297385c849f77195a3402fc Rando Wiltschek <randomw@gmx.net> 1483178581 +0100	commit: Initial
99141e8b43d821c4a297385c849f77195a3402fc 99141e8b43d821c4a297385c849f77195a3402fc Rando Wiltschek <randomw@gmx.net> 1483178614 +0100	checkout: moving from A15 to A16
99141e8b43d821c4a297385c849f77195a3402fc 99141e8b43d821c4a297385c849f77195a3402fc Rando Wiltschek <randomw@gmx.net> 1483178755 +0100	checkout: moving from A16 to A15
99141e8b43d821c4a297385c849f77195a3402fc eaeca002e03f000fb23f172bbd3a0f57f1a8ee31 Rando Wiltschek <randomw@gmx.net> 1483178778 +0100	commit: Added solution and project
eaeca002e03f000fb23f172bbd3a0f57f1a8ee31 99141e8b43d821c4a297385c849f77195a3402fc Rando Wiltschek <randomw@gmx.net> 1483178785 +0100	checkout: moving from A15 to A16
99141e8b43d821c4a297385c849f77195a3402fc eaeca002e03f000fb23f172bbd3a0f57f1a8ee31 Rando Wiltschek <randomw@gmx.net> 1483178800 +0100	merge A15: Fast-forward
eaeca002e03f000fb23f172bbd3a0f57f1a8ee31 778af3ffff2ff80d1d03a526b41f2d2f776817a8 Rando Wiltschek <randomw@gmx.net> 1483178843 +0100	commit: Updated version
778af3ffff2ff80d1d03a526b41f2d2f776817a8 6f56084242b2aee3a117aef1ceb46a8d6e74296e Rando Wiltschek <randomw@gmx.net> 1483185583 +0100	commit: Fixed obvious compiler errors
6f56084242b2aee3a117aef1ceb46a8d6e74296e 4054dd08546c0337a95900d7a6714f78037f0014 Rando Wiltschek <randomw@gmx.net> 1483284270 +0100	pull --no-commit origin A16: Fast-forward
4054dd08546c0337a95900d7a6714f78037f0014 bdc4b5790f05893fd117d8fad23dc88ddb584bc9 Rando Wiltschek <randomw@gmx.net> 1483285147 +0100	commit: Fixed guest bed def
bdc4b5790f05893fd117d8fad23dc88ddb584bc9 577072b4b192ce876c41be62bde9db2e5a55673d Rando Wiltschek <randomw@gmx.net> 1483285298 +0100	commit: Fixed CanIngestForJoy method
577072b4b192ce876c41be62bde9db2e5a55673d 282f4b464523498437bd19a0a120dbe63186ed1f Rando Wiltschek <randomw@gmx.net> 1483285340 +0100	commit: Removed CanIngestForJoy, now redundant (used to be fix for vanilla bug)
282f4b464523498437bd19a0a120dbe63186ed1f 61d0bd97fe3290a4ab82a1a124306a04c7aa8560 Rando Wiltschek <randomw@gmx.net> 1483285709 +0100	commit (amend): Removed CanIngestForJoy, now redundant (used to be fix for vanilla bug)
61d0bd97fe3290a4ab82a1a124306a04c7aa8560 49cacd808aad3ee71f51b5fc081db3b132f44849 Rando Wiltschek <randomw@gmx.net> 1483285735 +0100	commit: Fixed VisitorGroup incident df
49cacd808aad3ee71f51b5fc081db3b132f44849 a51ce63ac0e8f07f35ebbea3285b938dd14ec471 Rando Wiltschek <randomw@gmx.net> 1483285743 +0100	commit (amend): Fixed VisitorGroup incident def
a51ce63ac0e8f07f35ebbea3285b938dd14ec471 33b8bc3343b94d5972f0daf1039283d91683ae3b Rando Wiltschek <randomw@gmx.net> 1483285872 +0100	commit: Fixed Refugee chased and WandererJoin incident defs
33b8bc3343b94d5972f0daf1039283d91683ae3b 808dfaf57382ab0a5dcbb6b8bd0903d95e35165c Rando Wiltschek <randomw@gmx.net> 1483286273 +0100	commit: Set BuyFood to a more appropriate joy kind
808dfaf57382ab0a5dcbb6b8bd0903d95e35165c d52ea508a9e0fba2438efc086fdd6c9e9b2a6838 Rando Wiltschek <randomw@gmx.net> 1483286524 +0100	commit: Adapted new naming convention for memory thoughts and moved GuestBedCount thought to appropriate file
d52ea508a9e0fba2438efc086fdd6c9e9b2a6838 2bcf21a11857ff4cac0cf3e4d805805064d31083 Rando Wiltschek <randomw@gmx.net> 1483286532 +0100	commit (amend): Adapted new naming convention for memory thoughts and moved GuestBedCount thought to appropriate file
2bcf21a11857ff4cac0cf3e4d805805064d31083 910b592695f7794dcfba46cf8f0a0abbdad47047 Rando Wiltschek <randomw@gmx.net> 1483286734 +0100	commit: Updated LowExpectations thought to match vanilla
910b592695f7794dcfba46cf8f0a0abbdad47047 a7601bebd256bd3729c15ff26e26097742d3fc7e Rando Wiltschek <randomw@gmx.net> 1483287113 +0100	commit: Rolled back BuyFood joyKind. Has to match the JobGiver, which we can't / won't change.
a7601bebd256bd3729c15ff26e26097742d3fc7e 7b613d894d682de5ec960640ec35a3c1e7c188f9 Rando Wiltschek <randomw@gmx.net> 1483288363 +0100	commit: GetRoom method: because searcher can be null, added Map parameter
7b613d894d682de5ec960640ec35a3c1e7c188f9 487e2c88c65630c0fece40dc5cd2d03ea8fee14e Rando Wiltschek <randomw@gmx.net> 1483289868 +0100	commit: Fixed wanderer being of player's faction
487e2c88c65630c0fece40dc5cd2d03ea8fee14e f377b588361ccd6e975e647e1f1629eb50a5c757 Rando Wiltschek <randomw@gmx.net> 1483294265 +0100	commit: Fixed capitalization of tutor topics
f377b588361ccd6e975e647e1f1629eb50a5c757 c398ea9645c99f03779396eaa6a80eb10101c3e0 Rando Wiltschek <randomw@gmx.net> 1483294293 +0100	commit: Rephrased recruitment chance explanation
c398ea9645c99f03779396eaa6a80eb10101c3e0 769240bfd7bbd134e493513b0ec5859e99d29531 Rando Wiltschek <randomw@gmx.net> 1483294312 +0100	commit: Made guest tab show less information until guests have arrived
769240bfd7bbd134e493513b0ec5859e99d29531 361ae1056190cd9234b43f82a1a6f3eed024e6c7 Rando Wiltschek <randomw@gmx.net> 1483295652 +0100	commit: Added message to guest tab for pawns that are not guests (trading caravans)
361ae1056190cd9234b43f82a1a6f3eed024e6c7 a739a6dccfd40eba54013f079ebd621c97e2c8dc Rando Wiltschek <randomw@gmx.net> 1483296018 +0100	commit: Clarified trust message
a739a6dccfd40eba54013f079ebd621c97e2c8dc 059ec54d51d7554ef497a9e64ae272a571e1f9e7 Rando Wiltschek <randomw@gmx.net> 1483296311 +0100	checkout: moving from A16 to master
059ec54d51d7554ef497a9e64ae272a571e1f9e7 a739a6dccfd40eba54013f079ebd621c97e2c8dc Rando Wiltschek <randomw@gmx.net> 1483296332 +0100	checkout: moving from master to A16
a739a6dccfd40eba54013f079ebd621c97e2c8dc 51b674c67c76d3e1d19ff5f94559d7afa0cb11b5 Rando Wiltschek <randomw@gmx.net> 1483296413 +0100	pull --no-commit origin A16: Fast-forward
51b674c67c76d3e1d19ff5f94559d7afa0cb11b5 059ec54d51d7554ef497a9e64ae272a571e1f9e7 Rando Wiltschek <randomw@gmx.net> 1483296670 +0100	checkout: moving from A16 to develop
059ec54d51d7554ef497a9e64ae272a571e1f9e7 51b674c67c76d3e1d19ff5f94559d7afa0cb11b5 Rando Wiltschek <randomw@gmx.net> 1483296899 +0100	merge A16: Fast-forward
51b674c67c76d3e1d19ff5f94559d7afa0cb11b5 51b674c67c76d3e1d19ff5f94559d7afa0cb11b5 Rando Wiltschek <randomw@gmx.net> 1483297014 +0100	checkout: moving from develop to release/A16a
51b674c67c76d3e1d19ff5f94559d7afa0cb11b5 17502df50e525d0285fc53f81274767a29fb4c1e Rando Wiltschek <randomw@gmx.net> 1483297270 +0100	commit: Build
17502df50e525d0285fc53f81274767a29fb4c1e 51b674c67c76d3e1d19ff5f94559d7afa0cb11b5 Rando Wiltschek <randomw@gmx.net> 1483297596 +0100	checkout: moving from release/A16a to A16
51b674c67c76d3e1d19ff5f94559d7afa0cb11b5 41bd3e491d066eb7b4a3eab6f92d87850b53b874 Rando Wiltschek <randomw@gmx.net> 1483297653 +0100	commit: Removed obsolete license file
41bd3e491d066eb7b4a3eab6f92d87850b53b874 17502df50e525d0285fc53f81274767a29fb4c1e Rando Wiltschek <randomw@gmx.net> 1483297705 +0100	checkout: moving from A16 to release/A16a
17502df50e525d0285fc53f81274767a29fb4c1e 9d7d1d910513fdea62766ade8df0f43172a289da Rando Wiltschek <randomw@gmx.net> 1483297719 +0100	merge A16: Merge made by the 'recursive' strategy.
9d7d1d910513fdea62766ade8df0f43172a289da 51b674c67c76d3e1d19ff5f94559d7afa0cb11b5 Rando Wiltschek <randomw@gmx.net> 1483297742 +0100	checkout: moving from release/A16a to develop
51b674c67c76d3e1d19ff5f94559d7afa0cb11b5 41bd3e491d066eb7b4a3eab6f92d87850b53b874 Rando Wiltschek <randomw@gmx.net> 1483297757 +0100	merge A16: Fast-forward
41bd3e491d066eb7b4a3eab6f92d87850b53b874 44899e6388f02ba10031d8d83fe1d49a6172e12d Rando Wiltschek <randomw@gmx.net> 1483351501 +0100	merge origin/master: Merge made by the 'recursive' strategy.
44899e6388f02ba10031d8d83fe1d49a6172e12d 059ec54d51d7554ef497a9e64ae272a571e1f9e7 Rando Wiltschek <randomw@gmx.net> 1483351748 +0100	checkout: moving from develop to master
059ec54d51d7554ef497a9e64ae272a571e1f9e7 22b78bc428eed7d5bf2eb9077bd991533cb69dc0 Rando Wiltschek <randomw@gmx.net> 1483351762 +0100	merge origin/master: Fast-forward
22b78bc428eed7d5bf2eb9077bd991533cb69dc0 44899e6388f02ba10031d8d83fe1d49a6172e12d Rando Wiltschek <randomw@gmx.net> 1483352064 +0100	checkout: moving from master to develop
44899e6388f02ba10031d8d83fe1d49a6172e12d c1d3f4813d8106a1174f27686f6689dfb717ec13 Rando Wiltschek <randomw@gmx.net> 1483352225 +0100	commit: BuyItem: Cleanup
c1d3f4813d8106a1174f27686f6689dfb717ec13 8810b0887e95cbc803c86fd019b4775bdff43be4 Rando Wiltschek <randomw@gmx.net> 1483353932 +0100	commit: Removed (redundant?) error check from BuyItem
8810b0887e95cbc803c86fd019b4775bdff43be4 cd3093b09ff81d000ad0c6b596cb0e350c07fa2f Rando Wiltschek <randomw@gmx.net> 1483355684 +0100	commit: Fixed social thoughts of guests not appearing correctly
cd3093b09ff81d000ad0c6b596cb0e350c07fa2f 34914873a0bfe709aac9b8de31a3425f42f00f25 Rando Wiltschek <randomw@gmx.net> 1483355721 +0100	commit: Tweaked opinion offsets so guests can be recruited faster
34914873a0bfe709aac9b8de31a3425f42f00f25 22b78bc428eed7d5bf2eb9077bd991533cb69dc0 Rando Wiltschek <randomw@gmx.net> 1483355754 +0100	checkout: moving from develop to master
22b78bc428eed7d5bf2eb9077bd991533cb69dc0 801adb218c43c332a7788daf0b4785beb3fb9c47 Rando Wiltschek <randomw@gmx.net> 1483355959 +0100	commit (merge): Merge branch 'A15'
801adb218c43c332a7788daf0b4785beb3fb9c47 62196c16697a3a366327c9c019c18241da3d1bf6 Rando Wiltschek <randomw@gmx.net> 1483356137 +0100	cherry-pick: Removed obsolete license file
62196c16697a3a366327c9c019c18241da3d1bf6 34914873a0bfe709aac9b8de31a3425f42f00f25 Rando Wiltschek <randomw@gmx.net> 1483356189 +0100	checkout: moving from master to develop
34914873a0bfe709aac9b8de31a3425f42f00f25 f76a9f0fc1d8aefe3ba3164afae43af654228ff5 Rando Wiltschek <randomw@gmx.net> 1483357169 +0100	commit: Attempt at fixing "item is reserved" error when browsing
f76a9f0fc1d8aefe3ba3164afae43af654228ff5 26d4dbddd0944c56f5a64a19beb2c9ab9b83952c Rando Wiltschek <randomw@gmx.net> 1483357201 +0100	commit: More tweaking of opinions
26d4dbddd0944c56f5a64a19beb2c9ab9b83952c 36b7ac717ff08fdc5539b8ab6cf239312e11d2e3 Rando Wiltschek <randomw@gmx.net> 1483357976 +0100	commit: Another attempt at fixing reservation bug
36b7ac717ff08fdc5539b8ab6cf239312e11d2e3 ce631fca312ede86e2c2f560d2d077d534c0e388 Rando Wiltschek <randomw@gmx.net> 1483359456 +0100	commit: Fixed guests sleeping on the same spot
ce631fca312ede86e2c2f560d2d077d534c0e388 965b95d30ddeb5948d2bd07244a4c144494b128e Rando Wiltschek <randomw@gmx.net> 1483359682 +0100	commit: Build
965b95d30ddeb5948d2bd07244a4c144494b128e 9d7d1d910513fdea62766ade8df0f43172a289da Rando Wiltschek <randomw@gmx.net> 1483359704 +0100	checkout: moving from develop to release/A16a
9d7d1d910513fdea62766ade8df0f43172a289da 728d4cb86971a59edf60e8f930376156cc5ef973 Rando Wiltschek <randomw@gmx.net> 1483359744 +0100	commit (merge): Merge branch 'develop' into release/A16a
728d4cb86971a59edf60e8f930376156cc5ef973 62196c16697a3a366327c9c019c18241da3d1bf6 Rando Wiltschek <randomw@gmx.net> 1483359852 +0100	checkout: moving from release/A16a to master
62196c16697a3a366327c9c019c18241da3d1bf6 3bc05be6e0b1fbb65702a35fea8cc16f56b181d9 Rando Wiltschek <randomw@gmx.net> 1483359852 +0100	merge release/A16a: Merge made by the 'recursive' strategy.
3bc05be6e0b1fbb65702a35fea8cc16f56b181d9 965b95d30ddeb5948d2bd07244a4c144494b128e Rando Wiltschek <randomw@gmx.net> 1483359857 +0100	checkout: moving from master to develop
965b95d30ddeb5948d2bd07244a4c144494b128e d8f6204f453f5f9c95b4c0dc59f28f140069f6fc Rando Wiltschek <randomw@gmx.net> 1483359857 +0100	merge release/A16a: Merge made by the 'recursive' strategy.
d8f6204f453f5f9c95b4c0dc59f28f140069f6fc a1aed6ab29b79d769f60024981db88d25307d3bc Rando Wiltschek <randomw@gmx.net> 1483443143 +0100	commit: Fixed work priorities shifting when Hospitality is added mid-game
a1aed6ab29b79d769f60024981db88d25307d3bc de6024fe95c1f47f8f53f9ea3eabbabf61b21488 Rando Wiltschek <randomw@gmx.net> 1483443359 +0100	commit: Fixed colonists chatting with enemies during combat
de6024fe95c1f47f8f53f9ea3eabbabf61b21488 88842fba0826d037b46752e184476067fda6cb8c Rando Wiltschek <randomw@gmx.net> 1483459524 +0100	commit: Tweaked visitor sleeping priority
88842fba0826d037b46752e184476067fda6cb8c 43994be4bdbf414e333aa377f345490163f388ac Rando Wiltschek <randomw@gmx.net> 1483459557 +0100	commit: Fixed error when trying to browse items
43994be4bdbf414e333aa377f345490163f388ac 3b886cb070cc20f880a2777b6bca45b7063e0136 Rando Wiltschek <randomw@gmx.net> 1483459711 +0100	commit: Build
3b886cb070cc20f880a2777b6bca45b7063e0136 3b886cb070cc20f880a2777b6bca45b7063e0136 Rando Wiltschek <randomw@gmx.net> 1483459781 +0100	checkout: moving from develop to release/A16b
3b886cb070cc20f880a2777b6bca45b7063e0136 3bc05be6e0b1fbb65702a35fea8cc16f56b181d9 Rando Wiltschek <randomw@gmx.net> 1483460045 +0100	checkout: moving from release/A16b to master
3bc05be6e0b1fbb65702a35fea8cc16f56b181d9 1520908c7a146da5cde33a8b7a051a6521a748a7 Rando Wiltschek <randomw@gmx.net> 1483460045 +0100	merge release/A16b: Merge made by the 'recursive' strategy.
1520908c7a146da5cde33a8b7a051a6521a748a7 3b886cb070cc20f880a2777b6bca45b7063e0136 Rando Wiltschek <randomw@gmx.net> 1483460138 +0100	checkout: moving from master to develop
3b886cb070cc20f880a2777b6bca45b7063e0136 1520908c7a146da5cde33a8b7a051a6521a748a7 Rando Wiltschek <randomw@gmx.net> 1483460162 +0100	merge master: Fast-forward
