bgobandit b94ce1968b Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb ...

Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm

2016-05-18 03:13:37 -04:00

..

area

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

gamemodes

Adds new objective for devils to have X people on station be sintouched. (#17616)

2016-05-17 21:37:08 +01:00

machinery

[s] Simple animals can no longer drag-drop people into cryo or sleepers. (#17689)

2016-05-16 18:47:52 -05:00

mecha

Updates the Mech Bay Power Control Console to have a TGUI interface.

2016-05-16 02:24:41 +01:00

objects

Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb

2016-05-18 03:13:37 -04:00

pooling

…

turfs

SLIP-SANITY (#17096)

2016-05-10 22:52:05 -05:00

verbs

[s] Suicides are now logged. (#17636)

2016-05-16 22:11:23 -05:00

alternate_appearance.dm

…

asteroid.dm

cleanup

2016-05-08 11:46:26 -04:00

atoms_movable.dm

invisibility = 100 and 101 now use defines.

2016-04-29 01:00:05 +02:00

atoms.dm

Turns tablecrafting into personal crafting (#17341)

2016-05-09 18:14:48 +02:00

communications.dm

…

data_huds.dm

Fixes a few simple animal huds

2016-05-04 18:40:58 -04:00

dna.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

say.dm

…

shuttle_engines.dm

…

skincmd.dm

…

sound.dm

…