4155 Commits

Author	SHA1	Message	Date
kevinz000	13b0ae2b45	Merge pull request #676 from Citadel-Station-13/upstream-merge-26725 ... [MIRROR] Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass	2017-05-07 19:37:35 -07:00
kevinz000	78d64cbeed	Merge pull request #825 from Citadel-Station-13/upstream-merge-26941 ... [MIRROR] C4 planting takes 3 seconds, down from 5	2017-05-07 12:59:10 -07:00
CitadelStationBot	1a5050692b	Fixes his grace CtrlClick	2017-05-07 11:33:55 -05:00
CitadelStationBot	b0cceb8766	C4 planting takes 3 seconds, down from 5	2017-05-07 09:31:51 -05:00
kevinz000	cd95e42b69	Merge pull request #753 from Citadel-Station-13/upstream-merge-26870 ... [MIRROR] Adds an effect to Mending Mantra to show who is chanting it	2017-05-07 07:08:06 -07:00
kevinz000	d9908a74a7	Merge pull request #748 from Citadel-Station-13/upstream-merge-26808 ... [MIRROR] Adds aesthetic basalt floor tiles	2017-05-07 06:24:50 -07:00
kevinz000	035dd93158	Merge pull request #756 from Citadel-Station-13/upstream-merge-26848 ... [MIRROR] Adds spewium toxin in traitor kits	2017-05-06 21:43:08 -07:00
kevinz000	c8dbcb8597	Merge pull request #754 from Citadel-Station-13/upstream-merge-26863 ... [MIRROR] Fixes dropped cyborg repair modules	2017-05-06 21:30:12 -07:00
kevinz000	1168d06c9e	Merge pull request #759 from Citadel-Station-13/upstream-merge-26849 ... [MIRROR] New Tree Sprites	2017-05-06 21:25:06 -07:00
kevinz000	329190d660	Merge pull request #809 from Citadel-Station-13/upstream-merge-26933 ... [MIRROR] Makes medbay vending machines buildable	2017-05-06 14:22:08 -07:00
kevinz000	638250993c	Merge pull request #770 from Citadel-Station-13/upstream-merge-26873 ... [MIRROR] Fixes grammar error on spawner grenades	2017-05-06 14:11:18 -07:00
kevinz000	d1a8f643d6	Merge pull request #738 from Citadel-Station-13/upstream-merge-26774 ... [MIRROR] Fixes alien eggs	2017-05-06 13:59:33 -07:00
CitadelStationBot	30f7e170a3	Makes medbay vending machines buildable	2017-05-06 13:52:12 -05:00
CitadelStationBot	f85a44ed52	2017 Cult Overhaul P1: Cult Master and Datum Cult	2017-05-06 11:56:16 -05:00
CitadelStationBot	56d5e12263	Moves languages to a holder datum, gives mind its own language holder	2017-05-05 08:13:04 -05:00
CitadelStationBot	5de94c22e7	Fixes grammar error on spawner grenades	2017-05-04 20:25:46 -05:00
CitadelStationBot	4a142759a0	New Tree Sprites	2017-05-04 17:58:58 -05:00
CitadelStationBot	46d7976488	Adds spewium toxin in traitor kits	2017-05-04 17:53:42 -05:00
CitadelStationBot	34bf3e4113	Fixes dropped cyborg repair modules	2017-05-04 17:50:32 -05:00
CitadelStationBot	827bbb13c2	Adds an effect to Mending Mantra to show who is chanting it	2017-05-04 17:49:28 -05:00
CitadelStationBot	da781e0d76	Adds aesthetic basalt floor tiles	2017-05-04 06:12:26 -05:00
CitadelStationBot	7c56c058b3	Adds examining mouths with flashlights	2017-05-04 06:11:22 -05:00
LetterJay	d5ade71ea9	Merge pull request #706 from Citadel-Station-13/upstream-merge-26745 ... [MIRROR] Adds persistent trophy cases	2017-05-03 22:49:50 -05:00
CitadelStationBot	021f55a4d1	Fixes alien eggs	2017-05-03 22:22:26 -05:00
CitadelStationBot	33a93a611b	Curator Update	2017-05-03 22:22:12 -05:00
LetterJay	337e9ca937	Merge pull request #715 from Citadel-Station-13/upstream-merge-26769 ... [MIRROR] Fixes proximity sensors not tracking correctly	2017-05-02 18:45:21 -05:00
CitadelStationBot	ce302f4fe7	Trophy case hotfixes	2017-05-02 14:37:11 -05:00
LetterJay	fe5e1db512	Merge pull request #718 from Citadel-Station-13/upstream-merge-26765 ... [MIRROR] Makes golems able to transfer into empty shells	2017-05-02 12:24:24 -05:00
LetterJay	6310292531	woo	2017-05-02 11:19:14 -05:00
CitadelStationBot	25f1b24f62	Makes golems able to transfer into empty shells	2017-05-02 10:00:33 -05:00
CitadelStationBot	913a0c7c7f	Fixes proximity sensors not tracking correctly	2017-05-02 09:55:15 -05:00
LetterJay	3b8484b52b	Merge pull request #579 from Citadel-Station-13/upstream-merge-26129 ... [MIRROR] Unorphans the blackbox	2017-05-02 05:13:49 -05:00
LetterJay	4a6ffec412	rej cleanup	2017-05-02 04:56:46 -05:00
CitadelStationBot	036109de58	Changes a bunch of hrefs to the proper defines	2017-05-02 02:20:07 -05:00
CitadelStationBot	ea3ee7accc	Adds persistent trophy cases	2017-05-01 17:31:24 -05:00
CitadelStationBot	cc0a9b87fb	Changes /obj/machinery to have atom/movable occupants	2017-05-01 15:58:52 -05:00
LetterJay	b57a4aa6b4	Merge branch 'master' into upstream-merge-26386	2017-05-01 15:27:25 -05:00
LetterJay	7c02c0ef6a	Merge pull request #649 from Citadel-Station-13/upstream-merge-26678 ... [MIRROR] Ports chem grenades to Initialize	2017-05-01 07:58:20 -05:00
LetterJay	5cab328632	Merge pull request #638 from Citadel-Station-13/upstream-merge-26536 ... [MIRROR] Nerfs and buffs The Traps	2017-05-01 07:44:15 -05:00
CitadelStationBot	fad23e97c3	Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass	2017-05-01 07:24:29 -05:00
LetterJay	06bfa8770e	Merge branch 'master' into upstream-merge-26129	2017-04-29 11:45:37 -05:00
LetterJay	991fb8335c	manual merge	2017-04-29 11:42:28 -05:00
CitadelStationBot	9d50549c22	Ports chem grenades to Initialize	2017-04-29 08:13:56 -05:00
LetterJay	0cf401934b	manual merge	2017-04-29 07:57:16 -05:00
CitadelStationBot	daeba2eec7	Zombie/limb refactors/fixes	2017-04-28 21:05:06 -05:00
CitadelStationBot	e1883354ba	Nerfs and buffs The Traps	2017-04-28 21:03:57 -05:00
CitadelStationBot	941246e8fe	Tank suicide no longer gibs w/o enough pressure	2017-04-28 20:59:39 -05:00
CitadelStationBot	717d63f129	Adds new debug verb for highlighting roundstart ATs	2017-04-28 10:59:14 -05:00
LetterJay	a39b40d879	Merge pull request #578 from Citadel-Station-13/upstream-merge-25981 ... [MIRROR] Initialize Refactor	2017-04-28 09:29:00 -05:00
CitadelStationBot	caaf42815a	Changes some << to to_chat	2017-04-28 06:14:47 -05:00