mwerezak 5740f52964 Merge branch 'guns' into gun-rewrite ...

Conflicts:
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/energy/pulse.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/launcher.dm
	code/modules/projectiles/guns/projectile/shotgun.dm

2015-02-11 18:08:43 -05:00

..

hud

Merge branch 'guns' into gun-rewrite

2015-02-11 18:08:43 -05:00

adjacent.dm

Added a quick adjacent check for alt-clicking

2014-05-14 19:59:40 +12:00

ai.dm

Turret controls now affects all aspects of slaved turrets.

2014-11-30 15:50:51 +01:00

click.dm

Removed now-redundant buckle check.

2014-12-13 23:11:59 +10:30

cyborg.dm

Expands the AI photo-camera so that it now has robot/cyborg support. Also implements DRY in practice.

2014-07-28 23:41:55 +02:00

drag_drop.dm

…

item_attack.dm

Fixes runtime error: pick() from empty list

2015-01-13 13:37:07 -08:00

observer.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

oldcode.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

other_mobs.dm

Changes slime stun probabilities

2015-02-04 02:07:14 +03:00

telekinesis.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00