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 |
|
