PsiOmegaDelta f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm

2015-12-13 10:15:29 +01:00

..

ammunition

Mostly removes creation of throwaway objects from chameleon items

2015-06-06 18:19:23 -04:00

guns

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

2015-12-13 10:15:29 +01:00

projectile

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

2015-12-13 10:15:29 +01:00

ammunition.dm

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

effects.dm

Projectile visual bug fixes

2015-07-11 00:06:44 +12:00

gun.dm

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

2015-12-06 11:34:36 +01:00

projectile.dm

Misc.

2015-08-11 17:33:03 +02:00

targeting.dm

fixes #8391

2015-07-09 13:23:13 -07:00