7816 Commits

Author	SHA1	Message	Date
Novacat	e2afa12e38	Merge pull request #4841 from VOREStation/upstream-merge-5992 ... [MIRROR] Departmental Turtlenecks	2019-03-28 22:00:31 -04:00
Novacat	26660c5f70	Merge pull request #4832 from VOREStation/upstream-merge-5985 ... [MIRROR] Subspace Jammer now blocks signalers, suit sensors, lasts longer	2019-03-28 21:59:48 -04:00
Novacat	e47a99824c	Update jammer.dm	2019-03-28 21:46:37 -04:00
Unknown	3aa0fdfda5	Removes conductive flags from VR stuff	2019-03-28 21:45:38 -04:00
Neerti	30b967e28a	Items are now assumed to be conductive, rather than the opposite	2019-03-28 21:45:38 -04:00
Novacat	956809d681	Merge branch 'master' into upstream-merge-5985	2019-03-28 21:32:18 -04:00
Novacat	4c7370fb5d	Merge pull request #4811 from VOREStation/upstream-merge-5981 ... [MIRROR] Handtele no longer relies on teleporter being mapped in in very specific way	2019-03-28 21:28:30 -04:00
Novacat	bada08276f	Merge branch 'master' into upstream-merge-5959	2019-03-28 20:30:41 -04:00
Novacat	3f659d909c	Merge pull request #4758 from VOREStation/upstream-merge-5947 ... [MIRROR] Rewrites Atmospherics	2019-03-28 20:22:30 -04:00
Unknown	d3837b76e8	Conflict Resolution	2019-03-28 19:41:16 -04:00
Anewbe	8ed384b38c	Rewrites Atmospherics	2019-03-28 19:25:11 -04:00
Unknown	32bab4ba00	...Part two	2019-03-28 19:08:04 -04:00
Unknown	58427861e8	Fixes compile error	2019-03-28 19:06:53 -04:00
Unknown	4df295de75	Conflict Resolution	2019-03-28 18:43:38 -04:00
Mechoid	023815e2d2	Flash rebalance.	2019-03-28 18:23:33 -04:00
Novacat	65cd059497	Merge pull request #4751 from VOREStation/upstream-merge-5869 ... [MIRROR] Adds the Zaddat Race + Modifies pressure damage calculations	2019-03-28 18:17:11 -04:00
Novacat	aab0d4625e	Merge pull request #4759 from VOREStation/upstream-merge-5935 ... [MIRROR] Nerfs Sonic Speed Wheelchair	2019-03-28 17:43:33 -04:00
Novacat	f797a8a715	Merge pull request #4728 from VOREStation/upstream-merge-5899 ... [MIRROR] Ghosts who antagHUD can't make communicator calls	2019-03-28 17:25:35 -04:00
Novacat	4040039d70	Merge pull request #4730 from VOREStation/upstream-merge-5912 ... [MIRROR] Mechs can travel to the mines again	2019-03-28 17:25:06 -04:00
elgeonmb	9d056decda	Adds the Zaddat Race + Modifies pressure damage calculations	2019-03-28 16:54:32 -04:00
Novacat	b004d7d847	Merge pull request #4721 from VOREStation/upstream-merge-5901 ... [MIRROR] Unclogs powersink drains	2019-03-28 15:49:58 -04:00
Novacat	05cc6d7df3	Update step_triggers.dm	2019-03-28 15:18:23 -04:00
Novacat	8fcc46a6c9	Merge branch 'master' into upstream-merge-5912	2019-03-28 15:12:46 -04:00
Unknown	3e2d0bf9ea	Conflict Resolution Part Two	2019-03-28 15:09:40 -04:00
Atermonera	7403591727	Ghosts who antagHUD can't make communicator calls	2019-03-28 15:05:25 -04:00
Novacat	56752a1337	Merge branch 'master' into upstream-merge-5901	2019-03-28 14:37:02 -04:00
Unknown	cf39c61c2d	Conflict Resolution ... This one made a lynx cry.	2019-03-28 13:19:19 -04:00
Neerti	3256202407	[READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work	2019-03-27 22:02:07 -04:00
Novacat	2870ba8271	Merge pull request #4695 from VOREStation/upstream-merge-5856 ... [MIRROR] Fixes candle sprites	2019-03-27 20:54:57 -04:00
Novacat	94ae8fcc2a	Update candle.dm	2019-03-27 20:23:59 -04:00
Unknown	eca7086b45	Conflict Resolution	2019-03-27 19:24:13 -04:00
Anewbe	ac34c4b763	Stasis bags don't murder patients	2019-03-27 19:18:13 -04:00
Novacat	ffed098bf6	Merge branch 'master' into upstream-merge-5856	2019-03-27 19:00:41 -04:00
Novacat	aefedea4a3	Merge pull request #4694 from VOREStation/upstream-merge-5858 ... [MIRROR] Suit coolers don't overheat in vacuum	2019-03-27 18:58:47 -04:00
Novacat	dce3466f3b	Merge pull request #4684 from VOREStation/upstream-merge-5814 ... [MIRROR] [READY]Makes a bunch of processes subsystems instead	2019-03-27 17:46:31 -04:00
Novacat	97e98dd04d	Merge pull request #4682 from VOREStation/upstream-merge-5829 ... [MIRROR] Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it	2019-03-27 16:37:45 -04:00
Unknown	ec19a66eff	Conflict Resolution	2019-03-27 16:36:41 -04:00
kevinz000	6415e4193f	[READY]Makes a bunch of processes subsystems instead	2019-03-27 16:03:51 -04:00
Unknown	6636f1ba37	Conflict Resolution Part 2	2019-03-27 15:51:05 -04:00
Novacat	abcde8fe5f	Merge pull request #4680 from VOREStation/upstream-merge-5825 ... [MIRROR] Adds ability to put butts in boxes	2019-03-27 15:19:30 -04:00
Novacat	1bbb64494e	Merge pull request #4678 from VOREStation/upstream-merge-5835 ... [MIRROR] Updates Religion Lists + Adds Religious Paraphernalia	2019-03-27 15:19:15 -04:00
Novacat	696872690e	Merge pull request #4677 from VOREStation/upstream-merge-5776 ... [MIRROR] Adds pressure protection bounds to clothing.	2019-03-27 15:18:17 -04:00
Neerti	fe0b7373b3	Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it	2019-03-27 14:49:30 -04:00
Novacat	cfe200ffc9	Merge pull request #4665 from VOREStation/upstream-merge-5824 ... [MIRROR] Fixes non-black/white paint buckets not actually having paint in them	2019-03-27 14:12:46 -04:00
Novacat	823354433e	Merge pull request #4659 from VOREStation/upstream-merge-5796 ... [MIRROR] Adds New PoI Features + Bonus PoI	2019-03-27 13:52:46 -04:00
Neerti	9d46150515	Adds pressure protection bounds to clothing.	2019-03-27 13:26:07 -04:00
Novacat	42df71908b	Merge pull request #4644 from VOREStation/upstream-merge-5803 ... [MIRROR] Guns sounds refactor and improvements	2019-03-27 12:35:26 -04:00
Neerti	91a5203e32	Adds New PoI Features + Bonus PoI	2019-03-27 12:15:50 -04:00
Novacat	9e00a1b164	Merge pull request #4641 from VOREStation/upstream-merge-5808 ... [MIRROR] CODERS HATE HIM: THIS TOTAL LOSER FIXES TYPOS	2019-03-27 11:22:21 -04:00
Spades	eb0e2ec1f5	Guns sounds refactor and improvements	2019-03-27 10:42:18 -04:00