PsiOmega 0468f12e91 Merge remote-tracking branch 'upstream/dev' into APC ...

Conflicts:
	code/game/gamemodes/events/power_failure.dm
	code/modules/power/smes.dm

2014-11-11 14:13:02 +01:00

..

area

Merge remote-tracking branch 'upstream/dev' into APC

2014-11-11 14:13:02 +01:00

dna

Manual icon file merge.

2014-10-11 06:40:36 +10:30

gamemodes

Merge remote-tracking branch 'upstream/dev' into APC

2014-11-11 14:13:02 +01:00

jobs

Service personnel get their own radio frequency

2014-11-07 20:54:57 +01:00

machinery

Merge remote-tracking branch 'upstream/dev' into APC

2014-11-11 14:13:02 +01:00

magic

…

mecha

Merge conflict resolution.

2014-11-10 13:00:06 +10:30

objects

Compile issues with the merge. PDA tapping may be broken for pAIs.

2014-11-10 13:17:17 +10:30

turfs

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

vehicles

…

verbs

Ports verb-optimizations from /tg/

2014-11-05 08:52:56 +01:00

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

Service personnel get their own radio frequency

2014-11-07 20:54:57 +01:00

json.dm

…

response_team.dm

Merge pull request #6075 from MrSnapwalk/ertv3

2014-08-22 05:01:02 -05:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

Noted a wall-deletion optimization made over at -tg. Credit to @Aranclanos.

2014-08-19 10:50:17 +02:00

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Stack update

2014-09-02 09:59:32 +04:00