7 Commits

Include renames

Author	SHA1	Message	Date
DragonTrance	42f4fe1721	i probably should resolve conflicts with desktop	2021-04-20 01:18:01 -07:00
DragonTranceandGitHub	20e2c2fcea	Merge branch 'master' into various-fixes	2021-04-20 00:56:44 -07:00
DragonTrance	b4039d7cbb	various fixes v2 ... 1 - Loadout items no longer duplicate backpack items, and all items get stored into backpacks properly 2 - Fixed a runtime with captain's job on roundstart. They will now be announced when they join at the start of the shift. 3 - Fixed filter runtime when transferring ckeys 4 - Economy SS no longer fires, so it will no longer clutter runtime logs 5 - Fixed laughing peas not being able to be taken out of seed extractors by lazily renaming them	2021-04-20 00:52:33 -07:00
DragonTrance	11a41d1bc1	Revert "fixes various bugs and runtimes" ... This reverts commit 9860480e91.	2021-03-18 11:19:37 -07:00
QuoteFox	42b1d15981	Revert "Merge pull request #1035 from DragonTrance/various-fixes" ... This reverts commit 8436f16c54, reversing changes made to f512b6d42e.	2021-03-17 23:45:38 +00:00
DragonTrance	9860480e91	fixes various bugs and runtimes	2021-03-17 12:31:18 -07:00
DragonTrance	58b69503e3	#4	2021-02-11 20:02:40 -07:00