Arokha Sieyes 76567bb7a2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync ...

# Conflicts:
#	code/modules/mob/living/carbon/human/whisper.dm

Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).

2016-05-26 09:59:18 -04:00

..

combat

Tweaks to previous commits.

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

equipment

Adds a mech flare launcher, can be mounted on any mech.

2016-02-24 21:15:48 -05:00

medical

Removes unused Xeno stuff

2016-05-24 23:48:52 +01:00

working

…

mech_bay.dm

Construction Update

2016-03-25 16:02:36 -04:00

mech_fabricator.dm

Gateway Icon Change + Fitness Center (#95)

2016-05-17 20:03:45 -04:00

mech_sensor.dm

…

mecha_construction_paths.dm

…

mecha_control_console.dm

Merge branch 'dev' into ofMechfabAndPanic

2015-08-17 09:58:23 +03:00

mecha_parts.dm

Merge branch 'dev' into ofMechfabAndPanic

2015-08-21 16:59:57 +03:00

mecha_wreckage.dm

…

mecha.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00