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

Conflicts:
	maps/tgstation.2.1.2.dmm

2013-12-06 12:20:35 -05:00

..

diseases

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

2013-11-27 15:58:42 +00:00

helper_datums

* Tidied up the code.

2013-11-12 19:49:36 +00:00

spells

Added a check for the target of the magic missile between the sleeps. This will stop the runtimes and the MM objects from being stuck in the spot (I think you can pull them though)

2013-11-27 05:47:36 -03:00

wires

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

2013-12-06 12:20:35 -05:00

ai_laws.dm

…

browser.dm

…

computerfiles.dm

…

datacore.dm

Moves some datacore code into datacore.dm from other .dm's

2013-09-12 22:55:53 -05:00

datumvars.dm

Start of standardizing required permissions for admins.

2013-08-28 15:51:45 -07:00

disease.dm

Commiting some soft Updates of commits I'm behind on and Committing the rest via git.

2013-11-17 18:02:43 +00:00

mind.dm

Fixed out of date mind.dm, then applied the fix.

2013-11-30 00:17:38 +01:00

mixed.dm

Initial commit for telescience which uses projectile trajectory to obtain a destination coordinate.

2013-11-09 13:02:15 +00:00

modules.dm

…

recipe.dm

…

spell.dm

Merge pull request #1450 from Incoming5643/wizardspells2

2013-09-25 16:01:26 -07:00

sun.dm

…

supplypacks.dm

ADDED costume restocking unit

2013-11-18 19:15:23 +01:00

uplink_item.dm

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

2013-12-06 12:20:35 -05:00