Miauw 4bdffc2dc3 Merge branch 'master' of https://github.com/tgstation/-tg-station into somebodyfinallydoessomethingaboutnewlingsuckingpleaselickmyfeetnow ...

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2014-01-22 17:01:20 +01:00

..

area

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

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

gamemodes

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

2014-01-22 17:01:20 +01:00

jobs

Gives janitor service headset

2014-01-06 18:51:22 +00:00

machinery

Resolved more conflicts with drying rack before being pulled

2014-01-21 13:01:53 -05:00

mecha

Merge pull request #2391 from ManeaterMildred/MechUpdate

2014-01-17 10:02:39 -08:00

objects

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

2014-01-22 17:01:20 +01:00

turfs

unshittied it finally and hopefully actually finally today.

2014-01-12 14:11:22 +01: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

Re-added the recycler's emag functionality and changed it so that it does massive brute damage and eats the person's equipped items.

2014-01-06 17:21:13 +00: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

Fixed some issues

2014-01-02 09:27:51 +04:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

Adds "surround" arg to playsound, which enables 3D sound

2014-01-07 17:45:12 -05:00