PsiOmega 66c56926d0 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/gamemodes/cult/runes.dm

2015-04-08 10:40:38 +02:00

..

area_teleport.dm

refactor buckling to be more generic

2015-01-12 21:28:31 +00:00

conjure.dm

Beepsky and ED209 are now closer friends than ever, now actually sharing code instead of each having gone and bought their own.

2014-09-04 12:38:51 +02:00

dumbfire.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

emplosion.dm

…

ethereal_jaunt.dm

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

explosion.dm

…

genetic.dm

…

horsemask.dm

Fixes #4780

2014-05-01 23:58:47 -04:00

inflict_handler.dm

Organ rewrite mapclean attempt.

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

knock.dm

Adds docking support to shuttles, NanoUI

2014-06-09 23:41:08 -04:00

mind_transfer.dm

Rune logging.

2015-04-06 09:44:56 +02:00

projectile.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

trigger.dm

…

turf_teleport.dm

…

wizard.dm

…