Jack Edge 5da579b7c4 Merge branch 'master' into random-space ...

Conflicts:
	_maps/asteroidstation.dm

2016-06-20 13:06:08 +01:00

..

diseases

Fixes runtimes in sensory deprivation symptom

2016-06-13 17:51:25 +03:00

helper_datums

find_safe_turf more random, more cycles

2016-06-16 12:29:16 +01:00

martial

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

ruins

Spelling and grammar fixes

2016-06-16 16:33:09 +01:00

wires

Fix the admin log message for syndicate bomb logging

2016-05-31 22:18:53 +00:00

action.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

ai_laws.dm

Some more work or something, idk

2016-06-02 20:53:51 -04:00

beam.dm

fixes beam() lag

2016-03-20 16:07:48 -07:00

browser.dm

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

datacore.dm

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

datumvars.dm

Merge pull request #18472 from phil235/HackyShit

2016-06-13 09:24:52 +12:00

dna.dm

All species now use the bodypart system to create their body sprite.

2016-06-11 16:36:47 +02:00

dog_fashion.dm

Grammar fixes

2016-04-25 16:28:16 +01:00

hud.dm

Pre-testmerge polish

2016-05-15 13:15:27 -04:00

martial.dm

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

material_container.dm

R&D machinery refactor (#18295)

2016-06-08 17:18:22 +12:00

mind.dm

Fixes #18271

2016-06-18 15:02:32 +02:00

mutations.dm

Some adjustments, following suggestions in the PR discussion.

2016-05-05 21:50:30 +02:00

outfit.dm

…

progressbar.dm

Renames appearance flag defines.

2016-01-24 23:26:14 -06:00

recipe.dm

…

ruins.dm

Ruin budget system (#17366)

2016-05-08 23:03:42 +10:00

shuttles.dm

Adds Asteroid emergency shuttle to station (#18125)

2016-06-02 15:48:08 -05:00

votablemap.dm

…