| 
						
					 | 
					
						
						
						
						
							
						
						
							e4cdd2b95a
							
						
					 | 
					
						
						
							
							weapons can have tek modifiers
						
						
						
						
						
						
					 | 
					
						2020-12-02 19:20:33 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d9f52a73e4
							
						
					 | 
					
						
						
							
							thanksandy
						
						
						
						
						
						
					 | 
					
						2020-12-02 19:01:53 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							92c34b2d28
							
						
					 | 
					
						
						
							
							remove modifiers from weapon and armor
						
						
						
						
						
						
					 | 
					
						2020-12-01 23:17:07 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb6eaeffd2
							
						
					 | 
					
						
						
							
							remove change_item
						
						
						
						
						
						
					 | 
					
						2020-12-01 22:56:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c22b23ef03
							
						
					 | 
					
						
						
							
							Merge pull request 'interserver stuff and ship/block transfering' (#268) from one_day_i'll_have_useful_branch_names_again into master
						
						
						
						
						
						
					 | 
					
						2020-11-26 01:28:04 -05: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6f5aa5119f
							
						
					 | 
					
						
						
							
							login requests users from ship
						
						
						
						
						
						
					 | 
					
						2020-11-21 23:53:01 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5ca852260f
							
						
					 | 
					
						
						
							
							only 1 block actually exists
						
						
						
						
						
						
					 | 
					
						2020-11-21 23:50:10 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							26be2757c9
							
						
					 | 
					
						
						
							
							add use
						
						
						
						
						
						
					 | 
					
						2020-11-21 23:48:02 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6686aee824
							
						
					 | 
					
						
						
							
							fix dumb thing
						
						
						
						
						
						
					 | 
					
						2020-11-17 19:02:56 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a3db5b65e2
							
						
					 | 
					
						
						
							
							add ability for servers to manually send messages to eachother
						
						
						
						
						
						
					 | 
					
						2020-11-17 18:25:01 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							75260c40a0
							
						
					 | 
					
						
						
							
							improve error handling in new character
						
						
						
						
						
						
					 | 
					
						2020-11-16 23:05:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cf7be2e5d0
							
						
					 | 
					
						
						
							
							Merge pull request 'fix mags and picking up invalid items' (#260) from misc_stuff into master
						
						
						
						
						
						
					 | 
					
						2020-11-17 00:27:44 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4b78a110f0
							
						
					 | 
					
						
						
							
							anyhow the rest of the itemmanager
						
						
						
						
						
						
					 | 
					
						2020-11-16 21:55:24 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							463d623f16
							
						
					 | 
					
						
						
							
							fix tests
						
						
						
						
						
						
					 | 
					
						2020-11-16 21:50:10 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9c91df6d2e
							
						
					 | 
					
						
						
							
							fix mags
						
						
						
						
						
						
					 | 
					
						2020-11-16 21:50:10 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a25d400624
							
						
					 | 
					
						
						
							
							Merge pull request 'techs' (#264) from techs into master
						
						
						
						
						
						
					 | 
					
						2020-11-16 23:48:18 -05: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							99f5f4eb5f
							
						
					 | 
					
						
						
							
							Merge pull request 'professional rusting' (#257) from weapon_shop_ordering into master
						
						
						
						
						
						
					 | 
					
						2020-11-15 11:47:02 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							71ca309ab4
							
						
					 | 
					
						
						
							
							Merge pull request 'mag a e s t h e t i c s' (#252) from mag_colours into master
						
						
						
						
						
						
					 | 
					
						2020-11-15 11:43:18 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							30393edf20
							
						
					 | 
					
						
						
							
							Merge pull request 'save options to db' (#256) from save_options_pg into master
						
						
						
						
						
						
					 | 
					
						2020-11-15 11:42:47 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							73f0108d68
							
						
					 | 
					
						
						
							
							save options to db
						
						
						
						
						
						
					 | 
					
						2020-11-14 21:22:44 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6611f2b3a8
							
						
					 | 
					
						
						
							
							professional rusting
						
						
						
						
						
						
					 | 
					
						2020-11-14 19:50:21 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fe1a85caec
							
						
					 | 
					
						
						
							
							mag a e s t h e t i c s
						
						
						
						
						
						
					 | 
					
						2020-11-14 15:30:37 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							82c4c2a445
							
						
					 | 
					
						
						
							
							Merge pull request 'get_the_web_ui_working' (#251) from get_the_web_ui_working into master
						
						
						
						
						
						
					 | 
					
						2020-11-12 22:16:33 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c384b13453
							
						
					 | 
					
						
						
							
							actually save new character stuff
						
						
						
						
						
						
					 | 
					
						2020-11-12 19:05:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b34deba17f
							
						
					 | 
					
						
						
							
							update sqlx
						
						
						
						
						
						
					 | 
					
						2020-11-12 19:05:30 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4954dcb789
							
						
					 | 
					
						
						
							
							should probably split this since theres already live data
						
						
						
						
						
						
					 | 
					
						2020-11-12 17:13:42 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ceb632aec8
							
						
					 | 
					
						
						
							
							make equippedentity serializeable
						
						
						
						
						
						
					 | 
					
						2020-11-11 19:26:12 -07: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9de04ad87b
							
						
					 | 
					
						
						
							
							Merge pull request 'item_refactor' (#250) from item_refactor into master
						
						
						
						
						
						
					 | 
					
						2020-11-09 19:59:06 -05: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8ebbbb272a
							
						
					 | 
					
						
						
							
							update some deps, remove unused ones
						
						
						
						
						
						
					 | 
					
						2020-11-09 15:00:48 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7ae8976c10
							
						
					 | 
					
						
						
							
							i t e m r e f a c t o r
						
						
						
						
						
						
					 | 
					
						2020-11-05 16:36:39 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							898cb9064d
							
						
					 | 
					
						
						
							
							Merge pull request 'misc shit' (#246) from cleaning_up into master
						
						
						
						
						
						
					 | 
					
						2020-11-02 14:36:37 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							87fa74ac1a
							
						
					 | 
					
						
						
							
							Merge pull request 'bank_meseta' (#247) from bank_meseta into master
						
						
						
						
						
						
					 | 
					
						2020-11-02 02:04:26 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3dd25c3222
							
						
					 | 
					
						
						
							
							merge conflict
						
						
						
						
						
						
					 | 
					
						2020-11-02 00:03:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7157074419
							
						
					 | 
					
						
						
							
							remove comments
						
						
						
						
						
						
					 | 
					
						2020-11-01 23:27:47 -04:00 | 
					
					
						
						
							
							
							
						
					 |