Lzimann 3dd6722c07 Fix conflict

2017-03-10 01:39:22 -03:00

..

arrivals.dm

Arrivals Ferry (#24694)

2017-03-10 14:19:34 +13:00

assault_pod.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

computer.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

emergency.dm

Fix conflict

2017-03-10 01:39:22 -03:00

ferry.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

manipulator.dm

Merges map templates and map loader (#24140)

2017-02-19 16:55:02 +13:00

on_move.dm

Arrivals Ferry (#24694)

2017-03-10 14:19:34 +13:00

ripple.dm

Removes zombie shuttle ripples

2016-07-01 10:42:52 +01:00

shuttle.dm

Arrivals Ferry (#24694)

2017-03-10 14:19:34 +13:00

special.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

supply.dm

Fixes a bunch of things being able to get to centcom (#23485)

2017-02-01 15:52:51 +13:00

syndicate.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

transit.dm

Compilation

2016-06-28 13:04:43 +01:00

white_ship.dm

Machine/computer boards and frames refactor (#17300)

2016-05-08 12:11:18 +02:00