Tigercat2000 6e0bfbbbfa Merge remote-tracking branch 'upstream/master' into okayletstrysomethingslightlydifferent ...

Conflicts:
	maps/cyberiad.dmm

2015-04-28 14:26:43 -07:00

..

area

Popping sound fix

2015-04-22 03:59:10 +02:00

dna

Reintegrate mob fire

2015-04-28 13:57:58 -07:00

gamemodes

Reintegrate mob fire

2015-04-28 13:57:58 -07:00

jobs

Fix ID gender, bit of an agent-ID overhaul

2015-04-09 05:10:41 -07:00

machinery

Merge remote-tracking branch 'upstream/master' into okayletstrysomethingslightlydifferent

2015-04-28 14:26:43 -07:00

magic

…

mecha

[Goonchem] Reagent Decals

2015-04-17 18:27:49 -04:00

objects

Reintegrate mob fire

2015-04-28 13:57:58 -07:00

structure

…

turfs

Apply most/all of LINDA's updates

2015-04-28 12:45:58 -07:00

vehicles

Pod-Locator (probably temporary) sprites!

2015-04-08 13:55:40 -07:00

verbs

First part of Bay admin improvements

2015-04-23 10:01:45 -07:00

asteroid.dm

…

atoms_movable.dm

Disables Perma-Spinning (for now)

2015-03-29 19:05:59 -04:00

atoms.dm

LINDA, Stage 1

2015-04-28 08:43:42 -07:00

json.dm

…

response_team.dm

Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4

2015-03-08 19:05:36 +01:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Removes Recursive Explosions

2015-03-19 03:23:14 -04:00