GinjaNinja32 fb0732dbf4 Merge pull request #11006 from Zuhayr/mixedmodes ...

Added a handful of new mixed-antagonist modes.

2015-09-05 17:01:28 +01:00

..

antagonist

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

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

area

resolves issue with space and unsimulated turfs being odd and dark

2015-08-30 15:27:04 +10:00

dna

Merge remote-tracking branch 'upstream/dev' into 150707-MoreOverlaysFewerStates

2015-07-28 09:16:34 +02:00

gamemodes

Added a handful of new mixed-antagonist modes.

2015-09-05 18:05:39 +09:30

jobs

Merge pull request #11002 from Sligneris/patch-1

2015-09-05 17:29:16 +02:00

machinery

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

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

magic

…

mecha

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

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

objects

Merge pull request #10997 from PsiOmegaDelta/150904-RadioAccess

2015-09-05 16:59:42 +01:00

turfs

Merge pull request #10955 from SkyMarshal/multi-z

2015-09-05 11:36:59 +09:30

vehicles

…

verbs

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

2015-07-14 08:21:12 +02:00

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

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

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