Zuhayr 97801b4617 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

2014-09-29 00:39:43 +09:30

..

autotraitor

Replaces antag intro text and objective announcement with a proc.

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

blob

Fixes FEA temperature_expose() being used...

2014-06-22 00:13:22 -04:00

calamity

Merge pull request #6455 from Zuhayr/master

2014-09-20 00:07:56 +04:00

changeling

Replaces antag intro text and objective announcement with a proc.

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

cult

Fixes #6440

2014-09-18 07:45:44 +02:00

epidemic

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

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

events

Merge resolution, replaced 2 wires lost in map merge.

2014-09-25 23:54:24 +09:30

extended

…

heist

Lowercasing some Del() calls.

2014-08-02 00:15:49 +09:30

malfunction

iFail typo fix

2014-09-14 06:31:34 +02: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

Stack update

2014-09-02 09:59:32 +04:00

ninja

Replaces antag intro text and objective announcement with a proc.

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

nuclear

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

revolution

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

sandbox

shuttle_controller now uses a shuttle datum

2014-06-22 18:10:56 -04:00

traitor

Cleans up radio frequency numbers.

2014-09-18 13:07:34 +02:00

wizard

Adds a scrying orb for wizards

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

events.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

factions.dm

…

game_mode.dm

Updates the Syndicate uplink to use a more robust datum system, rather than the old way of parsing a giant string.

2014-08-29 12:48:12 +02:00

gameticker.dm

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

intercept_report.dm

Efficiency: Joblist

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

newobjective.dm

Stack update

2014-09-02 09:59:32 +04:00

objective.dm

Stack update

2014-09-02 09:59:32 +04:00

setupgame.dm

And now tested in game, with some fixes.

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