601 Commits

Author	SHA1	Message	Date
silicons	1ea0dd9f76	Merge remote-tracking branch 'citadel/master' into combat_rework_experimental	2020-09-19 15:56:13 -07:00
deathride58	1c9a22fa5e	Readds the old temperature notification method in the form of a shivering/sweating notification	2020-09-03 01:35:28 -04:00
silicons	8699ce2174	fixes a bunch of broken clickdelays (#13218) ... * fixes * fix	2020-08-25 20:58:20 +02:00
Ghommie	fde859bca0	Removing priority overlays, update_icon() splitup for guns.	2020-08-20 18:33:23 +02:00
Putnam	9bb3ba5c5a	added ethereals	2020-08-08 00:08:43 -07:00
silicons	de3227e3e0	fix	2020-08-04 22:55:33 -07:00
silicons	0a36f9fbb5	changes	2020-08-04 22:40:28 -07:00
Timothy Teakettle	289c186f32	Merge remote-tracking branch 'upstream/master' into wounds-part-2	2020-08-02 18:11:07 +01:00
Timothy Teakettle	03d01d917f	Merge branch 'master' into wounds-part-2	2020-08-02 18:10:31 +01:00
silicons	2230a3665a	Merge pull request #12965 from timothyteakettle/end-our-suffering ... drastically lowers the damage-related benefits of combat mode	2020-08-01 03:33:43 -07:00
silicons	320c91f4d3	Merge pull request #12742 from KeRSedChaplain/clockcultrework ... Clockwork Cult rework	2020-08-01 00:17:11 -07:00
silicons	ad75ac0c6d	Update telekinesis.dm	2020-07-31 02:30:56 -07:00
timothyteakettle	caaedce6e2	end our suffering	2020-07-30 02:33:39 +01:00
Timothy Teakettle	9721025582	Merge branch 'master' into wounds-part-2	2020-07-29 15:47:44 +01:00
silicons	e4148fe4ad	Merge remote-tracking branch 'citadel/master' into 12742	2020-07-29 01:11:11 -07:00
silicons	78312c23bf	sigh	2020-07-28 21:53:07 -07:00
Lin	a5dd08a054	Merge pull request #12734 from silicons/shoelaces ... shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.	2020-07-28 21:51:43 -05:00
silicons	5bf4afcade	sigh	2020-07-27 14:09:37 -07:00
silicons	dc278d7b02	woops	2020-07-27 13:11:26 -07:00
silicons	67b518bf42	experimental	2020-07-27 13:09:54 -07:00
silicons	8f9abfd63a	no return	2020-07-26 17:30:20 -07:00
silicons	49070d732b	ohhhhhhh boy	2020-07-26 15:10:08 -07:00
silicons	7d7f40ce90	fixes	2020-07-26 14:56:03 -07:00
silicons	94e218ccc0	ok	2020-07-26 01:04:55 -07:00
silicons	55dc0a1650	Fix	2020-07-26 00:36:52 -07:00
silicons	d3e808f0e1	fix	2020-07-26 00:18:42 -07:00
silicons	1990f75957	Merge remote-tracking branch 'citadel/master' into clickcd_experimental	2020-07-25 23:46:27 -07:00
silicons	8dda9b88b4	code	2020-07-25 23:23:45 -07:00
silicons	61a4d5eb06	fix	2020-07-25 23:22:01 -07:00
silicons	e3b8c212f1	ok	2020-07-25 23:14:38 -07:00
silicons	ac00d05a3f	fix	2020-07-24 23:41:21 -07:00
silicons	48fa617aeb	let's do this	2020-07-24 23:40:24 -07:00
silicons	0e1574bf77	sigh	2020-07-24 23:34:47 -07:00
silicons	849919d76c	fixes	2020-07-24 20:53:46 -07:00
silicons	44d3a0aa27	fixes	2020-07-24 20:37:02 -07:00
silicons	46fc0b6ae5	epic	2020-07-24 20:22:44 -07:00
silicons	33d5ba788b	aight	2020-07-24 20:19:18 -07:00
timothyteakettle	3ca098fe98	bugfixes	2020-07-25 00:22:24 +01:00
Timothy Teakettle	7fb55a02a5	section one	2020-07-24 22:34:22 +01:00
silicons	64de8f16a9	fixes	2020-07-23 16:59:27 -07:00
silicons	53b3c6099b	ok	2020-07-23 16:27:41 -07:00
silicons	1f25c7f06d	Merge remote-tracking branch 'citadel/master' into shoelaces	2020-07-23 16:23:34 -07:00
Lin	8a25582c1c	Merge pull request #12850 from silicons/drag ... fixes dragging stuff into space, enforces no sleeping on Life() and sets Move() to forced async	2020-07-23 17:13:48 -05:00
silicons	d30acd5b09	smooth	2020-07-23 13:49:17 -07:00
silicons	c3ca4be149	ok	2020-07-23 13:47:07 -07:00
silicons	80233e52af	ok	2020-07-23 11:56:08 -07:00
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