xxalpha a62c09bbb7 Merge remote-tracking branch 'upstream/master' into dryshoes ...

Conflicts:
	code/__DEFINES/misc.dm

2015-09-08 16:56:37 +01: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

changes associative lists to standard lists; updates MiniStation.dmm

2015-08-17 21:46:39 -06:00

clothing.dm

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

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

combat.dm

Move hostile animal target into the life subproc handle_automated_action().

2015-07-30 22:49:26 +02:00

flags.dm

Squashed commit of the following:

2015-08-29 13:19:15 -06:00

genetics.dm

Transferred body eggs to new organs system

2015-08-03 23:24:17 +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

Merge remote-tracking branch 'upstream/master' into dryshoes

2015-09-08 16:56:37 +01:00

pipe_construction.dm

fixes merge stuff

2015-08-17 16:48:34 -06:00

preferences.dm

announce login message as a config

2015-09-04 21:49:09 +10:00

qdel.dm

Squashed commit of the following:

2015-08-29 13:19:15 -06: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