Lzimann 79d9178adf Fix conflicts

2017-04-25 10:51:49 -03:00

..

area

Remove more datum accesses

2017-04-17 13:37:09 -04:00

gamemodes

Fix conflicts

2017-04-25 10:51:49 -03:00

machinery

Fix conflicts

2017-04-25 10:51:49 -03:00

mecha

Fix conflicts

2017-04-25 10:51:49 -03:00

objects

Fix conflicts

2017-04-25 10:51:49 -03:00

turfs

Proximity sensing refactor (#26260)

2017-04-16 14:48:29 -06:00

alternate_appearance.dm

Changed alternate appearances to /datum/atom_hud s (#26289)

2017-04-23 20:25:52 +02:00

atoms_movable.dm

Moves init_order to defines, moves SSevents above ticker.

2017-04-22 22:08:31 +01:00

atoms.dm

Fix conflicts

2017-04-25 10:51:49 -03:00

communications.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

data_huds.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

say.dm

Small efficiency improvements for saycode

2017-04-07 19:34:44 -04:00

shuttle_engines.dm

…

skincmd.dm

…

sound.dm

Refactors ear damage into ear organs (#26044)

2017-04-22 08:51:03 -04:00