e337852d72 
							
						 
					 
					
						
						
							
							initial ItemState  
						
						 
						
						
						
						
					 
					
						2022-07-25 16:41:06 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1af69800ed 
							
						 
					 
					
						
						
							
							add new arg for new_user_character and fix tests. add keyboard config tests. fix and clean up warnings in test files  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is passing 
				
			 
		
			
				
	 
				continuous-integration/drone/pr Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2022-02-19 20:29:46 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ea4c085dfd 
							
						 
					 
					
						
						
							
							satiate the clip's hunger for properness  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
			
				
	 
				continuous-integration/drone/pr Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-29 15:46:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							8b776a5906 
							
						 
					 
					
						
						
							
							ok turns out walletfull is a real thing  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
			
				
	 
				continuous-integration/drone/pr Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-29 15:22:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c015acb653 
							
						 
					 
					
						
						
							
							Merge branch 'master' into shop_sell  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/pr Build is failing 
				
			 
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-29 00:11:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							a6e50555de 
							
						 
					 
					
						
						
							
							appease the clip  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is passing 
				
			 
		
			
				
	 
				continuous-integration/drone/pr Build is passing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-28 01:37:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							22f630f562 
							
						 
					 
					
						
						
							
							properly set item_id after a trade serverside  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
			
				
	 
				continuous-integration/drone/pr Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-28 01:08:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							81916d1f57 
							
						 
					 
					
						
						
							
							TRADING JUST IN TIME TO BARELY MISS XMAS  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
			
				
	 
				continuous-integration/drone/pr Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-27 00:48:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ecf1f23c6c 
							
						 
					 
					
						
						
							
							fix tests  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-27 00:43:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9c34baeb26 
							
						 
					 
					
						
						
							
							meseta refactor  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-26 23:31:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							72d72801e1 
							
						 
					 
					
						
						
							
							trade meseta  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-12 22:55:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							872794e45f 
							
						 
					 
					
						
						
							
							improve error messages  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-12 15:55:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							6bd341cd01 
							
						 
					 
					
						
						
							
							check inventory has enough space to accept traded items  
						
						 
						
						
						
						
					 
					
						2021-12-12 15:55:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							6d2753d082 
							
						 
					 
					
						
						
							
							improve error display a bit  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-10 23:41:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							b3b6dad6ad 
							
						 
					 
					
						
						
							
							trades!  
						
						 
						
						
						
						
					 
					
						2021-12-10 13:24:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3865caba8d 
							
						 
					 
					
						
						
							
							refcell room id counter  
						
						 
						
						
						
						
					 
					
						2021-12-10 13:19:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d85ada945e 
							
						 
					 
					
						
						
							
							add some functions to Inventory  
						
						 
						
						
						
						
					 
					
						2021-12-10 13:16:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							82ef5ba2ea 
							
						 
					 
					
						
						
							
							RIP ItemLocation  
						
						 
						
						... 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						fun while it lasted
