Miniature 2a7336f61f Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	config/config.txt

2012-05-12 00:52:42 +09:30

..

Apples

Added Artifact #1

2012-02-24 16:07:35 +00:00

Cael_Aislinn

Fixes a rogue period in Tajaran examine, also fixes various glasses not working on Tajaran.

2012-05-11 00:29:10 +01:00

Chinsky

Small bugfix to ashtrays and cig butts

2012-03-04 06:45:14 +02:00

mapload

Removed and commented out the last traces of goon auth. code

2011-12-30 23:28:14 +02:00

Mini

Merge branch 'master' of github.com:Miniature/Baystation12

2012-05-06 22:15:29 +09:30

Mloc

Hotkeys here! Adds alt-click (pull object), ctrl-Q and ctrl-E (cycle backwards and forwards through the intents).

2012-02-13 20:18:17 +00:00

organs

TG: Apparently organs are being worked on.

2012-03-26 23:08:29 +01:00

Ported

fixed some weird merge issues

2012-05-08 15:43:41 +10:00

SkyMarshal

Updates eraser description and in uplink.

2012-05-07 23:44:48 +01:00

Tastyfish

more pipe stuff

2012-03-22 02:33:24 -04:00

virus2

Updates to Epidemic and virology:

2012-04-29 08:30:15 -07:00

Wrongnumber

Unique sprite fro welderpack

2012-03-08 17:28:06 +02:00

AI_Visibility.dm

Made picking a camera through the camera list actually work, also a couple of comments

2012-05-11 23:59:02 +09:30

buildmode.dm

Organs:

2011-10-08 10:38:01 +00:00

explosion_particles.dm

Energy projectiles work again.

2011-10-11 07:52:30 +00:00

meteors.dm

Final updates on Fingerprints

2012-01-31 02:01:39 -07:00