Lzimann 3dd6722c07 Fix conflict

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

..

processing

Fix coiaxs shit (#24902)

2017-03-10 10:17:21 +13:00

acid.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

air.dm

Replaces the default output with the to_chat wrapper.

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

assets.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

atoms.dm

Makes Initialize check QDELETED before calling (#24818)

2017-03-10 12:03:15 +13:00

augury.dm

Replaces the default output with the to_chat wrapper.

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

communications.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

diseases.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

events.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

fire_burning.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

garbage.dm

Moves cross_address/allowed to the config. Merges the protected config into the regular. (#24584)

2017-03-10 11:10:08 +13:00

icon_smooth.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

inbounds.dm

Fix coiaxs shit (#24902)

2017-03-10 10:17:21 +13:00

ipintel.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

jobs.dm

Replaces the default output with the to_chat wrapper.

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

lighting.dm

Merge pull request #24795 from MrStonedOne/patch-329

2017-03-09 12:31:39 -06:00

machines.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

mapping.dm

Fix conflict

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

minimap.dm

Replaces the default output with the to_chat wrapper.

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

mobs.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

npcpool.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

orbit.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

pai.dm

Replaces the default output with the to_chat wrapper.

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

parallax.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

persistence.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

ping.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

radio.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

religion.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

server_maintenance.dm

Replaces the default output with the to_chat wrapper.

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

shuttles.dm

Fix conflict

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

spacedrift.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

squeak.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

stickyban.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

sun.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

tgui.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

throwing.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

ticker.dm

Replaces the default output with the to_chat wrapper.

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

time_tracking.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

timer.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

title_screen.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00

voting.dm

Replaces the default output with the to_chat wrapper.

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

weather.dm

Repaths subsystem to controller/subsystem (#24624)

2017-03-08 22:05:45 +01:00