23479 Commits

Author	SHA1	Message	Date
Aurorablade	78eb685ac6	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub	2016-10-12 20:25:48 -04:00
Fox McCloud	4874d1c95c	Merge pull request #5695 from FlattestGuitar/logs ... Renames some bullets so they're easier to track	2016-10-12 17:15:27 -04:00
FlattestGuitar	15684d4850	Only bullets now	2016-10-12 23:07:01 +02:00
Fox McCloud	dfde050407	Merge pull request #5644 from GeneralChaos81/Conveyors ... Port of TGs conveyors	2016-10-11 20:27:46 -04:00
TheDZD	b108a639b7	Merge pull request #5762 from Fox-McCloud/power-gloves ... Power Gloves Sound Fix	2016-10-11 16:52:26 -04:00
TheDZD	568e648bfb	Merge pull request #5581 from Fox-McCloud/cloning-update ... Cloning Update	2016-10-11 16:51:34 -04:00
Fox-McCloud	4df07bd3c3	Power Gloves Sound Fix	2016-10-11 11:51:59 -04:00
TheDZD	e9574ebf4a	Merge pull request #5627 from Fox-McCloud/game-mode-cleanup ... Removes Unused Gamemodes	2016-10-10 21:00:33 -04:00
TheDZD	0b227c3d5b	Merge pull request #5646 from Fox-McCloud/grenade-tweak ... Atmos Grenade Balance	2016-10-10 20:54:23 -04:00
Fox McCloud	e698390a4a	Merge pull request #5679 from Crazylemon64/rnd_console_fix ... Makes the rnd console less prone to freezing	2016-10-10 20:44:19 -04:00
Fox McCloud	e0dd6c37b4	Merge pull request #5684 from shazbot194/master ... Small fixes for foam force weapons and smg mags	2016-10-10 20:41:17 -04:00
TheDZD	810f2adfb4	Merge pull request #5685 from Fox-McCloud/alert-fixes ... Fixes Alert Images	2016-10-10 20:38:07 -04:00
Fox McCloud	c943894282	Merge pull request #5706 from Codingale/BloodFix ... Fixes #5673 (Can not inject blood of compeltely drained bodies)	2016-10-10 20:29:23 -04:00
Fox McCloud	ce04590e25	Merge pull request #5752 from Markolie/antaghud ... AntagHUD fixes	2016-10-10 20:24:42 -04:00
Fox McCloud	74d475eaeb	Merge pull request #5758 from FlattestGuitar/actualnukiefix ... Actually fixes the cyberimplants this time	2016-10-10 20:21:24 -04:00
Fox McCloud	1525b0c019	Merge pull request #5760 from Markolie/nukefinish ... De-snowflakes Dronespeak	2016-10-10 20:21:06 -04:00
TheDZD	20078cbb48	Merge pull request #5755 from Fox-McCloud/loading-fixes ... Fixes Dual Location Objects with Grinder and Biogenerator	2016-10-10 20:18:24 -04:00
Markolie	92bc8350ad	Handle Drone radio	2016-10-10 23:54:16 +02:00
Markolie	4528e4d469	De-snowflakes Dronespeak	2016-10-10 23:42:31 +02:00
Mieszko Jędrzejczak	a64f1849c0	Actually fixes the implants this time	2016-10-10 12:51:56 +02:00
Fox McCloud	45974cf6bd	Merge pull request #5721 from FalseIncarnate/bug_fix ... Arcade duplication fix	2016-10-09 14:17:59 -04:00
Fox-McCloud	f7f1e493ed	Fixes Dual Location Objects with Grinder and Biogenerator	2016-10-09 14:04:52 -04:00
Fox McCloud	b878e315f1	Merge pull request #5754 from Markolie/nukefinish ... Better nuke disk finish checking	2016-10-09 13:57:44 -04:00
Markolie	1b3cae082e	Better nuke disk finish checking	2016-10-09 19:06:42 +02:00
Fox McCloud	0646ace084	Merge pull request #5641 from LittleBigKid2000/numbers-in-char-names ... Character names can now have numbers	2016-10-09 12:58:42 -04:00
Fox McCloud	cec8e4853c	Merge pull request #5731 from LittleBigKid2000/guardian-ghosts ... Ghosts of tossed out guardians are now respawnable	2016-10-09 12:52:52 -04:00
Fox McCloud	ab8f0d7b5d	Merge pull request #5753 from Markolie/master ... AI fixes	2016-10-09 12:41:48 -04:00
Fox McCloud	f5b1fd6011	Merge pull request #5744 from FlattestGuitar/unequip ... NODROP items won't spam horribly when being held with a broken hand.	2016-10-09 12:41:09 -04:00
Fox McCloud	230ec7603d	Merge pull request #5750 from FlattestGuitar/nukiefix ... Fixes nukie cyberimplants being free	2016-10-09 12:31:14 -04:00
Markolie	8a2a9ee3b0	Fixes multiple holograms being active at the same time, fixes AI's being unable to set wanted status.	2016-10-09 18:20:20 +02:00
Fox McCloud	24fa19782b	Merge pull request #5748 from FlattestGuitar/cluwnefix ... Fixes clowns getting their old name in the assasinate objective :v	2016-10-09 11:54:40 -04:00
Markolie	514222b6d7	Fixes silicons not having their antag powers/antagHUD removed properly. Fixes traitors/abductors not having their antagHUD added at roundstart.	2016-10-09 16:36:09 +02:00
Aurorablade	44d2243e26	yay.	2016-10-08 22:51:54 -04:00
Aurorablade	e2ce799aa1	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub	2016-10-08 22:21:48 -04:00
Aurorablade	d7a7815297	conflict time	2016-10-08 22:14:08 -04:00
FlattestGuitar	7592c65fe0	❄️ ❄️ ❄️ ❄️ ❄️ ❄️ ❄️ ❄️ ❄️	2016-10-07 20:13:24 +02:00
FlattestGuitar	f07f476a3c	Fixes cluwnes forever	2016-10-07 10:56:36 +02:00
FlattestGuitar	176d6cffae	no more nodrop spam	2016-10-05 15:44:01 +02:00
Isaac Erwin	0cc8a94d5d	Fine	2016-10-04 17:49:42 -04:00
Fox McCloud	3201ea3ccb	Merge pull request #5738 from FlattestGuitar/fix ... adds logs to missionary stuffs	2016-10-04 08:36:16 -04:00
FlattestGuitar	03cc776d40	moves the stuffs to mind.dm	2016-10-04 13:58:30 +02:00
Fox McCloud	d51834cbef	Merge pull request #5737 from Crazylemon64/maroon_fix ... Maroon now works as intended	2016-10-02 10:51:51 -04:00
Fox McCloud	9b1aad4cf8	Merge pull request #5716 from FlattestGuitar/snpc ... Ckeyless humans no longer get targeted by the assasinate objective	2016-10-02 10:51:12 -04:00
Fox McCloud	26fe47faa7	Merge pull request #5638 from theColdflame/10mmuplink ... Adds 10mm variants to the syndicate uplink.	2016-10-02 10:48:32 -04:00
FlattestGuitar	dedea7c1d2	adds logs to missionary stuffs	2016-10-02 16:48:27 +02:00
Fox McCloud	0b2b631b68	Merge pull request #5735 from FlattestGuitar/rutime-fix ... Fixes a hallucination runtime	2016-10-02 10:47:41 -04:00
Crazylemon64	a93663ac91	Maroon now works as intended	2016-10-01 22:58:16 -07:00
Mieszko Jędrzejczak	89dff895bb	makes it work	2016-10-02 00:48:31 +02:00
Mieszko Jędrzejczak	5296df4473	adds a neat uniform	2016-10-01 22:02:27 +02:00
FlattestGuitar	503287d89a	adresses things	2016-09-30 17:10:26 +02:00