Poojawa 789064a3a5 Clean up .rej files

2017-06-28 02:24:03 -05:00

..

processing

Merge pull request #1458 from Citadel-Station-13/upstream-merge-28146

2017-06-14 08:54:17 -05:00

acid.dm

…

air.dm

Renames Air subsystem to Atmospherics

2017-06-10 19:11:24 -05:00

assets.dm

…

atoms.dm

another huge sync

2017-06-21 18:00:00 -05:00

augury.dm

…

blackbox.dm

another huge sync

2017-06-21 18:00:00 -05:00

communications.dm

…

dbcore.dm

Fixes faulty query and logic

2017-05-31 08:39:39 -05:00

disease.dm

…

events.dm

…

explosion.dm

…

fire_burning.dm

…

garbage.dm

…

icon_smooth.dm

…

inbounds.dm

…

ipintel.dm

…

job.dm

another huge sync

2017-06-21 18:00:00 -05:00

language.dm

…

lighting.dm

…

machines.dm

Fixes SSmachines using colons

2017-05-29 11:04:13 -05:00

mapping.dm

Merge pull request #1697 from Citadel-Station-13/upstream-merge-28600

2017-06-26 06:24:31 -05:00

minimap.dm

…

mobs.dm

…

npcpool.dm

…

orbit.dm

…

pai.dm

…

parallax.dm

…

persistence.dm

…

ping.dm

…

radio.dm

…

religion.dm

…

server_maint.dm

…

shuttle.dm

Update shuttle.dm

2017-06-26 08:01:38 -05:00

spacedrift.dm

…

squeak.dm

…

stickyban.dm

…

sun.dm

…

tgui.dm

…

throwing.dm

…

ticker.dm

another huge sync

2017-06-21 18:00:00 -05:00

time_track.dm

…

timer.dm

another huge sync

2017-06-21 18:00:00 -05:00

title.dm

…

vote.dm

…

weather.dm

…