tigercat2000 c1dd7dda32 Merge pull request #9837 from variableundefined/RevenantRefactor ...

Improve revenant code a bit

2018-10-20 19:44:19 -07:00

..

area

Resolves conflicts.

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

dna

Resolves conflicts.

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

gamemodes

Merge pull request #9837 from variableundefined/RevenantRefactor

2018-10-20 19:44:19 -07:00

jobs

Update code/game/jobs/job/job.dm

2018-10-21 00:31:34 +02:00

machinery

Deconflict 1

2018-10-21 07:56:55 +08:00

magic

…

mecha

Merge pull request #9363 from MarsM0nd/Refactor_UID

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

objects

Deconflict 1

2018-10-21 07:56:55 +08:00

turfs

Merge pull request #9719 from SamHPurp/smoothing-improvements

2018-10-21 07:41:47 +08: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

Formatting fixes & spanning fish tank

2018-10-13 22:12:37 +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