Cheridan b84c7c3b1d Merge branch 'master' of https://github.com/Kelenius/-tg-station into Kelenius-master ...

Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm
	code/game/machinery/vending.dm
	code/modules/hydroponics/hydroponics.dm

2014-02-25 23:11:56 -06:00

..

area

Merge branch 'master' into spaceareas

2014-02-24 17:47:19 -05:00

gamemodes

Merge branch 'master' into spaceareas

2014-02-24 17:47:19 -05:00

jobs

Merge pull request #2854 from Incoming5643/oreroom

2014-02-24 08:04:11 -08:00

machinery

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

2014-02-25 23:11:56 -06:00

mecha

Fixed mech grenade prime runtime

2014-02-21 17:40:44 +04:00

objects

Merge branch 'master' of https://github.com/tgstation/-tg-station into ChuckTheSheep-Botany-Big-Booty-Twerk

2014-02-25 19:39:26 -06:00

turfs

Quick fix for tables, lockers and general drop_item

2014-02-21 05:15:40 +04:00

verbs

OOC Color Default In Input

2014-01-07 01:04:45 -05:00

asteroid.dm

[MAP] Mining fixes and a remap

2013-11-06 23:26:46 -05:00

atoms_movable.dm

second pass

2014-02-15 20:11:12 -08:00

atoms.dm

Removes slipping in space

2014-02-08 16:38:21 +13:00

communications.dm

Makes deathsquad frequency (144.1) a different colour again, this time grey to differentiate it from science's plum.

2013-12-31 16:50:17 +13:00

dna.dm

DNA and R&D console runtimes fix

2014-02-21 17:37:14 +04:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

Adds crlf default to .gitattributes for most text file types we use.

2014-02-04 15:14:39 +00:00