Leshana 5ae26332fa Merge branch 'master' into aro-tether-wip ...

# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm

2017-05-16 00:26:32 -04:00

..

combat

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

equipment

Merge pull request #3412 from VOREStation/pool-closed

2017-05-08 17:21:24 -05:00

medical

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00

micro

Fix VOREStation use of color macros so we pass the new stringent macro tests.

2017-05-08 22:34:13 -04:00

working

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

mech_bay.dm

Revert "Revert "Frame Cleanup""

2016-08-13 19:55:57 -04:00

mech_fabricator.dm

Eris Machines

2017-04-23 18:30:39 -04:00

mech_prosthetics.dm

Eris Machines

2017-04-23 18:30:39 -04:00

mech_sensor.dm

Now mecha area denial feedback is closer to 5 seconds apart then ever.

2014-08-24 23:41:15 +02:00

mecha_construction_paths.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

mecha_control_console.dm

Removes all the hard references to computer.dmi

2017-04-19 16:54:16 -04:00

mecha_parts.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

mecha_wreckage.dm

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

mecha.dm

Rename mecha power cell

2017-02-07 09:37:02 -05:00