Tigercat2000 bcb4a9601f Merge remote-tracking branch 'upstream/master' into poolit ...

Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm

2015-06-22 13:40:07 -07:00

..

autotraitor

All modes now choose their antagonists before they choose jobs.

2015-05-13 06:14:00 -07:00

blob

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

borer

Z-level check refactor

2015-02-16 20:33:28 +01:00

changeling

Fixes regenerative stasis' organ regeneration

2015-06-20 12:37:25 -04:00

cult

Fixes cult icon removal runtiming, probably

2015-06-19 10:53:34 -04:00

epidemic

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

events

Fix a few ex_act's.

2015-06-21 18:40:00 -07:00

extended

Nuke Ops Rework Phase 2

2014-11-05 06:56:46 -05:00

heist

Removing all mutantrace crap except for slimepeople

2015-04-13 06:20:17 -04:00

malfunction

Explosion Rework

2015-06-20 04:13:55 -04:00

meme

…

meteor

Make flaming meteors more flamey.

2015-06-21 18:54:42 -07:00

mutiny

Missing dmis, final fixes

2015-05-25 20:35:35 -04:00

nations

2/3 of port done

2015-05-25 19:48:13 -04:00

nuclear

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

revolution

Fix revolution. Antag-selection oopsied it.

2015-06-20 16:24:26 -07:00

sandbox

Add shuttle stranding

2015-02-01 16:05:43 +01:00

shadowling

Fixes shadowling end-round report formatting

2015-06-10 10:26:34 -04:00

traitor

Fixes runtime from objectiveless traitors

2015-05-25 07:50:15 -04:00

vampire

second pass

2015-06-07 09:52:52 -04:00

wizard

Explosion Rework

2015-06-20 04:13:55 -04:00

xenos

Overhaul global defines and vars

2015-05-12 20:48:38 -07:00

antag_spawner.dm

Simplify get_candidates, minor adjustment to antag ages

2015-02-12 19:09:05 +01:00

events.dm

Mob Refactor+Update and Pet Collars

2015-05-28 00:20:25 -04:00

factions.dm

…

game_mode.dm

Disable intercept and auto-blue-alert.

2015-05-29 10:17:44 -07:00

gameticker.dm

Adds in a New Title Theme

2015-06-03 18:36:57 -04:00

intercept_report.dm

…

newobjective.dm

Removes Space Ninjas

2015-03-02 19:05:44 -05:00

objective.dm

Objective Tweaks

2015-06-18 02:04:44 -04:00

scoreboard.dm

Z-level check refactor

2015-02-16 20:33:28 +01:00

setupgame.dm

Insulated Gloves Fix

2015-03-08 19:12:35 -04:00

steal_items.dm

Objective Tweaks

2015-06-18 02:04:44 -04:00