Razharas a589387ccf Fixing merge conflicts ...

THis is getting harder and harder

2014-02-06 22:26:16 +04:00

..

area

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

2014-01-15 18:32:55 +00:00

gamemodes

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

jobs

Added book bags. The librarian now spawns holding one.

2014-02-02 04:46:34 -03:00

machinery

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

mecha

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

objects

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

2014-02-06 22:05:39 +04:00

turfs

Fixing merge conflicts

2014-02-06 22:26:16 +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

Fixes the disposal outlet runtiming. The removed code, which was causing the runtime, wasn't even doing anything and was just setting "throwing" to 2 for no reason.

2014-01-06 18:20:59 +00:00

atoms.dm

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

2014-01-31 05:20:59 +04: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

Fixing merge conflicts

2014-02-06 22:26:16 +04: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

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

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