phil235 94d072828f Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix ...

Conflicts:
	code/game/atoms_movable.dm
	code/game/objects/items/weapons/dice.dm
	code/game/objects/weapons.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/living_defines.dm
	code/modules/reagents/reagent_containers.dm

2015-07-19 21:53:39 +02:00

..

_readme.dm

Initial pass to convert LF to CRLF

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

admin.dm

Initial pass to convert LF to CRLF

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

atmospherics.dm

Tweaks some atmos defines relating to spreading and plasma

2015-07-13 07:17:38 -07:00

clothing.dm

Cleaned some clothing flags. Ported turf/Entered optimization from vg.

2015-06-23 01:52:14 +01:00

combat.dm

Merge pull request #8206 from RemieRichards/AILessProcessing

2015-03-14 16:21:22 -05:00

flags.dm

Fixes thrown closet opening to not use spawn().

2015-07-19 21:29:35 +02:00

genetics.dm

Replaces magic number with define

2015-07-04 22:30:46 +03:00

hud.dm

Datum-Based Gangs

2015-07-02 15:12:55 -06:00

machines.dm

Finished the exofab revamp:

2014-12-02 23:00:22 +01:00

math.dm

Initial pass to convert LF to CRLF

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

misc.dm

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

preferences.dm

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

2015-06-13 05:30:05 +03:00

qdel.dm

Massive MC and subsystem rewrite

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

say.dm

Beginnings of new update

2015-05-16 22:06:42 -04:00

sight.dm

Includes antag HUDs in the datum hud overhaul

2014-11-20 15:43:51 -03:00

stat.dm

Shuttle stranding:

2015-01-21 17:35:45 -05:00

tablecrafting.dm

Adds a category for food items, adds some missing weapons and a Misc category

2015-06-25 11:58:42 +01:00