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

Conflicts:
	code/datums/spells/charge.dm
	code/modules/projectiles/ammunition/special.dm
	code/modules/projectiles/guns/magic/staff.dm

2014-03-26 13:03:12 -04:00

..

area

Gives a gravity generator to MiniStation.

2014-03-21 21:57:57 +00:00

gamemodes

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

2014-03-26 13:03:12 -04:00

jobs

Merge pull request #3163 from Mloc/tg-eol

2014-03-24 22:47:13 -03:00

machinery

Resolved Conflicts:

2014-03-25 09:07:38 -06:00

mecha

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

objects

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

2014-03-26 13:03:12 -04:00

turfs

Merge pull request #3161 from Giacom/gravity_changes

2014-03-26 03:27:20 -03:00

verbs

OOC Color Default In Input

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

asteroid.dm

Merge conflicts fix

2014-03-03 05:42:31 +04:00

atoms_movable.dm

Make most mobs del() instead of trying to GC them.

2014-03-25 08:44:40 -07:00

atoms.dm

Make most mobs del() instead of trying to GC them.

2014-03-25 08:44:40 -07: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

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

2014-03-21 03:05:39 -07:00

shuttle_engines.dm

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00

skincmd.dm

Experimental DMF vending machine update, by Tobba.

2011-11-18 00:45:50 +00:00

smoothwall.dm

- Fixes issue 985. false walls are now called 'wall' instead of 'falsewall', which made them obvious.

2012-10-02 21:40:36 +00:00

sound.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00