33839 Commits

Author	SHA1	Message	Date
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
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	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
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
Unknown	9fec157758	Conflict Resolution	2019-03-28 20:21:29 -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
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	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
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
Anewbe	9959a566bd	Rigsuits use the correct pressure protection mechanism	2019-03-28 18:55:23 -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
Spades	a184e67c93	Changes (R&D made) Saber SMG to Advanced SMG	2019-03-28 18:22:23 -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	da5d9c5013	Merge pull request #4739 from VOREStation/upstream-merge-5924 ... [MIRROR] Stairs go up	2019-03-28 17:55:27 -04:00
Novacat	3a1c35f0ad	Merge pull request #4768 from VOREStation/upstream-merge-5954 ... [MIRROR] Makes aiming more clear for the target.	2019-03-28 17:46:02 -04:00
Novacat	7e90225e81	Merge pull request #4736 from VOREStation/upstream-merge-5918 ... [MIRROR] [READY] Fixes pixel projectiles critical bugs	2019-03-28 17:44:22 -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	9759df2de4	Merge pull request #4756 from TheFurryFeline/TFF-Vakashi_Permit ... Vakashi's Permit	2019-03-28 17:40:23 -04:00
Novacat	04c5080426	Merge pull request #4755 from VOREStation/upstream-merge-5940 ... [MIRROR] Fix a div/0.	2019-03-28 17:39:34 -04:00
Novacat	0c71725ab0	Merge pull request #4734 from VOREStation/upstream-merge-5846 ... [MIRROR] Adds multiple organ-related chemicals.	2019-03-28 17:37:32 -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	0b71310df5	Merge pull request #4732 from VOREStation/upstream-merge-5909 ... [MIRROR] AFK Kicker stores AI cores	2019-03-28 17:25:22 -04:00
Novacat	c734e631a1	Merge pull request #4731 from VOREStation/upstream-merge-5908 ... [MIRROR] January News Update	2019-03-28 17:25:13 -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
Unknown	ad181e797a	Conflict Resolution ... Also fixes a compiling error with previous PR	2019-03-28 17:24:03 -04:00