Giacomand 06e7f401cd Merge branch 'master' of https://github.com/Giacomand/-tg-station into tator_typos ...

Conflicts:
	code/modules/admin/topic.dm

2013-06-20 21:37:30 +01:00

..

blob

Adding google code commits r5836 to r5849. RIP in peace google code.

2013-03-11 04:26:54 +00:00

changeling

Merge pull request #756 from AlexanderUlanH/master

2013-06-19 15:04:28 -07:00

cult

Merge pull request #804 from Ikarrus/tplog

2013-06-19 21:08:14 -07:00

extended

removed asteroids

2012-04-14 00:51:55 +00:00

malfunction

Separates the continuous round config options to be round-specific. For example, one can config wizard rounds don't have to end upon the wizard's death, while Rev rounds will still end upon one side's defeat.

2013-06-04 18:39:36 -05:00

meteor

-Changed emitters.

2012-12-30 10:47:25 +00:00

nuclear

Creates a log entry for each antag created at round start. Useful for admins who need to look back to see if someone was an antag or not.

2013-05-17 16:07:11 -05:00

revolution

Traitor Panel Improvements

2013-06-17 22:39:32 -06:00

sandbox

Missed an exception for a door that does not have a glass doortype

2013-05-15 13:20:16 -04:00

traitor

Merge branch 'master' of https://github.com/Giacomand/-tg-station into tator_typos

2013-06-20 21:37:30 +01:00

wizard

Separates the continuous round config options to be round-specific. For example, one can config wizard rounds don't have to end upon the wizard's death, while Rev rounds will still end upon one side's defeat.

2013-06-04 18:39:36 -05:00

events.dm

Committing carn's modifications to events and other things. Full details below.

2013-02-17 11:44:37 +00:00

factions.dm

Uplink Update:

2013-04-02 01:02:54 +01:00

game_mode.dm

* Fixed spelling typos. Tratior -> Traitor

2013-06-20 21:29:14 +01:00

gameticker.dm

Merge pull request #644 from Ikarrus/latejoin

2013-05-31 23:25:06 -07:00

intercept_report.dm

Committed Rolan7's patch to add more convenience to Hydroponics. The feature list includes:

2012-12-07 13:27:33 +00:00

objective.dm

* Fixed spelling typos. Tratior -> Traitor

2013-06-20 21:29:14 +01:00

setupgame.dm

Fixes for admin-spawned dnainjectors: repeat_string has been simplified (it wasn't making NULLED_SE and NULLED_UI to the correct size).

2013-04-27 06:40:17 +01:00