PsiOmega 1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning ...

Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm

2015-04-24 17:13:37 +02:00

..

alien

Replaced display_name with name, worked on severing limbs and damage propagation.

2015-03-25 19:07:22 +10:30

mutiny

…

outsider

Ports /vg/'s spell system for the sake of cult porting.

2015-04-09 20:08:06 +02:00

station

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

2015-04-24 17:13:37 +02:00

antagonist_build.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

antagonist_globals.dm

…

antagonist_helpers.dm

…

antagonist_objectives.dm

Resolving bugs with spawn order and delays.

2015-03-21 11:49:42 +10:30

antagonist_spawn.dm

Resolving bugs with spawn order and delays.

2015-03-21 11:49:42 +10:30

antagonist.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00