PsiOmegaDelta 388343a84e Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/machinery/recharger.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob.dm

2015-07-20 08:28:32 +02:00

..

hud

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-06 18:33:09 +02:00

adjacent.dm

…

ai.dm

Ports /tg/'s borg hotkeys. They work similarly to the AI's hotkeys.

2015-03-13 21:41:23 -04:00

click.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-20 08:28:32 +02:00

cyborg.dm

Ports /tg/'s borg hotkeys. They work similarly to the AI's hotkeys.

2015-03-13 21:41:23 -04:00

drag_drop.dm

…

item_attack.dm

Updates knifing

2015-05-31 11:36:38 -04:00

observer.dm

Minor folders. code/defines, code/FEA, code/__HELPERS, code/_onclick, code/TriDimension, code/ZAS

2015-05-29 20:36:48 +01:00

oldcode.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge

2015-05-05 22:13:58 +02:00

other_mobs.dm

Removed IS_SYNTHETIC and REGENERATES_LIMBS flags.

2015-05-25 14:49:07 +09:30

rig.dm

soft_assert addition

2015-05-23 19:41:42 +01:00

telekinesis.dm

Fixes #9852

2015-06-20 21:17:10 +09:30