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

Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi

2015-01-08 02:09:02 +08:00

..

area

Revert "Moves all the custom AsteroidStation areas"

2015-01-05 21:51:07 -03:00

gamemodes

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

2015-01-04 01:52:14 +00:00

jobs

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

2015-01-07 01:38:38 +08:00

machinery

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

2015-01-08 02:09:02 +08:00

mecha

* Added a default proc for prying open unpowered/broken machines using a crowbar

2015-01-06 23:57:19 +01:00

objects

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

2015-01-08 02:09:02 +08:00

pooling

…

turfs

Merge pull request #6823 from Firecage/Plasma_floor_fix

2015-01-06 21:53:10 -03:00

verbs

Merge pull request #6490 from tkdrg/nomoreadmingrudges

2014-12-27 19:25:43 -08:00

asteroid.dm

Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound.

2014-12-09 19:38:49 -08:00

atoms_movable.dm

…

atoms.dm

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

2014-12-28 11:20:15 +03:00

communications.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

data_huds.dm

…

dna.dm

Merge pull request #6758 from Menshin/crowbar_prying

2015-01-06 21:25:17 -03:00

say.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

Atoms don't have clients, Revert of previous commit

2014-12-27 01:04:32 +00:00