mwerezak e9171a9ae3 Adds docking support to shuttles, NanoUI ...

Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/airlock_control.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/modules/shuttles/shuttle.dm
	nano/css/shared.css

2014-06-14 04:10:39 -04:00

..

area_teleport.dm

Some improvement to the teleport scroll and spell code. It unbuckles the user now.

2013-01-17 06:22:29 +00:00

charge.dm

Magic Overhaul Part Deux

2013-12-18 02:30:55 -05:00

conjure.dm

Fixes some sounds

2014-01-16 05:23:32 -05:00

construct_spells.dm

Magic Overhaul

2013-12-14 05:54:03 -05:00

dumbfire.dm

Magic Overhaul

2013-12-14 05:54:03 -05:00

emplosion.dm

Fixed Issue 897

2012-09-08 07:04:22 +00:00

ethereal_jaunt.dm

Fixes #5098

2014-06-01 13:29:18 -04:00

explosion.dm

Fixed Issue 897

2012-09-08 07:04:22 +00:00

genetic.dm

Nerf hulk.

2014-03-20 13:15:58 -04:00

horsemask.dm

Magic Overhaul

2013-12-14 05:54:03 -05:00

inflict_handler.dm

Magic Overhaul

2013-12-14 05:54:03 -05:00

knock.dm

Adds docking support to shuttles, NanoUI

2014-06-14 04:10:39 -04:00

mind_transfer.dm

Magic Overhaul

2013-12-14 05:54:03 -05:00

projectile.dm

Magic Overhaul

2013-12-14 05:54:03 -05:00

trigger.dm

Garbage collection fixes

2014-02-19 20:24:31 -05:00

turf_teleport.dm

Fixed Issue 897

2012-09-08 07:04:22 +00:00

wizard.dm

Standardize LASER, NOCLONE, and HUSK

2014-01-21 22:59:53 -05:00