Ren Erthilo af9a80cce4 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	code/modules/mob/mob_defines.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/storage.dmi
	maps/tgstation.2.0.8.dmm

2012-04-02 00:37:54 +01:00

..

Apples

Added Artifact #1

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

Cael_Aislinn

Part one of bugfixes for the new damage system.

2012-03-31 22:01:21 -07: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

Added temp thing to make atmos not freeze everything after the first breach, also removed a doubled up pipe in medbay

2012-03-16 22:47:40 +10: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

cleaned up the paths of a few ported things

2012-03-08 00:46:24 -05:00

SkyMarshal

Portalathe fix, Magboots + airflow fix, Fix for the "MODE" job, fixed removing gravity catapult, fixed death alarms prematurely detonating.

2012-03-25 15:33:14 -07:00

Tastyfish

more pipe stuff

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

virus2

TG: toxloss is now only referenced via procs. r2875

2012-03-26 23:23:46 +01:00

Wrongnumber

Unique sprite fro welderpack

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

AI_Visibility.dm

Fixed a very rare bug with freelook

2012-03-10 19:08:17 +10: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