Arokha Sieyes 484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris ...

# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm

2016-07-03 16:21:21 -04:00

..

hud

Readded the click Catcher

2016-06-18 16:39:21 -03:00

_defines.dm

510 Improved Overlays

2016-06-18 15:50:10 -03:00

adjacent.dm

…

ai.dm

…

click.dm

510 Improved Overlays

2016-06-18 15:50:10 -03:00

cyborg.dm

…

drag_drop.dm

…

item_attack.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris

2016-07-03 16:21:21 -04:00

observer.dm

…

other_mobs.dm

Made slimes more interesting.

2016-05-06 04:07:52 +09:30

rig.dm

…

telekinesis.dm

…