Neerti bedeb1fdff Hopefully fixes some bugs that came out of that merge.

2015-09-06 20:00:01 -04:00

..

antagonist

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge

2015-09-06 18:26:06 -04:00

area

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge

2015-09-06 18:26:06 -04:00

dna

…

gamemodes

Hopefully fixes some bugs that came out of that merge.

2015-09-06 20:00:01 -04:00

jobs

Hopefully fixes some bugs that came out of that merge.

2015-09-06 20:00:01 -04:00

machinery

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge

2015-09-06 18:26:06 -04:00

magic

…

mecha

Merge remote-tracking branch 'upstream/dev' into 150822-Intercoms

2015-09-02 10:54:04 +02:00

objects

Hopefully fixes some bugs that came out of that merge.

2015-09-06 20:00:01 -04:00

turfs

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge

2015-09-06 18:26:06 -04:00

vehicles

…

verbs

…

asteroid.dm

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

atoms_movable.dm

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

2015-08-14 08:34:42 +02:00

atoms.dm

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

base_turf.dm

Hopefully fixes some bugs that came out of that merge.

2015-09-06 20:00:01 -04:00

json.dm

…

periodic_news.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

response_team.dm

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

2015-09-05 09:35:02 +02:00

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

fix #10617

2015-08-13 21:01:46 +01:00