| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							89ae918a2f
							
						
					 | 
					
						
						
							
							remove unused line
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/pr Build is passing 
				
			 
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						
					 | 
					
						2021-06-20 15:38:09 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a65afc4123
							
						
					 | 
					
						
						
							
							todo error?
						
						
						
						
						
						
					 | 
					
						2021-06-20 15:38:09 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							da2267c723
							
						
					 | 
					
						
						
							
							tell neighbours we are banking
						
						
						
						
						
						
					 | 
					
						2021-06-20 15:38:09 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1b506e014f
							
						
					 | 
					
						
						
							
							clean up last of normal warnings
						
						
						
						
						
						
					 | 
					
						2021-06-18 20:38:29 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4ce7fb2a26
							
						
					 | 
					
						
						
							
							lint src/common/*
						
						
						
						
						
						
					 | 
					
						2021-06-18 20:01:05 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							53ec82d9eb
							
						
					 | 
					
						
						
							
							lint src/ship/*
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						
					 | 
					
						2021-06-18 17:38:36 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3457996afd
							
						
					 | 
					
						
						
							
							lint src/ship/items/*
						
						
						
						
						
						
					 | 
					
						2021-06-18 16:09:35 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							03906a7f0a
							
						
					 | 
					
						
						
							
							lint src/ship/map/*
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						
					 | 
					
						2021-06-18 13:00:04 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f6bf34e193
							
						
					 | 
					
						
						
							
							lint src/ship/drops/*
						
						
						
						
						
						
					 | 
					
						2021-06-18 12:45:00 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							60bcfd78ec
							
						
					 | 
					
						
						
							
							lint src/ship/packet/builder/*
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						
					 | 
					
						2021-06-18 12:38:33 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3cf834ed55
							
						
					 | 
					
						
						
							
							lint src/ship/packet/handler/*
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						
					 | 
					
						2021-06-18 12:18:29 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e89821990f
							
						
					 | 
					
						
						
							
							lint src/ship/packet/builder/ship.rs
						
						
						
						
						
						
					 | 
					
						2021-06-18 11:53:23 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c3c0f031ed
							
						
					 | 
					
						
						
							
							lint src/ship/quests.rs
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						
					 | 
					
						2021-06-18 11:38:05 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							027de8a20d
							
						
					 | 
					
						
						
							
							lint src/ship/shop/weapon.rs
						
						
						
						
						
						
					 | 
					
						2021-06-18 11:37:49 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d42491095e
							
						
					 | 
					
						
						
							
							lint src/ship/shop/tool.rs
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						
					 | 
					
						2021-06-18 11:14:12 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							64a3a1ff97
							
						
					 | 
					
						
						
							
							lint src/ship/shop/armor.rs
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						
					 | 
					
						2021-06-18 10:40:57 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f9be2596cf
							
						
					 | 
					
						
						
							
							missed this const fix
						
						
						
						
						
						
					 | 
					
						2021-06-15 20:43:07 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f4fae162f0
							
						
					 | 
					
						
						
							
							tekking!
						
						
						
						
						
						
					 | 
					
						2020-12-03 15:04:48 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b45a0ba1d5
							
						
					 | 
					
						
						
							
							clean up directmsg handler
						
						
						
						
						
						
					 | 
					
						2020-12-03 15:03:58 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b6ce6296d4
							
						
					 | 
					
						
						
							
							create_item takes generic item rather than floor item
						
						
						
						
						
						
					 | 
					
						2020-12-03 15:01:41 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							92c34b2d28
							
						
					 | 
					
						
						
							
							remove modifiers from weapon and armor
						
						
						
						
						
						
					 | 
					
						2020-12-01 23:17:07 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							11fecd5bda
							
						
					 | 
					
						
						
							
							fix tests that care about rooms
						
						
						
						
						
						
					 | 
					
						2020-11-25 22:09:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ae696888e9
							
						
					 | 
					
						
						
							
							remove player from lobby before sending to another ship/block
						
						
						
						
						
						
					 | 
					
						2020-11-25 22:08:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fe03515871
							
						
					 | 
					
						
						
							
							basic multiple login check
						
						
						
						
						
						
					 | 
					
						2020-11-25 22:05:55 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f96ae557fd
							
						
					 | 
					
						
						
							
							how did this ever work?
						
						
						
						
						
						
					 | 
					
						2020-11-25 22:02:16 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							78ed2101e5
							
						
					 | 
					
						
						
							
							I forgot blocks are a thing
						
						
						
						
						
						
					 | 
					
						2020-11-24 23:17:42 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5ca852260f
							
						
					 | 
					
						
						
							
							only 1 block actually exists
						
						
						
						
						
						
					 | 
					
						2020-11-21 23:50:10 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ffce662c95
							
						
					 | 
					
						
						
							
							transfer ship
						
						
						
						
						
						
					 | 
					
						2020-11-21 23:45:27 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ae7ba9e3fe
							
						
					 | 
					
						
						
							
							start on misc interserver things like player counts and ship lists
						
						
						
						
						
						
					 | 
					
						2020-11-18 18:56:04 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a3db5b65e2
							
						
					 | 
					
						
						
							
							add ability for servers to manually send messages to eachother
						
						
						
						
						
						
					 | 
					
						2020-11-17 18:25:01 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6611f2b3a8
							
						
					 | 
					
						
						
							
							professional rusting
						
						
						
						
						
						
					 | 
					
						2020-11-14 19:50:21 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8fae8d11af
							
						
					 | 
					
						
						
							
							fix equipping bought weapon
						
						
						
						
						
						
					 | 
					
						2020-11-09 16:47:35 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6e2fab31f0
							
						
					 | 
					
						
						
							
							e q u i p r e f a c t o r
						
						
						
						
						
						
					 | 
					
						2020-11-09 16:47:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							10458baea0
							
						
					 | 
					
						
						
							
							shrink some structures, remove async from functions that didn't need it
						
						
						
						
						
						
					 | 
					
						2020-11-09 16:25:15 -07:00 | 
					
					
						
						
							
							
							
						
					 |