phil235 56c853f9d6 Merge branch 'master' of https://github.com/tgstation/-tg-station into bodybagfix1 ...

Conflicts:
	code/modules/mob/living/simple_animal/friendly/mouse.dm

2014-10-21 15:58:39 +02:00

..

blobs

Merge branch 'master' of https://github.com/tgstation/-tg-station into bodybagfix1

2014-10-21 15:58:39 +02:00

blob_finish.dm

Blob rounds are now reported as a win if the blob wins and vice versa (just like malf, nuke, rev)

2014-09-23 16:29:05 +02:00

blob_report.dm

Nuke Op Instructions Tweak

2014-09-06 15:00:01 -06:00

blob.dm

Reverts Antag selection happening before job selection

2014-10-09 22:57:19 +01:00

overmind.dm

Changes faction to list and edits hostile mobs to use the list type faction, along with changing existing factions to match the new list type

2014-07-12 20:03:46 -07:00

powers.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

theblob.dm

Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere.

2014-10-15 18:03:06 +02:00