variableundefined 34aadd6b25 Manually revert Purpose's smooth plating PR's smoothing component

2018-10-16 08:57:10 +08:00

..

area

Resolves conflicts.

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

dna

Resolves conflicts.

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

gamemodes

fixes cling stasis users not waking up

2018-10-15 06:09:00 -04:00

jobs

Resolves conflicts.

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

machinery

added description

2018-10-14 08:36:18 -04:00

magic

…

mecha

Merge pull request #9677 from DesolateG/global

2018-10-12 13:18:28 +08:00

objects

Merge pull request #9858 from Ty-Omaha/stunbaton-runtime

2018-10-15 13:17:30 +08:00

turfs

Manually revert Purpose's smooth plating PR's smoothing component

2018-10-16 08:57:10 +08:00

verbs

Resolves conflicts.

2018-10-11 05:36:22 -05: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

Abductor Update

2018-07-24 19:49:10 -04:00

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