D3athrow
|
d59f6a07b0
|
comment out panicwriter and saytesting
|
2015-07-20 16:04:48 -05:00 |
|
D3athrow
|
41d7df01fd
|
just fuck my shit up
|
2015-07-18 02:30:51 -05:00 |
|
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 |
|
Chris
|
7a5b9ca8b9
|
put things in order for watchdog script to respect map votes.
|
2015-01-07 14:03:39 -06:00 |
|
Rob Nelson
|
1b7f277554
|
Have watchdog tell us when it detects an update.
|
2013-09-18 10:08:13 -07:00 |
|
Rob Nelson
|
cc1d20f049
|
Add system to let the restart script know when a round ends so it doesn't kill the round.
|
2013-09-17 04:50:35 -07:00 |
|