38949 Commits

Author	SHA1	Message	Date
izac112	e28994b7be	Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate ... All conflicts resolved Signed-off-by: izac112 <izac10@live.com>	2020-05-06 21:53:03 +02:00
Aronai Sieyes	aaa86b1ed1	Merge pull request #7668 from Rykka-Stormheart/shep-dev-clamp-fix ... Fix clamp case breaking BYOND versions below 513.1490	2020-05-06 09:19:52 -04:00
Aronai Sieyes	602983705f	Merge pull request #7666 from VOREStation/aro-sounds ... Replace/Add lots of sounds from VerySoft	2020-05-06 09:14:31 -04:00
Rykka	9ceb5f768b	Fix clamp case breaking BYOND versions below 513.1490 ... 513.1490 added `clamp` as a native proc	2020-05-06 06:42:36 -04:00
Aronai Sieyes	3a587e34da	Fixes vore panel reload cancel ... Fixes https://github.com/VOREStation/VOREStation/issues/7665	2020-05-05 22:44:26 -04:00
Aronai Sieyes	f4c8a7e2f5	Replace/Add lots of sounds from VerySoft	2020-05-05 22:43:31 -04:00
Izac Joof Forsgren	8fa28d14e5	Merge branch 'master' into master	2020-05-06 03:45:00 +02:00
RadiantFlash7	0071485ca0	Interceptor adjustments	2020-05-05 21:29:31 -04:00
SplinterGP	c25bd646df	Commit to run travis again	2020-05-05 21:19:00 -03:00
SplinterGP	17df0f666f	Merge branch 'master' into master	2020-05-05 21:02:46 -03:00
SplinterGP	6b1cb4e1ff	Adds haemophilia too and reset button	2020-05-05 20:53:41 -03:00
Aronai Sieyes	586dcad6a1	Merge pull request #7655 from VOREStation/aro-doingafter ... Make some progress bar activities exclusive	2020-05-05 19:47:08 -04:00
Aronai Sieyes	c9f67a2396	Merge pull request #7656 from VOREStation/upstream-merge-7060 ... [MIRROR] Ling Fixes + Various other fixes	2020-05-05 19:46:57 -04:00
Aronai Sieyes	dd9a463601	Merge pull request #7658 from VOREStation/upstream-merge-7072 ... [MIRROR] Fix Broken Gun Examining	2020-05-05 19:21:20 -04:00
Aronai Sieyes	0b19c528da	Allows do_mob and do_after to be exclusive, to prevent stacking	2020-05-05 19:10:55 -04:00
RadiantFlash7	560b127aa3	Merge pull request #10 from Yawn-Wider/master ... Updating from server	2020-05-05 17:34:56 -04:00
RadiantFlash7	4c19dc58f8	Fixes keyboards+prototype on scrapmap ... Been away too long, and someons gone and done my job for me with the sec shuttle. Removed all commits related to mapping it, and am pushing keyboard fixes+shuttle prototypes on scrapmap.	2020-05-05 17:30:41 -04:00
Atermonera	34a2d38f3b	Merge pull request #7077 from Mechoid/KururakTweaks ... Kururaks now (theoretically) are not as agonizing to fight.	2020-05-05 17:18:03 -04:00
Atermonera	76177da0f9	Merge pull request #7072 from Mechoid/BrokenGunExamine ... Fix Broken Gun Examining	2020-05-05 17:09:57 -04:00
Atermonera	284a0b4d80	Ling Fixes + Various other fixes	2020-05-05 17:02:27 -04:00
Aronai Sieyes	c5e8685593	Port Paradise progress bars	2020-05-05 16:51:05 -04:00
SplinterGP	3ad4e4a535	Disabilities out of trait system	2020-05-05 15:46:30 -03:00
Aronai Sieyes	7560ff2c5a	Merge pull request #7644 from TeleTubby2/bazingabeamnatje ... Adds Natje's Curabitur Cannon	2020-05-05 13:11:38 -04:00
Aronai Sieyes	e76cd40756	Merge pull request #7646 from VOREStation/aro-hydroclick ... Prevent ghosts/others from messing with hydrotrays	2020-05-05 13:11:13 -04:00
Aronai Sieyes	1af099ec22	Merge pull request #7647 from VOREStation/aro-bsharpoon ... Bluespace Harpoon Tweaks	2020-05-05 13:11:05 -04:00
Aronai Sieyes	f497815fa4	Merge pull request #7648 from VOREStation/aro-rndconsole ... Update R&D Console, Autolathes	2020-05-05 13:10:59 -04:00
Aronai Sieyes	9319c120be	Merge pull request #7649 from VOREStation/aro-airlockelec ... Rewrite airlock electronics	2020-05-05 13:10:52 -04:00
Aronai Sieyes	e8cae15ed8	Don't show borgs alarms not local to them	2020-05-05 12:31:29 -04:00
Aronai Sieyes	186e887b0d	VS: Allow talon crew to unlock airlock electronics	2020-05-05 12:15:17 -04:00
Aronai Sieyes	bcb23abbfb	Rewrite airlock electronics	2020-05-05 12:15:17 -04:00
Teletubby2	709619fc9a	Back sprite. fixes. ... rusty boooys	2020-05-05 11:26:10 -04:00
Killian	24b507ad9c	scatter speedloader & box printing	2020-05-05 16:17:28 +01:00
Aronai Sieyes	783c951aab	Add filter option to autolathe, convert to fakenano	2020-05-05 11:01:03 -04:00
Aronai Sieyes	b83e893637	Add filter/search to protolathe and circuit designs	2020-05-05 10:41:12 -04:00
Aronai Sieyes	3179b741c0	Update R&D Console	2020-05-05 10:12:24 -04:00
Aronai Sieyes	1fb36dbcaf	Bluespace Harpoon Tweaks ... Random failure is lame, but so is removing gameplay.	2020-05-05 09:56:49 -04:00
Aronai Sieyes	e3bf07f90f	Prevent ghosts/others from messing with hydrotrays	2020-05-05 09:11:05 -04:00
Teletubby2	feb2f7da36	adds Natje's bazinga beam ... I forgot how much gun code sucked.	2020-05-05 06:37:18 -04:00
Killian	19c223c940	forgot a comma	2020-05-05 11:28:20 +01:00
Killian	6494e48c7a	small update to secpilot locker contents	2020-05-05 11:24:07 +01:00
Aronai Sieyes	5556588dbd	Merge pull request #7642 from VOREStation/aro-facesits ... Reword grab facesits	2020-05-04 23:32:50 -04:00
Aronai Sieyes	73877cfb7b	Merge pull request #7641 from VOREStation/aro-vitalicon ... Clean up vitals monitor icon when victim disconnects	2020-05-04 23:28:06 -04:00
Aronai Sieyes	72511b9fa7	Rewords grab facesits ... Let's be real here. It's facesits.	2020-05-04 23:21:46 -04:00
Aronai Sieyes	5134f60956	Merge pull request #7639 from VOREStation/aro-penspam ... Add cooldown to pen clicks	2020-05-04 23:18:53 -04:00
Aronai Sieyes	dec23b2612	Clean up vitals monitor icon when victim disconnects	2020-05-04 23:17:43 -04:00
Aronai Sieyes	8216144ab9	Add cooldown to pen clicks ... Fixes https://github.com/VOREStation/VOREStation/issues/7000	2020-05-04 23:06:38 -04:00
Aronai Sieyes	498b942a29	Fiftyspawners try to place themselves in crates if possible ... Fixes https://github.com/VOREStation/VOREStation/issues/7163	2020-05-04 21:21:48 -04:00
Aronai Sieyes	ad9cdaade6	Merge pull request #7637 from VOREStation/aro-shake ... Fix protein shaker name	2020-05-04 21:12:09 -04:00
Aronai Sieyes	d58c8ee4e2	Merge pull request #7638 from VOREStation/aro-talondirect ... Fixes Talon not being in char directory	2020-05-04 21:06:06 -04:00
Aronai Sieyes	08c371e271	Merge pull request #7636 from VOREStation/aro-condi ... Fix condiment container infinite range	2020-05-04 21:05:28 -04:00