547 Commits

Author	SHA1	Message	Date
silicons	db3f9b4549	woops	2020-07-23 11:48:46 -07:00
silicons	95cd7c6571	fix	2020-07-23 11:46:46 -07:00
silicons	ffd44b78ba	Merge remote-tracking branch 'citadel/master' into clickcd_experimental	2020-07-23 10:26:03 -07:00
silicons	89a1fa544e	fixes	2020-07-23 10:12:34 -07:00
silicons	e425ef7d68	fix	2020-07-23 09:33:32 -07:00
silicons	99eb77c052	fix	2020-07-23 09:32:28 -07:00
silicons	703afec454	ok	2020-07-23 08:57:15 -07:00
silicons	65898bb7f6	inf loop	2020-07-23 00:32:05 -07:00
silicons	21d57eeeac	sigh	2020-07-23 00:27:45 -07:00
silicons	3a38344a04	fix	2020-07-23 00:25:06 -07:00
silicons	910290edcf	buffers	2020-07-23 00:22:33 -07:00
silicons	76f885e1a6	ok	2020-07-23 00:16:43 -07:00
silicons	9a5e53a21f	ok	2020-07-21 11:57:47 -07:00
silicons	184e3992f3	fixes	2020-07-21 11:56:23 -07:00
silicons	4d48abf3a6	fixes	2020-07-21 11:46:17 -07:00
silicons	692656b02d	Whew	2020-07-20 11:53:33 -07:00
silicons	526d257410	fix	2020-07-20 11:48:08 -07:00
silicons	416b989e12	changes	2020-07-20 11:35:10 -07:00
silicons	98d3ac80d9	:pika:	2020-07-20 11:25:17 -07:00
silicons	924309aab8	changeS	2020-07-20 11:11:12 -07:00
silicons	984796b8c6	sigh	2020-07-20 10:46:52 -07:00
silicons	58e26c540c	merge from master	2020-07-20 10:18:44 -07:00
silicons	6ab250dd03	sigh	2020-07-20 10:13:50 -07:00
silicons	ae83a6df02	fix	2020-07-19 19:51:17 -07:00
silicons	55f8e37544	sigh	2020-07-18 20:26:11 -07:00
silicons	910869d6bf	more	2020-07-18 19:44:12 -07:00
silicons	b1ccccb322	more	2020-07-18 18:51:16 -07:00
silicons	1a040dd2a6	changes	2020-07-18 18:44:17 -07:00
silicons	0c6368e3e7	e	2020-07-18 18:34:16 -07:00
silicons	0b98b0409b	sigh	2020-07-18 18:29:09 -07:00
silicons	771a28e685	oh boy	2020-07-18 17:48:51 -07:00
Timothy Teakettle	a89a55a0cc	indentation fix	2020-07-18 23:23:25 +01:00
Timothy Teakettle	1a5008fee7	Merge branch 'master' into wound-port	2020-07-18 23:06:49 +01:00
Timothy Teakettle	974b80a2fd	Merge branch 'master' into wound-port	2020-07-18 21:45:24 +01:00
silicons	993b4ec222	Merge remote-tracking branch 'citadel/master' into unarmed_parry	2020-07-16 19:39:46 -07:00
timothyteakettle	584e74590f	port1	2020-07-17 02:01:33 +01:00
silicons	6cbab55ef8	Merge remote-tracking branch 'citadel/master' into unarmed_parry	2020-07-07 21:07:58 -07:00
silicons	5246408622	fix	2020-07-07 20:51:34 -07:00
silicons	6ee63f66aa	whew	2020-07-07 20:48:54 -07:00
Artur	280d3de6c3	Merge remote-tracking branch 'origin/master' into TGUI-3.0	2020-07-07 18:37:45 +03:00
silicons	c10350f10e	Merge pull request #12677 from Ghommie/Ghommie-cit830 ... Fixes items' skills list keys missing associated traits and improves modulability a little.	2020-07-04 00:12:37 -07:00
Ghommie	e3b1ca4942	Linter.	2020-07-03 19:57:38 +02:00
Ghommie	f5ffd7d2a9	Easing fine tuning of the system.	2020-07-03 03:00:33 +02:00
Ghommie	396989f143	Fixes items' used skills list keys missing associated base traits.	2020-07-03 01:52:03 +02:00
Artur	6ee1eba56c	Merge remote-tracking branch 'origin/master' into TGUI-3.0	2020-07-02 23:23:47 +03:00
silicons	3f1119fcdb	Merge pull request #12630 from Ghommie/Ghommie-cit822 ... You can't (un)equip garments on/from obscured inventory slots anymore.	2020-07-02 01:44:59 -07:00
Artur	20245f7319	Merge remote-tracking branch 'origin/master' into TGUI-3.0	2020-06-30 02:30:29 +03:00
Ghommie	a34a7ba5d4	You can't (un)equip garments on/from obscured inventory slots anymore.	2020-06-28 01:10:22 +02:00
Ghommie	c5cbfa64e5	Porting further material datum features and improvements.	2020-06-24 20:45:17 +02:00
Artur	c41d2e78be	Conflicts!!!	2020-06-22 17:39:24 +03:00