paprka 0ffba02112 Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables ...

Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/objects/structures/tables_racks.dm

2014-11-09 14:53:19 -08:00

..

area

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

2014-10-25 23:25:27 -07:00

gamemodes

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

2014-11-09 14:53:19 -08:00

jobs

Players jobbanned from assistant will get random jobs assigned before everyone else, in order to attempt to mitigate abuses.

2014-10-27 16:20:11 -03:00

machinery

Adds a sound for the RPED!

2014-11-08 23:49:04 -06:00

mecha

Merge pull request #5722 from Aranclanos/mechfabricators

2014-11-08 15:10:58 -08:00

objects

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

2014-11-09 14:53:19 -08:00

pooling

…

turfs

Merge pull request #5642 from phil235/AttackAnimation

2014-11-07 18:39:27 +00:00

verbs

Breathing won't check anymore if the person if committed suicide.

2014-11-06 13:48:41 -03:00

asteroid.dm

initial commit for table overhaul

2014-11-01 23:57:01 -07:00

atoms_movable.dm

Moves m_amt, g_amt, reliability and origin_tech to /obj/item (previously in /obj)

2014-11-02 14:10:03 -03:00

atoms.dm

Merge pull request #5512 from RemieRichards/AcidBurns

2014-11-03 18:11:49 -08:00

communications.dm

Conflicts solving

2014-11-04 20:24:52 +01:00

data_huds.dm

Cuts /disease variables from 28 to 23 (includes new ones)

2014-10-30 06:21:14 +00:00

dna.dm

* Prevent being able to open/close sleepers, cryo tubes and DNA scanners when in various conditions (weaken, ...) and by non-humans/non-silicons.

2014-11-01 21:52:54 +01:00

say.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

…