Cheridan 957f987b5d Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet ...

Conflicts:
	icons/effects/effects.dmi
	icons/obj/items.dmi

2015-06-22 22:57:53 -05:00

..

area

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

gamemodes

Tweaked the meteor screen shake a bit, grav anoms now throw shit, and rods don't gib anymore.

2015-06-22 01:19:12 -05:00

jobs

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

machinery

Merge pull request #9466 from Fayrik/TheNanoing

2015-06-22 14:24:20 +02:00

mecha

Merge pull request #9792 from GunHog/AI_STOLE_MY_BIKE

2015-06-21 00:30:03 +01:00

objects

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

2015-06-22 22:57:53 -05:00

pooling

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

turfs

Merge pull request #9971 from KorPhaeron/newfloors

2015-06-23 03:43:28 +01:00

verbs

reset ooc color buttons, changes how default color for admins is handled

2015-05-17 22:10:46 +10:00

asteroid.dm

Merge pull request #9715 from Firecage/datumspaths

2015-06-02 23:04:51 -05:00

atoms_movable.dm

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

atoms.dm

Revert dump_act and dump_from_storage

2015-06-18 21:21:41 +02:00

communications.dm

Removes strip_html_properly(), replaces it with html_encode().

2015-06-11 15:37:41 +02:00

data_huds.dm

…

dna.dm

Pray pray pray

2015-06-18 18:07:57 +01:00

say.dm

Fixes all possible exploits with the AI tracking href link

2015-05-22 11:26:43 -03:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

Removes unsimulated turfs.

2015-06-01 23:24:18 -03:00

sound.dm

Merge pull request #9612 from Aranclanos/lobbyMusic

2015-05-24 19:13:12 -05:00