Tigercat2000 bcb4a9601f Merge remote-tracking branch 'upstream/master' into poolit ...

Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm

2015-06-22 13:40:07 -07:00

..

area

Fixes all your problems...

2015-06-20 14:47:45 +02:00

dna

Fixes DNA modifier drag-drop runtime

2015-06-15 08:45:19 -04:00

gamemodes

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

2015-06-22 13:40:07 -07:00

jobs

Added brig physician jumpsuit. Brig Physician spawns with one, i also put one spare into locker.

2015-06-17 02:11:01 +02:00

machinery

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

2015-06-22 13:40:07 -07:00

magic

…

mecha

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

2015-06-22 13:40:07 -07:00

objects

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

2015-06-22 13:40:07 -07:00

structure

Adds chickenman and clown statues

2015-05-28 15:55:55 -04:00

turfs

Merge pull request #1355 from tigercat2000/tgetor2

2015-06-22 16:37:23 -04:00

vehicles

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

2015-06-22 13:40:07 -07:00

verbs

First 1/3 of port done.

2015-05-25 17:59:30 -04:00

asteroid.dm

…

atoms_movable.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

atoms.dm

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

2015-06-22 13:40:07 -07:00

json.dm

…

response_team.dm

Fixes engie ERT's infinitely-duplicable materials

2015-06-08 05:42:02 -04:00

shuttle_engines.dm

Add CanAtmosPass to shuttle windows

2015-04-30 19:45:48 -07:00

skincmd.dm

…

smoothwall.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

2/3 of port done

2015-05-25 19:48:13 -04:00