ItemLocation ceased to be the canonical place to store an item's
location. replaced with ItemNote which basically covers the actual use
case but without the enforcing of a location. 
						
						
					 
					
						2021-11-12 10:42:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							b80f30ef9d 
							
						 
					 
					
						
						
							
							initial actual trading logic  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-10-15 12:17:37 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							98260308e8 
							
						 
					 
					
						
						
							
							stray spaces  
						
						 
						
						
						
						
					 
					
						2021-10-14 00:30:53 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							8e82d6c4b4 
							
						 
					 
					
						
						
							
							convert item pickup to new itemtransaction model  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-10-14 00:28:31 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d80d0fb01d 
							
						 
					 
					
						
						
							
							add some functions to Inventory  
						
						 
						
						
						
						
					 
					
						2021-10-14 00:22:23 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							8a29a75397 
							
						 
					 
					
						
						
							
							remove TODO  
						
						 
						
						
						
						
					 
					
						2021-10-14 00:17:36 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							296d1cc0ea 
							
						 
					 
					
						
						
							
							InventoryItem::{stacked, mag}  
						
						 
						
						
						
						
					 
					
						2021-10-13 23:58:32 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							dbb1105741 
							
						 
					 
					
						
						
							
							cleanup  
						
						 
						
						
						
						
					 
					
						2021-10-13 23:57:38 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							21df9a9340 
							
						 
					 
					
						
						
							
							itemtransaction action takes boxed value  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-10-13 23:56:42 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							70a6764360 
							
						 
					 
					
						
						
							
							make these a bit more public for tests  
						
						 
						
						
						
						
					 
					
						2021-09-27 23:46:03 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							143ed7ed78 
							
						 
					 
					
						
						
							
							add ItemTransaction struct as begining of item refactor v3  
						
						 
						
						
						
						
					 
					
						2021-09-27 23:07:21 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							0d30df8da6 
							
						 
					 
					
						
						
							
							start of trading  
						
						 
						
						
						
						
					 
					
						2021-07-30 23:19:47 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							b60463eaa0 
							
						 
					 
					
						
						
							
							appease the clip  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
			
				
	 
				continuous-integration/drone/pr Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-07-31 02:21:15 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							66d882d336 
							
						 
					 
					
						
						
							
							cleanup todos  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
			
				
	 
				continuous-integration/drone/pr Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-07-31 02:07:41 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							61e7e8b39f 
							
						 
					 
					
						
						
							
							add impl From<> for shops. get_sell_price returns Result now.  
						
						 
						
						
						
						
					 
					
						2021-07-31 01:28:30 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1eff61629a 
							
						 
					 
					
						
						
							
							andy vs. clippy round 2  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is passing 
				
			 
		
			
				
	 
				continuous-integration/drone/pr Build is passing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-06-21 18:32:02 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							fbc68c7a26 
							
						 
					 
					
						
						
							
							handle selling photon tools and untekked weapon test  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-06-21 17:08:55 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							78c0ffda04 
							
						 
					 
					
						
						
							
							andy vs. clippy round 1  
						
						 
						
						
						
						
					 
					
						2021-06-21 02:17:55 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							10aca8c7ec 
							
						 
					 
					
						
						
							
							wow i should have pushed much smaller chunks more often oops. shop selling added, shop buying quantity bug fixed(?) added lots of todos  
						
						 
						
						
						
						
					 
					
						2021-06-21 02:17:54 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1b506e014f 
							
						 
					 
					
						
						
							
							clean up last of normal warnings  
						
						 
						
						
						
						
					 
					
						2021-06-18 20:38:29 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3457996afd 
							
						 
					 
					
						
						
							
							lint src/ship/items/*  
						
						 
						
						
						
						
					 
					
						2021-06-18 16:09:35 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							bbe22a305a 
							
						 
					 
					
						
						
							
							properly handle an error that doesn't even occur at the moment  
						
						 
						
						
	
		
			
	 
		 
	
	
		
	
	
		
			
				
	 
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-06-18 02:11:52 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							f4fae162f0 
							
						 
					 
					
						
						
							
							tekking!  
						
						 
						
						
						
						
					 
					
						2020-12-03 15:04:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d263bf4caa 
							
						 
					 
					
						
						
							
							remove item from inventory by id  
						
						 
						
						
						
						
					 
					
						2020-12-03 15:01:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							5345939b1b 
							
						 
					 
					
						
						
							
							IndividualInventoryItem::weapon  
						
						 
						
						
						
						
					 
					
						2020-12-03 15:00:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c437c3da5b 
							
						 
					 
					
						
						
							
							split this into individual/individual_mut  
						
						 
						
						
						
						
					 
					
						2020-12-02 22:51:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							4b78a110f0 
							
						 
					 
					
						
						
							
							anyhow the rest of the itemmanager  
						
						 
						
						
						
						
					 
					
						2020-11-16 21:55:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							a3cc29b68f 
							
						 
					 
					
						
						
							
							use anyhow for itemmanager  
						
						 
						
						
						
						
					 
					
						2020-11-16 21:50:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							f7c6be48b2 
							
						 
					 
					
						
						
							
							don't try and say an item was picked up that the client doesn't know about  
						
						 
						
						
						
						
					 
					
						2020-11-16 21:50:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9b05e60ca6 
							
						 
					 
					
						
						
							
							add todo for cheating  
						
						 
						
						
						
						
					 
					
						2020-11-16 21:02:11 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							55c393b7a8 
							
						 
					 
					
						
						
							
							move the tech level adjustment to prevent underflow for new FOs. let characters use tech disks  
						
						 
						
						
						
						
					 
					
						2020-11-16 20:46:52 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c7a310391f 
							
						 
					 
					
						
						
							
							make inv mod pub  
						
						 
						
						
						
						
					 
					
						2020-11-09 19:07:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							2d5f83fab6 
							
						 
					 
					
						
						
							
							make inv item stuff serializable  
						
						 
						
						
						
						
					 
					
						2020-11-09 19:03:03 -07:00