Chinsky ae75e3555e Merge remote-tracking branch 'remotes/upstream/dev-freeze' into conscience ...

Conflicts:
	code/modules/mob/living/carbon/human/human_attackhand.dm

2015-04-05 05:23:14 +03:00

..

modules

Added check for second pAi for #8287

2015-03-30 22:55:17 +03:00

suits

Tweaks rig emp effect, breach_threshold

2015-03-23 02:49:34 -04:00

rig_attackby.dm

Fixes #7861 (partial), #7957, #7940

2015-01-29 10:53:32 +10:30

rig_pieces.dm

Tweaks rig emp effect, breach_threshold

2015-03-23 02:49:34 -04:00

rig_verbs.dm

EMP briefly blocks switching/engaging modules

2015-02-26 00:05:04 -05:00

rig_wiring.dm

Working on the interface and suit hacking.

2014-11-16 18:11:15 +10:30

rig.dm

Adds weedkiller smoke checks to hydro trays and spreading plants.

2015-04-01 07:25:09 -07:00