oranges 78b73b5163 Merge pull request #18292 from ChangelingRain/mercyofRATVAR ...

Adds the Clockwork Obelisk, Mania Motor, and Vitality Matrix

2016-06-07 13:08:01 +12:00

..

area

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

gamemodes

Merge pull request #18292 from ChangelingRain/mercyofRATVAR

2016-06-07 13:08:01 +12:00

machinery

Merge pull request #18282 from coiax/removing-spawn

2016-06-07 10:21:54 +12:00

mecha

Merge pull request #18156 from X-TheDark/mech_battery_tweaks

2016-06-06 01:17:57 +12:00

objects

Merge pull request #18292 from ChangelingRain/mercyofRATVAR

2016-06-07 13:08:01 +12:00

pooling

…

turfs

Merge pull request #18254 from xxalpha/double_niggers

2016-06-07 10:02:59 +12:00

verbs

Conflicts II

2016-05-17 07:13:01 -04:00

alternate_appearance.dm

…

asteroid.dm

prevents capsules from breaching escape shuttle

2016-05-23 02:14:20 -04:00

atoms_movable.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

atoms.dm

Merge pull request #18241 from phil235/BloodRefactor

2016-06-07 10:09:35 +12:00

communications.dm

…

data_huds.dm

…

say.dm

…

shuttle_engines.dm

…

skincmd.dm

…

sound.dm

…