23559 Commits

Author	SHA1	Message	Date
killer653	4822804911	Fixes conflicts	2016-07-03 19:00:55 -04:00
killer653	43a7f8bad2	Fixes the sprites not updating after TF	2016-07-03 00:08:58 -04:00
killer653	3d35b13653	Brings back the floorlength braid.	2016-07-02 22:27:10 -04:00
Cameron653	13d75315bb	Adds in selectable egg TF, reverts #382, a few tf fixes.	2016-07-02 20:52:07 -04:00
Spades	33c36365f6	Merge pull request #393 from Cameron653/master ... Gives monkeys default language, removes neatness tabs.	2016-07-02 11:38:14 -04:00
Spades	e7e880a3f4	Merge pull request #387 from VOREStation/deathclaw ... Added Deathclaws.	2016-07-02 11:37:56 -04:00
Cameron653	99a887f1db	Gives monkeys the default language ... Also removes the tab spaces that were meant to make it look neater that Github just said "no" to.	2016-07-01 14:27:32 -04:00
Spades	45ef475bbd	Merge pull request #385 from Cameron653/master ... Bugfixes and features	2016-06-30 10:56:46 -04:00
JoanRisu	564d3a1ce6	The case of the backwards helmet.	2016-06-29 23:42:17 -07:00
killer653	7575cfef9e	Adds the monkeys back	2016-06-30 02:14:36 -04:00
Yoshax	e9b56deb40	Fixes a bug with tiny peeps	2016-06-30 02:55:18 +01:00
killer653	33f94bd9c1	Makes absorb longer	2016-06-29 03:47:20 -04:00
killer653	64b42e6257	Forgot this	2016-06-29 03:11:49 -04:00
killer653	4fbec91352	Fixes absorption	2016-06-29 02:53:09 -04:00
killer653	90b609c291	Fixes #386	2016-06-29 02:40:01 -04:00
Spades	0c00bd5c59	Added Deathclaws.	2016-06-28 23:30:27 -04:00
Cameron653	947d1f3073	Update egg_vr.dm	2016-06-28 10:20:00 -04:00
Cameron653	720b6df5e9	Fixes #384 ... Fixes #384	2016-06-28 10:19:20 -04:00
killer653	da250037d2	Ctrl C, Ctrl V doesn't always work	2016-06-25 23:02:52 -04:00
killer653	9bbcf5c8c6	Whoops!	2016-06-25 22:58:00 -04:00
killer653	6fd78fe69b	This took 5 hours to fix ... ...due to user error. It was a 5 minute fix that required 1 new line of code. Coding hurts.	2016-06-25 22:31:58 -04:00
Spades	e56fc38403	Merge pull request #376 from viv-eret/master ... Adds tentacle taur sprites	2016-06-24 18:49:40 -04:00
killer653	145da74b56	Removes a random space.	2016-06-22 22:46:59 -04:00
killer653	51debcf399	Allows hardsuits and rigsuits to store backpacks	2016-06-22 22:41:59 -04:00
Spades	3b249abdf9	Merge pull request #350 from Cameron653/master ... Adds in Xenochimeras (Scree Whitelisted race)	2016-06-22 16:55:21 -04:00
viv-eret	841db7077b	Added tentacle sprite code	2016-06-21 19:15:57 -07:00
Spades	a7f56a77d7	Merge pull request #369 from VOREStation/huddebug ... Hacky fix for HUD problems	2016-06-20 15:25:39 -04:00
killer653	750958945c	Small tweak	2016-06-20 15:14:07 -04:00
Spades	5d51bc48c4	Travis wake up.	2016-06-18 19:20:25 -04:00
Spades	c16257fd58	Travis wake up.	2016-06-18 19:19:29 -04:00
Cameron653	8ab0af947e	Update station_vr.dm	2016-06-18 17:32:50 -04:00
Cameron653	cbd9abf37c	Update station_vr.dm	2016-06-18 17:31:35 -04:00
Cameron653	9b4c967b23	Fixes!	2016-06-18 14:50:47 -04:00
Spades	05ce93721b	Forgot one part.	2016-06-17 19:50:16 -04:00
Spades	1057034044	Fixes #371	2016-06-17 17:05:36 -04:00
Arokha Sieyes	cebf45e11b	Hacky fix for HUD problems ... Teshari hud darkness overlay keeps getting deleted globally, and worse it keeps them from spawning after. This is a cheap fix to correct this, but I have no idea what's causing it in the first place.	2016-06-16 01:34:40 -04:00
Cameron653	61d4aeced1	Merge remote-tracking branch 'refs/remotes/VOREStation/master'	2016-06-15 14:30:40 -04:00
Arokha Sieyes	aea0af7f16	Exclusive list add for safety	2016-06-15 00:10:01 -04:00
Arokha Sieyes	6de29e6b9b	More Elegant	2016-06-15 00:00:16 -04:00
Arokha Sieyes	fa366e4b08	Fixes Vore ... - Makes belly modes stop duplicating themselves - Fixes 'owner' var on belly which is where prey is moved when eaten	2016-06-14 23:49:27 -04:00
Arokha Sieyes	07081327fa	Merge pull request #362 from VOREStation/sync ... Polaris Sync	2016-06-14 21:19:40 -04:00
Arokha Sieyes	3809e30a07	Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync ... # Conflicts: # code/datums/supplypacks/science.dm	2016-06-14 21:09:38 -04:00
Datraen	28872c5008	Merge pull request #1923 from Yoshax/supplygroups ... Adjusts cargo categories	2016-06-14 21:07:37 -04:00
Arokha Sieyes	5d6eff7e57	Merge pull request #358 from VOREStation/sync ... Polaris Sync	2016-06-14 19:29:43 -04:00
Arokha Sieyes	e591cadd7b	Merge pull request #360 from VOREStation/gun-fetish ... PDW added	2016-06-14 19:26:54 -04:00
Spades	f6871d2656	Almost forgot the AP rounds!	2016-06-14 17:41:47 -04:00
Spades	0433d9bf83	Derp.	2016-06-14 17:17:33 -04:00
Spades	1f48a98ba4	Official Vorestation SMG. *nodnod*	2016-06-14 17:16:29 -04:00
Spades	51be44fef0	PDW added	2016-06-14 17:11:57 -04:00
Arokha Sieyes	c15c4da829	Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync	2016-06-14 16:48:00 -04:00