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

Conflicts:
	code/modules/mob/mob.dm

2014-03-29 16:59:14 +00:00

..

diseases

Merge pull request #3187 from phil235/pierrotfix

2014-03-26 16:56:00 -07:00

helper_datums

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

spells

Merge pull request #3195 from MrPerson/qdel_ei_nath_REDO

2014-03-28 13:03:11 -05:00

wires

Resolved Conflicts:

2014-03-25 09:07:38 -06:00

ai_laws.dm

Added a failsafe, default_laws is now a config option.

2013-12-23 13:10:04 +01:00

browser.dm

…

computerfiles.dm

…

datacore.dm

Fixed coloring, overlays on overlays, and blood trails.

2014-02-18 16:54:22 -05:00

datumvars.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08: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

gas_mixture.dm

Removed group_multiplier nonsense from gas_mixture.

2014-02-28 18:12:33 -05:00

mind.dm

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

2014-03-22 21:01:09 +00: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

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

spell.dm

Make ei nath not destroy brains

2014-03-26 08:38:26 -07:00

sun.dm

…

supplypacks.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

uplink_item.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00