Poojawa 789064a3a5 Clean up .rej files

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

..

area

Ancient Space Station [Space Spawn Ruin]

2017-06-25 11:03:27 -05:00

gamemodes

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

2017-06-26 06:14:55 -05:00

machinery

Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584

2017-06-27 21:25:50 -05:00

mecha

rej cleanup

2017-06-26 23:19:17 -05:00

objects

Clean up .rej files

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

turfs

Adds some neat tiles and walls for use on lavaland

2017-06-26 09:19:17 -05:00

alternate_appearance.dm

…

atoms_movable.dm

Fixes things getting unbuckled in nullspace (#1606)

2017-06-20 08:04:01 -07:00

atoms.dm

Adds container types INJECTABLE and DRAWABLE

2017-06-27 08:19:49 -05:00

communications.dm

…

data_huds.dm

…

say.dm

[MIRROR] Fixes saying nothing when you have no language (#861)

2017-05-18 06:12:39 -05:00

shuttle_engines.dm

Shuttle engines affecting travel time

2017-06-25 20:53:00 -05:00

skincmd.dm

…

sound.dm

Ancient Space Station [Space Spawn Ruin]

2017-06-25 11:03:27 -05:00