Mieszko Jędrzejczak 8f5ddf2be1 Fixes conflicts, conflicts.

2016-07-10 13:03:01 +02:00

..

area

Mass replace

2016-07-07 19:34:02 -07:00

dna

Mass replace

2016-07-07 19:34:02 -07:00

gamemodes

Fixes conflicts, conflicts.

2016-07-10 13:03:01 +02:00

jobs

Mass replace

2016-07-07 19:34:02 -07:00

machinery

Merge pull request #4929 from Fox-McCloud/hit-reactions

2016-07-09 18:30:37 -04:00

magic

…

mecha

Mass replace

2016-07-07 19:34:02 -07:00

objects

Fixes conflicts, conflicts.

2016-07-10 13:03:01 +02:00

turfs

Mass replace

2016-07-07 19:34:02 -07:00

verbs

Mass replace

2016-07-07 19:34:02 -07:00

alternate_appearance.dm

Fixes alternate appearance clobbering

2016-07-07 16:25:46 -04:00

asteroid.dm

Loadouts

2016-07-06 22:26:42 +02:00

atoms_movable.dm

Mass replace

2016-07-07 19:34:02 -07:00

atoms.dm

Mass replace

2016-07-07 19:34:02 -07:00

data_huds.dm

Mass replace

2016-07-07 19:34:02 -07:00

response_team.dm

Mass replace

2016-07-07 19:34:02 -07:00

shuttle_engines.dm

Fixes shuttle smoothing

2016-04-21 21:35:53 -04:00

skincmd.dm

Mass replace

2016-07-07 19:34:02 -07:00

smoothwall.dm

…

sound.dm

Mass replace

2016-07-07 19:34:02 -07:00