15551 Commits

Author	SHA1	Message	Date
Novacat	690dc5cbec	Merge pull request #4864 from VOREStation/upstream-merge-6010 ... [MIRROR] Removes spammy keyboard noise from arcade machines	2019-03-28 22:02:21 -04:00
Novacat	d53ef70473	Merge pull request #4848 from VOREStation/upstream-merge-5996 ... [MIRROR] Fixed construction of fulltile electrochromic windows	2019-03-28 22:01:16 -04:00
Novacat	a7ee250193	Merge pull request #4844 from VOREStation/upstream-merge-5991 ... [MIRROR] Fixes drinks and adds new one.	2019-03-28 22:01:05 -04:00
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	21f4479636	Merge branch 'master' into upstream-merge-5991	2019-03-28 21:35:54 -04:00
Novacat	956809d681	Merge branch 'master' into upstream-merge-5985	2019-03-28 21:32:18 -04:00
Novacat	5ca397fb43	Merge pull request #4830 from VOREStation/upstream-merge-5960 ... [MIRROR] Reverts some real spacebrain gas	2019-03-28 21:29:55 -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	354a6b501b	Update turf_changing.dm	2019-03-28 21:13:59 -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
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	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
Neerti	bf6d7bf58b	Fixes blast door issue, and slimesky being considered unjustified.	2019-03-28 20:35:17 -04:00
Novacat	bada08276f	Merge branch 'master' into upstream-merge-5959	2019-03-28 20:30:41 -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	c910f5a0a7	Merge pull request #4760 from VOREStation/upstream-merge-5946 ... [MIRROR] i don't know how vending machines work	2019-03-28 20:22:37 -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	9fec157758	Conflict Resolution	2019-03-28 20:21:29 -04:00
Anewbe	d2e8078348	Fixes turrets, AI shooting, and makes mob AI shooting a little smarter.	2019-03-28 20:07:44 -04:00
Anewbe	82a5aa84f8	Merge pull request #5946 from elgeonmb/patch-10 ... i don't know how vending machines work	2019-03-28 19:49:00 -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	2ac862561e	Merge pull request #4743 from VOREStation/upstream-merge-5920 ... [MIRROR] Map Fixes and Tweaks	2019-03-28 19:08:25 -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	28d3f6f058	Merge branch 'master' into upstream-merge-5920	2019-03-28 16:35:59 -04:00
Novacat	be3ecb34ca	Merge pull request #4738 from VOREStation/upstream-merge-5913 ... [MIRROR] Readds access restrictions to supply computer	2019-03-28 16:31:58 -04:00
Novacat	615f413354	Merge pull request #4727 from VOREStation/upstream-merge-5798 ... [MIRROR] Adds Alien Reality pods, aka AR pods, for use in events or PoIs.	2019-03-28 16:30:53 -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
Unknown	efdb175d52	Conflict Resolution	2019-03-28 15:02:22 -04:00
Novacat	a4919caba2	Merge pull request #4719 from VOREStation/upstream-merge-5636 ... [MIRROR] [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work	2019-03-28 14:52:51 -04:00
Mechoid	c604e38036	Adds Alien Reality pods, aka AR pods, for use in events or PoIs.	2019-03-28 14:51:50 -04:00
Novacat	56752a1337	Merge branch 'master' into upstream-merge-5901	2019-03-28 14:37:02 -04:00
Novacat	3a0dbf687b	Merge pull request #4720 from VOREStation/upstream-merge-5896 ... [MIRROR] Changeling & Straight Jacket modifications.	2019-03-28 14:35:51 -04:00