1035 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
jake	64a3a1ff97	lint src/ship/shop/armor.rs	2021-06-18 10:40:57 -06:00
jake	bbe22a305a	properly handle an error that doesn't even occur at the moment	2021-06-18 02:11:52 -06:00
jake	60f04597d1	if any of these sends fail the program should panic so unwrap is fine	2021-06-18 02:11:19 -06:00
jake	d66a90c4cf	Merge pull request 'get elseware working with a newer version of rust' (#34) from latestrust into master ... Reviewed-on: #34	2021-06-17 14:48:43 -04:00
jake	cbe2b9a79a	get it working with latest rust	2021-06-17 12:06:36 -06:00
jake	1b9594dbec	rename	2021-06-17 12:06:01 -06:00
jake	b79c2b3ae6	update async-std to 1.9.0	2021-06-17 02:56:41 -06:00
jake	19fd3426b5	try this version instead v2	2021-06-17 00:23:23 -06:00
jake	675d9719a9	try this version instead	2021-06-17 00:21:13 -06:00
jake	a3176380d9	didn't need to set that one	2021-06-16 23:14:38 -06:00
jake	f38c791794	set serde version	2021-06-16 21:40:20 -06:00
jake	de42ac4f9f	disambiguate?	2021-06-16 20:09:34 -06:00
jake	45f0cc35dd	clean this up a bit	2021-06-16 20:09:19 -06:00
jake	b812e41168	this feature made its way in	2021-06-16 02:17:18 -06:00
jake	a3f2cd8586	specify nightly version	2021-06-16 02:16:52 -06:00
jake	f9be2596cf	missed this const fix	2021-06-15 20:43:07 -06:00
jake	8cece2431f	this isn't a valid thing anymore	2021-06-15 20:37:06 -06:00
jake	03aa41ef6a	Merge pull request 'tekking!' (#271) from andy_is_unable_to_tek_properly into master	2020-12-03 17:34:43 -05:00
jake	f4fae162f0	tekking!	2020-12-03 15:04:48 -07:00
jake	b45a0ba1d5	clean up directmsg handler	2020-12-03 15:03:58 -07:00
jake	b6ce6296d4	create_item takes generic item rather than floor item	2020-12-03 15:01:41 -07:00
jake	d263bf4caa	remove item from inventory by id	2020-12-03 15:01:00 -07:00
jake	5345939b1b	IndividualInventoryItem::weapon	2020-12-03 15:00:38 -07:00
jake	5bdac4f6de	postgres add_weapon_modifier	2020-12-03 14:58:17 -07:00
jake	6410042e48	fix grind modification	2020-12-03 14:57:17 -07:00
jake	fb53ccd03a	percents -> percent	2020-12-03 14:57:00 -07:00
jake	c437c3da5b	split this into individual/individual_mut	2020-12-02 22:51:36 -07:00
jake	3b2a7ec73d	tekking also affects grind	2020-12-02 22:24:37 -07:00
jake	e4cdd2b95a	weapons can have tek modifiers	2020-12-02 19:20:33 -07:00
jake	d9f52a73e4	thanksandy	2020-12-02 19:01:53 -07:00
jake	92c34b2d28	remove modifiers from weapon and armor	2020-12-01 23:17:07 -07:00
jake	fb6eaeffd2	remove change_item	2020-12-01 22:56:22 -07:00
jake	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
jake	11fecd5bda	fix tests that care about rooms	2020-11-25 22:09:00 -07:00
jake	ae696888e9	remove player from lobby before sending to another ship/block	2020-11-25 22:08:41 -07:00
jake	fe03515871	basic multiple login check	2020-11-25 22:05:55 -07:00
jake	f96ae557fd	how did this ever work?	2020-11-25 22:02:16 -07:00
jake	78ed2101e5	I forgot blocks are a thing	2020-11-24 23:17:42 -07:00
jake	6f5aa5119f	login requests users from ship	2020-11-21 23:53:01 -07:00
jake	5ca852260f	only 1 block actually exists	2020-11-21 23:50:10 -07:00
jake	26be2757c9	add use	2020-11-21 23:48:02 -07:00
jake	ffce662c95	transfer ship	2020-11-21 23:45:27 -07:00
jake	ae7ba9e3fe	start on misc interserver things like player counts and ship lists	2020-11-18 18:56:04 -07:00
jake	6686aee824	fix dumb thing	2020-11-17 19:02:56 -07:00
jake	a3db5b65e2	add ability for servers to manually send messages to eachother	2020-11-17 18:25:01 -07:00
jake	75260c40a0	improve error handling in new character	2020-11-16 23:05:28 -07:00
jake	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
jake	4b78a110f0	anyhow the rest of the itemmanager	2020-11-16 21:55:24 -07:00
jake	463d623f16	fix tests	2020-11-16 21:50:10 -07:00
jake	a3cc29b68f	use anyhow for itemmanager	2020-11-16 21:50:10 -07:00