22117 Commits

Author	SHA1	Message	Date
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
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
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	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	c734e631a1	Merge pull request #4731 from VOREStation/upstream-merge-5908 ... [MIRROR] January News Update	2019-03-28 17:25:13 -04:00
Unknown	ad181e797a	Conflict Resolution ... Also fixes a compiling error with previous PR	2019-03-28 17:24:03 -04:00
elgeonmb	9d056decda	Adds the Zaddat Race + Modifies pressure damage calculations	2019-03-28 16:54:32 -04:00
Novacat	a98ac52678	Merge pull request #4750 from VOREStation/upstream-merge-5886 ... [MIRROR] Introduces caseless ammo, and a caseless rifle	2019-03-28 16:40:13 -04:00
Novacat	77db377d61	Merge pull request #4748 from Heroman3003/mlembulance ... Tempest's saddlebags now double as ambulance siren/light	2019-03-28 16:39:37 -04:00
Novacat	4bf687c243	Merge pull request #4746 from VOREStation/upstream-merge-5922 ... [MIRROR] reduces delay in printing from librarian computer	2019-03-28 16:38:18 -04:00
Novacat	f98177b682	Merge pull request #4741 from Jwguy/Silver-KoyoFluffApp ... Adds Koyo's Fluff Item Box	2019-03-28 16:34:41 -04:00
Novacat	352fe555f2	Update structures.dm	2019-03-28 16:33:29 -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	07bbf88d0d	Merge pull request #4726 from VOREStation/upstream-merge-5905 ... [MIRROR] Woops I misse dit, removes the forced announce from atom proccall	2019-03-28 16:30:43 -04:00
Novacat	1eea84c861	Merge pull request #4722 from VOREStation/upstream-merge-5897 ... [MIRROR] Fixes some circuit bugs.	2019-03-28 16:30:33 -04:00
Unknown	75ede8c745	Fixes Merge Conflicts	2019-03-28 16:03:52 -04:00
Neerti	279ffc5dc9	[READY] Fixes pixel projectiles critical bugs	2019-03-28 15:56:47 -04:00
Novacat	1827a34381	Merge pull request #4674 from VOREStation/upstream-merge-5823 ... [MIRROR] Egun stun beams are weaker	2019-03-28 15:49:06 -04:00
Novacat	81d698b94c	Merge pull request #4643 from VOREStation/upstream-merge-5790 ... [MIRROR] Drop the number of shots of normal and sec-xeno tasers back down to 5.	2019-03-28 15:48:47 -04:00
Unknown	62b141bbf0	Fixes compile error	2019-03-28 15:30:41 -04:00
Atermonera	f75332f455	Merge pull request #5846 from Mechoid/ChemicalsChemicalsChemicals!1 ... Adds multiple organ-related chemicals.	2019-03-28 15:28:13 -04:00
Novacat	912111d5ea	Merge branch 'master' into upstream-merge-5908	2019-03-28 15:19:53 -04:00
Unknown	efdb175d52	Conflict Resolution	2019-03-28 15:02:22 -04:00
Novacat	c570f25dd8	Merge branch 'master' into upstream-merge-5905	2019-03-28 14:55:54 -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
Unknown	2767f5917d	Fixes Conflict	2019-03-28 14:49:44 -04:00