PsiOmegaDelta 12fb0bdb10 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower ...

Conflicts:
	code/modules/nano/nanoui.dm

2015-12-06 12:10:33 +01:00

..

antagonist

Merge pull request #11166 from PsiOmegaDelta/150921-UplinkTweak

2015-12-02 09:56:07 +10:30

area

Blobs locations are now more random.

2015-10-13 18:49:55 +02:00

dna

Updates blob

2015-10-05 18:10:16 +03:00

gamemodes

Merge pull request #11349 from PsiOmegaDelta/151023-Wires

2015-11-19 10:11:13 +03:00

jobs

Now fetches the user name from the id, if one is worn.

2015-12-02 09:27:57 +01:00

machinery

Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower

2015-12-06 12:10:33 +01:00

magic

…

mecha

Merge pull request #10172 from LightningIron/mecha

2015-12-02 09:55:19 +10:30

objects

Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower

2015-12-06 12:10:33 +01:00

turfs

Merge pull request #11559 from PsiOmegaDelta/151202-InfraredFix

2015-12-04 04:16:31 +10:30

vehicles

…

verbs

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-12-06 11:34:36 +01:00

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower

2015-11-23 08:57:12 +01:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

…