Ccomp5950 11eefbc4c9 Merge pull request #9856 from Hubblenaut/dev ...

Beret Resprites

2015-08-19 17:56:37 -04:00

..

antagonist

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

2015-08-19 07:04:40 +01:00

area

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

2015-08-19 07:04:40 +01:00

dna

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

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

gamemodes

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

2015-08-19 07:17:03 +01:00

jobs

Merge with master.

2015-08-18 11:31:10 -07:00

machinery

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-08-18 11:32:46 -07:00

magic

…

mecha

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

objects

Merge pull request #9856 from Hubblenaut/dev

2015-08-19 17:56:37 -04:00

turfs

Adds more decals. Moving turfs now includes under/overlays.

2015-08-19 10:44:42 +02:00

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

…

response_team.dm

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

fix #10617

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