22170 Commits

Author	SHA1	Message	Date
Neerti	30b967e28a	Items are now assumed to be conductive, rather than the opposite	2019-03-28 21:45:38 -04:00
Novacat	3bc9a2e903	Merge pull request #4824 from VOREStation/upstream-merge-5986 ... [MIRROR] Rings no longer cover ones hands	2019-03-28 21:29:47 -04:00
Novacat	1aa2f39c0f	Merge pull request #4815 from Novacat/nova-aifixes ... Fixes Newspapers	2019-03-28 21:29:07 -04:00
Novacat	44e3511842	Merge pull request #4812 from TheFurryFeline/patch-1 ... Add Resh's HOS Coat	2019-03-28 21:28:50 -04:00
Novacat	39792dd123	Merge pull request #4800 from Mewchild/MC-Mlem ... Antiseptic Mlems take 3	2019-03-28 21:27:40 -04:00
Novacat	77bf066a98	Merge pull request #4791 from VOREStation/upstream-merge-5977 ... [MIRROR] BTW I USE (FIXED) ARC	2019-03-28 21:27:26 -04:00
Novacat	785a36d4e0	Merge pull request #4783 from VOREStation/upstream-merge-5942 ... [MIRROR] Headgibbing is a config thing	2019-03-28 21:27:19 -04:00
Novacat	7768216c64	Merge pull request #4801 from VOREStation/upstream-merge-5974 ... [MIRROR] Fixes departmental teshari cloaks and coats	2019-03-28 21:09:51 -04:00
Novacat	cc75cc7228	Merge pull request #4789 from VOREStation/upstream-merge-5967 ... [MIRROR] Fixes submap footprint miscalculations	2019-03-28 21:08:01 -04:00
Novacat	0ea5634e93	Merge pull request #4788 from VOREStation/upstream-merge-5972 ... [MIRROR] fixes zaddat mask problem	2019-03-28 21:07:40 -04:00
Novacat	f62c6f2194	Merge pull request #4785 from VOREStation/upstream-merge-5962 ... [MIRROR] Prevents people from joining with the same character	2019-03-28 21:07:32 -04:00
Novacat	e7e59730ea	Merge pull request #4784 from VOREStation/upstream-merge-5956 ... [MIRROR] Nock masks, cowls & robes	2019-03-28 21:07:21 -04:00
Novacat	4a05c9e7e1	Merge pull request #4782 from VOREStation/upstream-merge-5966 ... [MIRROR] Fixes blast door issue, and slimesky being considered unjustified.	2019-03-28 21:07:14 -04:00
Unknown	2dbf8499f4	Conflict Resolution	2019-03-28 21:04:21 -04:00
Anewbe	38c4b88ded	BTW I USE (FIXED) ARC	2019-03-28 20:53:50 -04:00
Novacat	9079cdd276	Merge branch 'master' into upstream-merge-5972	2019-03-28 20:50:10 -04:00
Novacat	e5fdafd56e	Merge pull request #4781 from VOREStation/upstream-merge-5969 ... [MIRROR] Fixes Diona and Promethean prosthetics.	2019-03-28 20:46:05 -04:00
Novacat	d674e51405	Merge pull request #4780 from VOREStation/upstream-merge-5965 ... [MIRROR] Fix Organs not removing their verbs properly.	2019-03-28 20:45:57 -04:00
Novacat	a52d831113	Merge pull request #4779 from VOREStation/upstream-merge-5959 ... [MIRROR] Adds a new Shroud design	2019-03-28 20:45:50 -04:00
Novacat	c3f3419165	Merge pull request #4778 from VOREStation/upstream-merge-5949 ... [MIRROR] Tweaks Daxons	2019-03-28 20:45:42 -04:00
Novacat	809cb419e5	Merge pull request #4766 from VOREStation/upstream-merge-5953 ... [MIRROR] Fixes the 'cannot push thing being pulled' bug and other weirdness.	2019-03-28 20:45:35 -04:00
Unknown	4792fc1693	Conflict Resolution	2019-03-28 20:44:59 -04:00
Neerti	15e3c04ca3	Nock masks, cowls & robes	2019-03-28 20:42:42 -04:00
Neerti	256fb03dcc	Merge pull request #5942 from Anewbe/headgibs ... Headgibbing is a config thing	2019-03-28 20:38:34 -04:00
Unknown	e0fb53e385	Conflict Resolution	2019-03-28 20:37:08 -04:00
Neerti	bf6d7bf58b	Fixes blast door issue, and slimesky being considered unjustified.	2019-03-28 20:35:17 -04:00
Novacat	92a9d81599	Update robolimbs.dm	2019-03-28 20:33:14 -04:00
Novacat	25c9780722	Merge branch 'master' into upstream-merge-5965	2019-03-28 20:31:48 -04:00
Novacat	bada08276f	Merge branch 'master' into upstream-merge-5959	2019-03-28 20:30:41 -04:00
Neerti	a928244613	Tweaks Daxons	2019-03-28 20:29:05 -04:00
Novacat	e4cc8fa2fa	Merge pull request #4775 from VOREStation/upstream-merge-5961 ... [MIRROR] Fixed typo on name of RCON's output setting popup window	2019-03-28 20:24:38 -04:00
Novacat	5ea6489cea	Merge pull request #4770 from VOREStation/upstream-merge-5933 ... [MIRROR] AI sprite tweaks.	2019-03-28 20:23:14 -04:00
Novacat	ada7fcd1c4	Merge pull request #4764 from Sharkmare/patch-4 ... minor spelling fix	2019-03-28 20:23:01 -04:00
Novacat	716207d55d	Merge pull request #4763 from VOREStation/upstream-merge-5950 ... [MIRROR] Fixes turrets, AI shooting, and makes mob AI shooting a little smarter.	2019-03-28 20:22:52 -04:00
Novacat	8eddf7c5a8	Merge pull request #4762 from VOREStation/upstream-merge-5951 ... [MIRROR] Bugspeak is whitelisted	2019-03-28 20:22:45 -04:00
Novacat	3f659d909c	Merge pull request #4758 from VOREStation/upstream-merge-5947 ... [MIRROR] Rewrites Atmospherics	2019-03-28 20:22:30 -04:00
Novacat	cfc2b7b74c	Merge pull request #4757 from VOREStation/upstream-merge-5944 ... [MIRROR] I shouldn't do math at 2 AM	2019-03-28 20:22:22 -04:00
Anewbe	e98f578ea5	Fixes the 'cannot push thing being pulled' bug and other weirdness.	2019-03-28 20:15:30 -04:00
Novacat	b88035052b	Update persist_vr.dm	2019-03-28 20:10:57 -04:00
Unknown	9e329e2a92	Forgot something	2019-03-28 20:09:52 -04:00
Anewbe	d2e8078348	Fixes turrets, AI shooting, and makes mob AI shooting a little smarter.	2019-03-28 20:07:44 -04:00
Unknown	326a4c96fc	Unwhitelists	2019-03-28 19:53:00 -04:00
Neerti	8e86e8383e	Bugspeak is whitelisted	2019-03-28 19:51:07 -04:00
Unknown	d3837b76e8	Conflict Resolution	2019-03-28 19:41:16 -04:00
Novacat	f1da5f1f55	Merge pull request #4752 from VOREStation/upstream-merge-5907 ... [MIRROR] Flash rebalance.	2019-03-28 19:26:34 -04:00
Anewbe	8ed384b38c	Rewrites Atmospherics	2019-03-28 19:25:11 -04:00
Novacat	7a518bc619	Merge branch 'master' into upstream-merge-5944	2019-03-28 19:19:44 -04:00
Novacat	6d4ea26332	Merge pull request #4753 from VOREStation/upstream-merge-5936 ... [MIRROR] Rigsuits use the correct pressure protection mechanism	2019-03-28 19:08:43 -04:00
Anewbe	9959a566bd	Rigsuits use the correct pressure protection mechanism	2019-03-28 18:55:23 -04:00
Mechoid	023815e2d2	Flash rebalance.	2019-03-28 18:23:33 -04:00