Purpose 0fc81f51e4 corrections

2018-10-20 10:18:23 +01:00

..

area

Resolves conflicts.

2018-10-11 05:36:22 -05:00

dna

Resolves conflicts.

2018-10-11 05:36:22 -05:00

gamemodes

corrections

2018-10-20 10:18:23 +01:00

jobs

Resolves conflicts.

2018-10-11 05:36:22 -05:00

machinery

Merge pull request #9810 from SamHPurp/suit-storage-units

2018-10-20 08:25:34 +08:00

magic

…

mecha

Merge pull request #9363 from MarsM0nd/Refactor_UID

2018-10-19 07:46:42 +08:00

objects

Merge pull request #9843 from warior4356/Safe-Refactor

2018-10-19 12:35:59 +08:00

turfs

Merge pull request #9864 from variableundefined/ManualRevert

2018-10-19 19:16:00 -04:00

verbs

Merge-conflict fix + check for null rather than type.

2018-10-12 18:59:54 +02:00

alternate_appearance.dm

…

asteroid.dm

…

atoms_movable.dm

get area master does nothing!

2018-09-30 17:28:47 +01:00

atoms.dm

Merge pull request #9776 from tigercat2000/hover_indicator_inventory

2018-10-10 22:19:26 +08:00

data_huds.dm

…

shuttle_engines.dm

…

sound.dm

Merge pull request #9388 from FreeStylaLT/crunch

2018-10-15 12:52:43 +08:00

world.dm

Resolves conflicts.

2018-10-11 05:36:22 -05:00