skull132 a5848c2802 Merge branch 'development' into map-development ...

# Conflicts:
#	baystation12.dme
#	code/game/objects/random/random.dm
#	code/game/turfs/turf_changing.dm
#	code/modules/mining/ore.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm

2017-05-01 01:07:56 +03:00

..

antagonist

Simpler lighting process, bug fixes, & modular computer tweaks (#1809)

2017-02-24 20:24:31 +02:00

civilian

Crusher for the new map (#2127)

2017-04-28 16:33:02 -04:00

command

UDP Logging (#1997)

2017-04-01 23:47:00 +03:00

engineering

Simpler lighting process, bug fixes, & modular computer tweaks (#1809)

2017-02-24 20:24:31 +02:00

games

Simpler lighting process, bug fixes, & modular computer tweaks (#1809)

2017-02-24 20:24:31 +02:00

generic

Simpler lighting process, bug fixes, & modular computer tweaks (#1809)

2017-02-24 20:24:31 +02:00

medical

Simpler lighting process, bug fixes, & modular computer tweaks (#1809)

2017-02-24 20:24:31 +02:00

research

Simpler lighting process, bug fixes, & modular computer tweaks (#1809)

2017-02-24 20:24:31 +02:00

security

Various Changes (#2040)

2017-04-16 20:13:59 +03:00

system

Simpler lighting process, bug fixes, & modular computer tweaks (#1809)

2017-02-24 20:24:31 +02:00

_program.dm

Computer manager and more (#1406)

2017-01-20 21:45:53 +02:00

app_presets.dm

Crusher for the new map (#2127)

2017-04-28 16:33:02 -04:00