D3athrow 01d2471fc9 Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge ...

Conflicts:
	code/ATMOSPHERICS/pipe/pipe_dispenser.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/embedded_controller/embedded_controller_base.dm
	code/modules/mining/money_bag.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/rdconsole.dm
	code/modules/research/xenoarchaeology/machinery/analysis_base.dm
	code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
	code/modules/research/xenoarchaeology/tools/ano_device_battery.dm

2015-04-12 16:40:59 -05:00

..

sorts

Up to date timesort to resolve list issues.

2015-02-05 17:44:48 -06:00

_macros.dm

Addresses issues

2015-04-02 19:50:55 -05:00

cmp.dm

runtime fixes.

2015-02-07 03:00:23 -06:00

constants.dm

Fix for game modes that uses old master controller process time computation.

2015-01-22 11:38:35 +08:00

datumpool.dm

Part 3: Stable build, confirmation of powernet rebuilding successfully, powernet ticking successfully, pooling successfully, expanding and rebuilding networks successfully, and emitters fucking turn themselves off.

2015-04-01 04:44:57 -05:00

experimental.dm

Another datum initialization hotfix. Initial does not create lists causing type mismatches.

2015-03-23 04:49:37 -05:00

files.dm

csv in the allowed list.

2015-02-02 01:18:07 -06:00

game.dm

Use the new recursive contents checker at steal items objective

2015-04-10 02:45:04 +08:00

gender.dm

Get rid of test verb

2014-08-14 23:30:00 -07:00

global_lists.dm

Merge pull request #3662 from clusterfack/powernets

2015-04-03 17:59:15 -05:00

icons.dm

Move libraries into code/libs/

2014-07-12 20:07:45 -08:00

iteration.dm

…

lists.dm

Up to date timesort to resolve list issues.

2015-02-05 17:44:48 -06:00

logging.dm

Copy admin only log system of NSS-Phoenix.

2014-10-27 00:04:59 -08:00

maths.dm

Remove duplicate procs.

2015-03-23 01:49:16 +08:00

mobs.dm

Firelock rebalance, see changelog.

2014-07-24 01:26:24 -07:00

names.dm

Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge

2015-04-12 16:40:59 -05:00

sanitize_values.dm

…

text.dm

wow, how do variable names work work

2015-01-12 09:55:57 -05:00

time.dm

remove extra spaces.

2015-03-23 04:05:38 +08:00

timed_alerts.dm

i'm stupid too

2014-10-13 23:51:29 -05:00

type2type.dm

Up to date timesort to resolve list issues.

2015-02-05 17:44:48 -06:00

unsorted.dm

Use the new recursive contents checker at steal items objective

2015-04-10 02:45:04 +08:00