PsiOmega 0468f12e91 Merge remote-tracking branch 'upstream/dev' into APC ...

Conflicts:
	code/game/gamemodes/events/power_failure.dm
	code/modules/power/smes.dm

2014-11-11 14:13:02 +01:00

..

autotraitor

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

blob

More Z-level compatibility

2014-11-03 09:57:56 +01:00

calamity

Completes the basic random event manager.

2014-11-08 18:22:31 +01:00

changeling

Merge pull request #6791 from Zuhayr/dev

2014-10-21 01:13:17 +04:00

cult

Merge remote-tracking branch 'upstream/dev' into Ghosts

2014-11-06 08:40:18 +01:00

epidemic

Made spawning with a loyalty implant compliant to configuration...

2014-07-14 17:21:11 -04:00

events

Merge remote-tracking branch 'upstream/dev' into APC

2014-11-11 14:13:02 +01:00

extended

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

heist

Makes heist unvotable and fixes the language bug with spawned vox.

2014-10-17 14:20:39 +10:30

malfunction

fixes some annoying punctuation errors.

2014-10-22 15:58:27 -04:00

meme

Replaces antag intro text and objective announcement with a proc.

2014-07-30 21:36:31 +09:30

meteor

Fix meteors

2014-09-28 15:59:02 +01:00

mutiny

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

ninja

Replaces antag intro text and objective announcement with a proc.

2014-07-30 21:36:31 +09:30

nuclear

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

revolution

More Z-level compatibility

2014-11-03 09:57:56 +01:00

sandbox

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

traitor

Uplink Shopping List

2014-10-30 08:49:50 +01:00

wizard

Adds a scrying orb for wizards

2014-08-27 10:09:56 +04:00

events.dm

More Z-level compatibility

2014-11-03 09:57:56 +01:00

factions.dm

…

game_mode.dm

Uplink Shopping List

2014-10-30 08:49:50 +01:00

gameticker.dm

Merge conflict resolution.

2014-11-10 13:00:06 +10:30

intercept_report.dm

Efficiency: Joblist

2014-03-10 21:57:36 -05:00

newobjective.dm

More Z-level compatibility

2014-11-03 09:57:56 +01:00

objective.dm

More Z-level compatibility

2014-11-03 09:57:56 +01:00

setupgame.dm

And now tested in game, with some fixes.

2014-02-10 22:47:29 -06:00