Chinsky 3796c034f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev ...

Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
	maps/tgstation2.dmm

2014-10-20 04:52:45 +04:00

..

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

Fixes #6759

2014-10-18 07:56:11 +10:30

cult

Unnamed manifest ghosts now receive their role as name.

2014-10-19 15:19:21 +02:00

epidemic

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

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

events

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev

2014-10-12 02:06:27 +10:30

extended

…

heist

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

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

malfunction

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +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

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev

2014-10-12 02:06:27 +10:30

ninja

Replaces antag intro text and objective announcement with a proc.

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

nuclear

Fixes #6613 and #6492

2014-10-08 23:10:12 +10: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

Round-end summary now also lists job

2014-09-30 10:07:59 +02:00

wizard

Adds a scrying orb for wizards

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

events.dm

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

factions.dm

…

game_mode.dm

Merge repair

2014-10-03 16:04:31 -04:00

gameticker.dm

Fixes #6752

2014-10-18 08:09:50 +10:30

intercept_report.dm

Efficiency: Joblist

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

newobjective.dm

Organ rewrite mapclean attempt.

2014-09-29 06:18:58 +09:30

objective.dm

Reimplements ninja and cult species rarity bonuses.

2014-09-30 12:17:33 +09:30

setupgame.dm

And now tested in game, with some fixes.

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