PsiOmegaDelta f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm

2015-12-13 10:15:29 +01:00

..

equip

qdel/Destroy entries.

2015-07-21 14:22:01 +02:00

projectile

…

ethereal_jaunt.dm

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

2015-07-14 08:21:12 +02:00

genetic.dm

Magical fixes.

2015-07-21 11:34:25 +02:00

harvest.dm

…

mind_transfer.dm

Fixes #10550

2015-12-12 12:47:08 -06:00

shift.dm

…

subjugate.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

targeted.dm

Magical fixes.

2015-07-21 11:34:25 +02:00