24124 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Remie Richards	04fd06cb27	Merge pull request #11834 from Aranclanos/cultwall ... Fixes fingerprints not transfering to the cult wall girder	2015-09-19 14:10:42 +01:00
Remie Richards	316d0b9e1f	Merge pull request #11831 from Aranclanos/names ... Organizes the names in alphabetical order, removing duplicates.	2015-09-19 14:09:53 +01:00
Remie Richards	b3a027b1fe	Merge pull request #11827 from optimumtact/commentatrophe ... clean up more non useful comments	2015-09-19 14:08:56 +01:00
Remie Richards	f5f9ee8ed1	Merge pull request #11821 from Aranclanos/datumpipeline ... Removes some commented out code in datum_pipeline.dm	2015-09-19 14:08:24 +01:00
Remie Richards	9363a14d2f	Merge pull request #11743 from Delimusca/cleanconfusion ... changes confusion to be less RNG garbage	2015-09-19 14:01:58 +01:00
Remie Richards	73f0e984c2	Merge pull request #11784 from phil235/ChangelingSightFix ... Fixes weird bug when changeling with augmented eyesight (that isn't on) readapts.	2015-09-19 13:56:02 +01:00
Remie Richards	a20b7c31dc	Merge pull request #11825 from optimumtact/enforcefiledirs ... Add a tool to ensure no excess file dirs are defined	2015-09-19 13:55:27 +01:00
phil235	966ff4b05a	Merge pull request #11853 from feemjmeem/11850-fix ... partial revert of #11699, fixes #11850 without breaking #11699	2015-09-19 03:18:11 +02:00
Swag McYolosteinen	ad72658c12	Merge pull request #11844 from AnturK/randomfix ... Fixes spellbook refund issue	2015-09-18 16:42:25 +02:00
phil235	d83f6f6d5f	Merge pull request #11608 from Xhuis/blings ... A few shadowling changes	2015-09-18 13:47:30 +02:00
Cheridan	23f69d31b2	Merge pull request #11814 from spasticVerbalizer/ghostPaper ... Allows ghosts to read paper from anywhere	2015-09-17 17:28:39 -05:00
Marc R. Uchniat	75e6b70fbe	partial revert of #11699, fixes #11850 without breaking #11699	2015-09-17 15:12:18 -07:00
Swag McYolosteinen	9e24350297	Merge pull request #11593 from AnturK/misc ... Abductor QoL & Event	2015-09-17 19:25:38 +02:00
Razharas	a48254f31a	Merge pull request #11589 from Ergovisavi/swarmers_revision_2 ... Swarmer rev 2 fixes/changes | Some hostile mob range attack tweaks	2015-09-17 18:27:15 +03:00
AnturK	2ddddc1cdb	Fixes spellbook refund issue	2015-09-17 15:14:34 +02:00
phil235	826fdfac72	Merge pull request #11796 from AnturK/honkspiracysolved ... Purges mime of clown influence	2015-09-17 14:00:02 +02:00
sybil-tgstation13	0006805eb7	Automatic changelog compile	2015-09-17 05:17:00 +00:00
Cheridan	bc3bf6c979	Merge pull request #11810 from feemjmeem/11807-fix ... Completely Useless: fix orion trail text and remove number from Pun Pun	2015-09-16 23:00:50 -05:00
Aranclanos	2e33f9abb7	Fixes fingerprints not transfering to the cult wall girder	2015-09-16 23:49:44 -03:00
Aranclanos	cdc7c3a577	Organizes all names in alphabetical order in all the txts under the config/names folder, removing duplicates.	2015-09-16 23:00:12 -03:00
Cheridan	76d1e6add5	Merge pull request #11556 from bgobandit/hardmeatspike ... MEAT SPIKE EXPANSION	2015-09-16 20:19:42 -05:00
sybil-tgstation13	5842129f28	Automatic changelog compile	2015-09-17 01:03:20 +00:00
Razharas	e26060f299	Merge pull request #11611 from xxalpha/n_u_c_l_e_a_r ... Nuke deconstruction rework	2015-09-17 03:53:49 +03:00
Razharas	32fa762ef7	Merge pull request #11750 from CorruptComputer/RIP ... R.I.P. AsteroidStation 2011-2015	2015-09-17 03:33:49 +03:00
oranges	48f86bc9f5	clean up more non useful comments	2015-09-17 12:23:44 +12:00
oranges	2155207c8d	Add a tool to ensure no excess file dirs are defined ... Also plugs script into the travis buildchain	2015-09-17 11:43:18 +12:00
phil235	b87a25c13c	Merge pull request #11822 from Xhuis/sac_rune_hotfix ... Fixes sacrificed targets not being counted for cult objectives (Hotfix, please speedmerge)	2015-09-17 01:26:12 +02:00
Xhuis	e344997bd9	honke	2015-09-16 18:52:15 -04:00
Xhuis	17ee49cc09	Small fix	2015-09-16 18:43:13 -04:00
Xhuis	73fb009c2d	Fixes some debug code	2015-09-16 18:37:46 -04:00
Xhuis	ca45ec8464	Sacrifice hotfix	2015-09-16 18:35:00 -04:00
xxalpha	6a28c03139	MUH SECURITY ... GUNS	2015-09-16 23:22:49 +01:00
xxalpha	4d4b8e64c1	Merge remote-tracking branch 'upstream/master' into n_u_c_l_e_a_r ... Conflicts: _maps/map_files/TgStation/tgstation.2.1.3.dmm	2015-09-16 23:14:14 +01:00
phil235	3ca12736ca	Merge pull request #11700 from feemjmeem/suicides-sep10 ... suicide messages for damp rag, tanks, and telebaton	2015-09-16 23:57:51 +02:00
Marc R. Uchniat	7cc5cb1ef0	fix semicolon	2015-09-16 12:53:18 -07:00
Marc R. Uchniat	a7d4068d24	Merge remote-tracking branch 'upstream/master' into 11807-fix	2015-09-16 12:51:23 -07:00
Aranclanos	14a68a62df	Removes some commented out code in datum_pipeline.dm that I originally forgot to scrap out.	2015-09-16 16:18:58 -03:00
AnturK	5680634382	Fixes departmentless security runtime	2015-09-16 17:14:07 +02:00
Swag McYolosteinen	fbaf81e01c	Merge pull request #11817 from Steelpoint/DELETE ... DME Problem	2015-09-16 14:19:34 +02:00
Steelpoint	78eaf22766	DELETE	2015-09-16 20:15:11 +08:00
Swag McYolosteinen	3ef5d02cee	Merge pull request #11689 from Steelpoint/RifleS ... Security Weapon Overhaul: Auto Rifle Edition	2015-09-16 13:34:35 +02:00
Steelpoint	f1d2f5a41b	FuckLogs	2015-09-16 18:16:14 +08:00
Steelpoint	cd60f65513	Log	2015-09-16 18:12:31 +08:00
Steelpoint	aaad763928	Changelog	2015-09-16 18:06:52 +08:00
Steelpoint	e51eefbe34	MoreChanges	2015-09-16 18:00:21 +08:00
Steelpoint	62e7f1204d	NewChanges	2015-09-16 17:53:04 +08:00
AnturK	d644f3cacc	Update science.dm ... Fixes RD using medical backpack	2015-09-16 11:39:13 +02:00
Maarten van den Berg	f7d5f7bdd7	Allows ghosts to read paper from anywhere	2015-09-16 10:42:38 +02:00
sybil-tgstation13	a92d633c84	Automatic changelog compile	2015-09-16 05:18:15 +00:00
Marc R. Uchniat	d413ab9f3a	reset pun pun's unique_name to 0 to remove number, fixes #11736	2015-09-15 18:06:58 -07:00