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

Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm

2015-06-23 12:54:26 -07:00

..

bygex

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

sorts

Fixes timSort

2015-01-15 23:00:26 +00:00

_logging.dm

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

2014-11-03 22:38:21 -03:00

_string_lists.dm

Ion strings moved to external txt. Credits to volundr @ goonstation for the idea and the contents of _string_lists.dm

2014-11-13 19:59:20 -03:00

cmp.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

files.dm

fixes shit

2014-03-09 18:31:43 +01:00

game.dm

Moved lighting stuff from controllers folder to its own module

2015-04-12 02:25:28 -07:00

global_lists.dm

Readds wagging tail feature with WJohn's help on sprites

2015-06-13 20:34:38 -04:00

icons.dm

Ports /vg/ chem weighted colour averaging

2015-05-12 23:55:35 +01:00

lists.dm

Optimises uniqueList

2015-05-09 02:50:51 +01:00

maths.dm

Reduced the potency of carrying multiple light sources.

2014-02-05 16:54:46 -05:00

matrices.dm

Casing rotation

2014-06-07 01:23:49 -05:00

mobs.dm

Generalizes lizard parts to "features" for future non-lizard fields, at the same time merging mutant color into this list

2015-06-12 00:43:35 -04:00

names.dm

Additional Changes

2015-06-22 22:29:51 -06:00

sanitize_values.dm

Cleaning up and a new discovery, for me, means you don't have to unsanitize the color.

2014-01-18 00:25:33 +00:00

text.dm

Makes my strip_html_properly() removal compile.

2015-06-11 16:30:38 +02:00

time.dm

absolute paths for files in _HELPERS folder and one file in _onclick folder

2014-08-16 13:19:46 +02:00

type2type.dm

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

unsorted.dm

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

2015-06-23 12:54:26 -07:00